Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Martin Edenhofer 2016-01-13 20:46:09 +01:00
commit eec2801c2f
4 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/chat.coffee
View file

@ -601,6 +601,9 @@ class ChatWindow extends App.Controller
@el.addClass('is-offline') @el.addClass('is-offline')
@input.attr('disabled', true) @input.attr('disabled', true)
# add footer with create ticket button
@body.append App.view('customer_chat/chat_footer')()
maybeAddTimestamp: -> maybeAddTimestamp: ->
timestamp = Date.now() timestamp = Date.now()

3
app/assets/javascripts/app/views/customer_chat/chat_footer.jst.eco Normal file
View file

@ -0,0 +1,3 @@
<div class="chat-footer">
<div class="btn btn--primary js-createTicket">Turn chat into ticket</div>
</div>

14
app/assets/stylesheets/zammad.scss
View file

@ -7275,7 +7275,6 @@ output {
} }
&.is-offline { &.is-offline {
.chat-body-holder,
.chat-controls { .chat-controls {
opacity: 0.5; opacity: 0.5;
} }
@ -7286,7 +7285,7 @@ output {
background: hsl(210,8%,95%); background: hsl(210,8%,95%);
border: 1px solid hsl(0,0%,91%); border: 1px solid hsl(0,0%,91%);
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
height: 37px; height: 43px;
line-height: 13px; line-height: 13px;
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
@ -7336,7 +7335,7 @@ output {
.chat-disconnect, .chat-disconnect,
.chat-close { .chat-close {
cursor: pointer; cursor: pointer;
padding: 0 4px; padding: 10px;
.btn { .btn {
min-width: 80px; min-width: 80px;
@ -7437,6 +7436,15 @@ output {
67% { opacity: 1; transform: scale(1); } 67% { opacity: 1; transform: scale(1); }
} }
.chat-footer {
border-top: 1px solid hsl(0,0%,93%);
padding: 10px;
display: flex;
justify-content: center;
align-self: stretch;
margin: 0 -10px;
}
.chat-controls { .chat-controls {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;

24
test/integration/otrs_import_browser_test.rb
View file

@ -11,8 +11,6 @@ class OtrsImportBrowserTest < TestCase
fail "ERROR: Need IMPORT_BT_OTRS_ENDPOINT_KEY - hint IMPORT_BT_OTRS_ENDPOINT_KEY='01234567899876543210'" fail "ERROR: Need IMPORT_BT_OTRS_ENDPOINT_KEY - hint IMPORT_BT_OTRS_ENDPOINT_KEY='01234567899876543210'"
end end
import_url = "#{ENV['IMPORT_BT_OTRS_ENDPOINT']};Key=#{ENV['IMPORT_BT_OTRS_ENDPOINT_KEY']}"
@browser = browser_instance @browser = browser_instance
location(url: browser_url) location(url: browser_url)
@ -24,13 +22,31 @@ class OtrsImportBrowserTest < TestCase
click(css: '.js-otrs-link') click(css: '.js-otrs-link')
invalid_key_url = "#{ENV['IMPORT_BT_OTRS_ENDPOINT']};Key=31337"
set(
css: '#otrs-link',
value: invalid_key_url
)
sleep 5
watch_for(
css: '.otrs-link-error',
value: 'Invalid API key.',
)
import_url = "#{ENV['IMPORT_BT_OTRS_ENDPOINT']};Key=#{ENV['IMPORT_BT_OTRS_ENDPOINT_KEY']}"
set( set(
css: '#otrs-link', css: '#otrs-link',
value: import_url value: import_url
) )
exists( sleep 5
css: 'svg.icon-checkmark'
watch_for_disappear(
css: '.otrs-link-error',
value: 'Invalid API key.',
) )
click(css: '.js-migration-start') click(css: '.js-migration-start')