From 10e6bd4efc125bf13636b74348dc5c987ce5a388 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 09:58:46 +0200 Subject: [PATCH 01/10] fix paragraph color light blue on gray-blue background gray on white background --- app/assets/stylesheets/zzz.css.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index a59ff1031..8e6e66763 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -10,7 +10,7 @@ ul { } p { - color: hsl(198,19%,72%); + color: #bcbcbb; margin-bottom: 14px; } @@ -2000,6 +2000,10 @@ footer { margin: 21px 0 12px; } + .NavBarAdmin + .main p { + color: hsl(198,19%,72%); + } + .nav-stacked > li + li { margin-top: 0; } From dac4d69bee91a938038948bbc6dbdc75eb595f58 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 09:59:34 +0200 Subject: [PATCH 02/10] ticket title same width as articles --- app/assets/stylesheets/zzz.css.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 8e6e66763..69b354089 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -2435,7 +2435,8 @@ footer { } .ticket-title { - max-width: 596px; + max-width: 800px; + padding: 0 81px; } .ticket-title h1 { From 2dea2fc3be918e3374a3bf8beba32c42dbe7b773 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 09:59:58 +0200 Subject: [PATCH 03/10] make default .btn white on dark blue --- app/assets/stylesheets/zzz.css.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 69b354089..3554a6869 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1462,9 +1462,13 @@ footer { width: 100px; } -.btn { +.btn, +.btn:hover, +.btn:focus { font-size: 14px; padding: 9px 24px 8px; + color: white; + background: hsl(234,10%,29%); } .btn:active { From ed7a09f775d3458b97db17628d8d13ab0dd1999c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 10:00:36 +0200 Subject: [PATCH 04/10] add download, checkmark, error and loading icon --- app/assets/images/sprite.svg | 3 ++ app/assets/stylesheets/zzz.css.erb | 53 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index e9f234e9e..a51b68294 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -141,6 +141,7 @@ + @@ -158,5 +159,7 @@ + + \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 3554a6869..84df4a2c1 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1314,6 +1314,59 @@ ol.tabs li { background-position: -96px -335px; } + .download.icon { + width: 14px; + height: 13px; + background-position: -112px -339px; + } + + .checkmark.icon { + width: 16px; + height: 15px; + background-position: -126px -337px; + } + + .error.icon { + width: 13px; + height: 13px; + background-position: -143px -339px; + } + + .loading.icon { + width: 30px; + height: 30px; + background: hsl(339,80%,62%); + -webkit-animation: rotateplane 1.2s infinite ease-in-out; + animation: rotateplane 1.2s infinite ease-in-out; + } + + .small.loading.icon { + width: 20px; + height: 20px; + } + + @-webkit-keyframes rotateplane { + 0% { -webkit-transform: perspective(120px); background: hsl(202,68%,54%); } + 50% { -webkit-transform: perspective(120px) rotateY(180deg); background: hsl(145,51%,45%); } + 100% { -webkit-transform: perspective(120px) rotateY(180deg) rotateX(180deg); background: hsl(202,68%,54%); } + } + + @keyframes rotateplane { + 0% { + transform: perspective(120px) rotateX(0deg) rotateY(0deg); + -webkit-transform: perspective(120px) rotateX(0deg) rotateY(0deg); + background: hsl(202,68%,54%); + } 50% { + transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); + -webkit-transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg); + background: hsl(145,51%,45%); + } 100% { + transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); + -webkit-transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg); + background: hsl(202,68%,54%); + } + } + /* * removed margin of forms to not break the layout with submit buttons within
area e. g. for modal dialogs From 2ef7942e69ca0851d56d360b335fcef32343ab6b Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 12:22:12 +0200 Subject: [PATCH 05/10] scrollPageHeader fix header padding --- app/assets/stylesheets/zzz.css.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 84df4a2c1..fee14cb7d 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -3757,6 +3757,7 @@ footer { .scrollPageHeader .ticket-title { max-width: initial; + padding: 0; } .scrollPageHeader h1 { From 88dbf2c528478cb233cf3ce7c74a256b4ea77978 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 12:23:03 +0200 Subject: [PATCH 06/10] add import wizard --- app/assets/images/otrs-logo.png | Bin 0 -> 4362 bytes .../app/controllers/layout_ref.js.coffee | 68 ++++++++++ .../views/layout_ref/import_wizard.jst.eco | 90 +++++++++++++ .../app/views/layout_ref/index.jst.eco | 1 + app/assets/stylesheets/zzz.css.erb | 121 +++++++++++++++++- 5 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/otrs-logo.png create mode 100644 app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco diff --git a/app/assets/images/otrs-logo.png b/app/assets/images/otrs-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..437fb4d14b9d0b672336f9220aa7c1bd26c271d3 GIT binary patch literal 4362 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 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index c262c410e..2554ac2d2 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -497,4 +497,72 @@ class ContentSidebarLeft extends App.ControllerContent App.Config.set( 'layout_ref/content_sidebar_left', ContentSidebarLeft, 'Routes' ) + +class ImportWizard extends App.ControllerContent + elements: + '[data-target]': 'links' + '[data-slide]': 'slides' + '[data-action]': 'actions' + '#otrs-link': 'otrsLink' + '.input-feedback':'inputFeedback' + + constructor: -> + super + @render() + + @links.on 'click', @navigate + @actions.on 'click', @action + + # wait 500 ms after the last user input before we check the link + @otrsLink.on 'input', _.debounce(@checkOtrsLink, 600) + + checkOtrsLink: (e) => + if @otrsLink.val() is "" + @inputFeedback.attr('data-state', '') + return + + @inputFeedback.attr('data-state', 'loading') + + # send fake callback + if @otrsLink.val() is '1337' + state = 'success' + else + state = 'error' + + setTimeout @otrsLinkCallback, 1500, state + + otrsLinkCallback: (state) => + @inputFeedback.attr('data-state', state) + + @showNextButton @inputFeedback if state is 'success' + + action: (e) => + button = $(e.delegateTarget) + + switch button.attr('data-action') + when "reveal" then @showNextButton button + + showNextButton: (sibling) -> + sibling.parents('.wizard-slide').find('.btn.hide').removeClass('hide') + + navigate: (e) => + target = $(e.delegateTarget).attr('data-target') + targetSlide = @$("[data-slide=#{ target }]") + + if targetSlide + @goToSlide targetSlide + + goToSlide: (targetSlide) => + @slides.addClass('hide') + targetSlide.removeClass('hide') + + if targetSlide.attr('data-hide') + setTimeout @goToSlide, targetSlide.attr('data-hide'), targetSlide.next() + + + render: -> + @html App.view('layout_ref/import_wizard')() + +App.Config.set( 'layout_ref/import_wizard', ImportWizard, 'Routes' ) + App.Config.set( 'LayoutRef', { prio: 1700, parent: '#current_user', name: 'Layout Reference', target: '#layout_ref', role: [ 'Admin' ] }, 'NavBarRight' ) 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 new file mode 100644 index 000000000..e28ced7a2 --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco @@ -0,0 +1,90 @@ +
+
+
+

Import Tickets

+
+
+ +
+
+
+
+

Create OTRS Migration Plugin

+
+

+ Personalise Migration Plugin .. +

+
+
+ Go Back +
+
+
+

Download OTRS Migration Plugin

+
+

+ Download and install this personalised OTRS Migration Plugin on your OTRS System: +

+ Personal Migration Plugin +
+
+ Go Back +
Next
+
+
+
+

Link OTRS

+
+

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

+
+ +
+ +
+
+
+
+
+
+
+
+
+ Go Back +
Migrate OTRS Data
+
+
+
+

OTRS Migration

+
+ + + + + + + +
42/42 + Users +
+
+
+
29999/29999 + Tickets +
+
+
+
+ Configuration +
+
+
+
+
+
+ Done +
+
+
+
\ No newline at end of file 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 9d87a5a1f..7c81632af 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -14,6 +14,7 @@
  • Communication Reply - no content Example
  • Communication Reply - with content Example
  • Communication Reply - with multiline content Example
    • +
  • Import Wizard
    • \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index fee14cb7d..2da9dafdd 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -609,7 +609,11 @@ textarea, margin-top: 0; } -.login, .getstarted, .reset_password, .signup { +.login, +.getstarted, +.reset_password, +.signup, +.darkBackground { padding: 10px; height: auto; background: hsl(234,10%,19%); @@ -1550,6 +1554,13 @@ footer { background: hsl(0,65%,55%); } +.btn--download .download.icon { + margin-right: 6px; + margin-top: 3px; + margin-left: -10px; + vertical-align: top; +} + .navigation { width: 260px; background: #26272e; @@ -3768,6 +3779,114 @@ footer { white-space: nowrap; } +.wizard { + width: 360px; +} + +.wizard h2 { + text-align: center; + border-bottom: 1px solid rgba(0,0,0,.13); + padding-bottom: 8px; + margin-bottom: 16px; +} + +.wizard .form-group { + margin: 0; +} + +.wizard-slide { + min-height: 260px; +} + +.wizard-body { + padding-bottom: 15px; +} + +.wizard-controls { + padding-top: 15px; + height: 39px; +} + +.wizard-loadingText { + text-align: center; + margin: 0; +} + +.wizard-loadingText .loading { + vertical-align: middle; + margin-right: 10px; +} + +.import-source { + cursor: pointer; + border-radius: 5px; + border: 1px solid rgba(0,0,0,.13); + height: 50px; + margin: 5px 0; +} + +.input-feedback { + position: absolute; + padding-left: 10px; + right: 1px; + top: 1px; + bottom: 1px; + width: 52px; + border-radius: 0 5px 5px 0; + background: linear-gradient(to right, transparent, white 33%); + pointer-events: none; +} + +.input-feedback .icon { + display: none; +} + +.input-feedback[data-state=loading] .loading.icon, +.input-feedback[data-state=error] .error.icon, +.input-feedback[data-state=success] .checkmark.icon { + display: block; +} + +.progressTable { + max-width: 100%; + margin: 0 auto; +} + +.progressTable td { + padding: 8px 5px; +} + +.progressTable tr:not(:last-child) { + border-bottom: 1px solid #eee; +} + +.progressTable td:first-child { + text-align: right; +} + +.progressTable-progressCell { + width: 120px; +} + +.progress { + height: 10px; + margin: 3px 0 0; +} + + .progress .bar { + background: #389ed9; + height: 100%; + } + +.progressTable .progress + .checkmark { + margin-left: 10px; + opacity: 0; +} + +.progressTable tr.is-done .checkmark { + opacity: 1; +} + /* ---------------- From 3565fa392c693d576406f4387bcb723c35b3d363 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 12:25:51 +0200 Subject: [PATCH 07/10] company logo use new asset src (@C) --- app/assets/images/company-logo.png | Bin 0 -> 8058 bytes app/assets/javascripts/app/views/login.jst.eco | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 app/assets/images/company-logo.png diff --git a/app/assets/images/company-logo.png b/app/assets/images/company-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..673daa7b9d2a705bf9a7fc2b1c88a6fa3e233c6b GIT binary patch literal 8058 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 @T( 'Login with %s', @C( 'fqdn' ) ) %>

    - +
    From d5e73781aebe7ad792ec5ef479f198218950a866 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 12:25:58 +0200 Subject: [PATCH 08/10] add align-center --- app/assets/stylesheets/layout.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css index fc6e9edc4..e32940cdf 100755 --- a/app/assets/stylesheets/layout.css +++ b/app/assets/stylesheets/layout.css @@ -212,3 +212,8 @@ body.fit { .align-right { margin-left: auto; } + +.align-center { + margin-left: auto; + margin-right: auto; +} From 2ad6bf505dc6a153c3d22eeb07d4a89a4f56902c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 12:36:04 +0200 Subject: [PATCH 09/10] ticket zoom: change to js-submit class --- app/assets/javascripts/app/controllers/ticket_zoom.js.coffee | 2 +- app/assets/javascripts/app/views/ticket_zoom.jst.eco | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index c0dde5a8c..ec46a9fca 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -1,6 +1,6 @@ class App.TicketZoom extends App.Controller events: - 'click .submit': 'submit' + 'click .js-submit': 'submit' constructor: (params) -> super diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 0832137d8..acd57ad2a 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -88,7 +88,7 @@
    - +
    \ No newline at end of file From c651affb87595dd911bec0cf339cdd4b118b2dfe Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 13:07:05 +0200 Subject: [PATCH 10/10] style generic article-attachments --- .../javascripts/app/views/generic/attachment.jst.eco | 2 +- app/assets/stylesheets/zzz.css.erb | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/views/generic/attachment.jst.eco b/app/assets/javascripts/app/views/generic/attachment.jst.eco index 59bf5f7ec..4b7970b86 100644 --- a/app/assets/javascripts/app/views/generic/attachment.jst.eco +++ b/app/assets/javascripts/app/views/generic/attachment.jst.eco @@ -1,5 +1,5 @@
    -
    +
    Dateien wählen.. diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 2da9dafdd..220644930 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -473,15 +473,17 @@ textarea, outline: none; } - .form-control:focus { + .form-control:focus, + .form-control.is-focused { border-color: hsl(200,71%,59%); box-shadow: 0 0 0 3px hsl(201,62%,90%); } - - .form-control[contenteditable] { + .richtext.form-control [contenteditable] { height: auto; - min-height: 100px; + min-height: 82px; + border: none; + margin-bottom: 28px; } .tokenfield.focus { @@ -3243,7 +3245,7 @@ footer { } .formset-inset { - margin: 31px -24px 24px; + margin: 18px -24px 24px; padding: 19px 24px 4px; background: hsl(197,20%,93%); border-top: 1px solid hsl(0,0%,90%);