Merge pull request #72 from it3s/improve_lists

Improve lists
it3s · Sep 3, 2014 · 12c6494 · 12c6494
2 parents 37acd1a + 36b6433
commit 12c6494
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 28 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -167,7 +167,7 @@ GEM
     hike (1.2.3)
     http_accept_language (2.0.1)
     http_parser.rb (0.6.0)
-    i18n (0.6.9)
+    i18n (0.6.11)
     i18n-tasks (0.4.2)
       activesupport
       easy_translate (>= 0.5.0)
@@ -218,7 +218,7 @@ GEM
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
-    minitest (5.3.4)
+    minitest (5.4.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -236,7 +236,7 @@ GEM
       rack (~> 1.2)
     oily_png (1.1.1)
       chunky_png (~> 1.3.0)
-    paper_trail (3.0.3)
+    paper_trail (3.0.5)
       activerecord (>= 3.0, < 5.0)
       activesupport (>= 3.0, < 5.0)
     pg (0.17.1)
@@ -380,7 +380,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.1)
       execjs (>= 0.3.0)

diff --git a/app/assets/javascripts/components/list.js.coffee b/app/assets/javascripts/components/list.js.coffee
@@ -9,6 +9,7 @@ App.components.list = ->
       itemSelector: ".list .list-item"
       prefill:      on
       dataType:     "html"
+      pathParse:    (path) -> path.match(/^(.*?page=)[0-9]+(.*|$)/).slice(1)
 
   initialize: ->
     options = @handleOptions()

diff --git a/app/assets/stylesheets/core/_base.css.scss b/app/assets/stylesheets/core/_base.css.scss
@@ -152,3 +152,10 @@ body .mce-menu-item .mce-text {
   width: 18em;
   font-size: 12px;
 }
+
+p.empty {
+  text-align: center;
+  font-weight: bold;
+  margin: 30px 0;
+  color: $grey;
+}
diff --git a/app/assets/stylesheets/relations.css.scss b/app/assets/stylesheets/relations.css.scss
@@ -55,13 +55,6 @@
         }
       }
     }
-
-    .empty {
-      text-align: center;
-      font-weight: bold;
-      margin: 30px 0;
-      color: $grey;
-    }
   }
 
   &.edit {

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -9,6 +9,6 @@ def user_activity
   private
 
     def find_user
-      @user ||= User.find(id: params[:user_id])
+      @user ||= User.find(params[:id])
     end
 end
diff --git a/app/views/activities/_user_activities_list.html.erb b/app/views/activities/_user_activities_list.html.erb
@@ -0,0 +1,17 @@
+
+<section>
+  <br>
+  <h2><%= icon "clock-o", t('users.profile.activity') %></h2>
+  <div id="activity" data-components="list">
+    <div id="activities-pagination"><%= paginate @activities, :remote => true %></div>
+    <ul id="activities-list" class="list activities-list">
+        <% unless @activities.empty? %>
+          <% @activities.each do |activity| %>
+            <%= render 'activities/user_activity', activity: ActivityPresenter.new(object: activity, ctx: self) %>
+          <% end %>
+        <% else %>
+          <p class="empty"><%= t 'activities.empty', {name: @user.name} %></p>
+        <% end %>
+    </ul>
+  </div>
+</section>
diff --git a/app/views/activities/user_activity.html.erb b/app/views/activities/user_activity.html.erb
@@ -0,0 +1,12 @@
+<% if request.xhr? %>
+
+  <%= render 'activities/user_activities_list' %>
+
+<% else %>
+
+  <%= render 'shared/object',
+    presenter: ObjectPresenter.new(object: @user, ctx: self,
+      show_location: false, content: 'activities/user_activities_list')
+  %>
+
+<% end %>
diff --git a/app/views/contributings/_contributions.html.erb b/app/views/contributings/_contributions.html.erb
@@ -7,7 +7,7 @@
         <% unless @contributions.empty? %>
           <%= render @contributions, :size => :small %>
         <% else %>
-          <p><%= t 'contributings.empty.contributions' %></p>
+          <p class="empty"><%= t 'contributings.empty.contributions' %></p>
         <% end %>
     </ul>
   </div>

diff --git a/app/views/contributings/_contributors.html.erb b/app/views/contributings/_contributors.html.erb
@@ -7,7 +7,7 @@
       <% unless @contributors.empty? %>
         <%= render @contributors, :size => :small %>
       <% else %>
-        <p><%= t 'contributings.empty.contributors' %></p>
+        <p class="empty"><%= t 'contributings.empty.contributors' %></p>
       <% end %>
     </ul>
   </div>

diff --git a/app/views/followings/_followers.html.erb b/app/views/followings/_followers.html.erb
@@ -7,7 +7,7 @@
       <% unless @followers.empty? %>
         <%= render @followers, :size => :small %>
       <% else %>
-        <p><%= t 'followings.empty.followers', {name: @followable.try(:name)} %></p>
+        <p class="empty"><%= t 'followings.empty.followers', {name: @followable.try(:name)} %></p>
       <% end %>
     </ul>
   </div>

diff --git a/app/views/followings/_following.html.erb b/app/views/followings/_following.html.erb
@@ -7,7 +7,7 @@
       <% unless @following.empty? %>
         <%= render @following, :size => :small, :control_type => :follow_button %>
       <% else %>
-        <p><%= t 'followings.empty.following', {name: @followable.try(:name)} %></p>
+        <p class="empty"><%= t 'followings.empty.following', {name: @followable.try(:name)} %></p>
       <% end %>
     </ul>
   </div>

diff --git a/app/views/geo_data/_content.html.erb b/app/views/geo_data/_content.html.erb
@@ -20,7 +20,7 @@
     <div class="tab-content" id="content">
       <div class="description">
         <% if geo_data.description.blank? %>
-          <%= t 'geo_data.description.empty', name: geo_data.name %>
+          <p class="empty"><%= t 'geo_data.description.empty', name: geo_data.name %></p>
         <% else %>
           <%= raw geo_data.description %>
         <% end %>

diff --git a/app/views/geo_data/_list_actions.html.erb b/app/views/geo_data/_list_actions.html.erb
@@ -1,4 +1,4 @@
-<div class="list-actions">
+<div class="list-actions" data-components="stick" data-stick-options='{ "get_width_from": ".site-page" }'>
   <button class="select-all-btn" data-components='selectAll'>
     <input type="checkbox" name="all" />Select All
   </button>

diff --git a/app/views/geo_data/_maps.html.erb b/app/views/geo_data/_maps.html.erb
@@ -7,7 +7,7 @@
       <% unless @maps.empty? %>
         <%= render @maps, :size => :small %>
       <% else %>
-        <p><%= t 'geo_data.maps.empty', {name: @geo_data.try(:name)} %></p>
+        <p class="empty"><%= t 'geo_data.maps.empty', {name: @geo_data.try(:name)} %></p>
       <% end %>
     </ul>
   </div>

diff --git a/app/views/maps/_content.html.erb b/app/views/maps/_content.html.erb
@@ -20,7 +20,7 @@
     <div class="tab-content" id="content">
       <div class="description">
         <% if map.description.blank? %>
-          <%= t 'maps.description.empty', name: map.name %>
+          <p class="empty"><%= t 'maps.description.empty', name: map.name %></p>
         <% else %>
           <%= raw map.description %>
         <% end %>
@@ -37,7 +37,7 @@
         <% unless @geo_data_collection.empty? %>
           <%= render @geo_data_collection, :size => :small %>
         <% else %>
-          <p><%= t 'maps.data.empty', name: map.name %></p>
+          <p class="empty"><%= t 'maps.data.empty', name: map.name %></p>
         <% end %>
       </ul>
     </div>

diff --git a/app/views/maps/_geo_data.html.erb b/app/views/maps/_geo_data.html.erb
@@ -7,7 +7,7 @@
       <% unless @geo_data_collection.empty? %>
         <%= render @geo_data_collection, :size => :small %>
       <% else %>
-        <p><%= t 'maps.data.empty', {name: @map.try(:name)} %></p>
+        <p class="empty"><%= t 'maps.data.empty', {name: @map.try(:name)} %></p>
       <% end %>
     </ul>
   </div>

diff --git a/app/views/maps/_list_actions.html.erb b/app/views/maps/_list_actions.html.erb
@@ -1,4 +1,4 @@
-<div class="list-actions">
+<div class="list-actions" data-components="stick" data-stick-options='{ "get_width_from": ".site-page" }'>
   <button class="select-all-btn" data-components='selectAll'>
     <input type="checkbox" name="all" />Select All
   </button>

diff --git a/app/views/relations/_show.html.erb b/app/views/relations/_show.html.erb
@@ -1,7 +1,7 @@
 <div class="relations show">
   <ul>
     <% if relations.empty? %>
-      <div class="empty"><%= t('relations.empty') %></div>
+      <p class="empty"><%= t('relations.empty') %></p>
     <% else %>
       <% relations.each do |rel| %>
         <%= render 'relations/relation', rel: rel %>

diff --git a/app/views/users/_contributions_list.html.erb b/app/views/users/_contributions_list.html.erb
@@ -7,7 +7,7 @@
     <% unless contributions.empty? %>
       <%= render contributions, :size => :small %>
     <% else %>
-      <p><%= t 'contributings.empty.contributions' %></p>
+      <p class="empty"><%= t 'contributings.empty.contributions' %></p>
     <% end %>
   </ul>
 </div>
diff --git a/app/views/users/_following_list.html.erb b/app/views/users/_following_list.html.erb
@@ -5,7 +5,7 @@
     <% unless following.empty? %>
       <%= render following, :size => :small, :control_type => :follow_button %>
     <% else %>
-      <p><%= t 'followings.empty.following', {name: user.name} %></p>
+      <p class="empty"><%= t 'followings.empty.following', {name: user.name} %></p>
     <% end %>
   </ul>
 </div>
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -80,8 +80,8 @@
   end
 
   describe "#follow_options_for" do
-    let(:user) { FactoryGirl.create :user, id: 42 }
-    let(:geo_data) { FactoryGirl.create :geo_data, id: 42 }
+    let(:user) { FactoryGirl.create :user}
+    let(:geo_data) { FactoryGirl.create :geo_data}
 
     before { allow(helper).to receive(:current_user).and_return user }