Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update list.html.erb #7670

Closed
wants to merge 8 commits into from
Closed

Update list.html.erb #7670

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06be7a4
Update list.html.erb
r3yc0n1c Mar 17, 2020
ee78180
Update contributors.html.erb
r3yc0n1c Mar 17, 2020
d2faef1
Update blog.html.erb
r3yc0n1c Mar 17, 2020
665d939
Update blog.html.erb
r3yc0n1c Mar 17, 2020
4a3bd3c
Delete blog.html.erb
r3yc0n1c Mar 17, 2020
991d9a5
Update profiles.html.erb
r3yc0n1c Mar 17, 2020
fd467f3
Update _card.html.erb
r3yc0n1c Mar 17, 2020
0c7cdab
Merge pull request #1 from Reymor/Reymor-patch-1
r3yc0n1c Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions app/views/users/list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="col-md-12 col-lg-6 order-1 order-sm-2">
<% if current_user && (current_user.role == "admin" || current_user.role == "moderator")%>
<h3><%= t('users.list.user_moderation') %></h3>
<p><%= t('users.list.admins_ban_spam') %> </p>
<h3><%= translation('users.list.user_moderation') %></h3>
<p><%= translation('users.list.admins_ban_spam') %> </p>
<% end %>
<div class="row">
<div class ="col-md-8">
<h2><%= raw t('People') %></h2>
<h5><%= t('Recently active on Publiclab') =%></h5>
<h2><%= raw translation('People') %></h2>
<h5><%= translation('Recently active on Publiclab') =%></h5>
</div>
<% if current_user && (@map_lat.blank? || @map_lon.blank?) %>
<div class="col-md-4">
Expand All @@ -18,9 +18,9 @@
<br>
<p style="width: 100%; font-size:14px; text-align: center; border-bottom: 1px solid #ccc; line-height:2px; margin: 10px 0 20px;">
<span style="background-color: #fff; padding: 0 10px; color: #808080;">Sort by:
<a href = "<%= people_path %>?sort=username" style="text-decoration: underline; color: #808080;"> <%= t('users.list.username') %></a><span> | </span>
<a href = "<%= people_path %>?sort=last_activity"style="text-decoration: underline; color: #808080;"> <%= t('users.list.last_activity') %></a><span> | </span>
<a href = "<%= people_path %>?sort=joined" style="text-decoration: underline; color: #808080;"><%= t('users.list.joined') %></a><span> | </span>
<a href = "<%= people_path %>?sort=username" style="text-decoration: underline; color: #808080;"> <%= translation('users.list.username') %></a><span> | </span>
<a href = "<%= people_path %>?sort=last_activity"style="text-decoration: underline; color: #808080;"> <%= translation('users.list.last_activity') %></a><span> | </span>
<a href = "<%= people_path %>?sort=joined" style="text-decoration: underline; color: #808080;"><%= translation('users.list.joined') %></a><span> | </span>
</span>
</p>
<br/>
Expand Down Expand Up @@ -51,9 +51,9 @@
<li><a href="/profile/<%= user.username %>">See Full Profile</a></li>
<% if current_user && (current_user.role == "admin" || current_user.role == "moderator") %>
<% if user.status == 0 %>
<i class='fa fa-ban' style="color:#a00;"></i> <%= t('users.list.banned') %>
<i class='fa fa-ban' style="color:#a00;"></i> <%= translation('users.list.banned') %>
<% elsif user.status == 1 && user != current_user %>
<li><a data-confirm="<%= t('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= t('users.list.ban') %></a></li>
<li><a data-confirm="<%= translation('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= translation('users.list.ban') %></a></li>
<% end %>
<% end %>
</ul>
Expand All @@ -62,7 +62,7 @@
<div class="sub-info">
<div style="padding-bottom:6px;">
<% if user.status == 0 %>
<i class='fa fa-ban' style="color:#a00;"></i> <%= t('users.list.banned') %> |
<i class='fa fa-ban' style="color:#a00;"></i> <%= translation('users.list.banned') %> |
<% end %>
Active <%= t = user.revisions.order(timestamp: :desc).first.try(:created_at);time_ago_in_words(t) if (t) %> ago
</div>
Expand Down