comments and ratings: small changes following mB redesign

liqd · Aug 15, 2024 · 4b66fe1 · 4b66fe1
1 parent c00f5f5
commit 4b66fe1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/adhocracy4/comments_async/static/comments_async/comment_list.jsx b/adhocracy4/comments_async/static/comments_async/comment_list.jsx
@@ -4,7 +4,7 @@ import Comment from './comment'
 
 const CommentList = (props) => {
   return (
-    <ul className="u-list-reset">
+    <ul className="u-list-reset a4-comments">
       {
         props.comments.map((comment, index) => {
           return (

diff --git a/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx b/adhocracy4/comments_async/static/comments_async/comment_manage_dropdown.jsx
@@ -18,16 +18,22 @@ const CommentManageDropdown = (props) => {
       >
         <i className="fas fa-ellipsis-h" aria-hidden="true" />
       </button>
-      <div className="dropdown-menu dropdown-menu-end">
-        {props.has_changing_permission && [
-          <button key="1" className="dropdown-item" type="button" onClick={props.handleToggleEdit}>{translated.edit}</button>,
-          <div className="divider" key="2" />
-        ]}
-        {props.has_deleting_permission && [
-          <a key="3" className="dropdown-item" href={'#comment_delete_' + props.id} data-bs-toggle="modal">{translated.delete}</a>,
-          <div className="divider" key="4" />
-        ]}
-      </div>
+      <ul className="dropdown-menu dropdown-menu-end">
+        {props.has_changing_permission && (
+          <li className="dropdown-item">
+            <button type="button" onClick={props.handleToggleEdit}>
+              {translated.edit}
+            </button>
+          </li>
+        )}
+        {props.has_deleting_permission && (
+          <li className="dropdown-item">
+            <a href={'#comment_delete_' + props.id} data-bs-toggle="modal">
+              {translated.delete}
+            </a>
+          </li>
+        )}
+      </ul>
     </div>
   )
 }

diff --git a/adhocracy4/ratings/static/ratings/react_ratings.jsx b/adhocracy4/ratings/static/ratings/react_ratings.jsx
@@ -7,7 +7,9 @@ import config from '../../../static/config'
 
 const translations = {
   upvote: django.gettext('Click to vote up'),
-  downvote: django.gettext('Click to vote down')
+  downvote: django.gettext('Click to vote down'),
+  likes: django.gettext('Likes'),
+  dislikes: django.gettext('Dislikes')
 }
 
 class RatingBox extends React.Component {
@@ -133,6 +135,7 @@ class RatingBox extends React.Component {
         >
           <i className="fa fa-chevron-up" aria-hidden="true" />
           {this.state.positiveRatings}
+          <span className="rating__label">{translations.likes}</span>
         </button>
         <button
           aria-label={translations.downvote}
@@ -142,6 +145,7 @@ class RatingBox extends React.Component {
         >
           <i className="fa fa-chevron-down" aria-hidden="true" />
           {this.state.negativeRatings}
+          <span className="rating__label">{translations.dislikes}</span>
         </button>
       </div>
     )