Merge pull request #394 from Skylsmoi/master

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

@@ -125,8 +125,16 @@ body {
   font-size: 16px;
 }
 .header__navbar__switch-mode.switch-work-mode {
-    background-color: #eee;
-    color: #333;
+  background-color: #eee;
+  color: #333;
+}
+
+#move_folder_popup .sidebarleft {
+  border: 1px solid #ddd;
+  border-top-width: 0;
+}
+#move_folder_popup .sidebarleft__menu__item__link {
+  color: #333;
 }
 
 /*
@@ -603,7 +611,7 @@ div.mce-fullscreen {
   color: #31708f;
 }
 .content__home__tab__content-unread {
-    float: right;
+  float: right;
   margin-bottom: 15px;
 }
 

tracim/tracim/public/assets/js/trad.js

@@ -14,5 +14,18 @@ var tracimJsTraduction = {
 }
 
 function __ (tradId) {
-  return tracimJsTraduction[tradId][globalTracimLang]
+  const normalizedLang = (() => {
+    switch (globalTracimLang) { // @TODO - Côme - 2017/10/30 - need a more secure way to handle different langs
+      case 'fr':
+      case 'fr-fr':
+      case 'fr_FR':
+        return 'fr_FR';
+      case 'en':
+      case 'en_US':
+        return 'en_US';
+      default:
+        return 'en_US';
+    }
+  })()
+  return tracimJsTraduction[tradId][normalizedLang]
 }

tracim/tracim/templates/admin/workspace_getone.mak

@@ -53,7 +53,7 @@
         % if potential_new_user_nb<=0:
             ${TITLE.H3(_('Members'), 'fa-user', 'workspace-members')}
         % else:
-            ${TITLE.H3_WITH_BUTTON(fake_api.current_user, result.workspace, 'workspace-members', _('Members'), 'add-role-from-existing-user-form', _('add one...'), 'fa-user')}
+            ${TITLE.H3_WITH_BUTTON(fake_api.current_user, result.workspace, 'workspace-members', _('Members'), 'add-role-from-existing-user-form', _('add one...'), 'fa-user', 'btn btn-link')}
 
             <div id="add-role-from-existing-user-form" class="collapse col-sm-9">
                 <div class="pod-inline-form">

tracim/tracim/templates/folder/forms.mak

@@ -51,7 +51,7 @@
                     <li role="presentation"><a href="#move-to-another-workspace" aria-controls="move-to-another-workspace" role="tab" data-toggle="tab">${_('to another workspace')}</a></li>
                 </ul>
                 <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active bg-primary" id="move-to-same-workspace"></div>
+                    <div role="tabpanel" class="tab-pane active" id="move-to-same-workspace"></div>
                     <%
                       selected_id = 'workspace_{}__folder_{}'.format(item.workspace.id, item.folder.id if item.folder else '')
                       apiPath = tg.url('/workspaces/treeview_root')
@@ -60,7 +60,7 @@
                       apiChildParameters = tg.url('', dict(ignore_id=item.id, allowed_content_types='folder'))
                     %>
                     ${LEFT_MENU.TREEVIEW('move-to-same-workspace', apiPath, apiParameters, apiChildPath, apiChildParameters, 'True')}
-                    <div role="tabpanel" class="tab-pane bg-primary" id="move-to-another-workspace"></div>
+                    <div role="tabpanel" class="tab-pane" id="move-to-another-workspace"></div>
                     <%
                       apiPath = tg.url('/workspaces/treeview_root')
                       apiParameters = tg.url('', dict(current_id=None, all_workspaces=1, folder_allowed_content_types='folder', ignore_id=item.id, ignore_workspace_id=item.workspace.id))

tracim/tracim/templates/pod.mak

@@ -64,11 +64,11 @@
             menubar:false,
             statusbar:true,
             branding: false,
-            plugins: [ "table", "image", "charmap", "fullscreen", "autolink", "colorpicker", "link", "code", "contextmenu"],
+            plugins: [ "table", "image", "charmap", "fullscreen", "autolink", "colorpicker", "link", "code", "contextmenu", "lists"],
             language: globalTracimLang === 'fr' ? 'fr_FR' : globalTracimLang, // tinymce does't accept en_US as language, it is its default value named 'en'
             selector:'${selector}',
             toolbar: [
-              "undo redo | bold italic underline strikethrough | link | bullist numlist outdent indent | table | charmap | styleselect | alignleft aligncenter alignright | fullscreen | customInsertImage | code",
+              "undo redo | bold italic underline strikethrough | link | bullist numlist | outdent indent | table | charmap | styleselect | alignleft aligncenter alignright | fullscreen | customInsertImage | code",
             ],
             contextmenu: "link",
             link_context_toolbar: true,

tracim/tracim/templates/widgets/title.mak

@@ -7,7 +7,7 @@
         ${label}
     </h3>
 </%def>
-<%def name="H3_WITH_BUTTON(current_user, workspace, dom_id, label, action_dom_id='', action_label='', fa_icon='')">
+<%def name="H3_WITH_BUTTON(current_user, workspace, dom_id, label, action_dom_id='', action_label='', fa_icon='', custom_classes='')">
     <h3 id="${dom_id}">
         ${ICON.FA('t-less-visible '+fa_icon) if fa_icon else ''}
         ${label}
@@ -15,7 +15,7 @@
         ## Button is shown for contributors (or more), not for readers
         % if h.user_role(current_user, workspace)>1:
             % if action_dom_id and action_label:
-                <small class="t-spacer-left">${BUTTON.DATA_TARGET_AS_TEXT(action_dom_id, action_label)}</small>
+                <small class="t-spacer-left">${BUTTON.DATA_TARGET_AS_TEXT(action_dom_id, action_label, custom_classes)}</small>
             % endif
         % endif
     </h3>