Merge branch 'master' of github.com:tracim/tracim

tracim/tracim/controllers/content.py

@@ -527,7 +527,7 @@ class UserWorkspaceFolderThreadRestController(TIMWorkspaceContentRestController)
 
     @tg.require(current_user_is_reader())
     @tg.expose('tracim.templates.thread.getone')
-    def get_one(self, thread_id):
+    def get_one(self, thread_id, inverted: str=''):
         thread_id = int(thread_id)
         user = tmpl_context.current_user
         workspace = tmpl_context.workspace
@@ -543,7 +543,11 @@ class UserWorkspaceFolderThreadRestController(TIMWorkspaceContentRestController)
         fake_api = Context(CTX.FOLDER).toDict(fake_api_content)
 
         dictified_thread = Context(CTX.THREAD).toDict(thread, 'thread')
-        return DictLikeClass(result = dictified_thread, fake_api=fake_api)
+
+        if inverted:
+          dictified_thread.thread.history = reversed(dictified_thread.thread.history)
+
+        return DictLikeClass(result=dictified_thread, fake_api=fake_api, inverted=inverted)
 
 
 
@@ -949,4 +953,4 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
             back_url = self._parent_url.format(item.workspace_id, item.parent_id)
             msg = _('{} not un-deleted: {}').format(self._item_type_label, str(e))
             tg.flash(msg, CST.STATUS_ERROR)
-            tg.redirect(back_url)
+            tg.redirect(back_url)

tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po

@@ -1965,6 +1965,10 @@ msgstr ""
 msgid "Post a reply..."
 msgstr "Poster une réponse..."
 
+#: tracim/templates/thread/getone.mak:97
+msgid "Invert order"
+msgstr "Inverser l'ordre"
+
 #: tracim/templates/thread/toolbar.mak:16
 msgid "Edit current thread"
 msgstr "Modifier le sujet de discussion"

tracim/tracim/public/assets/css/dashboard.css

@@ -382,3 +382,11 @@ span.info.readonly {
 .no-padding {
     padding: 0px;
 }
+.threads-history-reverse {
+  float: right;
+  padding: 10px 15px 0 0;
+  font-size: 16px;
+}
+.threads-history-reverse > i {
+  font-size: 12px;
+}

tracim/tracim/templates/file/toolbar.mak

@@ -11,28 +11,28 @@
 
     <% download_url = tg.url('/workspaces/{}/folders/{}/files/{}/download?revision_id={}'.format(result.file.workspace.id, result.file.parent.id,result.file.id,result.file.selected_revision)) %>
     <% edit_disabled = ('', 'disabled')[file.selected_revision!='latest' or file.status.id[:6]=='closed'] %>
-    <% delete_or_archive_disabled = ('', 'disabled')[file.selected_revision!='latest'] %> 
+    <% delete_or_archive_disabled = ('', 'disabled')[file.selected_revision!='latest'] %>
     % if h.user_role(user, workspace)>1:
         <div class="btn-group btn-group-vertical">
             <a title="${_('Edit current file')}" class="btn btn-default ${edit_disabled}" data-toggle="modal" data-target="#file-edit-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/files/{}/edit'.format(file.workspace.id, file.parent.id, file.id))}" >${ICON.FA_FW('fa fa-edit t-less-visible')} ${_('Edit')}</a>
         </div>
         <p></p>
     % endif
-    
+
     <div class="btn-group btn-group-vertical">
         <a href="${download_url}" role="button" class="btn btn-default" data-toggle="modal" title="${_('Download the file')}">${ICON.FA('fa fa-download t-less-visible')} ${_('Download')}</a>
         <a href="#file-versions" role="button" class="btn btn-default" data-toggle="modal" title="${_('View versions of the file')}">${ICON.FA('fa fa-history t-less-visible')} ${_('Revisions')}</a>
 ## RESTORE LINKS IF REQUIRED        <a href="#file-associated-links" role="button" class="btn btn-default" data-toggle="modal" title="${_('View all links')}">${TIM.ICO(32, 'apps/internet-web-browser')}</a>
     </div>
     <p></p>
-    
+
     % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
         ## if the user can see the toolbar, it means he is the workspace manager.
         ## So now, we need to know if he alsa has right to delete workspaces
         <div class="btn-group btn-group-vertical">
             ## SHOW_ARCHIVE_BUTTON__BUG_#81
             <a title="${_('Archive file')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_archive'.format(file.workspace.id, file.parent.id, file.id))}">
-                ${ICON.FA_FW('fa fa-archive t-less-visible')} ${_('Archive')}test
+                ${ICON.FA_FW('fa fa-archive t-less-visible')} ${_('Archive')}
             </a>
             <a title="${_('Delete file')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_delete'.format(file.workspace.id, file.parent.id, file.id))}">
                 ${ICON.FA_FW('fa fa-trash t-less-visible')} ${_('Delete')}

tracim/tracim/templates/thread/getone.mak

@@ -85,6 +85,17 @@
 
 <div class="row">
     <div class="col-sm-7 col-sm-offset-3">
+        <div class="threads-history-reverse">
+        % if inverted:
+            <a href="${tg.url('/workspaces/{}/folders/{}/threads/{}'.format(result.thread.workspace.id, result.thread.parent.id, result.thread.id))}">
+                <i class="fa fa-chevron-down" aria-hidden="true"></i>
+        % else:
+            <a href="${tg.url('/workspaces/{}/folders/{}/threads/{}?inverted=1'.format(result.thread.workspace.id, result.thread.parent.id, result.thread.id))}">
+                <i class="fa fa-chevron-up" aria-hidden="true"></i>
+        % endif
+                ${_('Invert order')}
+            </a>
+        </div>
         % if h.user_role(fake_api.current_user, result.thread.workspace)<=1:
             ## READONLY USER
             <% a = 'b' %>
@@ -101,6 +112,7 @@
     </div>
 </div>
 
+<!-- % for event in reversed(result.thread.history): -->
 % for event in result.thread.history:
     ## TODO - D.A. - 2015-08-20
     ## Allow to show full history (with status change and archive/unarchive)