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

camelCased textBubble

Browse source
This commit is contained in:
Felix Niklas 2015-01-15 01:04:07 +01:00
parent 14a57f7a12
commit 7580bc98c2
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -788,7 +788,7 @@ class Edit extends App.Controller
'.attachmentUpload-progressBar': 'progressBar' '.attachmentUpload-progressBar': 'progressBar'
'.js-percentage': 'progressText' '.js-percentage': 'progressText'
'.js-cancel': 'cancelContainer' '.js-cancel': 'cancelContainer'
'.text-bubble': 'textBubble' '.textBubble': 'textBubble'
'.editControls-item': 'editControlItem' '.editControls-item': 'editControlItem'
#'.editControls': 'editControls' #'.editControls': 'editControls'
#'.recipient-picker': 'recipientPicker' #'.recipient-picker': 'recipientPicker'
@ -1279,8 +1279,8 @@ class ArticleView extends App.Controller
'click .show_toogle': 'show_toogle' 'click .show_toogle': 'show_toogle'
'click [data-type=reply]': 'reply' 'click [data-type=reply]': 'reply'
'click [data-type=replyAll]': 'replyAll' 'click [data-type=replyAll]': 'replyAll'
'click .text-bubble': 'toggle_meta_with_delay' 'click .textBubble': 'toggle_meta_with_delay'
'click .text-bubble a': 'stopPropagation' 'click .textBubble a': 'stopPropagation'
constructor: -> constructor: ->
super super

6
app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
View file

@ -58,7 +58,7 @@
<div class="article-content zIndex-1"> <div class="article-content zIndex-1">
<span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span> <span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
<div class="flex bubble-gap internal-border"> <div class="flex bubble-gap internal-border">
<div class="text-bubble"><div class="bubble-arrow"></div>Welcome! <div class="textBubble"><div class="bubble-arrow"></div>Welcome!
Thank you for installing Zammad. Thank you for installing Zammad.
@ -112,7 +112,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
<div class="article-content zIndex-1"> <div class="article-content zIndex-1">
<span class="avatar user-popover" data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span> <span class="avatar user-popover" data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
<div class="flex bubble-gap internal-border"> <div class="flex bubble-gap internal-border">
<div class="text-bubble"><div class="bubble-arrow"></div>Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?</div> <div class="textBubble"><div class="bubble-arrow"></div>Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?</div>
</div> </div>
</div> </div>
<div class="article-meta-clip bottom"> <div class="article-meta-clip bottom">
@ -150,7 +150,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
<div class="article-content zIndex-1"> <div class="article-content zIndex-1">
<span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span> <span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
<div class="flex bubble-gap internal-border"> <div class="flex bubble-gap internal-border">
<div class="text-bubble"><div class="bubble-arrow"></div>Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. <div class="textBubble"><div class="bubble-arrow"></div>Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort.
Grüße, Peter</div> Grüße, Peter</div>
</div> </div>

4
app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
View file

@ -9,10 +9,10 @@
<div class="ticket-edit"> <div class="ticket-edit">
<div class="article-content zIndex-5"> <div class="article-content zIndex-5">
<div class="internal-border"> <div class="internal-border">
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-textarea ticketEdit-body" contenteditable="true"><%- @content %></div> <div class="js-textarea ticketEdit-body" contenteditable="true"><%- @content %></div>
<!-- .text-bubble grows with textarea (and expanding clone) --> <!-- .textBubble grows with textarea (and expanding clone) -->
<div class="attachments"></div> <div class="attachments"></div>
<!-- <!--
</div> </div>

12
app/assets/javascripts/app/views/layout_ref/richtext.jst.eco
View file

@ -4,36 +4,36 @@
<h2>Singleline / Textonly</h2> <h2>Singleline / Textonly</h2>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-text-oneline text-1" contenteditable="true" data-name="body" style="min-height: 40px;"></div> <div class="js-text-oneline text-1" contenteditable="true" data-name="body" style="min-height: 40px;"></div>
</div> </div>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-text-oneline text-2" contenteditable="true" data-name="body" style="min-height: 40px;">some test</div> <div class="js-text-oneline text-2" contenteditable="true" data-name="body" style="min-height: 40px;">some test</div>
</div> </div>
<h2>Multiline / Textonly</h2> <h2>Multiline / Textonly</h2>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-text-multiline text-3" contenteditable="true" data-name="body" style="min-height: 40px;"></div> <div class="js-text-multiline text-3" contenteditable="true" data-name="body" style="min-height: 40px;"></div>
</div> </div>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-text-multiline text-4" contenteditable="true" data-name="body" style="min-height: 40px;">some text <br>Multiline</div> <div class="js-text-multiline text-4" contenteditable="true" data-name="body" style="min-height: 40px;">some text <br>Multiline</div>
</div> </div>
<h2>Multiline / Richtext</h2> <h2>Multiline / Richtext</h2>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-text-richtext text-5" contenteditable="true" data-name="body" style="min-height: 40px;"></div> <div class="js-text-richtext text-5" contenteditable="true" data-name="body" style="min-height: 40px;"></div>
</div> </div>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-text-richtext text-6" contenteditable="true" data-name="body" style="min-height: 40px;">some text <br>Multiline <b>bolt</b></div> <div class="js-text-richtext text-6" contenteditable="true" data-name="body" style="min-height: 40px;">some text <br>Multiline <b>bolt</b></div>
</div> </div>

2
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -42,7 +42,7 @@
<%- article.created_by.avatar("40", position) %> <%- article.created_by.avatar("40", position) %>
<div class="bubble-gap"> <div class="bubble-gap">
<div class="internal-border"> <div class="internal-border">
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<%- article.html %> <%- article.html %>
<% if !_.isEmpty( article.attachments ): %> <% if !_.isEmpty( article.attachments ): %>

4
app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
View file

@ -49,10 +49,10 @@
<div class="controls"><input id="" type="text" name="cc" value="<%= @article.cc %>" class="form-control"></div> <div class="controls"><input id="" type="text" name="cc" value="<%= @article.cc %>" class="form-control"></div>
</div> </div>
<div class="text-bubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-textarea ticketEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div> <div class="js-textarea ticketEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
<!-- .text-bubble grows with textarea (and expanding clone) --> <!-- .textBubble grows with textarea (and expanding clone) -->
<div class="attachments"></div> <div class="attachments"></div>
<div class="article-attachment u-unclickable u-textTruncate"> <div class="article-attachment u-unclickable u-textTruncate">
<div class="attachmentPlaceholder"> <div class="attachmentPlaceholder">

2
app/assets/stylesheets/zammad.css.scss
View file

@ -3040,7 +3040,7 @@ footer {
/* /*
clip the article-meta to not stand out on the other side clip the article-meta to not stand out on the other side
of the text-bubble if the text bubble is small of the textBubble if the text bubble is small
*/ */
.article-meta-clip { .article-meta-clip {