##// END OF EJS Templates
drafts: show TODO drafts properly....
super-admin -
r4746:55b7721d default
parent child
Show More
@@ -66,7 +66,7
66 % endif
66 % endif
67 % else:
67 % else:
68 ## SKIP TODOs we display them in other area
68 ## SKIP TODOs we display them in other area
69 % if comment_obj.is_todo:
69 % if comment_obj.is_todo and not comment_obj.draft:
70 <% display = 'none' %>
70 <% display = 'none' %>
71 % endif
71 % endif
72 ## Skip outdated comments
72 ## Skip outdated comments
@@ -122,12 +122,21
122 'review_status': (comment_obj.review_status or '')
122 'review_status': (comment_obj.review_status or '')
123 })
123 })
124
124
125 icon = ''
126
125 if comment_obj.outdated:
127 if comment_obj.outdated:
126 icon = 'icon-comment-toggle'
128 icon += ' icon-comment-toggle'
127 elif comment_obj.is_inline:
129 elif comment_obj.is_inline:
128 icon = 'icon-code'
130 icon += ' icon-code'
129 else:
131 else:
130 icon = 'icon-comment'
132 icon += ' icon-comment'
133
134 if comment_obj.draft:
135 if comment_obj.is_todo:
136 icon = 'icon-flag-filled icon-draft'
137 else:
138 icon = 'icon-comment icon-draft'
139
131 %>
140 %>
132
141
133 <i id="commentHovercard${comment_obj.comment_id}"
142 <i id="commentHovercard${comment_obj.comment_id}"
@@ -237,7 +237,7 if (show_disabled) {
237 <time class="timeago" title="<%= created_on %>" datetime="<%= datetime %>"><%= $.timeago(datetime) %></time>
237 <time class="timeago" title="<%= created_on %>" datetime="<%= datetime %>"><%= $.timeago(datetime) %></time>
238
238
239 <% if (is_todo) { %>
239 <% if (is_todo) { %>
240 <div style="text-align: center; padding-top: 5px">
240 <div style="text-align: left; padding-top: 5px">
241 <a class="btn btn-sm" href="#resolveTodo<%- comment_id -%>" onclick="Rhodecode.comments.resolveTodo(this, '<%- comment_id -%>'); return false">
241 <a class="btn btn-sm" href="#resolveTodo<%- comment_id -%>" onclick="Rhodecode.comments.resolveTodo(this, '<%- comment_id -%>'); return false">
242 <strong>Resolve TODO</strong>
242 <strong>Resolve TODO</strong>
243 </a>
243 </a>
@@ -564,7 +564,6
564 <input name="select_all_drafts" type="checkbox" onclick="selectDraftComments(event)">
564 <input name="select_all_drafts" type="checkbox" onclick="selectDraftComments(event)">
565 </span>
565 </span>
566 <span class="sidebar-heading noselect" onclick="refreshDraftComments(); return false">
566 <span class="sidebar-heading noselect" onclick="refreshDraftComments(); return false">
567 <i class="icon-comment icon-draft"></i>
568 ${_('Drafts')}
567 ${_('Drafts')}
569 </span>
568 </span>
570 <span class="block-right action_button last-item" onclick="submitDrafts(event)">${_('Submit')}</span>
569 <span class="block-right action_button last-item" onclick="submitDrafts(event)">${_('Submit')}</span>
General Comments 0
You need to be logged in to leave comments. Login now