Merge a0ff24a into 2943851

anitab-org · Jun 8, 2018 · 4968d3f · 4968d3f
2 parents 2943851 + a0ff24a
commit 4968d3f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/systers_portal/static/css/style.css b/systers_portal/static/css/style.css
@@ -428,6 +428,7 @@ table.decoration-none  tr a {
   word-wrap: break-word;
   margin-bottom: 40px;
 }
+
 /* Commentbox CSS
 ------------------------------------------------- */
 .comment-box{
@@ -437,6 +438,19 @@ table.decoration-none  tr a {
   font-family: Georgia, "Times New Roman", Times, serif;
   font-size: 1.0em;
   line-height: 1.0em;
+
+.edit .delete{
+    background-color: #fff;
+    color: black;
+    padding: 10px;
+    border: none;
+    cursor: pointer;
+    float: right;
+}
+
+.commentbox .details{
+  text-decoration: none;
+
 /*  webkit-text-size-adjust: 100%;*/
 }
 

diff --git a/systers_portal/templates/meetup/meetup.html b/systers_portal/templates/meetup/meetup.html
@@ -43,15 +43,16 @@ <h3>Discussion Area</h3>
     </div>
   {% endif %}
   {% for comment in comments %}
-    <div class="box-container pt25">
-      <a href="{{ comment.author.get_absolute_url }}">{{ comment.author}}</a>
-      <div class="box-body">
-        <pre class="comment-box">{{ comment.body }}</pre>
-      </div>
+    <div class="box-container pt25 commentbox">
+      <a href="{{ comment.author.get_absolute_url }}"><strong>{{ comment.author}}</strong></a>
+      <a class="details">commented on {{ comment.date_created}}</a>
       {% if user == comment.author.user %}
-        <a href="{% url 'edit_meetup_comment' meetup_location.slug meetup.slug comment.id %}">edit</a>
-        <a href="{% url 'delete_meetup_comment' meetup_location.slug meetup.slug comment.id %}">delete</a>
+           <a class="delete" href="{% url 'delete_meetup_comment' meetup_location.slug meetup.slug comment.id %}"><span class="glyphicon glyphicon-trash"></span></a>
+           <a class="edit" href="{% url 'edit_meetup_comment' meetup_location.slug meetup.slug comment.id %}"><span class="glyphicon glyphicon-pencil"></span></a>
       {% endif %}
+        <div class="box-body">
+        <p>{{ comment.body }}</p>
+      </div>
     </div>
   {% endfor %}
 {% endblock %}
diff --git a/systers_portal/templates/meetup/support_request.html b/systers_portal/templates/meetup/support_request.html
@@ -38,15 +38,16 @@ <h3>Discussion Area</h3>
     </div>
   {% endif %}
   {% for comment in comments %}
-    <div class="box-container pt25">
-      <a href="{{ comment.author.get_absolute_url }}">{{ comment.author}}</a>
-      <div class="box-body">
-        <pre class="comment-box">{{ comment.body }}</pre>
-      </div>
+    <div class="box-container pt25 commentbox">
+      <a href="{{ comment.author.get_absolute_url }}"><strong>{{ comment.author}}</strong></a>
+      <a class="details">commented on {{ comment.date_created}}</a>
       {% if user == comment.author.user %}
-        <a href="{% url 'edit_support_request_comment' meetup_location.slug meetup.slug support_request.pk comment.id %}">edit</a>
-        <a href="{% url 'delete_support_request_comment' meetup_location.slug meetup.slug support_request.pk comment.id %}">delete</a>
+           <a class="delete" href="{% url 'delete_meetup_comment' meetup_location.slug meetup.slug comment.id %}"><span class="glyphicon glyphicon-trash"></span></a>
+           <a class="edit" href="{% url 'edit_meetup_comment' meetup_location.slug meetup.slug comment.id %}"><span class="glyphicon glyphicon-pencil"></span></a>
       {% endif %}
+        <div class="box-body">
+        <p>{{ comment.body }}</p>
+      </div>
     </div>
   {% endfor %}
-{% endblock %}
+{% endblock %}