revamp footer
This commit is contained in:
parent
81c18097a5
commit
6466ea9653
11 changed files with 44 additions and 12 deletions
|
@ -93,10 +93,17 @@ section {
|
|||
}
|
||||
|
||||
footer {
|
||||
margin-top: 50px;
|
||||
padding-top: 20px;
|
||||
border-top: 1px solid lightGrey;
|
||||
color: #888;
|
||||
margin-top: 40px;
|
||||
padding-top: 14px;
|
||||
margin-bottom: 20px;
|
||||
border-top: 1px solid #e4e4e4;
|
||||
|
||||
a {
|
||||
color: mix(#888, @linkColor, 70%);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
table {
|
||||
|
||||
|
|
13
app/views/layouts/_footer.html.haml
Normal file
13
app/views/layouts/_footer.html.haml
Normal file
|
@ -0,0 +1,13 @@
|
|||
- unless FoodsoftConfig[:page_footer].to_s == 'blank'
|
||||
%footer
|
||||
.pull-right
|
||||
= link_to_unless FoodsoftConfig[:foodsoft_url].blank?, I18n.t('layouts.foodsoft'), FoodsoftConfig[:foodsoft_url]
|
||||
- if Foodsoft::REVISION.blank?
|
||||
= "v#{Foodsoft::VERSION}"
|
||||
- else
|
||||
%abbr{title: t('.revision', revision: Foodsoft::REVISION)}= "v#{Foodsoft::VERSION}"
|
||||
%p
|
||||
- if (s = FoodsoftConfig[:page_footer]).blank?
|
||||
= link_to FoodsoftConfig[:name], FoodsoftConfig[:homepage]
|
||||
- else
|
||||
= raw s
|
|
@ -48,6 +48,5 @@
|
|||
%h1= yield(:title)
|
||||
= yield
|
||||
|
||||
%footer
|
||||
%p= t '.footer'
|
||||
= render 'layouts/footer'
|
||||
#modalContainer.modal.hide.fade(tabindex="-1" role="dialog")
|
||||
|
|
|
@ -8,5 +8,4 @@
|
|||
%h1= yield(:title)
|
||||
= yield
|
||||
|
||||
%footer
|
||||
%p= t '.footer'
|
||||
= render 'layouts/footer'
|
||||
|
|
|
@ -34,6 +34,9 @@ default: &defaults
|
|||
# documentation URL for the apples&pears work system
|
||||
applepear_url: https://github.com/foodcoops/foodsoft/wiki/%C3%84pfel-u.-Birnen
|
||||
|
||||
# custom foodsoft software URL (used in footer)
|
||||
#foodsoft_url: https://github.com/foodcoops/foodsoft
|
||||
|
||||
# Default language
|
||||
#default_locale: en
|
||||
# By default, foodsoft takes the language from the webbrowser/operating system.
|
||||
|
@ -81,6 +84,9 @@ default: &defaults
|
|||
# after each sublist.
|
||||
#pdf_add_page_breaks: true
|
||||
|
||||
# Page footer (html allowed). Default is a Foodsoft footer. Set to `blank` for no footer.
|
||||
#page_footer: <a href="http://www.foodcoop.test/">FC Test</a> is supported by <a href="http://www.hoster.test/">Hoster</a>.
|
||||
|
||||
# email address to be used as sender
|
||||
email_sender: foodsoft@foodcoop.test
|
||||
|
||||
|
|
|
@ -64,4 +64,9 @@ module Foodsoft
|
|||
config.assets.precompile += [ 'vendor/assets/javascripts/*.js' ]
|
||||
|
||||
end
|
||||
|
||||
# Foodsoft version
|
||||
VERSION = File.read(Rails.root.join('VERSION')).strip
|
||||
# Current revision, or +nil+
|
||||
REVISION = (File.read(Rails.root.join('REVISION')).strip rescue nil)
|
||||
end
|
||||
|
|
|
@ -860,11 +860,12 @@ de:
|
|||
footer_3_homepage: 'Foodcoop: %{url}'
|
||||
footer_4_help: 'Hilfe: %{url}'
|
||||
foodsoft: Foodsoft
|
||||
footer:
|
||||
revision: Revision %{revision}
|
||||
header:
|
||||
feedback:
|
||||
desc: Fehler gefunden? Vorschlag? Idee? Kritik?
|
||||
title: Feedback
|
||||
footer: Foodsoft, open source software to manage a non-profit food coop.
|
||||
help: Hilfe
|
||||
logout: Abmelden
|
||||
ordergroup: Meine Bestellgruppe
|
||||
|
|
|
@ -862,11 +862,12 @@ en:
|
|||
footer_3_homepage: 'Foodcoop: %{url}'
|
||||
footer_4_help: 'Help: %{url}'
|
||||
foodsoft: Foodsoft
|
||||
footer:
|
||||
revision: revision %{revision}
|
||||
header:
|
||||
feedback:
|
||||
desc: Found a bug? Suggestions? Ideas? Review?
|
||||
title: Feedback
|
||||
footer: Foodsoft, open source software to manage a non-profit food coop.
|
||||
help: Help
|
||||
logout: Logout
|
||||
ordergroup: My ordergroup
|
||||
|
|
|
@ -882,7 +882,6 @@ fr:
|
|||
feedback:
|
||||
desc: Tu as trouvé une erreur? Tu as des propositions, des idées, des critiques?
|
||||
title: Retours
|
||||
footer: Foodsoft, un logiciel libre pour gérer les Boufcoops.
|
||||
help: Aide
|
||||
logout: Déconnexion
|
||||
ordergroup: Ta cellule
|
||||
|
|
|
@ -862,11 +862,12 @@ nl:
|
|||
footer_3_homepage: 'Foodcoop: %{url}'
|
||||
footer_4_help: 'Help: %{url}'
|
||||
foodsoft: Foodsoft
|
||||
footer:
|
||||
revision: revisie %{revision}
|
||||
header:
|
||||
feedback:
|
||||
desc: Foutje gevonden? Suggesties? Ideeën? Commentaar?
|
||||
title: Feedback
|
||||
footer: Foodsoft, open source software voor non-profit voedselcoops.
|
||||
help: Help
|
||||
logout: Uitloggen
|
||||
ordergroup: Mijn huishouden
|
||||
|
|
|
@ -61,7 +61,8 @@ class FoodsoftConfig
|
|||
def set_missing
|
||||
config.replace({
|
||||
use_nick: true,
|
||||
use_apple_points: true
|
||||
use_apple_points: true,
|
||||
foodsoft_url: 'https://github.com/foodcoops/foodsoft'
|
||||
}.merge(config))
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue