Merge pull request #1023 from subins2000/issue1017

Easified announcements priority display
raksha-life · Aug 9, 2019 · 7aeaeba · 7aeaeba
2 parents 906c1bc + 721a770
commit 7aeaeba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/static/css/style.css b/static/css/style.css
@@ -286,8 +286,8 @@ table thead tr th {
 .card.priority-high{border-color:#ef7831;}
     .card.priority-high .card-priority{background-color:#ef7831;}
 
-.card.priority-medium{border-color:#7ab754;}
-    .card.priority-medium .card-priority{background-color:#7ab754;}
+.card.priority-medium{border-color:#ffc107;}
+    .card.priority-medium .card-priority{background-color:#ffc107;}
 
 .card.priority-low{border-color:#286090;}
     .card.priority-low .card-priority{background-color:#286090;}

diff --git a/templates/announcements.html b/templates/announcements.html
@@ -23,11 +23,12 @@ <h2 class="main-logo">Important Announcements</h2>
         {% endfor %}
 
         <div class="priority-index">
-            Priority : <b style="background:#ef7831"></b> High <b style="background:#7ab754"></b> Medium <b style="background:#286090"></b> Low
+            Priority : <b style="background:#ef7831"></b> High <b style="background:#ffc107"></b> Medium <b style="background:#286090"></b> Low
         </div>
 
         {% for req in data %}
             <div class="card priority-{{ req.get_priority_display.lower }}">
+                <span class="card-title">{% bootstrap_icon "time" %} {{ req.dateadded }}&nbsp;<b title="Priority" class="card-priority">{{ req.get_priority_display.upper }} priority</b></span><br/><br/>
                 <span class="card-text">
                     {{ req.description | safe | urlize }}<br/>
                     {% if req.image %}
@@ -39,7 +40,6 @@ <h2 class="main-logo">Important Announcements</h2>
                             class="btn btn-default card-link">{% bootstrap_icon "download" %} Download</a>
                     {% endif %}
                 </span>
-                <span class="card-time">{% bootstrap_icon "time" %} {{ req.dateadded }}</span>
             </div>
         {% endfor %}
     </div>