From 1678176d32cd8d694990fcc96f7f2bec71490c7e 2016-03-02 21:45:56
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2016-03-02 21:45:56
Subject: [PATCH] Update base template: main menu

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@67 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index b79a2e1..926318d 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -12,7 +12,8 @@
     <style type="text/css">
       body {padding-top: 60px}
       .logo {padding-top: 5px; height: 50px}
-      .clickable-row {cursor: pointer;} 
+      .clickable-row {cursor: pointer;}
+      .col-no-padding { padding-left:0; }
     </style>
     <!--[if lt IE 9]>
 	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -37,16 +38,31 @@
       </div>
       <div class="collapse navbar-collapse" id="navigationbar">
         <ul class="nav navbar-nav"> 
-          <li class=" dropdown {% block camp-active %}{% endblock %}"><a href="{% url 'url_campaigns'%}">Campaigns</a>
+          <li class=" dropdown {% block operation-active %}{% endblock %}"><a href="{% url 'url_operation'%}">Operation</a>
           </li>
-          <li class=" dropdown {% block exp-active %}{% endblock %}"><a href="{% url 'url_experiments'%}">Experiments</a>
+          <li class=" dropdown {% block conf-active %}{% endblock %}">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Configuration<span class="caret"></span></a>          
+            <ul class="dropdown-menu" role="menu">
+              <li><a href="#">Campaigns</a></li>
+              <li><a href="#">Radars</a></li>
+              <li><a href="#">Devices</a></li>
+            </ul>          
           </li>
-          <li class=" dropdown {% block conf-active %}{% endblock %}"><a href="{% url 'url_dev_confs'%}">Configurations</a>
-          </li>
-          <li class=" dropdown {% block dev-active %}{% endblock %}"><a href="{% url 'url_devices'%}">Devices</a>
-          </li>
-          <li class=" dropdown {% block loc-active %}{% endblock %}"><a href="{% url 'url_locations'%}">Locations</a>
+          <li class=" dropdown {% block test-active %}{% endblock %}">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Test<span class="caret"></span></a>          
+            <ul class="dropdown-menu" role="menu">
+              <li><a href="{% url 'url_experiments' %}">Experiments</a></li>              
+              <li><a href="{% url 'url_devices' %}">Devices</a></li>
+            </ul>
           </li>
+          <li class=" dropdown {% block search-active %}{% endblock %}">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Search<span class="caret"></span></a>          
+            <ul class="dropdown-menu" role="menu">
+              <li><a href="{% url 'url_campaigns' %}">Campaigns</a></li>              
+              <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
+              <li><a href="{% url 'url_dev_confs' %}">Configurations</a></li>
+            </ul>
+          </li>          
         </ul>
         <ul class="nav navbar-nav navbar-right">
           <li class="nav-divider"></li>
diff --git a/apps/main/views.py b/apps/main/views.py
index 310a3fc..bcf79f1 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -591,4 +591,10 @@ def sidebar(conf):
     kwargs['configuration_keys'] = conf_keys[1:]
     kwargs['configurations'] = configurations #.values(*conf_keys)
     
-    return kwargs
\ No newline at end of file
+    return kwargs
+
+
+def operation(request):
+    pass
+
+
diff --git a/radarsys/urls.py b/radarsys/urls.py
index 29cab2a..37ff63a 100644
--- a/radarsys/urls.py
+++ b/radarsys/urls.py
@@ -18,6 +18,7 @@ from django.contrib import admin
 
 urlpatterns = [
     url(r'^$', 'apps.main.views.index', name='index'),
+    url(r'^operation/', 'apps.main.views.operation', name='url_operation'),    
     url(r'^admin/', include(admin.site.urls)),
     url(r'^accounts/', include('apps.accounts.urls')),  
     url(r'^', include('apps.main.urls')),