summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-28 14:17:52 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-28 14:17:52 +0100
commit8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch)
tree1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /app/views/layouts
parent39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff)
parent600574759573e48da9f5f82d4ff8a863b6830c95 (diff)
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_footer.html.haml5
-rw-r--r--app/views/layouts/_navbar.html.haml25
-rw-r--r--app/views/layouts/application.html.haml5
-rw-r--r--app/views/layouts/old-application.html.haml48
-rw-r--r--app/views/layouts/old_navbar.html.haml10
-rw-r--r--app/views/layouts/test.haml0
6 files changed, 24 insertions, 69 deletions
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index 61ea546..c498943 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -3,10 +3,11 @@
%ul{:class => 'nav nav-pills'}
- if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil?
%li
- %a{:href => "http://amooma.de/gemeinschaft/gs5", :ref => 'tooltip', :title => "Gemeinschaft Version " + GsParameter.get('GEMEINSCHAFT_VERSION') + "\nBuild #" + GsParameter.get('GEMEINSCHAFT_BUILDNAME')} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}
+ %a{:href => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'}
+ = "Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')}"
- else
%li
- %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}
+ %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')}
- if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user)
%li
%a{:href => "http://amooma.de"} Support und Consulting
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index d6f08cb..c2d9946 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -7,15 +7,26 @@
%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
- .nav-collapse.collapse
- %ul.nav
+ .nav-collapse.collapse
+ %ul.nav
+ - if current_user && GemeinschaftSetup.any? && current_user.admin?
+ - if current_page?(page_help_path)
+ %li.active
+ =link_to 'Admin-Doku', page_help_path
+ - else
+ %li
+ =link_to 'Admin-Doku', page_help_path
+ - if current_user && current_user.sip_accounts.any?
+ %li
+ %a{:href => sip_account_call_histories_path(current_user.sip_accounts.first)}
+ %i.icon-list-alt.icon-white
+ =t("call_histories.index.page_title")
%li
- %a{:href => "#about"} About
- %li.pull_right
- %a{:href => "#contact"} Contact
+ %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
+ %i.icon-volume-up.icon-white
+ =t("voicemail_messages.index.page_title")
- if current_user
%ul.nav.pull-right
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 74331af..33a730f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,10 +14,13 @@
/ HTML5 shim, for IE6-8 support of HTML5 elements
/[if lt IE 9]
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+
%body
.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"}
@@ -27,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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 07:12:42 +0000