tweaks. #377, #376

befdata · Aug 17, 2014 · 7f0e988 · 7f0e988
1 parent 868a9b9
commit 7f0e988
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 76 deletions.
diff --git a/app/assets/images/arrow2_s.png b/app/assets/images/arrow2_s.png
diff --git a/app/assets/images/calendar.png b/app/assets/images/calendar.png
diff --git a/app/assets/images/manman.png b/app/assets/images/manman.png
diff --git a/app/assets/images/user.png b/app/assets/images/user.png
diff --git a/app/assets/stylesheets/datasets.css.scss b/app/assets/stylesheets/datasets.css.scss
@@ -449,4 +449,13 @@ ul#downloaders {
     span{margin:10px 5px 10px 0px;float:left;}
     select {margin:3px 0px;float:left;}
   }
+  .private, .free-within-projects, .free-for-members,.free-for-public, .files-w, .files-a, .files-aw, .files-n {
+    background-position:2px center;
+    background-repeat: no-repeat;
+  }
+  .private { background-image: image-url('lock-closed.png') }
+  .free-for-public {background-image: image-url('lock-open.png')}
+  .free-within-projects {background-image:image-url('manman.png');}
+  .free-for-members {background-image:image-url('user.png')}
+  .files-w{background-image: image-url('calendar.png')}
 }
diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
@@ -1042,71 +1042,67 @@ $dropdown-divider-color: $light-gray;
     &:hover{color:#4aa94e; cursor:pointer; }
   }
   &.open > .js-modal-container {display:block;}
-  .js-modal-container {
-    display:none;
-    z-index: 20;
-    position:absolute;
-    top:100%;
-    left:0;
-    .js-modal{
-      -webkit-border-radius: 4px;
-      -moz-border-radius: 4px;
-      border-radius: 4px;
-
-      border:solid 1px $dropdown-border-color;
-      box-shadow: 0 3px 12px $dropdown-shadow-color;
-      -moz-box-shadow:0 3px 12px $dropdown-shadow-color;
-      -webkit-box-shadow:0 3px 12px $dropdown-shadow-color;
-      background-color:$dropdown-background-color;
-      overflow:hidden;
-      .modal-header{
-        padding: 9px;
-        background: #f5f5f5;
-        border-bottom:1px solid $dropdown-divider-color;
-        font-size:12px;
-        line-height:16px;
-        h4 {
-          font-weight: bold;
-          margin:0;
-          padding:0;
-          text-transform: none;
-        }
-        .close {
-          @extend .right;
-          width:16px;
-          height:16px;
-          background-image: image_url('cancel.png');
-          background-repeat: no-repeat;
-        }
+  ul.dropdown-menu{
+    margin:0;
+    padding:0;
+    min-width:200px;
+    _width:200px;
+    li {
+      float:none;
+      display:block;
+      white-space: nowrap;
+      margin:0;
+      padding:0;
+      list-style-type: none;
+      & + li {border-top:1px solid $dropdown-divider-color;}
+      background-position: right 3px center;
+      background-repeat: no-repeat;
+      &.selected{ background-image:image_url('checkbox.png'); }
+      a {
+        color:#222;
+        display:block;
+        padding:8px 20px;
+        text-decoration: none;
+        &:hover {text-decoration: none; color:#53a156; }
       }
-      .modal-body{
-        ul.js-select{
-          margin:0;
-          padding:0;
-          min-width:200px;
-          _width:200px;
-          li {
-            float:none;
-            display:block;
-            white-space: nowrap;
-            margin:0;
-            padding:0;
-            list-style-type: none;
-            & + li {border-top:1px solid $dropdown-divider-color;}
-            a {
-              color:#222;
-              display:block;
-              padding:8px 15px 8px 20px;
-              background-position:2px center;
-              background-repeat: no-repeat;
-              text-decoration: none;
-              &:hover {text-decoration: none; color:#53a156; }
-            }
-            &.selected a {
-              background-image:image_url('checkbox.png');
-            }
-          }
-        }
+    }
+  }
+}
+.js-modal-container {
+  display:none;
+  z-index: 20;
+  position:absolute;
+  top:100%;
+  left:0;
+  .js-modal{
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+
+    border:solid 1px $dropdown-border-color;
+    box-shadow: 0 3px 12px $dropdown-shadow-color;
+    -moz-box-shadow:0 3px 12px $dropdown-shadow-color;
+    -webkit-box-shadow:0 3px 12px $dropdown-shadow-color;
+    background-color:$dropdown-background-color;
+    overflow:hidden;
+    .modal-header{
+      padding: 9px;
+      background: #f5f5f5;
+      border-bottom:1px solid $dropdown-divider-color;
+      font-size:12px;
+      line-height:16px;
+      h4 {
+        font-weight: bold;
+        margin:0;
+        padding:0;
+        text-transform: none;
+      }
+      .close {
+        @extend .right;
+        width:16px;
+        height:16px;
+        background-image: image_url('cancel.png');
+        background-repeat: no-repeat;
       }
     }
   }

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -12,6 +12,7 @@ def index
 
   def show
     @project_datasets = @project.datasets.order(:title).uniq
+    @members = @project.users
   end
 
   def new

diff --git a/app/views/pages/data.html.haml b/app/views/pages/data.html.haml
@@ -28,27 +28,32 @@
     = select_tag :name, dropdown_list_to_sort_datasets, class: 'js-select-menu'
   %ul.left.nav
     %li.dropdown
-      %span.dropdown-toggle Access Right
+      %span.dropdown-toggle Access Rights
       .js-modal-container
         .js-modal
           .modal-header
-            %h4 Access Right
+            %h4 Access Rights
           .modal-body
-            %ul.js-select
+            %ul.dropdown-menu
               - Dataset::ACCESS_CODES.stringify_keys.each do |access, value|
                 = content_tag :li, class: @filter_params.has_param?(:access_code, value.to_s) ? 'selected' : nil do
-                  = link_to access.humanize, data_path(params.merge(q: @filter_params.toggle_param(:access_code, value.to_s)))
+                  = link_to access.humanize, data_path(params.merge(q: @filter_params.toggle_param(:access_code, value.to_s))), class: access.dasherize
     %li.dropdown
       %span.dropdown-toggle Data Files
       .js-modal-container
         .js-modal
           .modal-header
             %h4 Data Files
           .modal-body
-            %ul.js-select
-              - {'With Workbook' => 'w', 'With Attachment Files' => 'a', 'Workbook + Attachment Files' => ['w', 'a'], 'Metadata Only' => 'n'}.each do |text, code|
-                = content_tag :li, class: @filter_params.has_param?(:f, code) ? 'selected' : nil do
-                  = link_to text, data_path(params.merge(q: @filter_params.toggle_param(:f, code)))
+            %ul.dropdown-menu
+              = content_tag :li, class: @filter_params.has_param?(:f, 'w') ? 'selected' : nil do
+                = link_to 'With Workbook', data_path(params.merge(q: @filter_params.toggle_param(:f, 'w'))), class: 'files-w'
+              = content_tag :li, class: @filter_params.has_param?(:f, 'a') ? 'selected' : nil do
+                = link_to 'With Attached Files', data_path(params.merge(q: @filter_params.toggle_param(:f, 'a'))), class: 'files-a'
+              = content_tag :li, class: @filter_params.has_param?(:f, ['w', 'a']) ? 'selected' : nil do
+                = link_to 'With Workbook or Attached Files', data_path(params.merge(q: @filter_params.toggle_param(:f, ['w', 'a']))), class: 'files-aw'
+              = content_tag :li, class: @filter_params.has_param?(:f, 'n') ? 'selected' : nil do
+                = link_to 'Metadata Only', data_path(params.merge(q: @filter_params.toggle_param(:f, 'n'))), class: 'files-n'
 
 - if @datasets.empty?
   %i No Datasets Found.

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
@@ -10,16 +10,22 @@
         = image_tag "trash.png"
         Delete this Project
 = content_for :info do
-  %ul
-    - @project.users.sort{|x,y| if x.alumni == y.alumni then 0 elsif x.alumni then 1 else -1 end}.each do |person|
+  %ul.members
+    - @members.select{|u| !u.alumni}.each do |person|
       %li
         = render :partial => person, :locals => {:extra => formated_role_text(person, @project)}
+  - if @members.any?(&:alumni)
+    %hr
+    %ul.alumni
+      - @members.select{|u| u.alumni}.each do |person|
+        %li
+          = render :partial => person, :locals => {:extra => formated_role_text(person, @project)}
   - if current_user
     %h3 Email contact
     %ul
       %li
         = render :partial => "users/email_list_modal",
-          :locals => {:contacts => @project.users, :css => "project_members", :caption => 'Project members'}
+          :locals => {:contacts => @project.users.reject(&:alumni), :css => "project_members", :caption => 'Project members'}
 
 %h2
   = "#{@project.name} (#{@project.shortname})"

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -16,7 +16,7 @@
       - @project_roles.each do |role|
         %li
           = link_to role.authorizable, project_path(role.authorizable)
-          ="(#{t("role."+role.name)})"
+          ="(#{@user.alumni ? 'Former ' : ''}#{t("role."+role.name)})"
 
 %h2
   .user