From b0452ca47d6af44646b1a71002261c996a65caa5 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 18 Sep 2014 00:04:49 +0200 Subject: [PATCH 1/3] add white arrows --- app/assets/images/sprite.svg | 14 ++++++++------ app/assets/stylesheets/zzz.css.erb | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index b2d570a41..5bef08338 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -103,15 +103,15 @@ - - - - + + + + - - + + @@ -166,5 +166,7 @@ + + \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index de09bd532..62bc3982e 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1132,12 +1132,20 @@ ol.tabs li { background-position: -8px -299px; } + .white.left.arrow.icon { + background-position: -16px -299px; + } + + .white.right.arrow.icon { + background-position: -24px -299px; + } + .checkbox.icon { min-height: 0; /* overwriting bootstrap */ margin: 0; /* overwriting bootstrap */ width: 10px; height: 10px; - background-position: -16px -299px; + background-position: -32px -299px; } .white.checkbox.icon { @@ -1145,19 +1153,19 @@ ol.tabs li { } :checked + .checkbox.icon { - background-position: -26px -299px; + background-position: -42px -299px; } .arrow-right.icon { width: 12px; height: 11px; - background-position: -36px -299px; + background-position: -52px -299px; } .delete.icon { width: 9px; height: 9px; - background-position: -48px -300px; + background-position: -64px -300px; } .dark.group.icon { From 9acad47838c515f4134764e69da2abb297fa75ac Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 18 Sep 2014 00:05:12 +0200 Subject: [PATCH 2/3] add organisationList to recipientList with fade animation and back button --- .../controllers/agent_ticket_create.js.coffee | 56 +++++++- .../app/views/agent_ticket_create.jst.eco | 131 +++++++++++------- app/assets/stylesheets/zzz.css.erb | 120 ++++++++++------ 3 files changed, 212 insertions(+), 95 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 6dbdb7f49..19fff5eca 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -1,6 +1,6 @@ class App.TicketCreate extends App.Controller elements: - '.tabsSidebar' : 'sidebar' + '.tabsSidebar' : 'sidebar' events: 'click .type-tabs .tab': 'changeFormType' @@ -8,6 +8,8 @@ class App.TicketCreate extends App.Controller 'submit form': 'submit' 'click .submit': 'submit' 'click .cancel': 'cancel' + 'click .js-organisation': 'showOrganisationMembers' + 'click .js-back': 'hideOrganisationMembers' constructor: (params) -> super @@ -37,6 +39,58 @@ class App.TicketCreate extends App.Controller @log 'notice', 'error', defaults @render(defaults) + showOrganisationMembers: (e) => + e.stopPropagation() + + list = @$('.recipientList') + organisationList = @$('.recipientList-organisationMembers') + + # move organisation-list to the right and slide it in + + $.Velocity.hook(organisationList, 'translateX', '100%') + organisationList.removeClass('hide') + + organisationList.velocity + properties: + translateX: 0 + options: + speed: 300 + + # fade out list + + list.velocity + properties: + translateX: '-100%' + options: + speed: 300 + complete: -> list.height(organisationList.height()) + + hideOrganisationMembers: (e) => + e && e.stopPropagation() + list = @$('.recipientList') + organisationList = @$('.recipientList-organisationMembers') + + # fade list back in + + list.velocity + properties: + translateX: 0 + options: + speed: 300 + + # reset list height + + list.height('') + + # slide out organisation-list and hide it + + organisationList.velocity + properties: + translateX: '100%' + options: + speed: 300 + complete: -> organisationList.addClass('hide') + changeFormType: (e) => type = $(e.target).data('type') if !type diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index c7649b624..729c936c5 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -27,129 +27,154 @@
-
+
-
    -
  • - -
    + + + +
      +
    • +
      +
      +
      + <%- @T('Back') %> +
      +
      + +
    • +
      +
      +
      +
      + Andreas Kramer + - Albrecht & Bertschler GmbG +
      + +
    • +
      +
      +
      +
      + Belinda Matt + - Albrecht & Bertschler GmbG +
      + +
    • +
      +
      +
      +
      + Damian Sprengler + - Albrecht & Bertschler GmbG +
      + +
    • +
      +
      +
      +
      + Katharina Nussman + - Albrecht & Bertschler GmbG +
      +
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 62bc3982e..fc7487bb6 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -3136,74 +3136,112 @@ footer { right: 10px; } -.recipientList .dropdown-menu { +.dropdown-menu { margin: 0; padding: 0; width: 100%; color: white; - background: hsl(234,10%,19%); + background: none; border-radius: 0; border: none; box-shadow: none; + overflow-x: hidden; } - .recipientList .dropdown-menu ul { + + .dropdown ul { margin: 0; + background: hsl(234,10%,19%); } - .recipientList-entry { + .dropdown li { height: 40px; - padding-left: 5px; + padding: 0 15px; } - .recipientList-entry .checkbox-replacement { - width: 30px; - opacity: 0.7; - } - - .recipientList-icon { - width: 30px; - } - - .recipientList-entry:not(.recipientList-new) .recipientList-icon { - opacity: 0.2; - } - - .recipientList-name { - margin-left: 5px; - margin-top: 2px; - } - - .recipientList-entry:not(:last-child):not(:first-child) { + .dropdown li:not(:first-child) { box-shadow: 0 1px rgba(255,255,255,.13) inset; } - .recipientList-entry:hover { + .dropdown li:hover, + .dropdown li.is-active { background: hsl(205,90%,60%); } - .recipientList-entry:hover + :not(:last-child):not(:first-child) { + .dropdown li:not(.recipientList-controls):hover + li, + .dropdown li.is-active + li { box-shadow: none; } - .recipientList-entry:hover .recipientList-icon { - opacity: 1; - } +.recipientList-entry .recipientList-iconSpacer { + width: 20px; + margin-left: -5px; +} - .recipientList-detail { - opacity: 0.5; - } +.recipientList-entry .icon:not(.plus) { + opacity: 0.2; +} - .recipientList-icon.plus { - margin-left: 13px; - } +.recipientList-entry:hover .icon { + opacity: 1; +} - .recipientList-new { - background: hsl(145,51%,45%); - } +.recipientList-name { + margin-left: 10px; + margin-top: 2px; +} - .recipientList-new:hover { - background: hsl(147,52%,43%); - } +.recipientList-detail { + opacity: 0.5; +} + +.recipientList-icon.plus { + margin-left: 13px; +} + +.recipientList-new { + background: hsl(145,51%,45%); +} + +.dropdown .recipientList-new:hover { + background: hsl(147,52%,43%); +} + +li.recipientList-controls, +li.recipientList-controls:hover { + padding: 0; + background: hsl(206,7%,28%); +} + +.recipientList-backClickArea { + height: 100%; + float: left; + padding: 0 10px; +} + +.recipientList-backButton { + padding: 5px 10px; + font-size: 12px; + color: white; + border-radius: 3px; + border: 1px solid hsl(234,10%,10%); + box-shadow: 0 1px rgba(255,255,255,.03) inset; +} + +.recipientList-backClickArea:active .recipientList-backButton { + background: hsl(206,7%,25%); + box-shadow: 0 1px rgba(0,0,0,.1) inset; +} + +.recipientList-backButton .icon { + margin-bottom: -2px; +} + +.recipientList-organisationMembers { + position: absolute; + top: 0; + left: 0; + right: 0; +} /* From e4138e8cde757635c91b9ed457df2b19edb97e12 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 18 Sep 2014 00:16:39 +0200 Subject: [PATCH 3/3] reset dropdown on hide --- .../javascripts/app/controllers/agent_ticket_create.js.coffee | 1 + app/assets/javascripts/app/views/agent_ticket_create.jst.eco | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 19fff5eca..e52667452 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -8,6 +8,7 @@ class App.TicketCreate extends App.Controller 'submit form': 'submit' 'click .submit': 'submit' 'click .cancel': 'cancel' + 'hide.bs.dropdown .js-recipientDropdown': 'hideOrganisationMembers' 'click .js-organisation': 'showOrganisationMembers' 'click .js-back': 'hideOrganisationMembers' diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index 729c936c5..d0ad3f11e 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -27,7 +27,7 @@
-
+