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

Merge branch 'master' into site-customization

Browse Source
This commit is contained in:
Amaia Castro
2017-04-07 17:29:33 +02:00
parent 613f5521a2 d988acb18b
commit 9e5324cc1b
279 changed files with 9351 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/layouts/_admin_header.html.erb
View File

@@ -1,14 +1,16 @@
<header>
<section class="top-links">
<div class="top-links">
<div class="expanded row">
<%= render 'shared/locale_switcher' %>
<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'],
root_path, class: "float-right back-web" %>
</div>
</section>
</div>
<div class="expanded row">
<div class="top-bar">
<%= link_to setting['org_name'], admin_root_path, class: "logo show-for-small-only" %>
<%= link_to setting['org_name'], namespaced_root_path, class: "logo show-for-small-only" %>
<span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
<span class="menu-icon dark" data-toggle></span>
@@ -17,11 +19,13 @@
<div id="responsive-menu">
<div class="top-bar-title">
<%= link_to admin_root_path, class: "hide-for-small-only" do %>
<%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
<%= setting['org_name'] %>
&nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
<% end %>
<h1>
<%= link_to namespaced_root_path, class: "hide-for-small-only" do %>
<%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
<%= setting['org_name'] %>
&nbsp;|&nbsp;<%= namespaced_header_title %>
<% end %>
</h1>
</div>
<div class="top-bar-right">

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

@@ -30,7 +30,7 @@
<div class="off-canvas-content" data-off-canvas-content>
<%= render 'layouts/admin_header' %>
<main class="no-margin-top row no-max-width collapse">
<div class="no-margin-top row no-max-width collapse" data-equalizer>
<div class="small-12 medium-3 column">
<div class="show-for-small-only">
@@ -42,11 +42,11 @@
</div>
</div>
<div class="admin-content small-12 medium-9 column">
<div class="admin-content small-12 medium-9 column" data-equalizer-watch>
<%= render 'layouts/flash' %>
<%= yield %>
</div>
</main>
</div>
</div>
</div>
</div>

2
app/views/layouts/application.html.erb
View File

@@ -27,7 +27,7 @@
<h1 class="sr-only"><%= setting['org_name'] %></h1>
<div class="wrapper">
<div class="wrapper <%= yield (:wrapper_class) %>">
<%= render 'layouts/header' %>
<!--[if lt IE 9]>