Merge branch 'master' of github.com:IEEEKeralaSection/rescuekerala

raksha-life · Aug 9, 2019 · ca414c1 · ca414c1
2 parents fb8be05 + c29e830
commit ca414c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mainapp/templates/mainapp/volunteerview.html b/mainapp/templates/mainapp/volunteerview.html
@@ -52,10 +52,10 @@
 		}
 		#requests-table td:nth-of-type(1):before { content: "District - ജില്ല"; }
     #requests-table td:nth-of-type(2):before { content: "Name - പേര"; }
-    #requests-table td:nth-of-type(3):before { content: "Location - സ്ഥലം"; }
-    #requests-table td:nth-of-type(4):before { content: "Organization - സംഘടന"; }
-    #requests-table td:nth-of-type(5):before { content: "Phone - ഫോണ്‍ നമ്പര്‍"; }
-    #requests-table td:nth-of-type(6):before { content: "Area - സന്നദ്ധസേവനം"; }
+    #requests-table td:nth-of-type(3):before { content: "Area - സന്നദ്ധസേവനം"; }
+    #requests-table td:nth-of-type(4):before { content: "Location - സ്ഥലം"; }
+    #requests-table td:nth-of-type(5):before { content: "Organization - സംഘടന"; }
+    #requests-table td:nth-of-type(6):before { content: "Phone - ഫോണ്‍ നമ്പര്‍"; }
   }
 @media only screen and (max-width: 420px)  {
 		#requests-table td {
@@ -88,23 +88,23 @@ <h1 class="text-center">View Volunteers</h1>
       <tr>
         <th>District - ജില്ല</th>
         <th>Name - പേര</th>
+	<th>Area - സന്നദ്ധസേവനം</th>
 		{% if user.is_authenticated %}
 			<th>Location - സ്ഥലം</th>
 			<th>Organization - സംഘടന</th>
 		{% endif %}
-        <th>Area - സന്നദ്ധസേവനം</th>
       </tr>
     </thead>
     <tbody>
     {% for req in data %}
         <tr>
           <td>{{ req.get_district_display }}</td>
           <td>{{ req.name }}</td>
+	  <td>{{ req.get_area_display }}</td>
 		  {% if user.is_authenticated %}
 			  <td>{{ req.address }}</td>
 			  <td>{{ req.organisation }}</td>
 		  {% endif %}
-          <td>{{ req.get_area_display }}</td>
         </tr>
     {% endfor %}
   </tbody>

diff --git a/templates/announcements.html b/templates/announcements.html
@@ -15,7 +15,7 @@ <h2 class="main-logo">Important Announcements</h2>
         {% for req in pinned_data %}
             <div class="card priority-very-important">
                 <span class="card-text">
-                    {{ req.description | safe | linebreaks }}<br/>
+                    {{ req.description | safe | urlize | linebreaks }}<br/>
                 </span>
                 <span class="card-priority">Very Important</span><br/>
                 <span class="card-time">{% bootstrap_icon "time" %} {{ req.dateadded }}</span>
@@ -29,7 +29,7 @@ <h2 class="main-logo">Important Announcements</h2>
         {% for req in data %}
             <div class="card priority-{{ req.get_priority_display.lower }}">
                 <span class="card-text">
-                    {{ req.description | safe }}<br/>
+                    {{ req.description | safe | urlize }}<br/>
                     {% if req.image %}
                         <a href="{{req.image.url}}"
                             class="btn btn-default card-link">{% bootstrap_icon "eye-open" %} View Image</a>