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

improves site customization layout, tables, i18n

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2017-04-17 19:02:40 +02:00
parent cb60fb5a14
commit 8cbf9f3c3d
11 changed files with 161 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/views/admin/site_customization/content_blocks/_form.html.erb
View File

@@ -14,34 +14,35 @@
</div> </div>
<% end %> <% end %>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.label :name %>
<%= f.select :name, SiteCustomization::ContentBlock::VALID_BLOCKS, label: false %>
</div>
<div class="small-12 medium-6 column">
<%= f.label :locale %>
<%= f.select :locale, I18n.available_locales, label: false %>
</div>
<div class="small-12 medium-6 column"> <div class="small-12 column">
<%= f.label :name %> <%= f.label :body %>
<%= f.select :name, SiteCustomization::ContentBlock::VALID_BLOCKS, label: false %> <%= f.text_area :body, label: false, rows: 10 %>
</div> <div class="small-12 medium-6 large-4">
<div class="small-12 medium-6 column"> <%= f.submit class: "button success expanded" %>
<%= f.label :locale %> </div>
<%= f.select :locale, I18n.available_locales, label: false %> </div>
</div>
<div class="small-12 column">
<%= f.label :body %>
<%= f.text_area :body, label: false, rows: 10 %>
<%= f.submit class: "button success" %>
</div> </div>
<% end %> <% end %>
<h4><%= t('.content_blocks_information') %></h4> <h3><%= t('.content_blocks_information') %></h3>
<p><%= t('.content_block_about') %></p> <p><%= t('.content_block_about') %></p>
<p><%= t('.content_block_top_links_html') %></p> <p><%= t('.content_block_top_links_html') %></p>
<pre>
&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;
</pre>
<br>
<p><%= t('.content_block_footer_html') %></p> <code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
<p class="margin-top"><%= t('.content_block_footer_html') %></p>

15
app/views/admin/site_customization/content_blocks/edit.html.erb
View File

@@ -2,14 +2,13 @@
Admin - <%= t("admin.menu.site_customization.content_blocks") %> - <%= @content_block.name %> (<%= @content_block.locale %>) Admin - <%= t("admin.menu.site_customization.content_blocks") %> - <%= @content_block.name %> (<%= @content_block.locale %>)
<% end %> <% end %>
<%= link_to admin_site_customization_content_blocks_path, class: "back" do %> <%= back_link_to admin_site_customization_content_blocks_path %>
<span class="icon-angle-left"></span>
<%= t("admin.site_customization.content_blocks.edit.back") %>
<% end %>
<%= button_to t("admin.site_customization.content_blocks.index.delete"), admin_site_customization_content_block_path(@content_block), method: :delete, class: "button hollow alert float-right margin-right" %> <%= button_to t("admin.site_customization.content_blocks.index.delete"), admin_site_customization_content_block_path(@content_block), method: :delete, class: "button hollow alert float-right small" %>
<div class="row margin-top"> <div class="row">
<h2><%= t("admin.site_customization.content_blocks.edit.title") %></h2> <div class="small-12 column">
<%= render 'form' %> <h2><%= t("admin.site_customization.content_blocks.edit.title") %></h2>
<%= render 'form' %>
</div>
</div> </div>

47
app/views/admin/site_customization/content_blocks/index.html.erb
View File

@@ -2,28 +2,29 @@
Admin - <%= t("admin.menu.site_customization.content_blocks") %> Admin - <%= t("admin.menu.site_customization.content_blocks") %>
<% end %> <% end %>
<%= link_to t("admin.site_customization.content_blocks.index.create"), new_admin_site_customization_content_block_path, class: "button float-right margin-right" %> <%= link_to t("admin.site_customization.content_blocks.index.create"), new_admin_site_customization_content_block_path, class: "button float-right" %>
<h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2> <h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2>
<table class="cms_page_list"> <table class="cms_page_list">
<thead> <thead>
<tr> <tr>
<th><%= t("admin.site_customization.content_blocks.content_block.name") %></th> <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
<th><%= t("admin.site_customization.content_blocks.content_block.body") %></th> <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
<th></th> <th><%= t("admin.actions.actions") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @content_blocks.each do |content_block| %> <% @content_blocks.each do |content_block| %>
<tr id="<%= dom_id(content_block) %>"> <tr id="<%= dom_id(content_block) %>">
<td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td> <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
<td><%= content_block.body %></td> <td><%= content_block.body.html_safe %></td>
<td> <td>
<%= button_to t("admin.site_customization.content_blocks.index.delete"), <%= button_to t("admin.site_customization.content_blocks.index.delete"),
admin_site_customization_content_block_path(content_block), admin_site_customization_content_block_path(content_block),
method: :delete, class: "button hollow alert" %> method: :delete, class: "button hollow alert" %>
</td> </td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>

14
app/views/admin/site_customization/content_blocks/new.html.erb
View File

@@ -2,13 +2,11 @@
Admin - <%= t("admin.menu.site_customization.content_blocks") %> - <%= t("admin.site_customization.content_blocks.new.title") %> Admin - <%= t("admin.menu.site_customization.content_blocks") %> - <%= t("admin.site_customization.content_blocks.new.title") %>
<% end %> <% end %>
<%= link_to admin_site_customization_content_blocks_path, class: "back" do %> <%= back_link_to admin_site_customization_content_blocks_path %>
<span class="icon-angle-left"></span>
<%= t("admin.site_customization.content_blocks.new.back") %>
<% end %>
<div class="row margin-top"> <div class="row">
<h2><%= t("admin.site_customization.content_blocks.new.title") %></h2> <div class="small-12 column">
<%= render 'form' %> <h2><%= t("admin.site_customization.content_blocks.new.title") %></h2>
<%= render 'form' %>
</div>
</div> </div>

6
app/views/admin/site_customization/images/index.html.erb
View File

@@ -1,6 +1,12 @@
<h2><%= t("admin.site_customization.images.index.title") %></h2> <h2><%= t("admin.site_customization.images.index.title") %></h2>
<table> <table>
<thead>
<tr>
<th><%= t("admin.site_customization.images.index.image") %></th>
<th><%= t("admin.actions.actions") %></th>
</tr>
</thead>
<tbody> <tbody>
<% @images.each do |image| %> <% @images.each do |image| %>
<tr class="<%= image.name %>"> <tr class="<%= image.name %>">

69
app/views/admin/site_customization/pages/_form.html.erb
View File

@@ -1,21 +1,44 @@
<%= form_for [:admin, @page], html: {class: "edit_page", data: {watch_changes: true}} do |f| %> <%= form_for [:admin, @page], html: {class: "edit_page", data: {watch_changes: true}} do |f| %>
<% if @page.errors.any? %> <% if @page.errors.any? %>
<div id="error_explanation" data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<div id="error_explanation" data-alert class="callout alert" data-closable> <strong>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> <%= @page.errors.count %>
<span aria-hidden="true">&times;</span> <%= t("admin.site_customization.pages.errors.form.error", count: @page.errors.count) %>
</button> </strong>
</div>
<strong>
<%= @page.errors.count %>
<%= t("admin.site_customization.pages.errors.form.error", count: @page.errors.count) %>
</strong>
</div>
<% end %> <% end %>
<div class="small-12 medium-9 column"> <div class="row">
<div class="small-12 column">
<hr>
</div>
<div class="small-12 medium-5 column">
<h3><%= t("admin.site_customization.pages.form.options") %></h3>
<%= f.check_box :more_info_flag, class: "small" %>
<%= f.check_box :print_content_flag %>
</div>
<div class="small-12 medium-3 column">
<%= f.label :status %>
<% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %>
<%= f.radio_button :status, status, label: false %>
<%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
<br>
<% end %>
</div>
<div class="small-12 medium-4 column">
<%= f.label :slug %>
<%= f.text_field :slug, label: false, size: 80, maxlength: 80 %>
</div>
</div>
<div class="row">
<div class="small-12 column">
<hr>
<%= f.label :title %> <%= f.label :title %>
<%= f.text_field :title, label: false %> <%= f.text_field :title, label: false %>
@@ -23,30 +46,14 @@
<%= f.label :subtitle %> <%= f.label :subtitle %>
<%= f.text_field :subtitle, label: false, size: 80, maxlength: 80 %> <%= f.text_field :subtitle, label: false, size: 80, maxlength: 80 %>
<%= f.label :slug %>
<%= f.text_field :slug, label: false, size: 80, maxlength: 80 %>
<div class="ckeditor margin-top"> <div class="ckeditor margin-top">
<%= f.label :content %> <%= f.label :content %>
<%= f.cktext_area :content, label: false, cols: 80, rows: 10, ckeditor: { language: I18n.locale } %> <%= f.cktext_area :content, label: false, cols: 80, rows: 10, ckeditor: { language: I18n.locale } %>
</div> </div>
</div>
<div class="small-12 medium-3 column">
<div class="page_edit">
<h4><%= t("admin.site_customization.pages.form.options") %></h4>
<%= f.check_box :more_info_flag %>
<%= f.check_box :print_content_flag %>
<hr>
<h4><%= f.label :status %></h4> <div class="small-12 medium-6 large-4">
<% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %> <%= f.submit class: "button success expanded" %>
<%= f.radio_button :status, status, label: false %> </div>
<%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
<br/>
<% end %>
<%= f.submit class: "button success" %>
</div> </div>
</div> </div>
<% end %> <% end %>

15
app/views/admin/site_customization/pages/edit.html.erb
View File

@@ -2,14 +2,13 @@
Admin - <%= t("admin.menu.site_customization.pages") %> - <%= @page.title %> Admin - <%= t("admin.menu.site_customization.pages") %> - <%= @page.title %>
<% end %> <% end %>
<%= link_to admin_site_customization_pages_path, class: "back" do %> <%= back_link_to admin_site_customization_pages_path %>
<span class="icon-angle-left"></span>
<%= t("admin.site_customization.pages.edit.back") %>
<% end %>
<%= button_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "button hollow alert float-right margin-right" %> <%= button_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "button hollow alert small float-right" %>
<div class="row margin-top"> <div class="row">
<h2><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2> <div class="small-12 column">
<%= render 'form' %> <h2><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2>
<%= render 'form' %>
</div>
</div> </div>

73
app/views/admin/site_customization/pages/index.html.erb
View File

@@ -2,42 +2,45 @@
Admin - <%= t("admin.menu.site_customization.pages") %> Admin - <%= t("admin.menu.site_customization.pages") %>
<% end %> <% end %>
<%= link_to t("admin.site_customization.pages.index.create"), new_admin_site_customization_page_path, class: "button float-right margin-right" %> <%= link_to t("admin.site_customization.pages.index.create"), new_admin_site_customization_page_path, class: "button float-right" %>
<h2 class="inline-block"><%= t("admin.site_customization.pages.index.title") %></h2> <h2 class="inline-block"><%= t("admin.site_customization.pages.index.title") %></h2>
<h3><%= page_entries_info @pages %></h3> <h3><%= page_entries_info @pages %></h3>
<table class="cms_page_list"> <table class="cms_page_list">
<thead> <thead>
<tr> <tr>
<th><%= t("admin.site_customization.pages.page.title") %></th> <th><%= t("admin.site_customization.pages.page.title") %></th>
<th><%= t("admin.site_customization.pages.page.created_at") %></th> <th><%= t("admin.site_customization.pages.page.created_at") %></th>
<th><%= t("admin.site_customization.pages.page.updated_at") %></th> <th><%= t("admin.site_customization.pages.page.updated_at") %></th>
<th><%= t("admin.site_customization.pages.page.status") %></th> <th><%= t("admin.site_customization.pages.page.status") %></th>
<th></th> <th colspan="2"><%= t("admin.actions.actions") %></th>
<th></th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody> <% @pages.each do |page| %>
<% @pages.each do |page| %> <tr id="<%= dom_id(page) %>">
<tr id="<%= dom_id(page) %>"> <td>
<td> <%= link_to page.title, edit_admin_site_customization_page_path(page) %>
<%= link_to page.title, edit_admin_site_customization_page_path(page) %> </td>
</td> <td><%= I18n.l page.created_at, format: :short %></td>
<td><%= I18n.l page.created_at, format: :short %></td> <td><%= I18n.l page.created_at, format: :short %></td>
<td><%= I18n.l page.created_at, format: :short %></td> <td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td>
<td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td> <td class="small">
<td class="small"> <span class="icon-eye"></span>
<span class="icon-eye"></span> <% if page.status == "published" %>
<%= link_to t("admin.site_customization.pages.index.see_page"), page.url %> <%= link_to t("admin.site_customization.pages.index.see_page"), page.url, target: "_blank" %>
</td> <% else %>
<td class="small"> <%= t("admin.site_customization.pages.index.see_page") %>
<span class="icon-x"></span> <% end %>
<%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(page), method: :delete %> </td>
</td> <td class="small delete">
</tr> <span class="icon-x"></span>
<% end %> <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(page), method: :delete, class: "delete" %>
</tbody> </td>
</table> </tr>
<% end %>
</tbody>
</table>
<%= paginate @pages %> <%= paginate @pages %>

14
app/views/admin/site_customization/pages/new.html.erb
View File

@@ -2,13 +2,11 @@
Admin - <%= t("admin.menu.site_customization.pages") %> - <%= t("admin.site_customization.pages.new.title") %> Admin - <%= t("admin.menu.site_customization.pages") %> - <%= t("admin.site_customization.pages.new.title") %>
<% end %> <% end %>
<%= link_to admin_site_customization_pages_path, class: "back" do %> <%= back_link_to admin_site_customization_pages_path %>
<span class="icon-angle-left"></span>
<%= t("admin.site_customization.pages.new.back") %>
<% end %>
<div class="row margin-top"> <div class="row">
<h2><%= t("admin.site_customization.pages.new.title") %></h2> <div class="small-12 column">
<%= render 'form' %> <h2><%= t("admin.site_customization.pages.new.title") %></h2>
<%= render 'form' %>
</div>
</div> </div>

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

@@ -679,16 +679,14 @@ en:
notice: Content block deleted successfully notice: Content block deleted successfully
edit: edit:
title: Editing content block title: Editing content block
back: Back
errors: errors:
form: form:
error: Error error: Error
index: index:
create: Create new content block create: Create new content block
delete: Delete delete: Delete block
title: Content blocks title: Content blocks
new: new:
back: Back
title: Create new content block title: Create new content block
content_block: content_block:
body: Body body: Body
@@ -698,6 +696,7 @@ en:
title: Custom images title: Custom images
update: Update update: Update
delete: Delete delete: Delete
image: Image
update: update:
notice: Image updated successfully notice: Image updated successfully
error: Image couldn't be updated error: Image couldn't be updated
@@ -715,7 +714,6 @@ en:
notice: Page deleted successfully notice: Page deleted successfully
edit: edit:
title: Editing %{page_title} title: Editing %{page_title}
back: Back
errors: errors:
form: form:
error: Error error: Error
@@ -723,11 +721,10 @@ en:
options: Options options: Options
index: index:
create: Create new page create: Create new page
delete: Delete delete: Delete page
title: Custom Pages title: Custom Pages
see_page: See page see_page: See page
new: new:
back: Back
title: Create new custom page title: Create new custom page
page: page:
created_at: Created at created_at: Created at

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

@@ -679,16 +679,14 @@ es:
notice: Bloque borrado correctamente notice: Bloque borrado correctamente
edit: edit:
title: Editar bloque title: Editar bloque
back: Volver
errors: errors:
form: form:
error: Error error: Error
index: index:
create: Crear nuevo bloque create: Crear nuevo bloque
delete: Borrar delete: Borrar bloque
title: Bloques title: Bloques
new: new:
back: Volver
title: Crear nuevo bloque title: Crear nuevo bloque
content_block: content_block:
body: Contenido body: Contenido
@@ -698,6 +696,7 @@ es:
title: Personalizar imágenes title: Personalizar imágenes
update: Actualizar update: Actualizar
delete: Borrar delete: Borrar
image: Imagen
update: update:
notice: Imagen actualizada correctamente notice: Imagen actualizada correctamente
error: No se ha podido actualizar la imagen error: No se ha podido actualizar la imagen
@@ -715,7 +714,6 @@ es:
notice: Página eliminada correctamente notice: Página eliminada correctamente
edit: edit:
title: Editar %{page_title} title: Editar %{page_title}
back: Volver
errors: errors:
form: form:
error: Error error: Error
@@ -723,13 +721,13 @@ es:
options: Opciones options: Opciones
index: index:
create: Crear nueva página create: Crear nueva página
delete: Borrar delete: Borrar página
title: Páginas title: Páginas
see_page: Ver página see_page: Ver página
new: new:
back: Back
title: Página nueva title: Página nueva
page: page:
actions: Acciones
created_at: Creada created_at: Creada
status: Estado status: Estado
title: Título title: Título