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

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

Browse source
This commit is contained in:
Martin Edenhofer 2014-08-27 15:06:22 +02:00
commit a7bb402fa4
2 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -583,8 +583,8 @@ class ArticleView extends App.Controller
'click [data-type=internal]': 'public_internal' 'click [data-type=internal]': 'public_internal'
'click .show_toogle': 'show_toogle' 'click .show_toogle': 'show_toogle'
'click [data-type=reply]': 'reply' 'click [data-type=reply]': 'reply'
'click .text-bubble': 'more_toogle' 'click .text-bubble': 'toggle_meta'
'click .close-details': 'more_toogle' 'click .text-bubble a': 'stopPropagation'
# 'click [data-type=reply-all]': 'replyall' # 'click [data-type=reply-all]': 'replyall'
constructor: -> constructor: ->
@ -646,36 +646,61 @@ class ArticleView extends App.Controller
$(e.target).text( App.i18n.translateContent('See more') ) $(e.target).text( App.i18n.translateContent('See more') )
$(e.target).next('div').addClass('hide') $(e.target).next('div').addClass('hide')
more_toogle: (e) -> stopPropagation: (e) ->
e.stopPropagation()
toggle_meta: (e) ->
e.preventDefault() e.preventDefault()
animSpeed = 0.25
article = $(e.target).closest('.ticket-article-item') article = $(e.target).closest('.ticket-article-item')
metaTopClip = article.find('.article-meta-clip.top') metaTopClip = article.find('.article-meta-clip.top')
metaBottomClip = article.find('.article-meta-clip.bottom') metaBottomClip = article.find('.article-meta-clip.bottom')
metaTop = article.find('.article-content-meta.top') metaTop = article.find('.article-content-meta.top')
metaBottom = article.find('.article-content-meta.bottom') metaBottom = article.find('.article-content-meta.bottom')
if @elementContainsSelection( article.get(0) )
@stopPropagation(e)
return false
if !metaTop.hasClass('hide') if !metaTop.hasClass('hide')
article.removeClass('state--folde-out') article.removeClass('state--folde-out')
# scroll back up # scroll back up
TweenLite.to(article.scrollParent(), 0.5, { scrollTo: article.scrollParent().scrollTop() - metaTop.outerHeight() }) TweenLite.to(article.scrollParent(), animSpeed, { scrollTo: article.scrollParent().scrollTop() - metaTop.outerHeight() })
TweenLite.to(metaTop, 0.5, { y: 0, opacity: 0, onComplete: -> metaTop.addClass('hide') }) TweenLite.to(metaTop, animSpeed, { y: 0, opacity: 0, onComplete: -> metaTop.addClass('hide') })
TweenLite.to(metaBottom, 0.5, { y: -metaBottom.outerHeight(), opacity: 0, onComplete: -> metaTop.addClass('hide') }) TweenLite.to(metaBottom, animSpeed, { y: -metaBottom.outerHeight(), opacity: 0, onComplete: -> metaTop.addClass('hide') })
TweenLite.to(metaTopClip, 0.5, { height: 0 }) TweenLite.to(metaTopClip, animSpeed, { height: 0 })
TweenLite.to(metaBottomClip, 0.5, { height: 0 }) TweenLite.to(metaBottomClip, animSpeed, { height: 0 })
else else
article.addClass('state--folde-out') article.addClass('state--folde-out')
metaBottom.removeClass('hide') metaBottom.removeClass('hide')
metaTop.removeClass('hide') metaTop.removeClass('hide')
# balance out the top meta height by scrolling down # balance out the top meta height by scrolling down
TweenLite.to(article.scrollParent(), 0.5, { scrollTo: article.scrollParent().scrollTop() + metaTop.outerHeight() }) TweenLite.to(article.scrollParent(), animSpeed, { scrollTo: article.scrollParent().scrollTop() + metaTop.outerHeight() })
TweenLite.fromTo(metaTop, 0.5, { y: metaTop.outerHeight(), opacity: 0 }, { y: 0, opacity: 1 }) TweenLite.fromTo(metaTop, animSpeed, { y: metaTop.outerHeight(), opacity: 0 }, { y: 0, opacity: 1 })
TweenLite.fromTo(metaBottom, 0.5, { y: -metaBottom.outerHeight(), opacity: 0 }, { y: 0, opacity: 1 }) TweenLite.fromTo(metaBottom, animSpeed, { y: -metaBottom.outerHeight(), opacity: 0 }, { y: 0, opacity: 1 })
TweenLite.to(metaTopClip, 0.5, { height: metaTop.outerHeight() }) TweenLite.to(metaTopClip, animSpeed, { height: metaTop.outerHeight() })
TweenLite.to(metaBottomClip, 0.5, { height: metaBottom.outerHeight() }) TweenLite.to(metaBottomClip, animSpeed, { height: metaBottom.outerHeight() })
isOrContains: (node, container) ->
while node
if node is container
return true
node = node.parentNode
false
elementContainsSelection: (el) ->
sel = window.getSelection()
if sel.rangeCount > 0 && sel.toString()
for i in [0..sel.rangeCount-1]
if !@isOrContains(sel.getRangeAt(i).commonAncestorContainer, el)
return false
return true
false
checkIfSignatureIsNeeded: (type) => checkIfSignatureIsNeeded: (type) =>

8
app/assets/stylesheets/zzz.css.erb
View file

@ -1627,7 +1627,7 @@ footer {
vertical-align: bottom; vertical-align: bottom;
} }
.navigation .nav > li.active > .icon, .navigation .nav > li.active > a .icon,
.navigation .nav > li > a:hover .icon, .navigation .nav > li > a:hover .icon,
.navigation .nav > li > a:focus .icon { .navigation .nav > li > a:focus .icon {
opacity: 1; opacity: 1;
@ -2511,10 +2511,14 @@ footer {
.ticket-article-item .text-bubble.internal { .ticket-article-item .text-bubble.internal {
background: #f2def2; background: #f2def2;
border-color: #eed3d7; border-color: hsl(300,43%,90%);
box-shadow: none; box-shadow: none;
} }
.customer.ticket-article-item.state--folde-out .text-bubble.internal {
border-color: hsl(300,43%,84%);
}
.new-article .text-bubble { .new-article .text-bubble {
padding: 0; padding: 0;
border-color: #b3b3b3; border-color: #b3b3b3;