Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee

@@ -18,8 +18,8 @@ class App.TicketZoomArticleNew extends App.Controller
     'click .js-articleTypeItem':     'selectArticleType'
     'click .js-selectedArticleType': 'showSelectableArticleType'
     'click .js-mail-inputs':         'stopPropagation'
-    'click .js-writeArea':           'stopPropagation'
+    'click .js-writeArea':           'propagateOpenTextarea'
-    'click .list-entry-type div':    'change_type'
+    'click .list-entry-type div':    'changeType'
     'focus .js-textarea':            'openTextarea'
 
   constructor: ->
@@ -216,9 +216,8 @@ class App.TicketZoomArticleNew extends App.Controller
         )
       @subscribeIdTextModule = ticket.subscribe( callback )
 
-  change_type: (e) ->
+  changeType: (e) ->
     $(e.target).addClass('active').siblings('.active').removeClass('active')
-    # store $(this).data('value')
 
   toggleVisibility: (event) ->
     event.stopPropagation()
@@ -308,7 +307,12 @@ class App.TicketZoomArticleNew extends App.Controller
   scrollToBottom: ->
     @el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight')
 
+  propagateOpenTextarea: (event) ->
+    event.stopPropagation()
+    @textarea.focus()
+
   openTextarea: (event, withoutAnimation) =>
+    event.stopPropagation()
     if @articleNewEdit.hasClass('is-open')
       return
 

app/assets/javascripts/app/views/channel/chat.jst.eco

@@ -1,19 +1,15 @@
 <div class="page-header">
   <div class="page-header-title">
-    <h1><%- @T('Chat') %> <small></small></h1>
+    <div class="zammad-switch zammad-switch--small js-chatSetting">
+       <input name="chat" type="checkbox" id="setting-chat" <% if @chatSetting: %>checked<% end %>>
+       <label for="setting-chat"></label>
+    </div>
+    <h1><%- @T('Chat') %></h1>
   </div>
 </div>
 <div class="page-content">
   <p><%- @T('You can create chat widgets for your webpages to allow visitors to chat with you.') %></p>
 
-  <h2><%- @T('Enable') %>/<%- @T('Disable') %></h2>
-  <form>
-    <div class="zammad-switch js-chatSetting">
-       <input name="chat" type="checkbox" id="setting-chat" <% if @chatSetting: %>checked<% end %>>
-       <label for="setting-chat"></label>
-    </div>
-  </form>
-
   <h2><%- @T('Topics') %></h2>
   <p><%- @T('You can create multiple chat topics.') %></p>
   <div class="js-topics"></div>

app/assets/stylesheets/zammad.scss

@@ -920,6 +920,7 @@ th.align-right {
 .table .checkbox-replacement,
 .table .radio-replacement {
   height: 40px;
+  width: 40px;
 }
 
 .table-overview tbody .icon-checkbox,
@@ -1809,10 +1810,19 @@ kbd {
   justify-content: center;
 }
 
-.page-header-title h1,
+.page-header-title {
-.page-header-title h2 {
+  display: flex;
-  margin-top: 9px;
+  align-items: center;
-  margin-bottom: 7px;
+  
+  .zammad-switch {
+    margin-right: 9px;
+  }
+
+  h1,
+  h2 {
+    margin-top: 9px;
+    margin-bottom: 7px;
+  }
 }
 
 .page-header-center {
@@ -1827,8 +1837,17 @@ kbd {
 
 .page-header-meta {
   margin-left: auto;
-  padding-left: 9px;
+  padding-left: 20px;
   display: flex;
+  justify-content: flex-end;
+  flex: 1;
+  min-width: 0; /* firefox flexbug */
+  
+  .btn {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 
   .btn + .btn {
     margin-left: 9px;
@@ -4570,6 +4589,7 @@ footer {
     border-radius: 5px;
     padding-left: 12px;
     padding-right: 12px;
+    cursor: text;
   }
 
     .article-new .textBubble [contenteditable],