Merge branch 'ux-release-1' into ml-sci-2405

app/assets/javascripts/repository_columns/index.js.erb

@@ -43,6 +43,10 @@
             });
           });
         });
+      }).fail(function(error) {
+        HelperModule.flashAlertMsg(
+          "<%= I18n.t("libraries.repository_columns.no_permissions") %>",
+          'danger');
       });
     });
   }
@@ -58,6 +62,10 @@
           modal_html.modal('show');
           _initSubmitAction(modal_html, $(modal_html.find('form')));
         });
+      }).fail(function(error) {
+        HelperModule.flashAlertMsg(
+          "<%= I18n.t("libraries.repository_columns.no_permissions") %>",
+          'danger');
       });
     });
   }

app/assets/javascripts/sidebar_toggle.js.erb

@@ -5,10 +5,7 @@
     function show() {
       $('#sideBarLeft').show();
       $('#sideBarRight').hide();
-      $('#sidebar-wrapper').show(
+      $('#wrapper').removeClass('hidden2');
-        'slide', { direction: 'right', easing: 'linear' }, 400
-      );
-      $('#wrapper').css('paddingLeft', '280px');
       $('.navbar-secondary').css(
         { 'margin-left': '-280px', 'padding-left': '294px' }
       );
@@ -17,10 +14,7 @@
     function hide() {
       $('#sideBarLeft').hide();
       $('#sideBarRight').show();
-      $('#sidebar-wrapper').hide(
+      $('#wrapper').addClass('hidden2');
-        'slide', { direction: 'left', easing: 'linear'}, 400
-      );
-      $('#wrapper').css('paddingLeft', '0');
       $('.navbar-secondary').css({
         'margin-left': '0',
         'padding-left': '14px'

app/views/layouts/application.html.erb

@@ -51,6 +51,7 @@
           <p data-hook="general-no-teams-text"><%=t 'general.no_teams.text' %></p>
         </div>
       <% else %>
+        <%= yield :flash_messages_div %>
         <%= yield :content %>
       <% end %>
     </div>

app/views/reports/new/_report_sidebar.html.erb

@@ -1,22 +0,0 @@
-<% content_for :sidebar do %>
-  <div id="slide-panel" class="visible">
-
-    <div class="sidebar-header">
-      <div class="sidebar-header-title">
-        <h5><%=t "projects.reports.new.sidebar_title" %></h5>
-      </div>
-    </div>
-    <div class="sidebar-header-toggle">
-      <a href="" class="toggle-sidebar-link">
-        <span class="glyphicon glyphicon-play-circle"></span>
-      </a>
-    </div>
-
-    <div class="tree report-tree">
-      <ul id="report-sidebar-tree">
-      </ul>
-    </div>
-  </div>
-<% end %>
-
-<%= javascript_include_tag("sidebar") %>

app/views/repository_columns/index.html.erb

@@ -1,5 +1,7 @@
 <% provide(:head_title, t('libraries.repository_columns.head_title', repository: @repository.name)) %>
-
+<% provide(:flash_messages_div) do %>
+  <div id="notifications"></div>
+<% end %>
 <div class="content-pane">
   <div class="repository-columns-header container">
     <div class="row">

app/views/users/sessions/new.html.erb

@@ -26,7 +26,7 @@
     <% end -%>
 
     <div class="actions" style="margin-top: 10px; margin-bottom: 10px;">
-      <%= f.submit t("devise.sessions.new.submit"), class: "btn btn-default" %>
+      <%= f.submit t("devise.sessions.new.submit"), class: "btn btn-primary" %>
     </div>
   <% end %>
 

config/locales/en.yml

@@ -323,7 +323,7 @@ en:
         global_sort: "Sorting whole report will undo any custom sorting you might have done. Proceed?"
         unsaved_work: "Are you sure you want to leave this page? All unsaved data will be lost."
         no_content_for_PDF_html: "<h1>No content</h1>"
-        no_permissions: "You don't have permissions on that repository"
+        no_permissions: "You don't have permission to manage this column"
         save_PDF_to_inventory_modal:
           description_one: "Here you can save PDF report to an inventory item."
           description_two: "First select an inventory, then a column and finally the item within the inventory to which you would like to save the PDF report to. Note that the column has to be of type \"file\"."
@@ -1038,6 +1038,7 @@ en:
     repository_columns:
       head_title: '%{repository} | Manage Columns'
       repository_list_items_limit: "Dropdown items limit reached max. %{limit}"
+      no_permissions: "You don't have permissions on that repository"
       update:
         success_flash: "Column %{name} was successfully updated."
       create: