consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2170 from consul/design

Browse Source 
Design improvements
This commit is contained in:
Alberto García
2017-12-14 11:31:31 +01:00
committed by GitHub
parent 97f549ac10 34f07bcc82
commit 19925de06b
29 changed files with 228 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/users/_budget_investment_follow.html.erb Normal file
View File

@@ -0,0 +1,3 @@
<li id="budget_investment_<%= budget_investment.id %>">
<%= link_to budget_investment.title, budget_investment_path(budget_investment.budget, budget_investment) %>
</li>

49
app/views/users/_following.html.erb
View File

@@ -1,30 +1,27 @@
<ul class="accordion" data-accordion data-allow-all-closed="true">
<div class="row following margin-top" data-equalizer data-equalize-on="medium" >
<div class="small-12 medium-8 column" data-equalizer-watch>
<ul class="menu simple clear">
<% @follows.each do |followable_type, follows| %>
<li><%= link_to followable_type_title(followable_type), "##{followable_type_title(followable_type).parameterize.underscore}" %></li>
<% end %>
</ul>
<% @follows.each do |followable_type, follows| %>
<% @follows.each do |followable_type, follows| %>
<li class="accordion-item" data-accordion-item>
<h3 id="<%= followable_type_title(followable_type).parameterize.underscore %>">
<span class="icon-<%= followable_icon(followable_type) %>"></span>
<%= followable_type_title(followable_type) %>
</h3>
<a href="#" class="accordion-title">
<span class="icon">
<i class="icon icon-<%= followable_icon(followable_type) %>"></i>
</span>
<span class="title">
<strong><%= followable_type_title(followable_type) %></strong>
</span>
</a>
<ul class="follow-list">
<% follows.each do |follow| %>
<%= render_follow(follow) %>
<% end %>
</ul>
<% end %>
</div>
<div class="accordion-content" data-tab-content>
<table>
<tbody>
<% follows.each do |follow| %>
<%= render_follow(follow) %>
<% end %>
</tbody>
</table>
</div>
</li>
<% end %>
</ul>
<div class="small-12 medium-4 column interests" data-equalizer-watch>
<%= render 'interests', user: @user if valid_interests_access? %>
</div>
</div>

8
app/views/users/_interests.html.erb
View File

@@ -2,18 +2,10 @@
<h4><%= interests_title_text(user) %></h4>
<% if user.interests.any? %>
<ul class="no-bullet tags">
<% user.interests.each do |interest| %>
<li class="inline-block"><span><%= interest %></span></li>
<% end %>
</ul>
<% else %>
<div class="callout primary">
<%= empty_interests_message_text(user) %>
</div>
<% end %>
</div>

6
app/views/users/_proposal_follow.html.erb Normal file
View File

@@ -0,0 +1,6 @@
<li id="proposal_<%= proposal.id %>">
<%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %>
<% if proposal.retired? %>
<span class="label alert"><%= t('users.proposals.retired') %></span>
<% end %>
</li>

10
app/views/users/show.html.erb
View File

@@ -38,18 +38,20 @@
<% end %>
<% end %>
<% end %>
<%= t("users.show.no_activity") if @activity_counts.values.inject(&:+) == 0 %>
</ul>
<% if @activity_counts.values.inject(&:+) == 0 %>
<div class="callout primary">
<%= t("users.show.no_activity") %>
</div>
<% end %>
<%= render "activity_page" %>
<% else %>
<div class="callout warning margin">
<%= t('users.show.private_activity') %>
</div>
<% end %>
<%= render 'interests', user: @user if valid_interests_access? %>
</div>
</div>
</main>