gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #774 from davidsf/fix_title_in_layout

Browse source 
Put the config name as title in layouts.
This commit is contained in:
Christian Bruckmayer 2016-02-14 19:13:38 +01:00
commit cfea3af5ca
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.html.haml
View file

@ -2,7 +2,7 @@
%head %head
%meta{:charset => "utf-8"} %meta{:charset => "utf-8"}
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"} %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
%title= content_for?(:title) ? yield(:title) : "OSEM" %title= content_for?(:title) ? yield(:title) : CONFIG['name']
%meta{:content => "", :name => "description"} %meta{:content => "", :name => "description"}
%meta{:content => "", :name => "author"} %meta{:content => "", :name => "author"}
= stylesheet_link_tag "application", :media => "all" = stylesheet_link_tag "application", :media => "all"

2
app/views/layouts/schedule.html.haml
View file

@ -3,7 +3,7 @@
%head %head
%meta{:charset => "utf-8"} %meta{:charset => "utf-8"}
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"} %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
%title= content_for?(:title) ? yield(:title) : "OSEM" %title= content_for?(:title) ? yield(:title) : CONFIG['name']
%meta{:content => "", :name => "description"} %meta{:content => "", :name => "description"}
%meta{:content => "", :name => "author"} %meta{:content => "", :name => "author"}
= stylesheet_link_tag "/stylesheets/schedule/jquery-ui-1.9.2.custom.min" = stylesheet_link_tag "/stylesheets/schedule/jquery-ui-1.9.2.custom.min"