Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
d0a2f64607
4 changed files with 38 additions and 18 deletions
|
@ -18,8 +18,8 @@ class App.TicketZoomArticleNew extends App.Controller
|
||||||
'click .js-articleTypeItem': 'selectArticleType'
|
'click .js-articleTypeItem': 'selectArticleType'
|
||||||
'click .js-selectedArticleType': 'showSelectableArticleType'
|
'click .js-selectedArticleType': 'showSelectableArticleType'
|
||||||
'click .js-mail-inputs': 'stopPropagation'
|
'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'
|
'focus .js-textarea': 'openTextarea'
|
||||||
|
|
||||||
constructor: ->
|
constructor: ->
|
||||||
|
@ -216,9 +216,8 @@ class App.TicketZoomArticleNew extends App.Controller
|
||||||
)
|
)
|
||||||
@subscribeIdTextModule = ticket.subscribe( callback )
|
@subscribeIdTextModule = ticket.subscribe( callback )
|
||||||
|
|
||||||
change_type: (e) ->
|
changeType: (e) ->
|
||||||
$(e.target).addClass('active').siblings('.active').removeClass('active')
|
$(e.target).addClass('active').siblings('.active').removeClass('active')
|
||||||
# store $(this).data('value')
|
|
||||||
|
|
||||||
toggleVisibility: (event) ->
|
toggleVisibility: (event) ->
|
||||||
event.stopPropagation()
|
event.stopPropagation()
|
||||||
|
@ -308,7 +307,12 @@ class App.TicketZoomArticleNew extends App.Controller
|
||||||
scrollToBottom: ->
|
scrollToBottom: ->
|
||||||
@el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight')
|
@el.scrollParent().scrollTop @el.scrollParent().prop('scrollHeight')
|
||||||
|
|
||||||
|
propagateOpenTextarea: (event) ->
|
||||||
|
event.stopPropagation()
|
||||||
|
@textarea.focus()
|
||||||
|
|
||||||
openTextarea: (event, withoutAnimation) =>
|
openTextarea: (event, withoutAnimation) =>
|
||||||
|
event.stopPropagation()
|
||||||
if @articleNewEdit.hasClass('is-open')
|
if @articleNewEdit.hasClass('is-open')
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,15 @@
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<div class="page-header-title">
|
<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>
|
</div>
|
||||||
<div class="page-content">
|
<div class="page-content">
|
||||||
<p><%- @T('You can create chat widgets for your webpages to allow visitors to chat with you.') %></p>
|
<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>
|
<h2><%- @T('Topics') %></h2>
|
||||||
<p><%- @T('You can create multiple chat topics.') %></p>
|
<p><%- @T('You can create multiple chat topics.') %></p>
|
||||||
<div class="js-topics"></div>
|
<div class="js-topics"></div>
|
||||||
|
|
|
@ -920,6 +920,7 @@ th.align-right {
|
||||||
.table .checkbox-replacement,
|
.table .checkbox-replacement,
|
||||||
.table .radio-replacement {
|
.table .radio-replacement {
|
||||||
height: 40px;
|
height: 40px;
|
||||||
|
width: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.table-overview tbody .icon-checkbox,
|
.table-overview tbody .icon-checkbox,
|
||||||
|
@ -1809,10 +1810,19 @@ kbd {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-header-title h1,
|
.page-header-title {
|
||||||
.page-header-title h2 {
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
.zammad-switch {
|
||||||
|
margin-right: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1,
|
||||||
|
h2 {
|
||||||
margin-top: 9px;
|
margin-top: 9px;
|
||||||
margin-bottom: 7px;
|
margin-bottom: 7px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-header-center {
|
.page-header-center {
|
||||||
|
@ -1827,8 +1837,17 @@ kbd {
|
||||||
|
|
||||||
.page-header-meta {
|
.page-header-meta {
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
padding-left: 9px;
|
padding-left: 20px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0; /* firefox flexbug */
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
.btn + .btn {
|
.btn + .btn {
|
||||||
margin-left: 9px;
|
margin-left: 9px;
|
||||||
|
@ -4570,6 +4589,7 @@ footer {
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding-left: 12px;
|
padding-left: 12px;
|
||||||
padding-right: 12px;
|
padding-right: 12px;
|
||||||
|
cursor: text;
|
||||||
}
|
}
|
||||||
|
|
||||||
.article-new .textBubble [contenteditable],
|
.article-new .textBubble [contenteditable],
|
||||||
|
|
Binary file not shown.
Loading…
Reference in a new issue