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

Merge pull request #1505 from consul/design

Browse Source 
Design
This commit is contained in:
Juanjo Bazán
2017-04-28 13:34:25 +02:00
committed by GitHub
parent 7e6077e152 442dc2dc70
commit 08591645f9
11 changed files with 77 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/assets/stylesheets/admin.scss
View File

@@ -497,18 +497,21 @@ table.investment-projects-summary {
} }
} }
.geozone { body.admin {
background: #ececec;
border-radius: rem-calc(6);
color: $text;
display: inline-block;
font-size: $small-font-size;
margin-bottom: $line-height/3;
padding: $line-height/4 $line-height/3;
text-decoration: none;
&:hover { .geozone {
background: #e0e0e0; background: #ececec;
border-radius: rem-calc(6);
color: $text;
display: inline-block;
font-size: $small-font-size;
margin-bottom: $line-height/3;
padding: $line-height/4 $line-height/3;
text-decoration: none;
&:hover {
background: #e0e0e0;
}
} }
} }

9
app/assets/stylesheets/layout.scss
View File

@@ -1371,6 +1371,13 @@ table {
} }
} }
@include breakpoint(medium) {
.button.button-telegram, .ssb-telegram {
display: none !important;
}
}
.social { .social {
a { a {
@@ -1471,7 +1478,7 @@ table {
width: $line-height*2; width: $line-height*2;
&:before { &:before {
content: "A"; content: "1";
font-family: "icons" !important; font-family: "icons" !important;
font-size: rem-calc(24); font-size: rem-calc(24);
left: 50%; left: 50%;

4
app/helpers/banners_helper.rb
View File

@@ -1,7 +1,7 @@
module BannersHelper module BannersHelper
def has_banners def has_banners?
@banners.count > 0 @banners.present? && @banners.count > 0
end end
end end

5
app/views/admin/banners/edit.html.erb
View File

@@ -1,10 +1,7 @@
<div class="banner-edit row"> <div class="banner-edit row">
<div class="small-12 column"> <div class="small-12 column">
<%= link_to admin_banners_path, class: "back" do %> <%= back_link_to admin_banners_path %>
<span class="icon-angle-left"></span>
<%= t("admin.banners.edit.back") %>
<% end %>
<h1><%= t("admin.banners.edit.editing") %></h1> <h1><%= t("admin.banners.edit.editing") %></h1>

72
app/views/admin/banners/index.html.erb
View File

@@ -7,36 +7,48 @@
<h3><%= page_entries_info @banners %></h3> <h3><%= page_entries_info @banners %></h3>
<table> <% @banners.each do |banner| %>
<% @banners.each do |banner| %> <table>
<tr id="<%= dom_id(banner) %>"> <thead>
<td class="small-12 medium-9"> <tr id="<%= dom_id(banner) %>">
<small> <th scope="col"><%= t("admin.banners.banner.post_started_at")%></th>
<%= t("admin.banners.banner.post_started_at")%> <strong><%= banner.post_started_at %></strong> <th scope="col"><%= t("admin.banners.banner.post_ended_at")%></th>
&nbsp;|&nbsp; <th scope="col" class="text-center"><%= t("admin.actions.actions")%></th>
<%= t("admin.banners.banner.post_ended_at")%> <strong><%= banner.post_ended_at%></strong> </tr>
</small> </thead>
<tbody>
<div class="<%= banner.style %>"> <tr>
<div class="<%= banner.image %>"> <td><%= banner.post_started_at %></td>
<%= link_to banner.target_url do %> <td><%= banner.post_ended_at %></td>
<h2><%= banner.title %></h2> <td class="text-right">
<h3><%= banner.description %></h3> <div class="small-12 medium-6 column">
<% end %> <%= link_to t("admin.banners.index.edit"), edit_admin_banner_path(banner),
class: 'button hollow expanded' %>
</div> </div>
</div> <div class="small-12 medium-6 column">
</td> <%= link_to t("admin.banners.index.delete"), admin_banner_path(banner),
method: :delete,
<td class="text-right"> class: 'button hollow alert expanded' %>
<%= link_to t("admin.banners.index.edit"), edit_admin_banner_path(banner), </div>
class: 'edit-banner button hollow' %> </td>
</tr>
<%= link_to t("admin.banners.index.delete"), admin_banner_path(banner), <tr>
method: :delete, <th colspan="3" scope="col" class="text-center"><%= t("admin.banners.index.preview") %></th>
class: 'button hollow alert' %> </tr>
</td> <tr>
</tr> <td colspan="3">
<% end %> <div class="<%= banner.style %>">
</table> <div class="<%= banner.image %>">
<%= link_to banner.target_url do %>
<h2><%= banner.title %></h2>
<h3><%= banner.description %></h3>
<% end %>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<% end %>
<%= paginate @banners %> <%= paginate @banners %>

5
app/views/admin/banners/new.html.erb
View File

@@ -1,10 +1,7 @@
<div class="banner-new row"> <div class="banner-new row">
<div class="small-12 column"> <div class="small-12 column">
<%= link_to admin_banners_path, class: "back" do %> <%= back_link_to admin_banners_path %>
<span class="icon-angle-left"></span>
<%= t("admin.banners.new.back") %>
<% end %>
<h1><%= t("admin.banners.new.creating") %></h1> <h1><%= t("admin.banners.new.creating") %></h1>

2
app/views/debates/index.html.erb
View File

@@ -27,7 +27,7 @@
<% end %> <% end %>
</div> </div>
<% if has_banners %> <% if has_banners? %>
<%= render "shared/banner" %> <%= render "shared/banner" %>
<% end %> <% end %>

2
app/views/proposals/index.html.erb
View File

@@ -29,7 +29,7 @@
<% end %> <% end %>
</div> </div>
<% if has_banners %> <% if has_banners? %>
<%= render "shared/banner" %> <%= render "shared/banner" %>
<% end %> <% end %>

10
app/views/shared/_banner.html.erb
View File

@@ -1,9 +1,9 @@
<% banner = @banners.sample%> <% banner = @banners.sample %>
<div class="<%= banner.style %>"> <div class="<%= banner.style %>">
<div class="<%= banner.image %>"> <div class="<%= banner.image %>">
<%= link_to banner.target_url do %> <%= link_to banner.target_url do %>
<h2><%=banner.title%></h2> <h2><%=banner.title %></h2>
<h3><%=banner.description%></h3> <h3><%=banner.description %></h3>
<% end %> <% end %>
</div> </div>
</div> </div>

3
config/locales/admin.en.yml
View File

@@ -24,6 +24,7 @@ en:
all: All all: All
with_active: Active with_active: Active
with_inactive: Inactive with_inactive: Inactive
preview: Preview
banner: banner:
title: Title title: Title
description: Description description: Description
@@ -33,7 +34,6 @@ en:
post_started_at: Post started at post_started_at: Post started at
post_ended_at: Post ended at post_ended_at: Post ended at
edit: edit:
back: Back
editing: Edit banner editing: Edit banner
form: form:
submit_button: Save changes submit_button: Save changes
@@ -43,7 +43,6 @@ en:
one: "prevented this banner from being saved" one: "prevented this banner from being saved"
other: 'prevented this banner from being saved' other: 'prevented this banner from being saved'
new: new:
back: Back
creating: Create banner creating: Create banner
activity: activity:
show: show:

3
config/locales/admin.es.yml
View File

@@ -24,6 +24,7 @@ es:
all: Todos all: Todos
with_active: Activos with_active: Activos
with_inactive: Inactivos with_inactive: Inactivos
preview: Vista previa
banner: banner:
title: Título title: Título
description: Descripción description: Descripción
@@ -33,7 +34,6 @@ es:
post_started_at: Inicio de publicación post_started_at: Inicio de publicación
post_ended_at: Fin de publicación post_ended_at: Fin de publicación
edit: edit:
back: Volver
editing: Editar el banner editing: Editar el banner
form: form:
submit_button: Guardar Cambios submit_button: Guardar Cambios
@@ -43,7 +43,6 @@ es:
one: "error impidió guardar el banner" one: "error impidió guardar el banner"
other: "errores impidieron guardar el banner." other: "errores impidieron guardar el banner."
new: new:
back: Volver
creating: Crear banner creating: Crear banner
activity: activity:
show: show: