From 0c3d3e63a6a137ee3558f6de104a93686143bbcf Mon Sep 17 00:00:00 2001
From: Felix Niklas <mail@felixniklas.de>
Date: Mon, 29 Sep 2014 12:54:04 +0200
Subject: [PATCH] fix tabsSidebar overflow

by adding a tabsSidebar-holder to the parent element containing both the content and the sidebar
---
 .../app/views/agent_ticket_create.jst.eco     | 86 ++++++++++---------
 .../content_sidebar_tabs_right.jst.eco        | 28 +++---
 .../javascripts/app/views/ticket_zoom.jst.eco |  2 +-
 .../javascripts/app/views/user_zoom.jst.eco   |  2 +-
 app/assets/stylesheets/zzz.css.erb            |  6 ++
 5 files changed, 67 insertions(+), 57 deletions(-)

diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
index f6bccc058..067f3d155 100644
--- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco
@@ -1,49 +1,51 @@
-<div class="main no-padding flex tabsSidebarSpace">
-  <div class="newTicket">
-    <div class="box">
-      <div class="page-header">
-        <h1><%- @T( @head ) %></h1>
+<div class="tabsSidebar-holder">
+  <div class="main no-padding flex tabsSidebarSpace">
+    <div class="newTicket">
+      <div class="box">
+        <div class="page-header">
+          <h1><%- @T( @head ) %></h1>
+        </div>
+
+        <ul class="horizontal tabs type-tabs">
+
+          <li class="tab u-textTruncate" data-type="phone-in">
+            <div class="gray received-calls channel icon"></div>
+            <%- @T( 'Received Call' ) %>
+          </li>
+
+          <li class="tab u-textTruncate" data-type="phone-out">
+            <div class="gray outbound-calls channel icon"></div>
+            <%- @T( 'Outbound Call' ) %>
+          </li>
+
+         <li class="tab u-textTruncate" data-type="email-out">
+            <div class="gray email channel icon"></div>
+            <%- @T( 'Send E-Mail' ) %>
+          </li>
+        </ul>
+
+        <form role="form" class="ticket-create">
+          <input type="hidden" name="formSenderType"/>
+
+          <div class="ticket-form-top"></div>
+          <div class="article-form-top"></div>
+
+          <div class="formset-inset">
+            <div class="ticket-form-middle horizontal two-columns"></div>
+            <div class="ticket-form-bottom"></div>
+          </div>
+
+          <div class="form-actions horizontal">
+            <a class="subtle-link standalone cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
+            <button type="submit" class="btn btn--success submit align-right"><%- @T( 'Create' ) %></button>
+          </div>
+        </form>
       </div>
-
-      <ul class="horizontal tabs type-tabs">
-
-        <li class="tab u-textTruncate" data-type="phone-in">
-          <div class="gray received-calls channel icon"></div>
-          <%- @T( 'Received Call' ) %>
-        </li>
-
-        <li class="tab u-textTruncate" data-type="phone-out">
-          <div class="gray outbound-calls channel icon"></div>
-          <%- @T( 'Outbound Call' ) %>
-        </li>
-
-       <li class="tab u-textTruncate" data-type="email-out">
-          <div class="gray email channel icon"></div>
-          <%- @T( 'Send E-Mail' ) %>
-        </li>
-      </ul>
-
-      <form role="form" class="ticket-create">
-        <input type="hidden" name="formSenderType"/>
-
-        <div class="ticket-form-top"></div>
-        <div class="article-form-top"></div>
-
-        <div class="formset-inset">
-          <div class="ticket-form-middle horizontal two-columns"></div>
-          <div class="ticket-form-bottom"></div>
-        </div>
-
-        <div class="form-actions horizontal">
-          <a class="subtle-link standalone cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
-          <button type="submit" class="btn btn--success submit align-right"><%- @T( 'Create' ) %></button>
-        </div>
-      </form>
     </div>
   </div>
-</div>
 
-<div class="tabsSidebar vertical"></div>
+  <div class="tabsSidebar vertical"></div>
+</div>
 <!--
 <div class="sidebar">
   <div class="widgets">
diff --git a/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco b/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
index f2185e467..c2af4d756 100644
--- a/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
@@ -1,17 +1,19 @@
-<div class="main flex tabsSidebarSpace">
-  <h1>content</h1>
+<div class="tabsSidebar-holder flex horizontal">
+  <div class="main flex tabsSidebarSpace">
+    <h1>content</h1>
 
-  <p>
-Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.
-  </p>
+    <p>
+  Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.
+    </p>
 
-  <p>
-Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.
-  </p>
+    <p>
+  Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.
+    </p>
 
-  <p>
-Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
-  </p>
-</div>
+    <p>
+  Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+    </p>
+  </div>
 
-<div class="tabsSidebar vertical"></div>
\ No newline at end of file
+  <div class="tabsSidebar vertical"></div>
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
index 739702189..909b6de9a 100644
--- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco
@@ -1,4 +1,4 @@
-<div class="flex vertical">
+<div class="tabsSidebar-holder flex vertical">
   <div class="flex u-positionOrigin horizontal">
     <div class="main no-padding flex tabsSidebarSpace">
       <div class="ticketZoom">
diff --git a/app/assets/javascripts/app/views/user_zoom.jst.eco b/app/assets/javascripts/app/views/user_zoom.jst.eco
index a04ed077b..ea1ca64a6 100644
--- a/app/assets/javascripts/app/views/user_zoom.jst.eco
+++ b/app/assets/javascripts/app/views/user_zoom.jst.eco
@@ -1,4 +1,4 @@
-<div class="flex vertical">
+<div class="tabsSidebar-holder flex vertical">
   <div class="flex u-positionOrigin horizontal">
     <div class="main flex tabsSidebarSpace">
       <div class="userZoom">
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb
index cb94beead..dd04568c9 100644
--- a/app/assets/stylesheets/zzz.css.erb
+++ b/app/assets/stylesheets/zzz.css.erb
@@ -2375,6 +2375,7 @@ footer {
   }
 
     .ticket-title h1 {
+      max-width: 350px;
       margin-top: 15px;
       margin-bottom: 8px;
       text-align: center;
@@ -2839,6 +2840,11 @@ footer {
   margin-right: 0;
 }
 
+.tabsSidebar-holder {
+  overflow: hidden;
+  position: relative;
+}
+
 .tabsSidebar .sidebar {
   width: 280px;
   border-left: 1px solid #e6e6e6;