From 1ad13c2b590750876dc51f23c5ebf13afc12406d Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 29 Sep 2015 15:54:14 +0200 Subject: [PATCH 1/2] date + time layoutRef --- .../app/controllers/layout_ref.coffee | 2 + .../views/layout_ref/import_wizard.jst.eco | 2 +- .../app/views/layout_ref/ticket_zoom.jst.eco | 1267 +++++++++-------- app/assets/stylesheets/zammad.scss | 21 +- 4 files changed, 682 insertions(+), 610 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.coffee b/app/assets/javascripts/app/controllers/layout_ref.coffee index 629286f21..ad2bf3070 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.coffee @@ -848,6 +848,8 @@ class TicketZoomRef extends App.ControllerContent startDate: new Date().toLocaleDateString("en-US") # returns 9/25/2015 container: @$('.js-datepicker').parent() + @$('.js-timepicker').timepicker() + # for testing purposes the highlights get stored in localStorage loadHighlights: -> if highlights = localStorage['highlights'] diff --git a/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco index c3a04dd8b..d83140f3f 100644 --- a/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco @@ -39,7 +39,7 @@

Enter the link provided by the plugin at the end of the installation to link the two systems:

-
+
diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco index ee94c2127..92284fe6d 100644 --- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco @@ -1,624 +1,689 @@ -
+
+
-
-
-
- <%- @Icon('marker', 'js-highlight-icon') %> -
-
-
- <%- @Icon('arrow-down') %> +
+
+
+ <%- @Icon('marker', 'js-highlight-icon') %> +
+
+
+ <%- @Icon('arrow-down') %> +
+
-
-
-
- Ticket# 1002 -
-

Welcome to Zammad! We want to entertain you and your whole family!

-
-
- 1/36 -
- -
-
-
- NB -
+
+ Ticket# 1002 +

Welcome to Zammad! We want to entertain you and your whole family!

-
- Ticket# 10001 - erstellte 11.07.2014 - +
+ 1/36
-
-
- -
-
-
-
-
-
-
From
-
Zammad Feedback <feedback@zammad.org>
-
-
-
-
-
- NB -
-
-
-
-
-Welcome! -
-Thank you for installing Zammad.
-
-You will find updates and patches at http://zammad.org/. Online
-documentation is available at http://guides.zammad.org/. You can also
-use our forums at http://forums.zammad.org/
-
-Regards,
-The Zammad.org Project -
-
-
<%- @T('See more') %>
-
-
-
-
-
-
-
-
-
-
Kanal
-
- - phone -
-
-
-
- - - set to internal - - - - reply - - - - split - -
-
-
- -
- -
-
-
-
-
-
From
-
Felix Niklas
-
-
-
-
-
- -
-
-
Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?
-
-
-
-
-
-
-
Kanal
-
- - note -
-
-
-
- - - set to internal - -
-
-
- -
- -
-
-
-
-
-
From
-
Zammad Feedback <feedback@zammad.org>
-
-
-
-
-
- NB -
-
Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. - -Grüße, Peter
-
-
-
-
-
-
-
Kanal
-
- - phone -
-
-
-
- - - set to internal - - - - reply - - - - split - -
-
-
- -
- -
-
-
-
-
-
From
-
Felix Niklas
-
-
-
-
-
- -
-
-
-
Lieber HP,
-anbei findest du die Midi Noten für Maria Maria "I Like it Loud".
-Wünsche dir einen guten Auftritt in Hamburg.
-
-Deine Frau bekommt ein Kind haben wir gehört.
-Gratulation dazu! Wir schicken dir was liebes.
-
-Und wenn du noch mal Probleme mit der Stimme hast sag bescheid – ich kenn da ein Wundermittel.
-
-Das ist eine Pille von einem Druiden aus dem Bayerischen Wald. Die ölt einem so richtig die Stimmbänder.
-
-Verwende ich immer wenn ich meine Frau anschreien will. Die macht meinen Tenor richtig zum Löwen.
-
-Ach ja und dein Freund Tim. Richt dem mal aus dass er das doch bitte sein lassen soll mit den Anrufen.
-
Ich weiß schon dass ich ein hübscher bin. Aber ich hab ihm schon tausend mal gesagt, dass ich seine Gefühle leider nicht erwiedern kann.
-
-Bin verheiratet, hab Kind. Is doch offensichtlich, Junge!
-Alles gute,
-Oliver
-
-
<%- @T('See more') %>
-
-
-
- -
2 <%- @T('Attached Files') %>
-
-
midinotes_view.jpg
-
35.5 kb
-
-
-
lyrics_I_Like_it_Loud.txt
-
17.1 kb
-
-
-
something with very long line which is slonger as the container arount it if you can see it I wish you a very happy day.txt
-
17.1 kb
-
-
-
-
-
-
-
-
-
-
Kanal
-
- - note -
-
-
-
- - - set to internal - -
-
-
- -
-
-
- -
- -
-
-
-

- Ticket -

-
-
- - -
-
-
-
-
-
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
- -
-
- child +
+
+ NB +
+

Welcome to Zammad! We want to entertain you and your whole family!

-
    -
  1. -
    -
    - Noch mehr Tickets bitte +
    + Ticket# 10001 - erstellte 11.07.2014 + +
    +
    +
+ +
+
+
+
+
+
+
From
+
Zammad Feedback <feedback@zammad.org>
+
-
- - +
+
+
+ NB +
+
+
+
+
+ Welcome! +
+ Thank you for installing Zammad.
+
+ You will find updates and patches at http://zammad.org/. Online
+ documentation is available at http://guides.zammad.org/. You can also
+ use our forums at http://forums.zammad.org/
+
+ Regards,
+ The Zammad.org Project +
+
+
<%- @T('See more') %>
+
+
+
+
+
+
+
+
+
+
Kanal
+
+ + phone +
+
+
+
+ + + set to internal + + + + reply + + + + split + +
+
+
+
-
- + Add Link + +
+
+
+
+
+
From
+
Felix Niklas
+
+
+
+
+
+ +
+
+
Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?
+
+
+
+
+
+
+
Kanal
+
+ + note +
+
+
+
+ + + set to internal + +
+
+
+ +
+ +
+
+
+
+
+
From
+
Zammad Feedback <feedback@zammad.org>
+
+
+
+
+
+ NB +
+
Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort. + + Grüße, Peter
+
+
+
+
+
+
+
Kanal
+
+ + phone +
+
+
+
+ + + set to internal + + + + reply + + + + split + +
+
+
+ +
+ +
+
+
+
+
+
From
+
Felix Niklas
+
+
+
+
+
+ +
+
+
+
Lieber HP,
+ anbei findest du die Midi Noten für Maria Maria "I Like it Loud".
+ Wünsche dir einen guten Auftritt in Hamburg.
+
+ Deine Frau bekommt ein Kind haben wir gehört.
+ Gratulation dazu! Wir schicken dir was liebes.
+
+ Und wenn du noch mal Probleme mit der Stimme hast sag bescheid – ich kenn da ein Wundermittel.
+
+ Das ist eine Pille von einem Druiden aus dem Bayerischen Wald. Die ölt einem so richtig die Stimmbänder.
+
+ Verwende ich immer wenn ich meine Frau anschreien will. Die macht meinen Tenor richtig zum Löwen.
+
+ Ach ja und dein Freund Tim. Richt dem mal aus dass er das doch bitte sein lassen soll mit den Anrufen.
+
Ich weiß schon dass ich ein hübscher bin. Aber ich hab ihm schon tausend mal gesagt, dass ich seine Gefühle leider nicht erwiedern kann.
+
+ Bin verheiratet, hab Kind. Is doch offensichtlich, Junge!
+ Alles gute,
+ Oliver
+
+
<%- @T('See more') %>
+
+
+
+ +
2 <%- @T('Attached Files') %>
+
+
midinotes_view.jpg
+
35.5 kb
+
+
+
lyrics_I_Like_it_Loud.txt
+
17.1 kb
+
+
+
something with very long line which is slonger as the container arount it if you can see it I wish you a very happy day.txt
+
17.1 kb
+
+
+
+
+
+
+
+
+
+
Kanal
+
+ + note +
+
+
+
+ + + set to internal + +
+
+
+
+
-
-
-

- Customer -

-
-
- - -
-
-
-
-
-
-
- NB -

- Nicole Braun -

-
-
- nicole.braun@zammad.org -
-
- -
-
-
- open (5) -
-
-
-
-
-

- Organization -

-
-
- - -
-
-
-
-
-
-
-
- -
-

- Zammad Foundation -

-
-
- Yes -
-
- -
- Wir sand ausm Woid! + +
+
+
+

+ Ticket +

+
+
+ + +
+
- - +
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+
+ + <%- @Icon('arrow-down', 'dropdown-arrow') %> +
+
+
+
+
+
+ +
+
+ +
+
+
at
+
+
+ +
+
+
+
+
+ +
+
+
+ + <%- @Icon('arrow-down', 'dropdown-arrow') %> +
+
+
+
+
+
+ +
    +
  • +
    + test +
    +
    +
    • +
  • +
    + 123 +
    +
    +
    • +
  • +
    + planeten +
    +
    +
    • +
+
+ + Add Tag +
+
+ +
+
+
+ +
+
+ child +
+
    +
  1. +
    +
    + Noch mehr Tickets bitte +
    +
    +
    2. +
+
+
+ + Add Link +
+
+
+
+
+
+

+ Customer +

+
+
+ + +
+
+
+
+
+
+
+ NB +

+ Nicole Braun +

+
+
+ nicole.braun@zammad.org +
+
+ +
+
+
+ open (5) +
+
+
+
+
+

+ Organization +

+
+
+ + +
+
+
+
+
+
+
+
+ +
+

+ Zammad Foundation +

+
+
+ Yes +
+
+ +
+ Wir sand ausm Woid! +
+
+
+ + +
+
+
+
+ <%- @Icon('message') %> +
+
+ <%- @Icon('person') %> +
+
+ <%- @Icon('group') %> +
-
-
-
-
+
+
+
+ + + <%- @Icon('arrow-down', 'dropdown-arrow') %> +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + +
+
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 47cea3ad7..99f26b888 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -867,7 +867,7 @@ fieldset { } } -fieldset .form-group { +fieldset > .form-group { padding: 0 4px; &:last-child { @@ -875,11 +875,6 @@ fieldset .form-group { } } -fieldset > *:not(.form-group) .form-control { - margin-left: 4px; - margin-right: 4px; -} - .form-group { margin-bottom: 16px; @@ -888,7 +883,7 @@ fieldset > *:not(.form-group) .form-control { } } -.datetime.form-group .controls { +.date.form-group .controls { position: relative; } @@ -1071,10 +1066,20 @@ fieldset > *:not(.form-group) .form-control { } } -.fromGroup--standalone .form-control { +.formGroup--standalone .form-control { margin-bottom: 0; } +.formGroup-bundle { + display: flex; + align-items: flex-end; + margin: 0 4px; + + .formGroup-bundle-label { + margin: 0 5px 27px 11px; + } +} + input[type="radio"], input[type="checkbox"] { margin: 0; From 41f8eec259c2b35710cac33703f5332af2ae868c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 29 Sep 2015 17:12:59 +0200 Subject: [PATCH 2/2] change notify style --- .../app/controllers/widget/notify.coffee | 29 +- .../javascripts/app/lib/base/jquery.noty.js | 1203 ++++++++++++++--- app/assets/stylesheets/application.css | 3 - app/assets/stylesheets/jquery.noty.css | 105 -- app/assets/stylesheets/medium.css | 44 - app/assets/stylesheets/noty_theme_twitter.css | 129 -- app/assets/stylesheets/zammad.scss | 87 ++ 7 files changed, 1112 insertions(+), 488 deletions(-) delete mode 100644 app/assets/stylesheets/jquery.noty.css delete mode 100644 app/assets/stylesheets/medium.css delete mode 100644 app/assets/stylesheets/noty_theme_twitter.css diff --git a/app/assets/javascripts/app/controllers/widget/notify.coffee b/app/assets/javascripts/app/controllers/widget/notify.coffee index 3942bb6d4..cecaeb8b4 100644 --- a/app/assets/javascripts/app/controllers/widget/notify.coffee +++ b/app/assets/javascripts/app/controllers/widget/notify.coffee @@ -36,27 +36,14 @@ class App.Notify extends App.ControllerWidgetPermanent $.noty.closeAll() if data.link data.msg = '' + data.msg + '' - $('#notify').noty( - { - dismissQueue: true - text: data.msg - layout: 'top' - type: data.type - theme: 'noty_theme_twitter' - animateOpen: { - height: 'toggle' - opacity: 0.85, - }, - animateClose: { - opacity: 0.25 - }, - speed: 450 - timeout: data.timeout || 3800 - closeButton: false - closeOnSelfClick: true - closeOnSelfOver: false - } - ) + $('#notify').noty + text: data.msg + type: data.type + animation: + open: 'animated fadeInDown' + close: 'animated fadeOutDown' + timeout: data.timeout || 3800 + closeWith: ['click'] destroy: (e) -> e.preventDefault() diff --git a/app/assets/javascripts/app/lib/base/jquery.noty.js b/app/assets/javascripts/app/lib/base/jquery.noty.js index 05b7b4ba0..0c00f422e 100644 --- a/app/assets/javascripts/app/lib/base/jquery.noty.js +++ b/app/assets/javascripts/app/lib/base/jquery.noty.js @@ -1,220 +1,1051 @@ -/** -* jQuery Noty Plugin v1.1.1 -* Authors: Nedim Arabacı (http://ned.im), Muhittin Özer (http://muhittinozer.com) -* -* Examples and Documentation - http://needim.github.com/noty/ -* -* Licensed under the MIT licenses: -* http://www.opensource.org/licenses/mit-license.php -* -**/ -(function($) { - $.noty = function(options, customContainer) { +!function(root, factory) { + if (typeof define === 'function' && define.amd) { + define(['jquery'], factory); + } else if (typeof exports === 'object') { + module.exports = factory(require('jquery')); + } else { + factory(root.jQuery); + } +}(this, function($) { - var base = this; - var $noty = null; - var isCustom = false; +/*! + @package noty - jQuery Notification Plugin + @version version: 2.3.7 + @contributors https://github.com/needim/noty/graphs/contributors - base.init = function(options) { - base.options = $.extend({}, $.noty.defaultOptions, options); - base.options.type = base.options.cssPrefix+base.options.type; - base.options.id = base.options.type+'_'+new Date().getTime(); - base.options.layout = base.options.cssPrefix+'layout_'+base.options.layout; + @documentation Examples and Documentation - http://needim.github.com/noty/ - if (base.options.custom.container) customContainer = base.options.custom.container; - isCustom = ($.type(customContainer) === 'object') ? true : false; + @license Licensed under the MIT licenses: http://www.opensource.org/licenses/mit-license.php + */ - return base.addQueue(); - }; + if(typeof Object.create !== 'function') { + Object.create = function(o) { + function F() { + } - // Push notification to queue - base.addQueue = function() { - var isGrowl = ($.inArray(base.options.layout, $.noty.growls) == -1) ? false : true; - if (!isGrowl) (base.options.force) ? $.noty.queue.unshift({options: base.options}) : $.noty.queue.push({options: base.options}); - return base.render(isGrowl); - }; + F.prototype = o; + return new F(); + }; + } - // Render the noty - base.render = function(isGrowl) { + var NotyObject = { - // Layout spesific container settings - var container = (isCustom) ? customContainer.addClass(base.options.theme+' '+base.options.layout+' noty_custom_container') : $('body'); - if (isGrowl) { - if ($('ul.noty_cont.' + base.options.layout).length == 0) - container.prepend($('
    ').addClass('noty_cont ' + base.options.layout)); - container = $('ul.noty_cont.' + base.options.layout); - } else { - if ($.noty.available) { - var fromQueue = $.noty.queue.shift(); // Get noty from queue - if ($.type(fromQueue) === 'object') { - $.noty.available = false; - base.options = fromQueue.options; - } else { - $.noty.available = true; // Queue is over - return base.options.id; - } - } else { - return base.options.id; - } - } - base.container = container; + init: function(options) { - // Generating noty bar - base.bar = $('
    ').attr('id', base.options.id).addClass(base.options.theme+' '+base.options.layout+' '+base.options.type); - $noty = base.bar; - $noty.append(base.options.template).find('.noty_text').html(base.options.text); - $noty.data('noty_options', base.options); + // Mix in the passed in options with the default options + this.options = $.extend({}, $.noty.defaults, options); - // Close button display - (base.options.closeButton) ? $noty.addClass('noty_closable').find('.noty_close').show() : $noty.find('.noty_close').remove(); + this.options.layout = (this.options.custom) ? $.noty.layouts['inline'] : $.noty.layouts[this.options.layout]; - // Bind close event to button - $noty.find('.noty_close').bind('click', function() { $noty.trigger('noty.close'); }); + if($.noty.themes[this.options.theme]) + this.options.theme = $.noty.themes[this.options.theme]; + else + options.themeClassName = this.options.theme; - // If we have a button we must disable closeOnSelfClick and closeOnSelfOver option - if (base.options.buttons) base.options.closeOnSelfClick = base.options.closeOnSelfOver = false; - // Close on self click - if (base.options.closeOnSelfClick) $noty.bind('click', function() { $noty.trigger('noty.close'); }).css('cursor', 'pointer'); - // Close on self mouseover - if (base.options.closeOnSelfOver) $noty.bind('mouseover', function() { $noty.trigger('noty.close'); }).css('cursor', 'pointer'); + delete options.layout; + delete options.theme; - // Set buttons if available - if (base.options.buttons) { - $buttons = $('
    ').addClass('noty_buttons'); - $noty.find('.noty_message').append($buttons); - $.each(base.options.buttons, function(i, button) { - bclass = (button.type) ? button.type : 'gray'; - $button = $('