Feat(dashboard): Show scrollbars for dashboard panels with many entri…

…es. Fix #539
hpi-swt2 · Jan 10, 2017 · 29fda31 · 29fda31
1 parent aba6ea2
commit 29fda31
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -207,6 +207,11 @@ tr.highlight {
     color: white;
 }
 
+.panel-scroll {
+    max-height: 300px;
+    overflow: auto;
+}
+
 /* Styling for Bootstrap modal popovers of gem 'data-confirm-modal' */
 
 .modal-footer {

diff --git a/app/views/dashboard/_missing_timesheets.html.erb b/app/views/dashboard/_missing_timesheets.html.erb
@@ -4,7 +4,7 @@
         <div class="panel-heading">
           <h4><%= t 'dashboard.index.missing_timesheets' %></h4>
         </div>
-        <div class="panel-body">
+        <div class="panel-body panel-scroll">
           <% if @missing_timesheets.empty? %>
             <%= t 'no_entries_yet', target: t('activerecord.models.time_sheet.other') %>
           <% else %>

diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
@@ -34,7 +34,7 @@
         <div class="panel-heading">
           <h4><%= t '.ending_contracts' %></h4>
         </div>
-        <div class="panel-body">
+        <div class="panel-body panel-scroll">
           <% if @ending_contracts.empty? %>
             <%= t 'no_entries_yet', target: t('activerecord.models.contract.other') %>
           <% else %>
@@ -76,7 +76,7 @@
       <div class="panel-heading">
         <h4><%=t('.notifications')%></h4>
       </div>
-      <div class="panel-body">
+      <div class="panel-body panel-scroll">
         <% @notifications.each do |event| %>
           <%= render partial: event %>
           <%= link_to t('helpers.submit.hide'), hide_event_path(id: event, request: current_user), method: :post, class: 'label label-warning' %>
@@ -96,7 +96,7 @@
       <div class="panel-heading">
         <h4><%=t('.activities')%></h4>
       </div>
-      <div class="panel-body">
+      <div class="panel-body panel-scroll">
         <% unless @activities.empty? %>
           <% @activities.each do |event| %>
             <%= render partial: event %>