From 841580afdae19343058deda0373c84bdbfca4283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= <dkmaster@dkmon.com>
Date: Fri, 15 Nov 2013 10:32:49 +0000
Subject: [PATCH]

---
 server/src/uds/templates/uds/admin/index.html |  6 +--
 .../templates/uds/admin/pages/dashboard.html  |  9 +++++
 .../templates/uds/admin/snippets/navbar.html  | 39 +++++++++----------
 .../templates/uds/admin/templates/base.html   | 20 +++++++++-
 .../templates/uds/html5/templates/base.html   |  9 ++++-
 5 files changed, 55 insertions(+), 28 deletions(-)
 create mode 100644 server/src/uds/templates/uds/admin/pages/dashboard.html

diff --git a/server/src/uds/templates/uds/admin/index.html b/server/src/uds/templates/uds/admin/index.html
index 7aa214d69..1603cbeff 100644
--- a/server/src/uds/templates/uds/admin/index.html
+++ b/server/src/uds/templates/uds/admin/index.html
@@ -7,12 +7,8 @@
 
 {% block js %}
     <script>
-        $(function() {
-			// Initialize gui        	
-        	gui.init();
-        	
-        });
     </script>
+    
 {% endblock %}
 
 {% block body %}
diff --git a/server/src/uds/templates/uds/admin/pages/dashboard.html b/server/src/uds/templates/uds/admin/pages/dashboard.html
new file mode 100644
index 000000000..2d762f9da
--- /dev/null
+++ b/server/src/uds/templates/uds/admin/pages/dashboard.html
@@ -0,0 +1,9 @@
+{% load i18n html5 static %}
+<div class="row">
+  <div class="col-xs-12">
+    <h1>Dashboard <small>{% trans 'overview' %}</small></h1>
+    <ol class="breadcrumb">
+      <li><a id="lnk-dashboard" href=""><i class="fa fa-dashboard"></i> Dashboard</a></li>
+    </ol>
+  </div>
+</div><!-- /.row -->
diff --git a/server/src/uds/templates/uds/admin/snippets/navbar.html b/server/src/uds/templates/uds/admin/snippets/navbar.html
index 17136a5e4..6f2a868df 100644
--- a/server/src/uds/templates/uds/admin/snippets/navbar.html
+++ b/server/src/uds/templates/uds/admin/snippets/navbar.html
@@ -1,5 +1,5 @@
 {% load i18n html5 static %}
- 		<nav class="navbar navbar-inverse navbar-default navbar-fixed-top" role="navigation">
+ 		<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
 			<!-- Brand and toggle get grouped for better mobile display -->
 			<div class="navbar-header">
 				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -12,26 +12,25 @@
 			</div>
             
           <!-- Side bar -->
-          <ul class="nav navbar-nav side-nav">
-            <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
-            <li><a class="lnk-service_providers" href="#"><i class="fa fa-bar-chart-o"></i> {% trans 'Service providers' %}</a></li>
-            <li><a class="lnk-authenticators" href="#"><i class="fa fa-user"></i> {% trans 'Authenticators' %}</a></li>
-            <li><a class="lnk-osmanagers" href="#"><i class="fa fa-edit"></i> Os Managers</a></li>
-            <li><a class="lnk-connectivity" href="#"><i class="fa fa-font"></i> {% trans 'Connectivity' %}</a></li>
-            <li><a class="lnk-deployed_services" href=""><i class="fa fa-desktop"></i> {% trans 'Deployed services' %}</a></li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-square-o-down"></i> Tools <b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li><a href="#">{% trans 'Configuration' %}</a></li>
-                <li><a href="#">Another Item</a></li>
-                <li><a href="#">Third Item</a></li>
-                <li><a href="#">Last Item</a></li>
+           <div class="collapse navbar-collapse navbar-ex1-collapse">
+              <ul class="nav navbar-nav side-nav">
+                <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+                <li><a class="lnk-service_providers" href="#"><i class="fa fa-bar-chart-o"></i> {% trans 'Service providers' %}</a></li>
+                <li><a class="lnk-authenticators" href="#"><i class="fa fa-user"></i> {% trans 'Authenticators' %}</a></li>
+                <li><a class="lnk-osmanagers" href="#"><i class="fa fa-edit"></i> Os Managers</a></li>
+                <li><a class="lnk-connectivity" href="#"><i class="fa fa-font"></i> {% trans 'Connectivity' %}</a></li>
+                <li><a class="lnk-deployed_services" href=""><i class="fa fa-desktop"></i> {% trans 'Deployed services' %}</a></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-square-o-down"></i> Tools <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="#">{% trans 'Configuration' %}</a></li>
+                    <li><a href="#">Another Item</a></li>
+                    <li><a href="#">Third Item</a></li>
+                    <li><a href="#">Last Item</a></li>
+                  </ul>
+                </li>
               </ul>
-            </li>
-          </ul>
-            
-             <div class="collapse navbar-collapse navbar-ex1-collapse">
-                <ul class="nav navbar-nav">
+                <ul class="nav navbar-nav navbar-right navbar-user">
                 </ul>
                 <form id="form_language" action="{% url "django.views.i18n.set_language" %}" method="post">
                 {% csrf_token %}
diff --git a/server/src/uds/templates/uds/admin/templates/base.html b/server/src/uds/templates/uds/admin/templates/base.html
index 3e7143fe7..d9ef9c25f 100644
--- a/server/src/uds/templates/uds/admin/templates/base.html
+++ b/server/src/uds/templates/uds/admin/templates/base.html
@@ -20,6 +20,8 @@
         <link href="{% get_static_prefix %}css/bootstrap-switch.css" rel="stylesheet" media="screen">
 
         <link href="{% get_static_prefix %}adm/css/jquery.dataTables.css" rel="stylesheet" media="screen">
+        <link href="{% get_static_prefix %}adm/css/TableTools.css" rel="stylesheet" media="screen">
+        <link href="{% get_static_prefix %}adm/css/dataTables.bootstrap.css" rel="stylesheet" media="screen">
 
         <!-- <link href="{% get_static_prefix %}css/tables.css" rel="stylesheet" media="screen"> -->
         <link href="{% get_static_prefix %}css/uds-admin.css" rel="stylesheet" media="screen">
@@ -39,13 +41,20 @@
                 <!--  End of content -->
         </div>
         </div>
+        <script src="{% url 'uds.web.views.jsCatalog' LANGUAGE_CODE %}"></script>
+        
         <script src="{% get_static_prefix %}js/jquery-1.10.2.min.js"></script>
         <script src="{% get_static_prefix %}js/jquery.cookie.js"></script>
         <script src="{% get_static_prefix %}js/bootstrap.min.js"></script>
         <script src="{% get_static_prefix %}js/bootstrap-switch.min.js"></script>
         <script src="{% get_static_prefix %}adm/js/jquery.dataTables.min.js"></script>
         
-        <script src="{% url 'uds.web.views.jsCatalog' LANGUAGE_CODE %}"></script>
+        <script src="{% get_static_prefix %}adm/js/TableTools.min.js"></script>
+<!--         <script src="{% get_static_prefix %}adm/js/ZeroClipboard.js"></script> -->
+        
+        <script src="{% get_static_prefix %}adm/js/dataTables.bootstrap.js"></script>
+        
+        
         <script src="{% get_static_prefix %}adm/js/templating.js"></script>
 
         <script>
@@ -61,9 +70,16 @@
                 
             }(window.api = window.api || {}, jQuery));
         </script>
-        
         <script src="{% get_static_prefix %}adm/js/api.js"></script>
         <script src="{% get_static_prefix %}adm/js/gui.js"></script>
+        
+        <script>
+            $(function() {
+    			// Initialize gui        	
+            	gui.init();
+            	
+            });        
+        </script>
 
         
         {% block js %}{% endblock %}
diff --git a/server/src/uds/templates/uds/html5/templates/base.html b/server/src/uds/templates/uds/html5/templates/base.html
index efedef939..7b196bd28 100644
--- a/server/src/uds/templates/uds/html5/templates/base.html
+++ b/server/src/uds/templates/uds/html5/templates/base.html
@@ -23,6 +23,7 @@
 		
 		<link href="{% get_static_prefix %}css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
 		<link href="{% get_static_prefix %}css/bootstrap-formhelpers.min.css" rel="stylesheet" media="screen">
+        <link href="{% get_static_prefix %}css/bootstrap-select.min.css" rel="stylesheet" media="screen">
 		
 		{% ifbrowser ie<10 %}
 		<link href="{% get_static_prefix %}css/fix.css" rel="stylesheet" media="screen">
@@ -72,12 +73,18 @@
 			<a href="http://www.virtualcable.es">&copy; 2012-2014 Virtual Cable S.L.U.</a>
 		{% endblock %}
 		</footer>
+        
+        <script src="{% url 'uds.web.views.jsCatalog' LANGUAGE_CODE %}"></script>
 		<script src="{% get_static_prefix %}js/jquery-1.10.2.min.js"></script>
 		<script src="{% get_static_prefix %}js/jquery.cookie.js"></script>
 		<script src="{% get_static_prefix %}js/bootstrap.min.js"></script>
 		<script src="{% get_static_prefix %}js/bootstrap-switch.min.js"></script>
+        <script src="{% get_static_prefix %}js/bootstrap-select.min.js"></script>
+
 		<script>
-			var decimalSeparator = "{{ 1.1|localize|slice:"1:2" }}";
+			$(function(){
+				$('.selectpicker').selectpicker();
+			});
 		</script>
 		
 		{% block js %}{% endblock %}