sufia 3.5.0 → 3.6.0

data/app/views/users/_activity_log.html.erb

@@ -1,20 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
-<span id="last-event" class="ui-helper-hidden"><%# @last_event_timestamp %></span>
 <table id="activity" class="table table-striped well"> 
   <caption class="accessible-hidden">Activity of users you follow</caption>
   <thead>
@@ -26,6 +9,7 @@ limitations under the License.
   </thead>
   <tbody>
   <% events.each do |event| %>
+    <% next if event[:action].blank? or event[:timestamp].blank? %>
     <tr>
       <td>&nbsp;</td>
       <td><%= event[:action].html_safe %></td>

data/app/views/users/_contributions.html.erb

@@ -0,0 +1,29 @@
+        <div class="tab-pane active" id="contributions">
+		      <i class="icon-trophy trophy-on" ></i> <strong>Highlighted Files</strong>
+		      <% if @trophies.count > 0 %>
+		        <table>
+		        <% @trophies.each do |t| %>
+              <tr id="trophyrow_<%= Sufia::Noid.noidify(t.pid) %>">   
+		          <% if t.image? || t.pdf? %>
+		            <% temp_thumbnail_path = sufia.download_path(t) + "?datastream_id=thumbnail" %>
+		            <% temp_href = "<a href=\"" + sufia.download_path(t) + "\"> <img src=\"" + temp_thumbnail_path + "\" width=\"90\" alt=\"Download the full-sized image\"/></a>" %>
+		          <% else %>
+		            <% temp_href = "<a href=\"" + sufia.download_path(t) + "\"> <img src=\"/assets/default.png\"  width=\"90\" alt=\"Download file\"/></a>" %>
+		          <% end %>                                 
+		          <td>  
+                <%= temp_href.html_safe() %> 
+		          </td>
+		          <td>
+		            <%= link_to display_title(t), sufia.generic_file_path(t) %>
+                <% if current_user == @user %>
+                  <%= link_to raw("<i class='trophy-on icon-remove'></i>"),"", class: 'trophy-on trophy-class', title: "Click to remove from Highlighted files.", id: Sufia::Noid.noidify(t.pid),  remote: true, data: {removerow: "true" }  %>
+                <% end %>
+		          </td>
+		          </tr>
+		        <% end %>
+		        </table>
+		      <% else %>
+		        <%= @user.name %> has no highlighted files.
+		      <% end %>
+        </div>
+

data/app/views/users/_follower_modal.html.erb

@@ -0,0 +1,26 @@
+<div class="modal-div">
+
+<!-- Text to trigger modal -->
+<h4><i class="icon-hand-left"></i><a data-toggle="modal" href="#followers">Follower(s):</a>  <%= @followers.count %></h4>
+<!-- Modal -->
+<div class="modal hide in" id="followers" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+  </div>
+  <div class="modal-body">
+    <% if @followers.count > 0 %>
+      <h3>Follower(s)</h3>
+      <ul>
+      <% @followers.each do |f| %>
+        <li> <a href="<%= sufia.profile_path(f.login) %>" title="View user's profile"><%= f.name %></a></li>
+      <% end %>
+      </ul>
+    <%else%>
+      <h3>No Followers</h3>
+    <%end %>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+  </div>
+</div>
+</div>

data/app/views/users/_following_modal.html.erb

@@ -0,0 +1,26 @@
+<div class="modal-div">
+
+<!-- Text to trigger modal -->
+<h4><i class="icon-hand-right"></i><a data-toggle="modal" href="#following">Following:</a>  <%= @following.count %></h4>
+<!-- Modal -->
+<div class="modal hide in" id="following" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+  </div>
+  <div class="modal-body">
+    <% if @following.count > 0 %>
+      <h3>Following</h3>
+      <ul>
+      <% @following.each do |f| %>
+        <li> <a href="<%= sufia.profile_path(f.login) %>" title="View user's profile"><%= f.name %></a></li>
+      <% end %>
+      </ul>
+    <% else %>
+      <h3>No Following</h3>
+    <% end %>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+  </div>
+</div>
+</div>

data/app/views/users/_left_sidebar.html.erb

@@ -0,0 +1,12 @@
+      <%= image_tag @user.avatar.url(:thumb), :width => 100 %>
+      <h3><%= @user.name %><br /><%= @user.user_key %> </h3>
+      <hr /> 
+        <%= render "vitals" %>
+      <hr />
+
+      <%= render "follower_modal" %>
+      <%= render "following_modal" %>
+ 
+      <br />
+      <a class="btn btn-primary" href="<%= sufia.profiles_path %>"><i class="icon-globe"></i> View Users</a>
+

data/app/views/users/_notify_number.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <i class="icon-bullhorn"></i>
 <% if @notify_number > 0 %>
 <span id="notify_number" class="overlay"> <%=@notify_number%></span>

data/app/views/users/_profile.html.erb

@@ -0,0 +1,7 @@
+        <div class="tab-pane" id="profile">
+          <h2>User Info</h2>
+             <dl id="user_info"> 
+                <%= render :partial => 'social_media_info', :locals => {:user => @user} %>
+                <%= render :partial => 'user_info', :locals => {:user => @user} %>
+             </dl>
+        </div>

data/app/views/users/_profile_actions.html.erb

@@ -0,0 +1,11 @@
+    <!-- profile and view buttons -->
+      <% if not signed_in? %>
+        <!-- sign in to access social functions -->
+      <% elsif current_user == @user %>
+        <a class="btn" href="<%= sufia.edit_profile_path(@user) %>"><i class="icon-edit"></i> Edit Your Profile </a>
+      <% elsif current_user.following?(@user) %>
+        <a class="btn btn-primary" href="<%= sufia.unfollow_user_path(@user) %>"><i class="icon-eye-close"></i> Unfollow </a>
+      <% else %>
+        <a class="btn btn-primary" href="<%= sufia.follow_user_path(@user) %>"><i class="icon-eye-open"></i> Follow</a>
+      <% end %>
+

data/app/views/users/_profile_tabs.html.erb

@@ -0,0 +1,11 @@
+      <ul class="nav nav-tabs" id="myTab">
+        <li class="active"><a href="#contributions"><i class="icon-trophy"></i> Contributions</a></li>
+        <li><a href="#profile"><i class="icon-info-sign"></i> Profile</a></li>
+        <li><a href="#activity_log" ><i class="icon-rss"></i> Activity</a></li>
+      </ul>
+       
+      <div class="tab-content">
+        <%= render 'contributions' %>
+        <%= render 'profile' %>
+        <%= render 'activity' %>
+      </div> <!-- /tab-content -->

data/app/views/users/_search_form.html.erb

@@ -1,21 +1,5 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <div style="float: right;" >
-    <%= form_tag sufia.profiles_path, :method => :search, :class => "well form-search" do %>
+    <%= form_tag sufia.profiles_path, :method => :get, :class => "well form-search" do %>
       <label class="accessible-hidden">Search Users</label>
       <%= text_field_tag :uq, params[:uq], :class => "q", :placeholder => "Search Users", :size => '30', :type => "search", :id => "user_search" %>
       <%= hidden_field_tag :sort, params[:sort], :id => 'user_sort' %>

data/app/views/users/_social_media_info.html.erb

@@ -0,0 +1,20 @@
+  <% if !user.facebook_handle.blank?() %>
+    <dt><i class="icon-facebook"></i> Facebook Handle</dt>
+    <dd><%= link_to "http://facebook.com/#{user.facebook_handle}", "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>
+  <% end %>
+
+  <% if !user.twitter_handle.blank?() %>
+    <dt><i class="icon-twitter"></i> Twitter Handle</dt>
+    <dd><%= link_to "http://twitter.com/#{user.twitter_handle}", "http://twitter.com/#{user.twitter_handle}", {target:'_blank'} %></dd>
+  <% end %>
+
+  <!-- 
+
+  <dt><i class="icon-google-plus"></i> Google+ Handle</dt>
+  <dd><%# link_to user.googleplus_handle, "http://google.com/+#{user.googleplus_handle}", {target:'_blank'} %></dd>
+  --> 
+
+  <% if !user.linkedin_handle.blank?() %>
+    <dt><i class="icon-linkedin"></i> Linked In</dt>
+    <dd><%= link_to "#{@linkedInUrl}", "#{@linkedInUrl}", {target:'_blank'} %></dd>
+  <% end %>

data/app/views/users/_user_info.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <dl id="user_info">
   <dt><i class="icon-facebook"></i> Facebook Handle</dt>
   <dd><%= link_to user.facebook_handle, "http://facebook.com/#{user.facebook_handle}", {target:'_blank'} %></dd>

data/app/views/users/_vitals.html.erb

@@ -0,0 +1,4 @@
+        <i class="icon-time"></i> Joined on <%= @user.created_at.to_date.strftime("%b %d, %Y") %> <br />
+        <i class="icon-folder-open"></i> Deposited Files
+        <%= link_to_field('depositor', @user.to_s, number_of_deposits(@user)) %> <br />
+

data/app/views/users/edit.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% content_for :local_js do %>
 // initialize popover helpers
 $("a[rel=popover]").popover({ html: true });
@@ -90,7 +74,7 @@ $("a[rel=popover]").popover({ html: true });
   <hr />
 
   <h3><i class="icon-group"></i> User Managed Groups Info (UMG) <%= link_to 'Manage UMG', 'http://umg.its.psu.edu/', :class => 'btn btn-mini btn-primary' %> </h3>
-  <% groups.each do |g| %>
+  <% current_user.groups.each do |g| %>
     <i class="icon-caret-right"></i> <%= g %><br />
   <% end %>
 </div>

data/app/views/users/index.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <div id="search" class="row">
 <%= render :partial => 'search_form' %>
 <h1><%= t('sufia.product_name') %> Users</h1>

data/app/views/users/notifications_number.js.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 $("#notify_link").html("<%= escape_javascript(render :partial => "notify_number")  %>");
 <% @batches.each do |batch|%>
   $(".<%=batch%>").attr('class', '');;

data/app/views/users/show.html.erb

@@ -1,63 +1,26 @@
-  <h1 class="span110">
-    <span class="span60">
-    <%= image_tag @user.avatar.url(:thumb), :width => 100 %>
-    <%= @user.name %> (<%= @user.user_key %>)
-    </span>
+<% content_for :local_js do %>
 
-    <span class="span20 offset20">
-      <% if not signed_in? %>
-        <!-- sign in to access social functions -->
-      <% elsif current_user == @user %>
-        <a class="btn btn-primary" href="<%= sufia.edit_profile_path(@user) %>"><i class="icon-edit"></i> Edit Your Profile </a>
-      <% elsif current_user.following?(@user) %>
-        <a class="btn btn-primary" href="<%= sufia.unfollow_user_path(@user.to_s) %>"><i class="icon-eye-close"></i> Unfollow </a>
-      <% else %>
-        <a class="btn btn-primary" href="<%= sufia.follow_user_path(@user.to_s) %>"><i class="icon-eye-open"></i> Follow</a>
-      <% end %>
-      <a class="btn btn-primary" href="<%= sufia.profiles_path %>"><i class="icon-globe"></i> View Users</a>
-    </span>
-  </h1>
-    <dl>
-      <dt><i class="icon-calendar"></i> Active Since</dt>
-      <dd><%= @user.created_at.to_date.to_formatted_s(:long_ordinal) %></dd>
-      <dt><i class="icon-folder-open"></i> Deposited Files</dt>
-      <dd><%= link_to_field('depositor', @user.to_s, GenericFile.where(:depositor => @user.to_s).count) %></dd>
-      <dt><i class="icon-trophy trophy-on" ></i> Highlighted Files</dt>
-      <% @trophies.each do |t| %>
-        <dd> <%= link_to t, sufia.generic_file_path(t) %></dd>
-      <% end %>
-    </dl>
+$('#myTab a').click(function (e) {
+  e.preventDefault();
+  $(this).tab('show');
+})
 
-<hr />
+<% end %>
+  <div class="accessible-hidden" id="current_user"><%=@user.user_key%></div>
+  <div class="span110"> 
+    <div class="pull-right">
+      <%= render 'profile_actions' %>
+    </div>
+    <span class="span20">
+      <%= render 'left_sidebar' %>
+    </span> <!-- /close span20 -->
+
+<!-- right col -->
+    <span class="span78 offset2"> 
+
+      <%= render 'profile_tabs' %>
+    </span> <!-- /close span50 -->
+  </div><!-- /close span110 -->
 
-<h2>User Info</h2>
-<div class="span44">
-  <div>
-    <h4><i class="icon-hand-left"></i> Follower(s): <%= @followers.count %></h4>
-    <ul class="thumbnails">
-      <% @followers.each do |f| %>
-        <li class="span8">
-          <%= link_to(image_tag(f.avatar.url(:thumb)), sufia.profile_path(f.user_key), { :title => f.name } ) %>
-          <%= link_to(f.name, sufia.profile_path(f.user_key), { :title => f.name } ) %>
-        <li>
-      <% end %>
-    </ul>
-  </div>
 
-  <div>
-    <h4><i class="icon-hand-right"></i> Following: <%= @following.count %></h4>
-    <ul class="thumbnails">
-      <% @following.each do |f| %>
-        <li class="span8">
-          <%= link_to(image_tag(f.avatar.url(:thumb)), sufia.profile_path(f.user_key), { :title => f.name } ) %>
-          <%= link_to(f.name, sufia.profile_path(f.user_key), { :title => f.name } ) %>
-        <li>
-      <% end %>
-    </ul>
-  </div>
-  <%= render :partial => 'user_info', :locals => {:user => @user} %>
-</div><!-- close span44 -->
 
-<div class="span60 offset5">
-  <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
-</div>

data/lib/sufia.rb

@@ -7,13 +7,12 @@ require 'sufia/models'
 
 require 'rails_autolink'
 
-autoload :Zip, 'zipruby'
 module Sufia
   extend ActiveSupport::Autoload
 
   class Engine < ::Rails::Engine
     engine_name 'sufia'
- 
+
     config.autoload_paths += %W(
       #{config.root}/app/controllers/concerns
       #{config.root}/app/models/concerns
@@ -28,4 +27,3 @@ module Sufia
   autoload :BatchEditsControllerBehavior
   autoload :DownloadsControllerBehavior
 end
-

data/lib/sufia/controller.rb

@@ -6,18 +6,12 @@ module Sufia::Controller
     include Hydra::Controller::ControllerBehavior
 
     before_filter :notifications_number
-    helper_method :groups
-
   end
 
   def current_ability
     user_signed_in? ? current_user.ability : super
   end
 
-  def groups
-    @groups ||= user_signed_in? ? current_user.groups : []
-  end
-
   def render_404(exception)
     logger.error("Rendering 404 page due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
     render :template => '/error/404', :layout => "error", :formats => [:html], :status => 404