more makeup

server/src/uds/static/adm/css/uds-admin.css

@@ -52,6 +52,15 @@ body {
     padding-bottom: 3px;
 }
 
+.info-img {
+    width: 5em;
+}
+
+.navbar-img {
+    width: 2em;
+    margin-top: -8px;
+}
+
 .cursor-pointer {
 	cursor: pointer !important;
 }

server/src/uds/static/adm/js/gui-d-connectivity.coffee

@@ -12,6 +12,7 @@ gui.connectivity.link = (event) ->
       networks: "networks-placeholder"
     )
     gui.connectivity.transports.table
+      icon: 'transports'
       rowSelect: "single"
       container: "transports-placeholder"
       buttons: [
@@ -26,6 +27,7 @@ gui.connectivity.link = (event) ->
       onDelete: gui.methods.del(gui.connectivity.transports, gettext("Delete transport"), gettext("Transport deletion error"))
 
     gui.connectivity.networks.table
+      icon: 'networks'
       rowSelect: "single"
       container: "networks-placeholder"
       buttons: [

server/src/uds/static/adm/js/gui-d-gallery.coffee

@@ -60,6 +60,7 @@ gui.gallery.link = ->
       gallery: "gallery-placeholder"
     )
     gui.gallery.table
+      icon: 'gallery'
       container: "gallery-placeholder"
       rowSelect: "single"
       buttons: [

server/src/uds/static/adm/js/gui-d-reports.coffee

@@ -11,6 +11,7 @@ gui.reports.link = (event) ->
     gui.setLinksEvents()
     
     tableId = gui.reports.table(
+      icon: 'reports'
       container: "reports-placeholder"
       rowSelect: "single"
       buttons: [

server/src/uds/static/adm/js/gui-d-servicespools.coffee

@@ -105,6 +105,7 @@ gui.servicesPools.link = (event) ->
     #             * Services pools part
     #             
     servicesPoolsTable = gui.servicesPools.table(
+      icon: 'pools'
       container: "deployed-services-placeholder"
       rowSelect: "single"
       buttons: [
@@ -146,6 +147,7 @@ gui.servicesPools.link = (event) ->
           # Cached items table
           prevCacheLogTbl = null
           cachedItemsTable = cachedItems.table(
+            icon: 'cached'
             container: "cache-placeholder_tbl"
             buttons: [
               "delete"
@@ -186,6 +188,7 @@ gui.servicesPools.link = (event) ->
           
           # Groups items table
           groupsTable = groups.table(
+            icon: 'groups'
             container: "groups-placeholder"
             rowSelect: "single"
             buttons: [
@@ -260,6 +263,7 @@ gui.servicesPools.link = (event) ->
         prevAssignedLogTbl = null
         assignedServices = new GuiElement(api.servicesPools.detail(servPool.id, "services", { permission: servPool.permission }), "services")
         assignedServicesTable = assignedServices.table(
+          icon: 'assigned'
           container: "assigned-services-placeholder_tbl"
           rowSelect: "single"
           buttons: (if info.must_assign_manually then [
@@ -305,6 +309,7 @@ gui.servicesPools.link = (event) ->
         
         # Transports items table
         transportsTable = transports.table(
+          icon: 'transports'
           container: "transports-placeholder"
           rowSelect: "single"
           buttons: [
@@ -369,6 +374,7 @@ gui.servicesPools.link = (event) ->
           
           # Publications table
           publicationsTable = publications.table(
+            icon: 'publications'
             container: "publications-placeholder"
             rowSelect: "single"
             buttons: [

server/src/uds/static/adm/js/gui.coffee

@@ -66,11 +66,10 @@
     panelId = "panel-" + table_id
     text: api.templates.evaluate("tmpl_comp_table",
       panelId: panelId
-      icon: options.icon or "table"
+      icon: api.config.img_url + 'icons/' + (options.icon or 'maleta') + '.png'
       size: options.size or 12
       title: title
       table_id: table_id
-      icon: api.config.img_url + 'icons/' + (options.icon or 'maleta') + '.png'
     )
     panelId: panelId
     refreshSelector: "#" + panelId + " span.fa-refresh"

server/src/uds/static/css/uds-html5.css

@@ -129,8 +129,7 @@ footer {
 }
 
 .navbar-img {
-    width: 32px;
-    height: 32px;
+    width: 2em;
     margin-top: -8px;
 }
 

server/src/uds/templates/uds/admin/snippets/navbar.html

@@ -8,27 +8,30 @@
 	    			<span class="icon-bar"></span>
 	    			<span class="icon-bar"></span>
 	  			</button>
-	  			<a href="{% url 'uds.admin.views.index' %}"><span class="navbar-brand">UDS Dashboard</span></a>
+          <a class ="navbar-brand lnk-dashboard" href="#">
+            <img alt="Universal Desktop Services" src="{% get_static_prefix %}img/udsicon.png" class="navbar-img pull-left">
+            <span>Universal Desktop Services</span>
+          </a>
 			</div>
             
           <!-- Side bar -->
            <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-desktop"></i> {% trans 'Services' %}</a></li>
-                <li><a class="lnk-authenticators" href="#"><i class="fa fa-key"></i> {% trans 'Authenticators' %}</a></li>
-                <li><a class="lnk-osmanagers" href="#"><i class="fa fa-gears"></i> Os Managers</a></li>
-                <li><a class="lnk-connectivity" href="#"><i class="fa fa-sitemap"></i> {% trans 'Connectivity' %}</a></li>
-                <li><a class="lnk-deployed_services" href=""><i class="fa fa-puzzle-piece"></i> {% trans 'Service Pools' %}</a></li>
+                <li><a class="lnk-dashboard" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/dashboard-monitor.png"/> {% trans 'Overview' %}</a></li>
+                <li><a class="lnk-service_providers" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/providers.png"/> {% trans 'Services' %}</a></li>
+                <li><a class="lnk-authenticators" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/authenticators.png"/> {% trans 'Authenticators' %}</a></li>
+                <li><a class="lnk-osmanagers" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/osmanagers.png"/> Os Managers</a></li>
+                <li><a class="lnk-connectivity" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/transports.png"/> {% trans 'Connectivity' %}</a></li>
+                <li><a class="lnk-deployed_services" href=""><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/pools.png"/> {% trans 'Service Pools' %}</a></li>
                 {% if admin %}
                 
                 <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>
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/tools.png"/> Tools <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a class="lnk-gallery" href="#"><i class="fa fa-file-image-o"></i> {% trans 'Gallery' %}</a></li>
-                    <li><a class="lnk-reports" href=""><i class="fa fa-list-alt"></i> {% trans 'Reports' %}</a></li>
-                    <li><a class="lnk-configuration" href="#"><i class="fa fa-database"></i> {% trans 'Configuration' %}</a></li>
-                    <li><a class="lnk-clear_cache" href="#"><i class="fa fa-exclamation-triangle"></i> {% trans 'Flush cache' %}</a></li>
+                    <li><a class="lnk-gallery" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/gallery.png"/> {% trans 'Gallery' %}</a></li>
+                    <li><a class="lnk-reports" href=""><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/reports.png"/> {% trans 'Reports' %}</a></li>
+                    <li><a class="lnk-configuration" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/configuration.png"/> {% trans 'Configuration' %}</a></li>
+                    <li><a class="lnk-clear_cache" href="#"><img class="table-icon" src="{{ STATIC_URL }}/adm/img/icons/flush-cache.png"/> {% trans 'Flush cache' %}</a></li>
                   </ul>
                 </li>
                 {% endif %}

server/src/uds/templates/uds/admin/tmpl/authenticators.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'Authenticators' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Authenticators' %}</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/configuration.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'UDS Configuration' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Configuration' %}</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/connectivity.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'Connectivity' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Connectivity' %}</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/dashboard.html

@@ -2,9 +2,9 @@
 
 <div class="row">
   <div class="col-xs-12">
-    <h1>Dashboard <small>{% trans 'overview' %}</small></h1>
+    <h1>{% trans 'Overview' %}</h1>
     <ol class="breadcrumb">
-      <li><a id="lnk-dashboard" href=""><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a id="lnk-dashboard" href="">Dashboard</a></li>
     </ol>
   </div>
 </div><!-- /.row -->
@@ -27,7 +27,7 @@
       <div class="panel-heading">
         <div class="row">
           <div class="col-xs-6">
-            <i class="fa fa-key fa-5x" style="color: #E2C774;"></i>
+            <img class="info-img" src="{% endverbatim %}{{ STATIC_URL }}{% verbatim %}/adm/img/icons/users.png"/>
           </div>
           <div class="col-xs-6 text-right">
             <p class="announcement-heading">{{ users }}</p>
@@ -54,7 +54,7 @@
       <div class="panel-heading">
         <div class="row">
           <div class="col-xs-6">
-            <i class="fa fa-desktop fa-5x"></i>
+            <img class="info-img" src="{% endverbatim %}{{ STATIC_URL }}{% verbatim %}/adm/img/icons/services.png"/>
           </div>
           <div class="col-xs-6 text-right">
             <p class="announcement-heading">{{ services }}</p>
@@ -81,7 +81,7 @@
       <div class="panel-heading">
         <div class="row">
           <div class="col-xs-6">
-            <i class="fa fa-puzzle-piece fa-5x"></i>
+            <img class="info-img" src="{% endverbatim %}{{ STATIC_URL }}{% verbatim %}/adm/img/icons/assigned.png"/>
           </div>
           <div class="col-xs-6 text-right">
             <p class="announcement-heading">{{ user_services }}</p>

server/src/uds/templates/uds/admin/tmpl/gallery.html

@@ -4,7 +4,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'UDS Image Gallery' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Gallery' %}</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/osmanagers.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>Os Managers</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>OS Managers</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/providers.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'Services' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Services' %}</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/reports.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'Reports' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Reports' %}</li>
     </ol>
   </div>

server/src/uds/templates/uds/admin/tmpl/restricted.html

@@ -4,7 +4,7 @@
   <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>
+      <li><a id="lnk-dashboard" href="">Dashboard</a></li>
     </ol>
   </div>
 </div><!-- /.row -->

server/src/uds/templates/uds/admin/tmpl/services_pool.html

@@ -3,7 +3,7 @@
   <div class="col-xs-12">
     <h1>{% trans 'Service Pools' %}</h1>
     <ol class="breadcrumb">
-      <li><a class="lnk-dashboard" href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+      <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>{% trans 'Service Pools' %}</li>
     </ol>
   </div>