diff options
| -rw-r--r-- | app/views/layouts/_navbar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/old-application.html.haml | 48 | ||||
| -rw-r--r-- | app/views/layouts/old_navbar.html.haml | 10 | ||||
| -rw-r--r-- | app/views/layouts/test.haml | 0 |
5 files changed, 3 insertions, 61 deletions
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index d9dd990..7ef6523 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -7,7 +7,7 @@ %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} %span.icon-bar %span.icon-bar - %span.icon-bar + %span.icon-bar - if current_user && current_user.sip_accounts.any? .nav-collapse.collapse diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9fdcb8a..33a730f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,6 +19,8 @@ .container .row .span12 + = render 'layouts/navbar' + - unless response.cache_control[:public] - flash.each do |name, msg| %div{:class => "alert alert-#{name == :notice ? "success" : "error"} fade in"} @@ -28,8 +30,6 @@ - if current_user = render_breadcrumbs :builder => ::BootstrapBreadcrumbsBuilder, :separator => "/" - = render 'layouts/navbar' - = yield .row diff --git a/app/views/layouts/old-application.html.haml b/app/views/layouts/old-application.html.haml deleted file mode 100644 index a2afbf8..0000000 --- a/app/views/layouts/old-application.html.haml +++ /dev/null @@ -1,48 +0,0 @@ -!!! 5 -<!--[if lt IE 7]> <html lang="en" class="no-js ie6"> <![endif]--> -<!--[if IE 7]> <html lang="en" class="no-js ie7"> <![endif]--> -<!--[if IE 8]> <html lang="en" class="no-js ie8"> <![endif]--> -<!--[if gt IE 8]><!--> -%html.no-js{ :lang => I18n.locale.to_s } - <!--<![endif]--> - %header - %meta{ :charset => "utf-8" }/ - ~#OPTIMIZE "/" seems to be supposed to make an empty element tag, but it doesn't work. HAML bug? - %title - = content_for?(:title) ? yield(:title) : "Untitled" - %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }/ - = stylesheet_link_tag "application" - = javascript_include_tag "application" - = csrf_meta_tag - = yield(:head) - - %body - #container - - cache(['application_header', I18n.locale, current_user]) do - = render :partial => "shared/header" - = render :partial => "shared/flash", :locals => { :flash => flash} - - #content{:role => 'main'} - .light - %header.main - .breadcrumbs= render_breadcrumbs :separator => ' ยป ' - - if show_title? - %h1= yield(:title) - = yield - - - cache(['application_footer', I18n.locale]) do - %footer#main - %ul - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) - %li - %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting - - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) - %li - %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste - - .amooma-logo - %span brought to you by - %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma - diff --git a/app/views/layouts/old_navbar.html.haml b/app/views/layouts/old_navbar.html.haml deleted file mode 100644 index 4d795e4..0000000 --- a/app/views/layouts/old_navbar.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -.navbar.navbar-inverse.navbar-fixed-top - .navbar-inner - .container - %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"} - %span.icon-bar - %span.icon-bar - %span.icon-bar - %a.brand{:href => "/"} Gemeinschaft 5 - - / /.nav-collapse diff --git a/app/views/layouts/test.haml b/app/views/layouts/test.haml deleted file mode 100644 index e69de29..0000000 --- a/app/views/layouts/test.haml +++ /dev/null |