diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 245fb52ed..078e3dd82 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -500,6 +500,7 @@ class App.ControllerModal extends App.Controller head: '?' buttonClass: 'btn--success' centerButtons: [] + container: null options = _.extend( defaults, options ) @@ -526,10 +527,14 @@ class App.ControllerModal extends App.Controller if @content @body.html @content + if @container + @el.addClass('modal--local') + @el.modal keyboard: @keyboard show: true backdrop: @backdrop + container: @container .on 'show.bs.modal': @onShow 'shown.bs.modal': @onShown diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 789cfecda..82cee0451 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -732,4 +732,15 @@ class RichText extends App.ControllerContent App.Config.set( 'layout_ref/richtext', RichText, 'Routes' ) +class LocalModalRef extends App.ControllerContent + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/local_modal')() + +App.Config.set( 'layout_ref/local_modal', LocalModalRef, 'Routes' ) + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 01bb6618b..631c095fd 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -329,7 +329,10 @@ class App.TicketZoom extends App.Controller showTicketHistory = => new App.TicketHistory( ticket_id: @ticket.id ) showTicketMerge = => - new App.TicketMerge( ticket: @ticket, task_key: @task_key ) + new App.TicketMerge + ticket: @ticket + task_key: @task_key + container: @el changeCustomer = (e, el) => new App.TicketCustomer( ticket: @ticket diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js index 93891aa4e..6db63d443 100644 --- a/app/assets/javascripts/app/lib/bootstrap/modal.js +++ b/app/assets/javascripts/app/lib/bootstrap/modal.js @@ -6,6 +6,12 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * ======================================================================== */ + /* + modified by Felix Jan-2014 + - change $body to $container + - add this.$container = $(options.container || document.body) +*/ + +function ($) { 'use strict'; @@ -15,7 +21,7 @@ var Modal = function (element, options) { this.options = options - this.$body = $(document.body) + this.$container = $(options.container || document.body) this.$element = $(element) this.$backdrop = this.isShown = null @@ -57,7 +63,8 @@ this.checkScrollbar() this.setScrollbar() - this.$body.addClass('modal-open') + + this.$container.addClass('modal-open') this.escape() this.resize() @@ -68,7 +75,7 @@ var transition = $.support.transition && that.$element.hasClass('fade') if (!that.$element.parent().length) { - that.$element.appendTo(that.$body) // don't move modals dom position + that.$element.appendTo(that.$container) // don't move modals dom position } that.$element @@ -160,7 +167,7 @@ var that = this this.$element.hide() this.backdrop(function () { - that.$body.removeClass('modal-open') + that.$container.removeClass('modal-open') that.resetAdjustments() that.resetScrollbar() that.$element.trigger('hidden.bs.modal') @@ -253,20 +260,20 @@ } Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) - if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) + var bodyPad = parseInt((this.$container.css('padding-right') || 0), 10) + if (this.bodyIsOverflowing) this.$container.css('padding-right', bodyPad + this.scrollbarWidth) } Modal.prototype.resetScrollbar = function () { - this.$body.css('padding-right', '') + this.$container.css('padding-right', '') } Modal.prototype.measureScrollbar = function () { // thx walsh var scrollDiv = document.createElement('div') scrollDiv.className = 'modal-scrollbar-measure' - this.$body.append(scrollDiv) + this.$container.append(scrollDiv) var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth - this.$body[0].removeChild(scrollDiv) + this.$container[0].removeChild(scrollDiv) return scrollbarWidth } diff --git a/app/assets/javascripts/app/views/layout_ref/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index ae9c4d412..8b8b8928f 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -19,6 +19,7 @@
  • Organization Profile
  • Setup Wizard
  • Richtext
    • +
  • Local Modal
    • \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco new file mode 100644 index 000000000..7f685341e --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -0,0 +1,537 @@ +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Edit Customer

    +
    +
    +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + +
    +
    +
    + + + + +
    +
    +
    + +
    +
    +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + + + + +
    + + + + +
    +
    +
    + + + + +
    +
    + + + +
    + + + + +
    +
    +
    + + + + +
    +
    + +
    +
    + + + + +
    +
    +
    +
    +
    + Cancel & Go Back + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +

    Doreen Kubiak

    +
    Steuerbüro C. Kaik
    +
    +
    +
    +
    + + doreen.kubiak@gmail.com +
    +
    + + Steuerbüro C. Kaik +
    +
    + + chaik.com +
    +
    + + Johannitergasse 2/2 +
    +
    + + +43 5522 36346 +
    +
    + + 6800 Feldkirch +
    +
    + + +43 699 4565789 +
    +
    + + Österreich +
    +
    +
    +
    + +
    +
    Tickets von Doreen Kubiak
    +
    Tickets von Steuerbüro C. Kaik
    +
    + +
    +
    + +
    +
    + Keine offenen Tickets +
    + Alle Tickets von Doreen Kubiak … +
    +
    + +
      +
    1. +
      +
      +
      +
      +
      Micro-SIM doesn't work
      +
      23 minutes ago
      +
      +
    2. +
      +
      +
      +
      +
      Superb Service!
      +
      43 minutes ago
      +
      +
    3. +
      +
      +
      +
      +
      Print sheets strip off
      +
      1 hour ago
      +
      +
    4. +
      +
      +
      +
      +
      Block not properly wrought
      +
      2 hour ago
      +
      +
    + Alle Tickets von Steuerbüro C. Kaik … +
    +
    +
    +
    +
    +

    Status

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    Tickets of my Group: 78 of 234
    +
    Average: 22%
    +
    +
    +

    Stimmung

    +
    +
    +
    +
    3% of my tickets escalated.
    +
    Average: 17%
    +
    +
    +
    +
    +

    Frequency

    +
    +
    +
    +
    +
    +
    +
    Jan
    +
    +
    +
    +
    +
    +
    +
    Feb
    +
    +
    +
    +
    +
    +
    +
    Mär
    +
    +
    +
    +
    +
    +
    +
    Apr
    +
    +
    +
    +
    +
    +
    +
    Mai
    +
    +
    +
    +
    +
    +
    +
    Jun
    +
    +
    +
    +
    +
    +
    +
    Jul
    +
    +
    +
    +
    +
    +
    +
    Aug
    +
    +
    +
    +
    +
    +
    +
    Sep
    +
    +
    +
    +
    +
    +
    +
    Okt
    +
    +
    +
    +
    +
    +
    +
    Nov
    +
    +
    +
    +
    +
    +
    +
    Dez
    +
    +
    +
    +
    Bearbeitet
    +
    Offen
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a286bf89f..1fd527660 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,7 +26,10 @@ //= require ./app/lib/bootstrap/tooltip.js //= require ./app/lib/bootstrap/popover.js //= require ./app/lib/bootstrap/popover-enhance.js + +// modified by Felix Jan-2014 //= require ./app/lib/bootstrap/modal.js + //= require ./app/lib/bootstrap/tab.js //= require ./app/lib/bootstrap/transition.js //= require ./app/lib/bootstrap/button.js diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 9be8242a4..a68b47334 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4070,6 +4070,22 @@ footer { border: none; } +.modal.modal--local { + display: block; + padding-left: 40px; + position: absolute; + overflow: auto; + background: hsla(210,17%,98%,.55); + + .modal-backdrop { + display: none; + } + + .modal-dialog { + box-shadow: 0 0 40px hsla(210,17%,40%,.34); + } +} + .caret { position: absolute; top: 50%;