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

Improved wording.

Browse source
This commit is contained in:
Martin Edenhofer 2015-04-06 00:36:21 +02:00
parent 92014a7ded
commit d34d293f8f
6 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -159,7 +159,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
'.attachmentPlaceholder': 'attachmentPlaceholder' '.attachmentPlaceholder': 'attachmentPlaceholder'
'.attachmentPlaceholder-inputHolder': 'attachmentInputHolder' '.attachmentPlaceholder-inputHolder': 'attachmentInputHolder'
'.attachmentPlaceholder-hint': 'attachmentHint' '.attachmentPlaceholder-hint': 'attachmentHint'
'.ticket-edit': 'ticketEdit' '.article-new': 'articleNewEdit'
'.attachments': 'attachmentsHolder' '.attachments': 'attachmentsHolder'
'.attachmentUpload': 'attachmentUpload' '.attachmentUpload': 'attachmentUpload'
'.attachmentUpload-progressBar':'progressBar' '.attachmentUpload-progressBar':'progressBar'
@ -215,13 +215,13 @@ class LayoutRefCommunicationReply extends App.ControllerContent
@remove_textarea_catcher() @remove_textarea_catcher()
open_textarea: (event, withoutAnimation) => open_textarea: (event, withoutAnimation) =>
if !@ticketEdit.hasClass('is-open') if !@articleNewEdit.hasClass('is-open')
duration = 300 duration = 300
if withoutAnimation if withoutAnimation
duration = 0 duration = 0
@ticketEdit.addClass('is-open') @articleNewEdit.addClass('is-open')
@textarea.velocity @textarea.velocity
properties: properties:
@ -268,7 +268,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
add_textarea_catcher: -> add_textarea_catcher: ->
@textareaCatcher = new App.clickCatcher @textareaCatcher = new App.clickCatcher
holder: @ticketEdit.offsetParent() holder: @articleNewEdit.offsetParent()
callback: @close_textarea callback: @close_textarea
zIndexScale: 4 zIndexScale: 4
@ -287,7 +287,7 @@ class LayoutRefCommunicationReply extends App.ControllerContent
options: options:
duration: 300 duration: 300
easing: 'easeOutQuad' easing: 'easeOutQuad'
complete: => @ticketEdit.removeClass('is-open') complete: => @articleNewEdit.removeClass('is-open')
@textBubble.velocity @textBubble.velocity
properties: properties:
@ -317,18 +317,18 @@ class LayoutRefCommunicationReply extends App.ControllerContent
@open_textarea() if @dragEventCounter is 0 @open_textarea() if @dragEventCounter is 0
@dragEventCounter++ @dragEventCounter++
@ticketEdit.addClass('is-dropTarget') @articleNewEdit.addClass('is-dropTarget')
onDragleave: (event) => onDragleave: (event) =>
@dragEventCounter-- @dragEventCounter--
@ticketEdit.removeClass('is-dropTarget') if @dragEventCounter is 0 @articleNewEdit.removeClass('is-dropTarget') if @dragEventCounter is 0
onFileDrop: (event) => onFileDrop: (event) =>
event.preventDefault() event.preventDefault()
event.stopPropagation() event.stopPropagation()
files = event.originalEvent.dataTransfer.files files = event.originalEvent.dataTransfer.files
@ticketEdit.removeClass('is-dropTarget') @articleNewEdit.removeClass('is-dropTarget')
@queueUpload(files) @queueUpload(files)

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

@ -278,10 +278,9 @@ class App.TicketZoom extends App.Controller
@form_id = App.ControllerForm.formId() @form_id = App.ControllerForm.formId()
new Edit( new ArticleNew(
ticket: @ticket ticket: @ticket
el: @el.find('.ticket-edit') el: @el.find('.article-new')
#el: @el.find('.edit')
form_meta: @form_meta form_meta: @form_meta
form_id: @form_id form_id: @form_id
defaults: @taskGet('article') defaults: @taskGet('article')
@ -943,13 +942,13 @@ class TicketMeta extends App.Controller
release: => release: =>
App.Ticket.unsubscribe( @subscribeId ) App.Ticket.unsubscribe( @subscribeId )
class Edit extends App.Controller class ArticleNew extends App.Controller
elements: elements:
'.js-textarea': 'textarea' '.js-textarea': 'textarea'
'.attachmentPlaceholder': 'attachmentPlaceholder' '.attachmentPlaceholder': 'attachmentPlaceholder'
'.attachmentPlaceholder-inputHolder': 'attachmentInputHolder' '.attachmentPlaceholder-inputHolder': 'attachmentInputHolder'
'.attachmentPlaceholder-hint': 'attachmentHint' '.attachmentPlaceholder-hint': 'attachmentHint'
'.article-add': 'ticketEdit' '.article-add': 'articleNewEdit'
'.attachments': 'attachmentsHolder' '.attachments': 'attachmentsHolder'
'.attachmentUpload': 'attachmentUpload' '.attachmentUpload': 'attachmentUpload'
'.attachmentUpload-progressBar': 'progressBar' '.attachmentUpload-progressBar': 'progressBar'
@ -1069,7 +1068,7 @@ class Edit extends App.Controller
ticket = App.Ticket.fullLocal( @ticket.id ) ticket = App.Ticket.fullLocal( @ticket.id )
@html App.view('ticket_zoom/edit')( @html App.view('ticket_zoom/article_new')(
ticket: ticket ticket: ticket
articleTypes: @articleTypes articleTypes: @articleTypes
article: @defaults article: @defaults
@ -1298,14 +1297,14 @@ class Edit extends App.Controller
@remove_textarea_catcher() @remove_textarea_catcher()
open_textarea: (event, withoutAnimation) => open_textarea: (event, withoutAnimation) =>
console.log('ticketEdit', @ticketEdit.hasClass('is-open')) console.log('articleNewEdit', @articleNewEdit.hasClass('is-open'))
if !@ticketEdit.hasClass('is-open') if !@articleNewEdit.hasClass('is-open')
duration = 300 duration = 300
if withoutAnimation if withoutAnimation
duration = 0 duration = 0
@ticketEdit.addClass('is-open') @articleNewEdit.addClass('is-open')
@textarea.velocity @textarea.velocity
properties: properties:
@ -1350,9 +1349,9 @@ class Edit extends App.Controller
duration: duration duration: duration
add_textarea_catcher: => add_textarea_catcher: =>
if @ticketEdit.is(':visible') if @articleNewEdit.is(':visible')
@textareaCatcher = new App.clickCatcher @textareaCatcher = new App.clickCatcher
holder: @ticketEdit.offsetParent() holder: @articleNewEdit.offsetParent()
callback: @close_textarea callback: @close_textarea
zIndexScale: 4 zIndexScale: 4
@ -1371,7 +1370,7 @@ class Edit extends App.Controller
options: options:
duration: 300 duration: 300
easing: 'easeOutQuad' easing: 'easeOutQuad'
complete: => @ticketEdit.removeClass('is-open') complete: => @articleNewEdit.removeClass('is-open')
@textBubble.velocity @textBubble.velocity
properties: properties:
@ -1401,12 +1400,12 @@ class Edit extends App.Controller
@open_textarea() if @dragEventCounter is 0 @open_textarea() if @dragEventCounter is 0
@dragEventCounter++ @dragEventCounter++
@ticketEdit.parent().addClass('is-dropTarget') @articleNewEdit.parent().addClass('is-dropTarget')
onDragleave: (event) => onDragleave: (event) =>
@dragEventCounter-- @dragEventCounter--
@ticketEdit.parent().removeClass('is-dropTarget') if @dragEventCounter is 0 @articleNewEdit.parent().removeClass('is-dropTarget') if @dragEventCounter is 0
renderAttachment: (file) => renderAttachment: (file) =>
@attachmentsHolder.append App.view('generic/attachment_item') @attachmentsHolder.append App.view('generic/attachment_item')

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

@ -6,12 +6,12 @@
<h2>Article Reply</h2> <h2>Article Reply</h2>
<div class="ticket-edit"> <div class="article-new">
<div class="article-content zIndex-5"> <div class="article-content zIndex-5">
<div class="internal-border"> <div class="internal-border">
<div class="textBubble"> <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 articleNewEdit-body" contenteditable="true"><%- @content %></div>
<!-- .textBubble grows with textarea (and expanding clone) --> <!-- .textBubble grows with textarea (and expanding clone) -->
<div class="attachments"></div> <div class="attachments"></div>
<!-- <!--

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

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="ticket-article"></div> <div class="ticket-article"></div>
<div class="ticket-edit"></div> <div class="article-new"></div>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco → app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
View file

@ -51,7 +51,7 @@
<div class="textBubble"> <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 articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
<!-- .textBubble 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">

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

@ -3305,7 +3305,7 @@ footer {
} }
.ticket-article, .ticket-article,
.ticket-edit { .article-new {
max-width: 800px; max-width: 800px;
margin: 0 auto; margin: 0 auto;
padding: 0 21px; padding: 0 21px;
@ -3580,7 +3580,7 @@ footer {
position: relative; position: relative;
} }
.ticket-edit { .article-new {
margin-top: auto; margin-top: auto;
margin-bottom: 36px; margin-bottom: 36px;
} }
@ -3664,13 +3664,13 @@ footer {
visibility: hidden; visibility: hidden;
} }
.ticket-edit .recipient-picker { .article-new .recipient-picker {
height: 36px; height: 36px;
position: relative; position: relative;
transition: 300ms; transition: 300ms;
} }
.ticket-edit .recipient-picker.is-open { .article-new .recipient-picker.is-open {
opacity: 1; opacity: 1;
} }
@ -3778,16 +3778,16 @@ footer {
.recipient-list input::-moz-placeholder { opacity: 1; color: #666; } .recipient-list input::-moz-placeholder { opacity: 1; color: #666; }
.recipient-list input:-ms-input-placeholder { color: #666; } .recipient-list input:-ms-input-placeholder { color: #666; }
.ticket-edit .textBubble { .article-new .textBubble {
border-color: #b3b3b3; border-color: #b3b3b3;
border-radius: 5px; border-radius: 5px;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
.ticket-edit .textBubble [contenteditable], .article-new .textBubble [contenteditable],
.ticket-edit textarea, .article-new textarea,
.ticketEdit-body { .articleNewEdit-body {
width: 100%; width: 100%;
position: relative; position: relative;
min-height: 20px; min-height: 20px;
@ -3798,7 +3798,7 @@ footer {
resize: none; resize: none;
} }
.ticketEdit-body { .articleNewEdit-body {
height: auto; height: auto;
min-height: 38px; min-height: 38px;
} }