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

Merge pull request #197 from AyuntamientoMadrid/styling_admin

Browse Source 
Styling admin
This commit is contained in:
Juanjo Bazán
2015-08-18 15:30:44 +02:00
parent 219be7114a fc9689c2da
commit b84fb65b93
19 changed files with 171 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admin/_menu.html.erb
View File

@@ -34,21 +34,21 @@
<li <%= 'class=active' if controller_name == 'officials' %>>
<%= link_to admin_officials_path do %>
<i class="icon-chat-bubble-two"></i>
<i class="icon-user"></i>
<%= t('admin.menu.officials') %>
<% end %>
</li>
<li <%= 'class=active' if controller_name == 'settings' %>>
<%= link_to admin_settings_path do %>
<i class="icon-chat-bubble-two"></i>
<i class="icon-settings"></i>
<%= t('admin.menu.settings') %>
<% end %>
</li>
<li <%= 'class=active' if controller_name == 'stats' %>>
<%= link_to stats_path do %>
<i class="icon-chat-bubble-two"></i>
<i class="icon-stats"></i>
<%= t('admin.menu.stats') %>
<% end %>
</li>

2
app/views/admin/comments/index.html.erb
View File

@@ -10,7 +10,7 @@
<div class="small-12 medium-2 column">
<%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment),
method: :put, data: { confirm: t("admin.actions.confirm") },
class: "button radius tiny success right" %>
class: "button radius small success right" %>
</div>
</div>
</li>

13
app/views/admin/officials/edit.html.erb
View File

@@ -1,14 +1,15 @@
<h1><%= t("admin.officials.edit.title") %></h1>
<h2>
<%= t("admin.officials.edit.title") %>
<span class="official right"><strong><%= @user.name %></strong> (<%= @user.email %>)</span>
</h2>
<%= @user.name %> (<%= @user.email %>)
<%= form_for @user, url: admin_official_path(@user) do |f| %>
<%= f.text_field :official_position %>
<%= f.select :official_level, official_level_options %>
<%= link_to t("admin.officials.edit.back"), admin_officials_path, class: "button radius small secondary" %>
<%= f.submit %>
<% if @user.official? %>
<%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'button tiny alert' %>
<% else %>
<%= link_to t("admin.officials.edit.cancel"), admin_officials_path, class: 'button tiny alert' %>
<%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'delete' %>
<% end %>
<% end %>
<% end %>

41
app/views/admin/officials/index.html.erb
View File

@@ -1,25 +1,32 @@
<h1><%= t("admin.officials.index.title") %></h1>
<h2><%= t("admin.officials.index.title") %></h2>
<div>
<%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %>
<%= text_field_tag :email, "", label: false, placeholder: t("admin.officials.index.search_email_placeholder") %>
<%= f.submit t("admin.officials.index.search") %>
<div class="row">
<div class="small-12 medium-6 column">
<%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %>
</div>
<div class="form-inline small-12 medium-6 column">
<%= f.submit t("admin.officials.index.search"), class: "button radius success" %>
</div>
</div>
<% end %>
</div>
<div>
<%= page_entries_info @officials %>
</div>
<h3><%= page_entries_info @officials %></h3>
<div>
<ul class="admin-list">
<% @officials.each do |official| %>
<%= link_to official.name, edit_admin_official_path(official) %>
<%= official.official_position %>
<%= t("admin.officials.level_#{official.official_level}") %>
<br/><br/>
<% end %>
</div>
<li>
<%= link_to official.name, edit_admin_official_path(official) %>
<span class="bullet">&nbsp;&bullet;&nbsp;</span>
<span class="level"><%= t("admin.officials.level_#{official.official_level}") %></span>
<span class="bullet">&nbsp;&bullet;&nbsp;</span>
<span class="label round level-<%= official.official_level %>">
<%= official.official_position %>
</span>
<%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(official), class: "button radius tiny right" %>
</li>
<% end %>
</ul>
<div>
<%= paginate @officials %>
</div>

41
app/views/admin/officials/search.html.erb
View File

@@ -1,21 +1,30 @@
<h1><%= t("admin.officials.search.title") %></h1>
<h2><%= t("admin.officials.search.title") %></h2>
<div>
<%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %>
<%= text_field_tag :email, "", label: false, placeholder: t("admin.officials.index.search_email_placeholder") %>
<%= f.submit t("admin.officials.search.search") %>
<div class="row">
<div class="small-12 medium-6 column">
<%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %>
</div>
<div class="small-12 medium-6 column">
<%= f.submit t("admin.officials.search.search"), class: "button radius success" %>
</div>
</div>
<% end %>
</div>
<div>
<%= page_entries_info @users %>
</div>
<h3><%= page_entries_info @users %></h3>
<div>
<% @users.each do |user| %>
<%= link_to user.name, edit_admin_official_path(user) %>
<%= user.official_position %>
<%= t("admin.officials.level_#{user.official_level}") %>
<%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(user) %>
<% end %>
</div>
<ul class="admin-list">
<% @users.each do |user| %>
<li>
<%= link_to user.name, edit_admin_official_path(user) %>
<span class="bullet">&nbsp;&bullet;&nbsp;</span>
<span class="label round level-<%= user.official_level %>">
<%= user.official_position %>
</span>
<span class="bullet">&nbsp;&bullet;&nbsp;</span>
<span class="level"><%= t("admin.officials.level_#{user.official_level}") %></span>
<%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(user), class: "button radius tiny right" %>
</li>
<% end %>
</ul>

9
app/views/admin/settings/index.html.erb
View File

@@ -1,15 +1,14 @@
<h1><%= t("admin.settings.index.title") %></h1>
<h2><%= t("admin.settings.index.title") %></h2>
<ul>
<ul class="admin-list">
<% @settings.each do |setting| %>
<li>
<strong><%= setting.key.classify %></strong>
<%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
<%= f.text_field :value, label: false, id: dom_id(setting) %>
<%= f.submit(class: "button radius tiny") %>
<%= f.submit(class: "button radius tiny success") %>
<% end %>
</li>
<% end %>
</ul>
</ul>

4
app/views/admin/tags/index.html.erb
View File

@@ -16,7 +16,7 @@
</div>
</div>
<%= f.submit(class: "button radius create") %>
<%= f.submit(class: "button radius success") %>
<% end %>
@@ -38,7 +38,7 @@
<% end %>
<%= f.submit(class: "button radius tiny success") %>
<br>
<%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "delete" %>
<% end %>
</li>

31
app/views/stats/show.html.erb
View File

@@ -1,13 +1,24 @@
<h1>Stats</h1>
<div class="stats row-full">
<div class="row">
<div class="small-12 column">
<h2>Stats</h2>
<h3>Visits</h3>
<%= visits_chart_tag id: "visits" %>
<div class="small-12 medium-6 column">
<h3>Visits</h3>
<%= visits_chart_tag id: "visits" %>
</div>
<h3>Combined</h3>
<%= events_chart_tag @event_types, id: 'combined' %>
<div class="small-12 medium-6 column">
<h3>Combined</h3>
<%= events_chart_tag @event_types, id: 'combined' %>
</div>
<% @event_types.each do |event_type| %>
<h3><%= event_type.titleize %></h3>
<%= events_chart_tag event_type %>
<% end %>
<div class="small-12">
<% @event_types.each do |event_type| %>
<h3><%= event_type.titleize %></h3>
<%= events_chart_tag event_type %>
<% end %>
</div>
</div>
</div>
</div>