added reply count, link option for nicedit, change in date format

7 files changed, 84 insertions, 42 deletions

diff --git a/static/website/js/thread-user.js b/static/website/js/thread-user.js
index a8e7eee..502f0ce 100644
--- a/static/website/js/thread-user.js
+++ b/static/website/js/thread-user.js
@@ -1,7 +1,7 @@
 bkLib.onDomLoaded(function() {
 
     var questionNicEditor = new nicEditor({
-        buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image'],
+        buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link'],
         iconsPath: "/static/website/js/nicEditorIcons.gif",
     });
     questionNicEditor.setPanel('questionNicPanel');
@@ -71,7 +71,7 @@ $(document).ready(function() {
     $replyPanelWrapper = $("#replyPanelWrapper");
 
     var replyNicEditor = new nicEditor({
-        buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image'],
+        buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link'],
         iconsPath: "/static/website/js/nicEditorIcons.gif",
     });
     replyNicEditor.panelInstance('replyNicPanel');
diff --git a/static/website/templates/ajax-keyword-search.html b/static/website/templates/ajax-keyword-search.html
index 2426e55..db9fbc7 100644
--- a/static/website/templates/ajax-keyword-search.html
+++ b/static/website/templates/ajax-keyword-search.html
@@ -2,12 +2,14 @@
 <br>
 <table class="table table-striped table-bordered table-hover">
     <th> FOSS </th>
-    <th>TUTORIAL</th>
-    <th> MIN</th>
-    <th> SEC </th>
-    <th> QUESTION</th>
-    <th> DATE</th>
-    <th> USER</th>
+    <th> Tutorial</th>
+    <th> Min </th>
+    <th> Sec </th>
+    <th> Question</th>
+    <th> Date</th>
+    <th> Views</th>
+    <th> Replies</th>
+    <th> User</th>
     {% for question in questions %}
     <tr>
         <td>
@@ -53,14 +55,25 @@
         <td>    
             <span>
                 <i>
-                    {{ question.date_created|date:"y-m-d" }}
+                    {{ question.date_created|date:"d-m-y" }}
                 </i>
             </span>
         </td>
-                
+
         <td>
-                {{ question.user }}
+            {{ question.views}}
         </td>
+
+        <td>
+            {{ question.reply_set.count }}
+        </td>
+
+        <td>
+                <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.user }}">
+                {{ question.user|truncatechars:10 }}
+            </span>
+        </td>
+
     </tr>
     {% endfor %}
 </table>
diff --git a/static/website/templates/ajax-time-search.html b/static/website/templates/ajax-time-search.html
index 2426e55..0b1673c 100644
--- a/static/website/templates/ajax-time-search.html
+++ b/static/website/templates/ajax-time-search.html
@@ -2,12 +2,14 @@
 <br>
 <table class="table table-striped table-bordered table-hover">
     <th> FOSS </th>
-    <th>TUTORIAL</th>
-    <th> MIN</th>
-    <th> SEC </th>
-    <th> QUESTION</th>
-    <th> DATE</th>
-    <th> USER</th>
+    <th> Tutorial</th>
+    <th> Min </th>
+    <th> Sec </th>
+    <th> Question</th>
+    <th> Date</th>
+    <th> Views</th>
+    <th> Replies</th>
+    <th> User</th>    
     {% for question in questions %}
     <tr>
         <td>
@@ -53,14 +55,25 @@
         <td>    
             <span>
                 <i>
-                    {{ question.date_created|date:"y-m-d" }}
+                    {{ question.date_created|date:"d-m-y" }}
                 </i>
             </span>
         </td>
-                
+
+        <td>
+            {{ question.views}}
+        </td>
+
         <td>
-                {{ question.user }}
+            {{ question.reply_set.count }}
+        </td>
+
+        <td>
+                <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.user }}">
+                {{ question.user|truncatechars:10 }}
+            </span>
         </td>
+               
     </tr>
     {% endfor %}
 </table>
diff --git a/static/website/templates/filter.html b/static/website/templates/filter.html
index 79943c1..64eeb5c 100644
--- a/static/website/templates/filter.html
+++ b/static/website/templates/filter.html
@@ -40,7 +40,7 @@
             <span class="meta">
                 <small>
                         <i>
-                            {{ question.date_created|date:"y-m-d" }}, {{ question.date_created|time }}
+                            {{ question.date_created|date:"d-m-y" }}, {{ question.date_created|time }}
                         </i>
                 </small>
 
@@ -74,13 +74,14 @@
 
     <table class="table table-striped table-bordered">
         <th> FOSS </th>
-        <th> ST</th>
-        <th> MIN</th>
-        <th> SEC </th>
-        <th> QUESTION</th>
-        <th> DATE</th>
-        <th>VIEWS</th>
-        <th> USER</th>
+        <th> Tutorial</th>
+        <th> Min </th>
+        <th> Sec </th>
+        <th> Question</th>
+        <th> Date</th>
+        <th> Views</th>
+        <th> Replies</th>
+        <th> User</th>
         {% for question in questions %}
         <tr>
             <td>
@@ -126,7 +127,7 @@
             <td>    
                 <span>
                     <i>
-                        {{ question.date_created|date:"y-d-m" }}
+                        {{ question.date_created|date:"d-m-y" }}
                     </i>
                 </span>
             </td>
@@ -136,8 +137,15 @@
             </td>
 
             <td>
-                    {{ question.user }}
+                {{ question.reply_set.count }}
+            </td>
+
+            <td>
+                    <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.user }}">
+                    {{ question.user|truncatechars:10 }}
+                </span>
             </td>
+
         </tr>
         {% endfor %}
     </table>
diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html
index 15c0197..8c242d6 100644
--- a/static/website/templates/get-question.html
+++ b/static/website/templates/get-question.html
@@ -117,7 +117,7 @@
     bkLib.onDomLoaded(function() {
         new nicEditor({
             iconsPath: "{% static 'website/js/nicEditorIcons.gif' %}",
-            buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image']
+            buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link']
         }).panelInstance('id_body');
     });
 </script>
diff --git a/static/website/templates/index.html b/static/website/templates/index.html
index ea0b43f..1823f4e 100644
--- a/static/website/templates/index.html
+++ b/static/website/templates/index.html
@@ -4,13 +4,14 @@
 <h4><u>Recent Questions</u></h4>
 <table class="table table-striped table-bordered table-hover">
     <th> FOSS </th>
-    <th>TUTORIAL</th>
-    <th> MIN</th>
-    <th> SEC </th>
-    <th> QUESTION</th>
-    <th> DATE</th>
-    <th>VIEWS</th>
-    <th> USER</th>
+    <th> Tutorial</th>
+    <th> Min </th>
+    <th> Sec </th>
+    <th> Question</th>
+    <th> Date</th>
+    <th> Views</th>
+    <th> Replies</th>
+    <th> User</th>
     {% for question in questions %}
     <tr>
         <td>
@@ -56,7 +57,7 @@
         <td>    
             <span>
                 <i>
-                    {{ question.date_created|date:"y-m-d" }}
+                    {{ question.date_created|date:"d-m-y" }}
                 </i>
             </span>
         </td>
@@ -64,12 +65,19 @@
         <td>
             {{ question.views}}
         </td>
-                
+
         <td>
-                {{ question.user }}
+            {{ question.reply_set.count }}
+        </td>
+       
+        <td>
+            <span class="title" data-toggle="tooltip" data-placement="top" title="{{ question.user }}">
+                {{ question.user|truncatechars:10 }}
+            </span>
         </td>
     </tr>
     {% endfor %}
+
 </table>
     {% if total > 10 %}
         <ul class="pagination pull-right">
diff --git a/static/website/templates/new-question.html b/static/website/templates/new-question.html
index d14c956..60efa9b 100644
--- a/static/website/templates/new-question.html
+++ b/static/website/templates/new-question.html
@@ -74,7 +74,7 @@
 bkLib.onDomLoaded(function() {
 	new nicEditor({
         iconsPath: "{% static 'website/js/nicEditorIcons.gif' %}",
-        buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image']
+        buttonList : ['fontSize','bold','italic','underline','strikeThrough','subscript','superscript','html','image', 'link']
     }).panelInstance('id_body');
 });
 </script>