Merge pull request #3254 from jamalex/device_metadata_fix

Merge develop into central-develop
learningequality · Mar 11, 2015 · 105272d · 105272d
2 parents 073046f + 69fa0f6
commit 105272d
Show file tree

Hide file tree

Showing 49 changed files with 220 additions and 10,735 deletions.
diff --git a/kalite/coachreports/templates/coachreports/base.html b/kalite/coachreports/templates/coachreports/base.html
@@ -3,9 +3,11 @@
 {% load i18n %}
 {% load my_filters %}
 
-{% block reports_active %}reports-active active-tab active-nav{% endblock reports_active %}
-{% block teacher_active %}active{% endblock teacher_active %}
-{% block admin_active %}active{% endblock admin_active %}
+{% block i18n_do_not_translate %}
+    {% block reports_active %}reports-active active-tab active-nav{% endblock reports_active %}
+    {% block teacher_active %}active{% endblock teacher_active %}
+    {% block admin_active %}active{% endblock admin_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block title %}{% trans "Coach Reports" %}{% endblock title %}
 

diff --git a/kalite/coachreports/templates/coachreports/base_d3_visualization.html b/kalite/coachreports/templates/coachreports/base_d3_visualization.html
@@ -22,8 +22,10 @@
 {% load my_filters %}
 {% load staticfiles %}
 
-{% block teacher_active %}active{% endblock teacher_active %}
-{% block admin_active %}active{% endblock admin_active %}
+{% block i18n_do_not_translate %}
+    {% block teacher_active %}active{% endblock teacher_active %}
+    {% block admin_active %}active{% endblock admin_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block headcss %} {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/jquery-ui/jquery-ui.min.css' %}" />

diff --git a/kalite/coachreports/templates/coachreports/tabular_view.html b/kalite/coachreports/templates/coachreports/tabular_view.html
@@ -4,11 +4,13 @@
 {% load kalite_staticfiles %}
 {% load my_filters %}
 
-{% block teacher_active %}active{% endblock teacher_active %}
-{% block admin_active %}active{% endblock admin_active %}
-{% block title %}{% trans "Progress by topic" %} | {{ block.super }}{% endblock title %}
-{% block coachnav %}progress-tab-active{% endblock coachnav %}
-{% block progress_active %}sub-active{% endblock progress_active %}
+{% block i18n_do_not_translate %}
+    {% block teacher_active %}active{% endblock teacher_active %}
+    {% block admin_active %}active{% endblock admin_active %}
+    {% block title %}{% trans "Progress by topic" %} | {{ block.super }}{% endblock title %}
+    {% block coachnav %}progress-tab-active{% endblock coachnav %}
+    {% block progress_active %}sub-active{% endblock progress_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block headcss %}{{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/coachreports/tabular_view.css' %}" />

diff --git a/kalite/coachreports/templates/coachreports/test_detail_view.html b/kalite/coachreports/templates/coachreports/test_detail_view.html
@@ -4,7 +4,10 @@
 {% load kalite_staticfiles %}
 {% load my_filters %}
 
-{% block coachreports_active %}active{% endblock coachreports_active %}
+{% block i18n_do_not_translate %}
+    {% block coachreports_active %}active{% endblock coachreports_active %}
+{% endblock i18n_do_not_translate %}
+
 {% block title %}{{ test_obj.title }} {{ block.super }}{% endblock title %}
 
 {% block headcss %}{{ block.super }}

diff --git a/kalite/coachreports/templates/coachreports/timeline_view.html b/kalite/coachreports/templates/coachreports/timeline_view.html
@@ -4,11 +4,13 @@
 {% load my_filters %}
 {% load kalite_staticfiles %}
 
-{% block title %}{{ title }} | {{ block.super }}{% endblock title %}
-{% block report_title %}{{ title }}{% endblock report_title %}
-{% block teacher_active %}active{% endblock teacher_active %}
-{% block admin_active %}active{% endblock admin_active %}
-{% block mastery_active %}sub-active{% endblock mastery_active %}
+{% block i18n_do_not_translate %}
+    {% block title %}{{ title }} | {{ block.super }}{% endblock title %}
+    {% block report_title %}{{ title }}{% endblock report_title %}
+    {% block teacher_active %}active{% endblock teacher_active %}
+    {% block admin_active %}active{% endblock admin_active %}
+    {% block mastery_active %}sub-active{% endblock mastery_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block headcss %}{{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/coachreports/timeline_view.css' %}">

diff --git a/kalite/control_panel/templates/control_panel/base.html b/kalite/control_panel/templates/control_panel/base.html
@@ -2,7 +2,9 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block control_panel_active %}active{% endblock control_panel_active %}
+{% block i18n_do_not_translate %}
+    {% block control_panel_active %}active{% endblock control_panel_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block headcss %}{{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/control_panel/base.css' %}" />

diff --git a/kalite/control_panel/templates/control_panel/data_export.html b/kalite/control_panel/templates/control_panel/data_export.html
@@ -3,7 +3,9 @@
 {% load staticfiles %}
 {% load include_block %}
 
-{% block facility_active %}facility-active active-tab active-nav{% endblock facility_active %}
+{% block i18n_do_not_translate %}
+    {% block facility_active %}active{% endblock facility_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block title %}{{ zone.name }} - {% trans "Data Export" %} {{ block.super }}{% endblock title %}
 

diff --git a/kalite/control_panel/templates/control_panel/device_management.html b/kalite/control_panel/templates/control_panel/device_management.html
@@ -8,7 +8,7 @@
 {% block i18n_do_not_translate %}
     {% block users_active %}active{% endblock users_active %}
     {% block manage_active %}active{% endblock manage_active %}
-    {% block facility_active %}facility-active active-tab active-nav{% endblock facility_active %}
+    {% block facility_active %}active{% endblock facility_active %}
 {% endblock i18n_do_not_translate %}
 
 {% block headcss %}{{ block.super }}

diff --git a/kalite/control_panel/templates/control_panel/facility_management.html b/kalite/control_panel/templates/control_panel/facility_management.html
@@ -3,9 +3,10 @@
 {% load my_filters %}
 {% load staticfiles %}
 
-{% block control_panel_active %}{% endblock %}
-{% block users_active %}active{% endblock %}
-{% block user_active %}users-active active-tab active-nav{% endblock user_active %}
+{% block i18n_do_not_translate %}
+    {% block control_panel_active %}{% endblock %}
+    {% block user_active %}active{% endblock user_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block title %}{{ facility.name }} - {% trans "Facility Management" %}{% endblock title %}
 

diff --git a/kalite/control_panel/templates/control_panel/zone_management.html b/kalite/control_panel/templates/control_panel/zone_management.html
@@ -5,9 +5,11 @@
 
 {% block title %}{% if zone.name %}{{ zone.name }} - {% endif %}{% trans "Sharing Network Management Console" %}{% endblock title %}
 
-{% block users_active %}active{% endblock users_active %}
-{% block manage_active %}active{% endblock manage_active %}
-{% block facility_active %}facility-active active-tab active-nav{% endblock facility_active %}
+{% block i18n_do_not_translate %}
+    {% block users_active %}active{% endblock users_active %}
+    {% block manage_active %}active{% endblock manage_active %}
+    {% block facility_active %}active{% endblock facility_active %}
+{% endblock i18n_do_not_translate %}
 
 {% block headcss %}{{ block.super }}
     {% if clock_set %}

diff --git a/kalite/distributed/hbtemplates/topics/sidebar.handlebars b/kalite/distributed/hbtemplates/topics/sidebar.handlebars
@@ -2,7 +2,9 @@
 
 <nav class="sidebar-panel" role="navigation">
     {{!-- TODO: Replace icon with better chevron that looks different from the one in sidebar-tab --}}
-    <div class="sidebar-back"><span class="icon icon-arrow-left2"></span></div>
+    <div class="sidebar-back">
+        <span class="icon icon-arrow-left2"></span>
+    </div>
     <div class="sidebar-content"></div>
 </nav>
 

diff --git a/kalite/distributed/static/css/distributed/bootstrap-overrides.css b/kalite/distributed/static/css/distributed/bootstrap-overrides.css
@@ -101,7 +101,7 @@ input[type="submit"] {
 }
 .nav-tabs li a,
 .nav-tabs li.active a,
-.nav-tabls li a:active {
+.nav-tabs li a:active {
     border: 0;
     border-radius: 5px 15px 0 0;
     margin: 0;
@@ -115,19 +115,29 @@ input[type="submit"] {
 #points {
     margin-left: 20px;
 }
+.nav-tabs li.active a:hover {
+    border: none;
+}
 .nav-tabs li.active a:hover,
 .nav-tabs li a:hover,
 .nav-tabs li.active a {
     background-color: white;
-    border-left: 2px solid #5AA685;
-    border-top: 2px solid #5AA685;
-    border-right: 2px solid #5AA685;
     color: #5AA685;
     -webkit-transition: all 80ms ease-out;
     -moz-transition: all 80ms ease-out;
     -o-transition: all 80ms ease-out;
     transition: all 80ms ease-out;
 }
+.top-nav li.active a:hover,
+.top-nav li.active a,
+.top-nav li a:hover,
+.top-nav li a,
+.top-nav li.active a,
+.top-nav li a:active {
+    border-left: 2px solid #5AA685;
+    border-top: 2px solid #5AA685;
+    border-right: 2px solid #5AA685;
+}
 .navbar ul li.dropdown {
     padding-right: 0;
 }

diff --git a/kalite/distributed/static/css/distributed/khan-lite.css b/kalite/distributed/static/css/distributed/khan-lite.css
@@ -154,7 +154,6 @@ a:hover {
     -moz-transition: all 115ms ease-out;
     -o-transition: all 115ms ease-out;
     transition: all 115ms ease-out;
-
 }
 .teach-nav li div {
     position: relative;
@@ -199,38 +198,17 @@ a:hover {
     border-top-right-radius: 16px;
     font-weight: bold;
 }
-.active-tab {
-    height: 89px;
-    width: 110px;
-}
 .active-tab div {
     color: #5AA685 !important;
 }
-.reports {
-    background-position: center 7px;
-    height: 87px;
-}
-.reports:hover, .reports-active {
-    background-position: center 7px;
-    height: 87px;
-    color: #5AA685 !important;
-}
-.playlist {
-    background-position: center 7px;
-    height: 87px;
-}
-.playlist:hover, .playlists-active {
-    background-position: center 7px;
-    height: 87px;
-}
-.exams {
-    background-position: center 7px;
-    height: 87px;
-}
-.exams:hover, .exams-active {
+.reports, .reports:hover, .reports-active,
+.playlist, .playlist:hover, .playlists-active,
+.exams, .exams:hover, .exams-active, 
+.learn, .learn:hover, .learn-active {
     background-position: center 7px;
     height: 87px;
 }
+
 .units {
     background: url("../../images/distributed/units-icon.png") no-repeat;
     background-position: center 7px;
@@ -241,14 +219,7 @@ a:hover {
     background-position: center 7px;
     height: 87px;
 }
-.learn {
-    background-position: center 7px;
-    height: 87px;
-}
-.learn:hover, .learn-active {
-    background-position: center 7px;
-    height: 87px;
-}
+
 /********* End Sub-Navigation bar **********/
 
 
@@ -261,8 +232,7 @@ a:hover {
 }
 .manage-nav ul {
     padding-left: 1%;
-    margin-bottom: -4px;
-    height: 87px;
+    margin-bottom: -1px;
 }
 .manage-nav li {
     background-color: #5AA685;
@@ -294,65 +264,24 @@ a:hover {
     border-top-left-radius: 5px;
     border-top-right-radius: 17px;
 }
-.manage-nav li div {
-    position: relative;
-    width: 110px;
-    height: 85px;
-    /*line-height: 9.5;*/
-    margin-left: -3px;
-    margin-top: 5px;
-}
 .manage-nav li div:hover {
     color: #5AA685;
 }
 .manage-nav li a:hover {
-    border-top-left-radius: 5px !important;
-    border-top-right-radius: 16px !important;
     color: #5AA685;
     font-weight: bold;
     text-decoration: none;
 }
 .manage-nav span.icon {
     font-size: 40pt;
 }
+
 .active-nav {
     color: #405D32 !important;
     background-color: white !important;
-    border-top-left-radius: 5px !important;
-    border-top-right-radius: 16px !important;
     font-weight: bold;
 }
-.users {
-    background-position: center 7px;
-    height: 87px;
-}
-.users:hover, .users-active {
-    background-position: center 7px;
-    height: 87px;
-}
-.video {
-    background-position: center 7px;
-    height: 87px;
-}
-.video:hover, .video-active {
-    background-position: center 7px;
-    height: 87px;
-}
-.languages {
-    background-position: center 7px;
-    height: 87px;
-}
-.languages:hover, .languages-active {
-    background-position: center 7px;
-    height: 87px;
-}
-.facility {
-    background-position: center 7px;
-    height: 87px;
-}
-.facility:hover, .facility-active {
-    background-position: center 7px;
-    height: 87px;
+
 }
 /********* End "Admin" Sub-Navigation bar **********/