Merge branch 'master' of github.com:mikemintz/deme

mikemintz · May 8, 2014 · ebb559b · ebb559b
2 parents 90f8e48 + 56417a2
commit ebb559b
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 66 deletions.
diff --git a/deme_django/modules/newsroll/templates/newsroll/show.html b/deme_django/modules/newsroll/templates/newsroll/show.html
@@ -4,32 +4,32 @@
 {% block title %}<img src="{{ item|icon_url:24 }}" /> {% viewable_name item %}{% endblock %}
 {% block content %}
 
+<div class="newsroll-wrap">
 {% for details in members %}
-
-    <div style="border: thin #ccc solid; background: #eee; -moz-border-radius: 8px; padding: 2px">
-        <div style="font-weight: bold;">
-            <a href="{{ details.url }}">{{ details.name }}</a> 
+    <div class="item">
+        <div class="title">
+            <a href="{{ details.url }}">{{ details.name }}</a>
         </div>
-        
+
         {% if details.display_body %}
             {% ifagentcan 'view TextDocument.body' details.member %}
                 {% if details.is_html %}
                     {{ details.body|safe|truncatewords_html:entry_length }}
 
                 {% else %}
                     <div>
-                        {{ details.body|truncatewords:entry_length }} 
+                        {{ details.body|truncatewords:entry_length }}
                     </div>
                 {% endif %}
-                
+
                 <br><a href="{{ details.url }}"> Full Article </a>
-           {% endifagentcan %}    
+           {% endifagentcan %}
         {% endif %}
-        
+
         <div>
             Posted
             {% ifagentcan 'view Item.creator' details.member %}
-                by <a href="{{ details.creator_url }}">{{ details.creator }}</a> 
+                by <a href="{{ details.creator_url }}">{{ details.creator }}</a>
             {% endifagentcan %}
 
             {% ifagentcan 'view Item.created_at' details.member %}
@@ -38,25 +38,23 @@
                 </span>
             {% endifagentcan %}
         </div>
-
     </div>
-
-    <div style="border: 1px solid #aaa; margin-bottom: 8px; margin-top: 8px;"></div>
-
 {% endfor %}
+</div>
+
 {% if is_not_one_page %}
 <div style="border-bottom: 2px solid #aaa; margin-bottom: 8px; padding-bottom: 8px; text-align: center;">
 {% if entries.has_previous %}
 <a href="{{ redirect }}?page={{ entries.previous_page_number }}"> ~ Prev |</a>
 {% endif %}
     {% for page in page_range %}
-        {% ifequal page entries.number %} 
+        {% ifequal page entries.number %}
             {{ entries.number }}
         {% endifequal %}
 
         {% ifnotequal page entries.number %}
         <a href="{{ redirect }}?page={{ page }}">{{ page }}</a>
-        {% endifnotequal %}    
+        {% endifnotequal %}
     {% endfor %}
 {% if entries.has_next %}
 <a href="{{ redirect }}?page={{ entries.next_page_number }}">| Next ~</a>
@@ -65,7 +63,7 @@
 {% endif %}
 <div style="text-align: center; padding-left: 35px; padding-bottom: 8px;">
     {% ifagentcan 'modify_membership' collection %}
-        <a href="{% url 'item_type_url' viewer="htmldocument" action="new" %}?add_to_collection={{ collection.pk }}&redirect={{ redirect|urlencode }}">Create A New Entry ||</a> 
+        <a href="{% url 'item_type_url' viewer="htmldocument" action="new" %}?add_to_collection={{ collection.pk }}&redirect={{ redirect|urlencode }}">Create A New Entry ||</a>
     {% endifagentcan %}
 
     <a href="{% url 'item_type_url' viewer="item" action="list.rss" %}?collection={{ collection.pk }}"> View this Listing's RSS Feed</a>
@@ -75,4 +73,3 @@
 </div>
 
 {% endblock content %}
-
diff --git a/deme_django/modules/symsys/templates/symsysgroup/show.html b/deme_django/modules/symsys/templates/symsysgroup/show.html
@@ -1,7 +1,6 @@
 {% extends layout %}
 {% load newsroll_extras %}
 {% load item_tags %}
-{% block title %}<img src="{{ item|icon_url:24 }}" /> {% viewable_name item %}{% endblock %}
 {% block content %}
 {% comment %}
 <script type="text/javascript">
@@ -32,7 +31,7 @@
             <a href="{{ member.item.get_absolute_url }}">{% viewable_name member.item %}</a>
         </td>
         <td>
-            <b>Academic Title: </b>{{ member.academic_title }} 
+            <b>Academic Title: </b>{{ member.academic_title }}
         </td>
     </tr>
     <tr>
@@ -44,7 +43,7 @@
         <td>
             {% if member.item.publications %}
             {% ifagentcan 'view SymsysAffiliate.publications' member.item %}
-                <b>Publications: </b>{{ member.item.publications }} 
+                <b>Publications: </b>{{ member.item.publications }}
                 <br>
             {% endifagentcan %}
             {% endif %}
@@ -77,8 +76,8 @@
     </tr>
 </table>
 <hr>
-{% comment %}
 </div>
+{% comment %}
 <div id="bigstaff{{ member.item.pk }}" style="display: none;">
     <a href="#" onclick="$('#bigstaff{{ member.item.pk }}').hide(); $('#staff{{ member.item.pk }}').show(); return false;">Hide all details</a>
 </div>
@@ -149,13 +148,13 @@
 <a href="?page={{ members.previous_page_number }}"> ~ Prev |</a>
 {% endif %}
     {% for page in page_range %}
-        {% ifequal page members.number %} 
+        {% ifequal page members.number %}
             {{ members.number }}
         {% endifequal %}
 
         {% ifnotequal page members.number %}
             <a href="?page={{ page }}">{{ page }}</a>
-        {% endifnotequal %}    
+        {% endifnotequal %}
     {% endfor %}
 {% if members.has_next %}
 <a href="?page={{ members.next_page_number }}">| Next ~</a>

diff --git a/deme_django/modules/symsys/update_notes/symsys-website-layout.html b/deme_django/modules/symsys/update_notes/symsys-website-layout.html
@@ -222,4 +222,4 @@ <h4 class="panel-title">
 
 {% block footer %}
     {{ block.super }}
-{% endblock footer %}
+{% endblock footer %}
diff --git a/deme_django/modules/symsys/update_notes/symsys.css b/deme_django/modules/symsys/update_notes/symsys.css
@@ -1,63 +1,63 @@
 .adminbar {
   background: #8c1515;
-  background-image: -webkit-linear-gradient(top, #8c1515 0%, #600e0e 100%);
-  background-image: linear-gradient(to bottom, #8c1515 0%, #600e0e 100%);
+  background-image: -webkit-linear-gradient(top, #8c1515 0%, #831414 100%);
+  background-image: linear-gradient(to bottom, #8c1515 0%, #831414 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff600e0e', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff831414', GradientType=0);
 }
 .adminbar .nav > li > a:active,
 .adminbar .nav > li > a.active,
 .adminbar .nav > li > a:hover.active {
   background: #820000;
-  background-image: -webkit-linear-gradient(top, #820000 0%, #4f0000 100%);
-  background-image: linear-gradient(to bottom, #820000 0%, #4f0000 100%);
+  background-image: -webkit-linear-gradient(top, #820000 0%, #780000 100%);
+  background-image: linear-gradient(to bottom, #820000 0%, #780000 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff820000', endColorstr='#ff4f0000', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff820000', endColorstr='#ff780000', GradientType=0);
 }
 .adminbar .nav .dropdown.open > a {
   background: #820000;
-  background-image: -webkit-linear-gradient(top, #820000 0%, #4f0000 100%);
-  background-image: linear-gradient(to bottom, #820000 0%, #4f0000 100%);
+  background-image: -webkit-linear-gradient(top, #820000 0%, #780000 100%);
+  background-image: linear-gradient(to bottom, #820000 0%, #780000 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff820000', endColorstr='#ff4f0000', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff820000', endColorstr='#ff780000', GradientType=0);
 }
 .adminbar .nav.actions-wrap {
   background: #8c1515;
-  background-image: -webkit-linear-gradient(top, #8c1515 0%, #600e0e 100%);
-  background-image: linear-gradient(to bottom, #8c1515 0%, #600e0e 100%);
+  background-image: -webkit-linear-gradient(top, #8c1515 0%, #831414 100%);
+  background-image: linear-gradient(to bottom, #8c1515 0%, #831414 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff600e0e', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff831414', GradientType=0);
 }
 .adminbar .nav.breadcrumbs > li {
-  background: #b81c1c;
-  background-image: -webkit-linear-gradient(top, #b81c1c 0%, #8c1515 100%);
-  background-image: linear-gradient(to bottom, #b81c1c 0%, #8c1515 100%);
+  background: #951616;
+  background-image: -webkit-linear-gradient(top, #951616 0%, #8c1515 100%);
+  background-image: linear-gradient(to bottom, #951616 0%, #8c1515 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb81c1c', endColorstr='#ff8c1515', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff951616', endColorstr='#ff8c1515', GradientType=0);
 }
 @media (max-width: 767px) {
   .adminbar .nav.search {
     background: #8c1515;
-    background-image: -webkit-linear-gradient(top, #8c1515 0%, #600e0e 100%);
-    background-image: linear-gradient(to bottom, #8c1515 0%, #600e0e 100%);
+    background-image: -webkit-linear-gradient(top, #8c1515 0%, #831414 100%);
+    background-image: linear-gradient(to bottom, #8c1515 0%, #831414 100%);
     background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff600e0e', GradientType=0);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff831414', GradientType=0);
   }
   .adminbar.breadcrumbs > li > a,
   .adminbar.breadcrumbs > li > span {
     background: #8c1515;
-    background-image: -webkit-linear-gradient(top, #8c1515 0%, #600e0e 100%);
-    background-image: linear-gradient(to bottom, #8c1515 0%, #600e0e 100%);
+    background-image: -webkit-linear-gradient(top, #8c1515 0%, #831414 100%);
+    background-image: linear-gradient(to bottom, #8c1515 0%, #831414 100%);
     background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff600e0e', GradientType=0);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff831414', GradientType=0);
   }
   .adminbar.breadcrumbs > li:last-child > a,
   .adminbar.breadcrumbs > li:last-child > span {
     background: #8c1515;
-    background-image: -webkit-linear-gradient(top, #8c1515 0%, #600e0e 100%);
-    background-image: linear-gradient(to bottom, #8c1515 0%, #600e0e 100%);
+    background-image: -webkit-linear-gradient(top, #8c1515 0%, #831414 100%);
+    background-image: linear-gradient(to bottom, #8c1515 0%, #831414 100%);
     background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff600e0e', GradientType=0);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff831414', GradientType=0);
   }
 }
 #metabar {
@@ -66,18 +66,18 @@
   border-left: 1px solid #cccccc;
 }
 #metabar > .title {
-  background: #4f0000;
-  background-image: -webkit-linear-gradient(top, #4f0000 0%, #350000 100%);
-  background-image: linear-gradient(to bottom, #4f0000 0%, #350000 100%);
+  background: #780000;
+  background-image: -webkit-linear-gradient(top, #780000 0%, #5e0000 100%);
+  background-image: linear-gradient(to bottom, #780000 0%, #5e0000 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4f0000', endColorstr='#ff350000', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff780000', endColorstr='#ff5e0000', GradientType=0);
 }
 #metabar .btn-metadata {
   background: #8c1515;
-  background-image: -webkit-linear-gradient(top, #8c1515 0%, #b81c1c 100%);
-  background-image: linear-gradient(to bottom, #8c1515 0%, #b81c1c 100%);
+  background-image: -webkit-linear-gradient(top, #8c1515 0%, #951616 100%);
+  background-image: linear-gradient(to bottom, #8c1515 0%, #951616 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ffb81c1c', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8c1515', endColorstr='#ff951616', GradientType=0);
 }
 .navbar-inverse,
 .navbar-inverse .navbar-nav > .open > a,

diff --git a/deme_django/modules/symsys/update_notes/symsys.less b/deme_django/modules/symsys/update_notes/symsys.less
@@ -30,11 +30,11 @@
 ///////
 
 @adminbar-top: @su-cardinal-red; //#68a7bd;
-@adminbar-bottom: darken(@adminbar-top,10);//#29687e;
+@adminbar-bottom: darken(@adminbar-top,2);//#29687e;
 @adminbar-top-active: @su-dark-red; //#5c95ad;
-@adminbar-bottom-active: darken(@adminbar-top-active,10);//#17475b;
-@adminbar-top-light: lighten(@su-cardinal-red,10); //#8ac9df;
-@adminbar-bottom-light: darken(@adminbar-top-light,10);//#49869c;
+@adminbar-bottom-active: darken(@adminbar-top-active,2);//#17475b;
+@adminbar-top-light: lighten(@su-cardinal-red,2); //#8ac9df;
+@adminbar-bottom-light: darken(@adminbar-top-light,2);//#49869c;
 
 @navbar-inverse-bg:                         @adminbar-top;
 
@@ -72,4 +72,4 @@
 //      }
 //    }
 //  }
-//}
+//}
diff --git a/deme_django/static/css/deme.css b/deme_django/static/css/deme.css
@@ -6865,6 +6865,9 @@ body {
   text-overflow: ellipsis;
   overflow: hidden;
 }
+.sidebar-section a.active {
+  font-weight: bold;
+}
 .sidebar-section .recently-viewed div {
   padding-bottom: 10px;
 }
@@ -7045,6 +7048,16 @@ html.embed .well .row {
   border-radius: 5px;
   background: #ffffff;
 }
+.newsroll-wrap {
+  background: #eeeeee;
+}
+.newsroll-wrap .item {
+  border-bottom: 3px solid #ffffff;
+  padding: 15px;
+}
+.newsroll-wrap .title {
+  font-weight: bold;
+}
 .panel-group .panel-body ul,
 .panel-group .panel-body ol {
   padding-left: 15px;

diff --git a/deme_django/static/javascripts/deme/adminbar.js b/deme_django/static/javascripts/deme/adminbar.js
@@ -17,9 +17,27 @@ if (checker.android) {
 // check tab areas to see if is current page.
 $(function(){
   var pathname = window.location.pathname;
+
+  // collapse and open panels as necessary
+  $(".panel-group").each(function(){
+    var group = $(this);
+    group.find(".panel-collapse a").each(function(){
+      var me = $(this);
+      if (me.attr('href') == pathname) {
+        $('#symsysnav .panel-collapse').removeClass("in");
+        // open up the section
+        me.closest(".panel-collapse").addClass("in");
+        return false;
+      }
+    });
+  });
+
+  // highlight active links
   $('.page-layout').find('a[href="' + pathname + '"],a[href="' + window.location + '"]').each(function(){
-    $(this).closest('li').addClass('active');
+    $(this).addClass('active');
   });
+
+
 });
 
 

diff --git a/deme_django/static/less/css/newsroll.css b/deme_django/static/less/css/newsroll.css
@@ -0,0 +1,9 @@
+.newsroll-wrap .item {
+  border: thin #ccc solid;
+  background: #eee;
+  -moz-border-radius: 8px;
+  padding: 2px;
+}
+.newsroll-wrap .title {
+  font-weight: bold;
+}
diff --git a/deme_django/static/less/deme.less b/deme_django/static/less/deme.less
@@ -66,7 +66,8 @@
 @import "deme/type.less";
 @import "deme/calendar.less";
 @import "deme/admin.less";
-@import "deme/components";
+@import "deme/newsroll.less";
+@import "deme/components.less";
 
 // Mobile specific
-@import "deme/mobile-sidebar.less";
+@import "deme/mobile-sidebar.less";
diff --git a/deme_django/static/less/deme/newsroll.less b/deme_django/static/less/deme/newsroll.less
@@ -0,0 +1,12 @@
+.newsroll-wrap {
+  background: @grayLighter;
+  .item {
+    //border: thin #ccc solid; background: #eee; -moz-border-radius: 8px; padding: 2px;
+    border-bottom: 3px solid @white;
+    padding: 15px;
+  }
+  .title {
+    font-weight: bold;
+  }
+  // <div style="border: 1px solid #aaa; margin-bottom: 8px; margin-top: 8px;"></div>
+}
diff --git a/deme_django/static/less/deme/page-layout.less b/deme_django/static/less/deme/page-layout.less
@@ -67,9 +67,12 @@ body {
 }
 
 .sidebar-section {
+  a.active {
+    font-weight: bold;
+  }
   .recently-viewed {
     div {
       padding-bottom: 10px;
     }
   }
-}
+}