From 027b25ae0d02e5ce72e5f3b1abe38e60151375b9 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 11 Nov 2014 08:53:21 +0100 Subject: [PATCH] organization profile & no ticket placeholder --- .../app/controllers/layout_ref.js.coffee | 11 + .../app/views/layout_ref/index.jst.eco | 1 + .../layout_ref/organization_profile.jst.eco | 241 ++++++++++++++++++ .../app/views/layout_ref/user_profile.jst.eco | 40 +-- .../app/views/organization_profile.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 17 ++ 6 files changed, 276 insertions(+), 36 deletions(-) create mode 100644 app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 2ba3689ae..198b93ec3 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -590,4 +590,15 @@ class ReferenceUserProfile extends App.ControllerContent App.Config.set( 'layout_ref/user_profile', ReferenceUserProfile, 'Routes' ) +class ReferenceOrganizationProfile extends App.ControllerContent + + constructor: -> + super + @render() + + render: -> + @html App.view('layout_ref/organization_profile')() + +App.Config.set( 'layout_ref/organization_profile', ReferenceOrganizationProfile, '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/index.jst.eco b/app/assets/javascripts/app/views/layout_ref/index.jst.eco index b02f25772..ef41f6f9d 100644 --- a/app/assets/javascripts/app/views/layout_ref/index.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/index.jst.eco @@ -16,6 +16,7 @@
  • Communication Reply - with multiline content Example
  • Import Wizard
  • User Profile
    • +
  • Organization Profile
    • \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco new file mode 100644 index 000000000..8bd5ef581 --- /dev/null +++ b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco @@ -0,0 +1,241 @@ +
    + +
    +
    +
    + + +
    +

    Steuerbüro C. Kaik

    +
    +
    +
    +
    + + chaik.com +
    +
    + + Johannitergasse 2/2 +
    +
    + + +43 5522 36346 +
    +
    + + 6800 Feldkirch +
    +
    + + +43 699 4565789 +
    +
    + + Österreich +
    +
    +
    +
    + +
    +
    + Doreen Kubiak +
    +
    + Franz Xaver +
    +
    + Julius Müller +
    +
    + Hans Hubert +
    +
    +
    +
    +
    +
    + +
      +
    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 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 … +
    +
    +
    +
    +
    +

    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/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index 1429d9f32..ac595cdc2 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -64,41 +64,11 @@
    - -
      -
    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
      -
      -
    + +
    +
    + Keine offenen Tickets +
    Alle Tickets von Doreen Kubiak …
    diff --git a/app/assets/javascripts/app/views/organization_profile.jst.eco b/app/assets/javascripts/app/views/organization_profile.jst.eco index eee5f54f6..3c2a005a5 100644 --- a/app/assets/javascripts/app/views/organization_profile.jst.eco +++ b/app/assets/javascripts/app/views/organization_profile.jst.eco @@ -30,7 +30,7 @@ <% if @organization.members: %>
    - +
    <% for user in @organization.members: %> diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index de023356d..f311fe747 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4216,6 +4216,16 @@ footer { margin-left: -50px; } +.profile-ticketsPlaceholder { + @extend .flex; + margin: 12px 0 22px; + color: hsl(209,28%,74%); + + .mood.icon { + margin-bottom: 10px; + } +} + .profile-detailsEntry { margin: 8px 0; padding-left: 50px; @@ -4230,10 +4240,17 @@ footer { .profile-ticketList { @extend .flex; + @extend .vertical; &:not(:last-child) { margin-right: 50px; } + + .tasks { + @extend .flex; + @extend .vertical; + @extend .justified; + } } .profile-ticketList {