Merge pull request #350 from DigitalCurationCentre/vyruss/bugfixes

Vyruss/bugfixes

Author: xsrust

app/controllers/plans_controller.rb

@@ -184,6 +184,7 @@ def update_guidance_choices
       end
     end
     @plan.save
+    flash[:notice] = _('Guidance choices saved.')
     redirect_to action: "show"
   end
 

app/models/org.rb

@@ -3,6 +3,11 @@ class Org < ActiveRecord::Base
   include FlagShihTzu
   extend Dragonfly::Model::Validations
 
+  ##
+  # Sort order: Name ASC
+  default_scope { order(name: :asc) }
+  
+
   ##
   # Associations
 #  belongs_to :organisation_type   # depricated, but cannot be removed until migration run

app/views/layouts/_signin_signout.html.erb

@@ -37,3 +37,7 @@
     <% end %>
   </ul>
 </div>
+<!-- Quick'n'dirty touchscreen hack for Bootstrap's buggy dropdown -->
+  <style>
+    .dropdown-backdrop{ position: static; }
+  </style>

app/views/users/admin_grant_permissions.html.erb

@@ -6,11 +6,36 @@
 
 <div class="white_background">
   <%= form_tag( admin_update_permissions_user_path(@user), method: :put) do %>
-    <table id="dmp_table" class="dmp_table tablesorter">
+    <table id="dmp_table" class="dmp_table">
       <thead>
         <tr>
           <% @perms.each do |perm| %>
-          <th class="dmp_th_medium"> <%= perm.name %> </th>
+            <% case perm.name when 'grant_permissions' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to assign permissions to other users within the same organisation. Users can only assign permissions they own themselves') %>">
+                  <%= _('Grant permissions') %>
+                </th>
+              <% when 'modify_templates' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to create new institutional templates, edit existing ones and customise funder templates') %>">
+                  <%= _('Modify templates') %>
+                </th>
+              <% when 'modify_guidance' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to create and edit guidance') %>">
+                  <%= _('Modify guidance') %>
+                </th>
+              <% when 'use_api' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Provides the user with an API token and grants rights to harvest information from the tool') %>">
+                  <%= _('API rights') %>
+                </th>
+              <% when 'change_org_details' %>
+                <th class="dmp_th_medium" title="
+                  <%= _('Allows the user to amend the organisation details (name, URL etc) and add basic branding such as the logo') %>">
+                  <%= _('Change organisation details') %>
+                </th>
+            <% end %>
           <% end %>
         </tr>
       </thead>
@@ -26,4 +51,4 @@
     </table>
     <%= submit_tag _('Save') %>
   <% end %>
-</div>
+</div>

lib/assets/bg.gif

@@ -1670,7 +1670,7 @@ table.tablesorter thead tr th{
   padding-right: 20px;
 }
 table.tablesorter thead tr .header {
-  background-image: url(bg.gif);
+  background-image: asset-url("bg.gif");
   background-repeat: no-repeat;
   background-position: center right;
   background-color: @orange_lighter_colour;
@@ -1679,10 +1679,10 @@ table.tablesorter thead tr .header {
 
 
 table.tablesorter thead tr .headerSortUp {
-  background-image: url(asc.gif);
+  background-image: asset-url("asc.gif");
 }
 table.tablesorter thead tr .headerSortDown {
-  background-image: url(desc.gif);
+  background-image: asset-url("desc.gif");
 }
 
 

lib/assets/stylesheets/admin.css.less

@@ -1851,15 +1851,15 @@ ul.help_ul li{
 table.tablesorter thead  {
   th.header {
     cursor: pointer;
-    background: url('/assets/bg.gif') no-repeat center right;
+    background: asset-url('bg.gif') no-repeat center right;
   }
 
   th.headerSortDown {
-    background: @orange_lighter_colour url('/assets/desc.gif') no-repeat center right;
+    background: @orange_lighter_colour asset-url('desc.gif') no-repeat center right;
   }
 
   th.headerSortUp {
-    background: @orange_lighter_colour url('/assets/asc.gif') no-repeat center right;
+    background: @orange_lighter_colour asset-url('asc.gif') no-repeat center right;
   }
 }