##// END OF EJS Templates
Update base template: main menu...
Juan C. Espinoza -
r46:1678176d32cd
parent child
Show More
@@ -12,7 +12,8
12 <style type="text/css">
12 <style type="text/css">
13 body {padding-top: 60px}
13 body {padding-top: 60px}
14 .logo {padding-top: 5px; height: 50px}
14 .logo {padding-top: 5px; height: 50px}
15 .clickable-row {cursor: pointer;}
15 .clickable-row {cursor: pointer;}
16 .col-no-padding { padding-left:0; }
16 </style>
17 </style>
17 <!--[if lt IE 9]>
18 <!--[if lt IE 9]>
18 <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
19 <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -37,16 +38,31
37 </div>
38 </div>
38 <div class="collapse navbar-collapse" id="navigationbar">
39 <div class="collapse navbar-collapse" id="navigationbar">
39 <ul class="nav navbar-nav">
40 <ul class="nav navbar-nav">
40 <li class=" dropdown {% block camp-active %}{% endblock %}"><a href="{% url 'url_campaigns'%}">Campaigns</a>
41 <li class=" dropdown {% block operation-active %}{% endblock %}"><a href="{% url 'url_operation'%}">Operation</a>
41 </li>
42 </li>
42 <li class=" dropdown {% block exp-active %}{% endblock %}"><a href="{% url 'url_experiments'%}">Experiments</a>
43 <li class=" dropdown {% block conf-active %}{% endblock %}">
44 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Configuration<span class="caret"></span></a>
45 <ul class="dropdown-menu" role="menu">
46 <li><a href="#">Campaigns</a></li>
47 <li><a href="#">Radars</a></li>
48 <li><a href="#">Devices</a></li>
49 </ul>
43 </li>
50 </li>
44 <li class=" dropdown {% block conf-active %}{% endblock %}"><a href="{% url 'url_dev_confs'%}">Configurations</a>
51 <li class=" dropdown {% block test-active %}{% endblock %}">
45 </li>
52 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Test<span class="caret"></span></a>
46 <li class=" dropdown {% block dev-active %}{% endblock %}"><a href="{% url 'url_devices'%}">Devices</a>
53 <ul class="dropdown-menu" role="menu">
47 </li>
54 <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
48 <li class=" dropdown {% block loc-active %}{% endblock %}"><a href="{% url 'url_locations'%}">Locations</a>
55 <li><a href="{% url 'url_devices' %}">Devices</a></li>
56 </ul>
49 </li>
57 </li>
58 <li class=" dropdown {% block search-active %}{% endblock %}">
59 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Search<span class="caret"></span></a>
60 <ul class="dropdown-menu" role="menu">
61 <li><a href="{% url 'url_campaigns' %}">Campaigns</a></li>
62 <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
63 <li><a href="{% url 'url_dev_confs' %}">Configurations</a></li>
64 </ul>
65 </li>
50 </ul>
66 </ul>
51 <ul class="nav navbar-nav navbar-right">
67 <ul class="nav navbar-nav navbar-right">
52 <li class="nav-divider"></li>
68 <li class="nav-divider"></li>
@@ -591,4 +591,10 def sidebar(conf):
591 kwargs['configuration_keys'] = conf_keys[1:]
591 kwargs['configuration_keys'] = conf_keys[1:]
592 kwargs['configurations'] = configurations #.values(*conf_keys)
592 kwargs['configurations'] = configurations #.values(*conf_keys)
593
593
594 return kwargs No newline at end of file
594 return kwargs
595
596
597 def operation(request):
598 pass
599
600
@@ -18,6 +18,7 from django.contrib import admin
18
18
19 urlpatterns = [
19 urlpatterns = [
20 url(r'^$', 'apps.main.views.index', name='index'),
20 url(r'^$', 'apps.main.views.index', name='index'),
21 url(r'^operation/', 'apps.main.views.operation', name='url_operation'),
21 url(r'^admin/', include(admin.site.urls)),
22 url(r'^admin/', include(admin.site.urls)),
22 url(r'^accounts/', include('apps.accounts.urls')),
23 url(r'^accounts/', include('apps.accounts.urls')),
23 url(r'^', include('apps.main.urls')),
24 url(r'^', include('apps.main.urls')),
General Comments 0
You need to be logged in to leave comments. Login now