Download as
Browse Code »

Commit 269367da2c4d19a55572cc723a80b6ee59adf897

Authored by Macieski
2 parents f3ef5d35 77dcc34f
Exists in master

Merge branch 'master' of https://github.com/lightbase/WSCacicNeo

Showing 4 changed files with 32 additions and 38 deletions   Show diff stats
wscacicneo/static/caciclogo_transparent.png 0 → 100644
View file @269367d

4.33 KB
wscacicneo/static/macadmin/js/custom.js
  Diff comments   View file @269367d
@@ -279,6 +279,7 @@ $(function(){ @@ -279,6 +279,7 @@ $(function(){
279 279
280 /* jQuery Notification */ 280 /* jQuery Notification */
281 281
  282 +/*
282 $(document).ready(function(){ 283 $(document).ready(function(){
283 284
284 setTimeout(function() {noty({text: '<strong>Howdy! Hope you are doing good...</strong>',layout:'topRight',type:'information',timeout:15000});}, 7000); 285 setTimeout(function() {noty({text: '<strong>Howdy! Hope you are doing good...</strong>',layout:'topRight',type:'information',timeout:15000});}, 7000);
@@ -317,7 +318,7 @@ $(document).ready(function() { @@ -317,7 +318,7 @@ $(document).ready(function() {
317 318
318 }); 319 });
319 320
320 - 321 +*/
321 /* Date picker */ 322 /* Date picker */
322 323
323 $(function() { 324 $(function() {
wscacicneo/templates/master.pt
  Diff comments   View file @269367d
@@ -13,33 +13,26 @@ @@ -13,33 +13,26 @@
13 <div class="navbar navbar-fixed-top bs-docs-nav" role="banner"> 13 <div class="navbar navbar-fixed-top bs-docs-nav" role="banner">
14 14
15 <div class="conjtainer"> 15 <div class="conjtainer">
  16 +
16 <!-- Menu button for smallar screens --> 17 <!-- Menu button for smallar screens -->
17 <div class="navbar-header"> 18 <div class="navbar-header">
18 <button class="navbar-toggle btn-navbar" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> 19 <button class="navbar-toggle btn-navbar" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
19 <span>Menu</span> 20 <span>Menu</span>
20 </button> 21 </button>
  22 +
21 <!-- Site name for smallar screens --> 23 <!-- Site name for smallar screens -->
22 <a href="index.html" class="navbar-brand hidden-lg">Super-Gerente</a> 24 <a href="index.html" class="navbar-brand hidden-lg">Super-Gerente</a>
23 </div> 25 </div>
24 -  
25 -  
26 -  
27 - <!-- Navigation starts --> 26 +
  27 + <!-- Navigation starts -->
28 <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation"> 28 <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
29 -  
30 - <!-- Search form -->  
31 - <form class="navbar-form navbar-right" role="search">  
32 - <div class="form-group">  
33 - <input type="text" class="form-control" placeholder="Search">  
34 - </div>  
35 - </form>  
36 - <!-- Links --> 29 +
  30 + <!-- Links -->
37 <ul class="nav navbar-nav pull-right"> 31 <ul class="nav navbar-nav pull-right">
38 <li class="dropdown pull-right"> 32 <li class="dropdown pull-right">
39 <a data-toggle="dropdown" class="dropdown-toggle" href="#"> 33 <a data-toggle="dropdown" class="dropdown-toggle" href="#">
40 <i class="fa fa-user"></i> Admin <b class="caret"></b> 34 <i class="fa fa-user"></i> Admin <b class="caret"></b>
41 </a> 35 </a>
42 -  
43 <!-- Dropdown menu --> 36 <!-- Dropdown menu -->
44 <ul class="dropdown-menu"> 37 <ul class="dropdown-menu">
45 <li><a href="#"><i class="fa fa-user"></i> Profile</a></li> 38 <li><a href="#"><i class="fa fa-user"></i> Profile</a></li>
@@ -47,14 +40,19 @@ @@ -47,14 +40,19 @@
47 <li><a href="login.html"><i class="fa fa-sign-out"></i> Logout</a></li> 40 <li><a href="login.html"><i class="fa fa-sign-out"></i> Logout</a></li>
48 </ul> 41 </ul>
49 </li> 42 </li>
50 -  
51 </ul> 43 </ul>
  44 +
  45 + <!-- Search form -->
  46 + <form class="navbar-form navbar-right" role="search">
  47 + <div class="form-group">
  48 + <input type="text" class="form-control" placeholder="Buscar">
  49 + </div>
  50 + </form>
52 </nav> 51 </nav>
53 52
54 </div> 53 </div>
55 </div> 54 </div>
56 -  
57 - 55 +
58 <!-- Header starts --> 56 <!-- Header starts -->
59 <header> 57 <header>
60 <div class="container"> 58 <div class="container">
@@ -64,8 +62,10 @@ @@ -64,8 +62,10 @@
64 <div class="col-md-4"> 62 <div class="col-md-4">
65 <!-- Logo. --> 63 <!-- Logo. -->
66 <div class="logo"> 64 <div class="logo">
67 - <h1><a href="home">Super<span class="bold">Gerente</span></a></h1> 65 + <h1><a href="${request.route_url('root')}home"><img src="${request.route_url('root')}/static/caciclogo_transparent.png"> </a>
  66 + <a href="${request.route_url('root')}home">Super<span class="bold">Gerente</span></a></h1>
68 </div> 67 </div>
  68 +
69 <!-- Logo ends --> 69 <!-- Logo ends -->
70 </div> 70 </div>
71 71
wscacicneo/templates/menu.pt
  Diff comments   View file @269367d
1 <div class="sidebar"> 1 <div class="sidebar">
2 - <div class="sidebar-dropdown"><a href="#">Navigation</a></div>  
3 -<ul id="nav">  
4 - <!-- Main menu with font awesome icon -->  
5 - <li class="open"><a href="home"><i class="fa fa-home"></i> Dashboard</a>  
6 - </li>  
7 - <li class="has_sub">  
8 - <a href="#"><i class="fa fa-file-o"></i> Páginas <span class="pull-right"><i class="fa fa-chevron-right"></i></span></a>  
9 - <ul>  
10 - <li><a href="orgao">Orgao</a></li>  
11 - <li><a href="login.html">Login</a></li>  
12 - <li><a href="register.html">Register</a></li>  
13 - <li><a href="support.html">Support</a></li>  
14 - <li><a href="invoice.html">Invoice</a></li>  
15 - <li><a href="gallery.html">Gallery</a></li>  
16 - </ul>  
17 - </li>  
18 -  
19 -  
20 -</ul>  
21 -</div> 2 + <div class="sidebar-dropdown"><a href="#">Navigation</a></div>
  3 + <ul id="nav">
  4 + <!-- Main menu with font awesome icon -->
  5 + <li class="open"><a href="${request.route_url('root')}home"><i class="fa fa-home"></i> Início</a>
  6 + </li>
  7 + <li class="has_sub">
  8 + <a href="#"><i class="fa fa-file-o"></i> Orgão <span class="pull-right"><i class="fa fa-chevron-right"></i></span></a>
  9 + <ul>
  10 + <li><a href="${request.route_url('root')}orgao">Cadastrar Orgao</a></li>
  11 + </ul>
  12 + </li>
  13 + </ul>
  14 + </div>