From 3bd59292e77885b16cf76783abc7e40ac730eb7a Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sun, 12 Jul 2015 04:41:27 +0200
Subject: [PATCH] Improved tab behaviour.

---
 .../controllers/_application_controller_generic.js.coffee  | 2 ++
 .../javascripts/app/controllers/_channel/chat.js.coffee    | 1 +
 .../javascripts/app/controllers/_channel/email.js.coffee   | 1 +
 .../javascripts/app/controllers/_channel/web.js.coffee     | 1 +
 .../javascripts/app/controllers/object_manager.js.coffee   | 1 +
 app/assets/javascripts/app/controllers/settings.js.coffee  | 5 +++++
 app/assets/javascripts/app/views/generic/tabs.jst.eco      | 7 ++++++-
 7 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
index b8517b38d..02de5fa90 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
@@ -281,6 +281,8 @@ class App.ControllerTabs extends App.Controller
   render: ->
 
     @html App.view('generic/tabs')(
+      header: @header
+      subHeader: @subHeader
       tabs: @tabs
     )
 
diff --git a/app/assets/javascripts/app/controllers/_channel/chat.js.coffee b/app/assets/javascripts/app/controllers/_channel/chat.js.coffee
index b4289a1ba..2bf26c2d0 100644
--- a/app/assets/javascripts/app/controllers/_channel/chat.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/chat.js.coffee
@@ -1,4 +1,5 @@
 class App.ChannelChat extends App.ControllerTabs
+  header: 'Chat'
   constructor: ->
     super
 
diff --git a/app/assets/javascripts/app/controllers/_channel/email.js.coffee b/app/assets/javascripts/app/controllers/_channel/email.js.coffee
index b822f97d0..64245b96b 100644
--- a/app/assets/javascripts/app/controllers/_channel/email.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/email.js.coffee
@@ -1,4 +1,5 @@
 class App.ChannelEmail extends App.ControllerTabs
+  header: 'Email'
   constructor: ->
     super
 
diff --git a/app/assets/javascripts/app/controllers/_channel/web.js.coffee b/app/assets/javascripts/app/controllers/_channel/web.js.coffee
index f1df512c9..bdc13c748 100644
--- a/app/assets/javascripts/app/controllers/_channel/web.js.coffee
+++ b/app/assets/javascripts/app/controllers/_channel/web.js.coffee
@@ -1,4 +1,5 @@
 class App.ChannelWeb extends App.ControllerTabs
+  header: 'Web'
   constructor: ->
     super
 
diff --git a/app/assets/javascripts/app/controllers/object_manager.js.coffee b/app/assets/javascripts/app/controllers/object_manager.js.coffee
index a606130a4..75e9d353d 100644
--- a/app/assets/javascripts/app/controllers/object_manager.js.coffee
+++ b/app/assets/javascripts/app/controllers/object_manager.js.coffee
@@ -1,4 +1,5 @@
 class Index extends App.ControllerTabs
+  header: 'Object Manager'
   constructor: ->
     super
 
diff --git a/app/assets/javascripts/app/controllers/settings.js.coffee b/app/assets/javascripts/app/controllers/settings.js.coffee
index 44c8f1472..6b632b657 100644
--- a/app/assets/javascripts/app/controllers/settings.js.coffee
+++ b/app/assets/javascripts/app/controllers/settings.js.coffee
@@ -1,4 +1,5 @@
 class Branding extends App.ControllerTabs
+  header: 'Branding'
   constructor: ->
     super
     return if !@authenticate()
@@ -9,6 +10,7 @@ class Branding extends App.ControllerTabs
     @render()
 
 class System extends App.ControllerTabs
+  header: 'System'
   constructor: ->
     super
     return if !@authenticate()
@@ -22,6 +24,7 @@ class System extends App.ControllerTabs
     @render()
 
 class Security extends App.ControllerTabs
+  header: 'Security'
   constructor: ->
     super
     return if !@authenticate()
@@ -36,6 +39,7 @@ class Security extends App.ControllerTabs
     @render()
 
 class Import extends App.ControllerTabs
+  header: 'Import'
   constructor: ->
     super
     return if !@authenticate()
@@ -47,6 +51,7 @@ class Import extends App.ControllerTabs
     @render()
 
 class Ticket extends App.ControllerTabs
+  header: 'Ticket'
   constructor: ->
     super
     return if !@authenticate()
diff --git a/app/assets/javascripts/app/views/generic/tabs.jst.eco b/app/assets/javascripts/app/views/generic/tabs.jst.eco
index d8042c453..721b36aec 100644
--- a/app/assets/javascripts/app/views/generic/tabs.jst.eco
+++ b/app/assets/javascripts/app/views/generic/tabs.jst.eco
@@ -1,4 +1,9 @@
-<ul class="nav nav-tabs" role="tablist">
+<div class="page-header">
+  <div class="page-header-title">
+    <h1><%- @T( @header ) %> <small><%- @T( @subHeader ) %></small></h1>
+  </div>
+</div>
+<ul class="nav nav-tabs <% if @tabs.length <= 1: %>hide<% end %>" role="tablist">
   <% for tab in @tabs: %>
     <li><a href="#<%= tab.target %>" role="tab" data-toggle="tab"><%- @T( tab.name ) %></a></li>
   <% end %>