From 4996c6fb954ba7027f7c83943ab97b41641e4878 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 4 Sep 2014 15:03:32 +0200 Subject: [PATCH] rename .contain-text to .u-textTruncate --- .../views/agent_ticket_view/navbar.jst.eco | 2 +- .../javascripts/app/views/dashboard.jst.eco | 20 +++++++++---------- .../app/views/getting_started.jst.eco | 6 +++--- .../app/views/navigation/personal.jst.eco | 2 +- .../app/views/navigation/result.jst.eco | 2 +- .../app/views/popover/ticket.jst.eco | 10 +++++----- .../app/views/task_widget_tasks.jst.eco | 2 +- .../javascripts/app/views/ticket_zoom.jst.eco | 2 +- .../views/ticket_zoom/article_view.jst.eco | 16 +++++++-------- app/assets/stylesheets/zzz.css.erb | 12 +++++------ 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco index f3d4eb867..b9378d406 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco @@ -3,7 +3,7 @@ <% for item in @items: %>
  • class="active"<% end %>> - <%- @T(item.name) %> + <%- @T(item.name) %> <%= item.count %>
    • diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index d979e0648..64c2e8c89 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -15,8 +15,8 @@
    -
    My handling time: 25 minutes
    -
    Average: 13%
    +
    My handling time: 25 minutes
    +
    Average: 13%
    @@ -25,8 +25,8 @@
    -
    3% of my tickets escalated.
    -
    Average: 17%
    +
    3% of my tickets escalated.
    +
    Average: 17%
    @@ -90,8 +90,8 @@
    -
    Tickets of my Group: 78 of 234
    -
    Average: 22%
    +
    Tickets of my Group: 78 of 234
    +
    Average: 22%
    @@ -100,8 +100,8 @@
    -
    74% are currently in process
    -
    Average: 62%
    +
    74% are currently in process
    +
    Average: 62%
    @@ -110,8 +110,8 @@
    -
    7% are being reopened
    -
    Average: 6%
    +
    7% are being reopened
    +
    Average: 6%
    diff --git a/app/assets/javascripts/app/views/getting_started.jst.eco b/app/assets/javascripts/app/views/getting_started.jst.eco index a673232bb..a70ad3bd0 100644 --- a/app/assets/javascripts/app/views/getting_started.jst.eco +++ b/app/assets/javascripts/app/views/getting_started.jst.eco @@ -1,9 +1,9 @@
      -
    1. <%- @T( 'Create Admin' ) %>
      2. -
    2. <%- @T( 'Invite Agents' ) %>
      3. -
    3. <%- @T( 'Configure Channels' ) %>
      4. +
    4. <%- @T( 'Create Admin' ) %>
      5. +
    5. <%- @T( 'Invite Agents' ) %>
      6. +
    6. <%- @T( 'Configure Channels' ) %>
    <% if @master_user: %>
    diff --git a/app/assets/javascripts/app/views/navigation/personal.jst.eco b/app/assets/javascripts/app/views/navigation/personal.jst.eco index a3316d2b9..9abfd83e1 100644 --- a/app/assets/javascripts/app/views/navigation/personal.jst.eco +++ b/app/assets/javascripts/app/views/navigation/personal.jst.eco @@ -20,7 +20,7 @@ <% end %>
  • - <%- @T( item.name ) %> + <%- @T( item.name ) %> <% if item['count'] isnt undefined: %><%= item['count'] %><% end %> <% if item.iconClass: %><% end %> diff --git a/app/assets/javascripts/app/views/navigation/result.jst.eco b/app/assets/javascripts/app/views/navigation/result.jst.eco index af00345b5..d84bd7c14 100644 --- a/app/assets/javascripts/app/views/navigation/result.jst.eco +++ b/app/assets/javascripts/app/views/navigation/result.jst.eco @@ -4,7 +4,7 @@
  • -
    +
    <% console.log area.name %> <% if area.name is "Ticket": %> <%= item.display %> - diff --git a/app/assets/javascripts/app/views/popover/ticket.jst.eco b/app/assets/javascripts/app/views/popover/ticket.jst.eco index 4ad92d225..2c6eec2ec 100644 --- a/app/assets/javascripts/app/views/popover/ticket.jst.eco +++ b/app/assets/javascripts/app/views/popover/ticket.jst.eco @@ -14,22 +14,22 @@

    #

    -
    <%- @P( @ticket.number ) %>
    +
    <%- @P( @ticket.number ) %>

    <%- @T( 'State' ) %>

    -
    <%- @P( @ticket.state.name ) %>
    +
    <%- @P( @ticket.state.name ) %>

    <%- @T( 'Priority' ) %>

    -
    <%- @T( @ticket.priority.name ) %>
    +
    <%- @T( @ticket.priority.name ) %>

    <%- @T( 'Age' ) %>

    -
    <%- @P( @ticket.humanTime ) %>
    +
    <%- @P( @ticket.humanTime ) %>

    <%- @T( 'Group' ) %>

    -
    <%- @P( @ticket.group ) %>
    +
    <%- @P( @ticket.group ) %>
    \ No newline at end of file diff --git a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco index bed3ad73b..42f12db8d 100644 --- a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco +++ b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco @@ -3,7 +3,7 @@
    -
    <%= item.data.head %>
    +
    <%= item.data.head %>
    diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index d1c73c15e..19e6bbd7b 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -32,7 +32,7 @@
    -

    +

    diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index b603ae6d1..8b9d61ee2 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -7,26 +7,26 @@
    <% if article.from: %>
    -
    <%- @T( 'From' ) %>
    -
    <%= article.from %>
    +
    <%- @T( 'From' ) %>
    +
    <%= article.from %>
    <% end %> <% if article.to: %>
    -
    <%- @T( 'To' ) %>
    -
    <%= article.to %>
    +
    <%- @T( 'To' ) %>
    +
    <%= article.to %>
    <% end %> <% if article.cc: %>
    -
    <%- @T( 'Kopie' ) %>
    -
    <%= article.cc %>
    +
    <%- @T( 'Kopie' ) %>
    +
    <%= article.cc %>
    <% end %> <% if article.subject: %>
    -
    <%- @T( 'Subject' ) %>
    -
    <%= article.subject %>
    +
    <%- @T( 'Subject' ) %>
    +
    <%= article.subject %>
    <% end %>
    diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 9f54c85d2..402e61db2 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -25,6 +25,12 @@ small { user-select: none; } +.u-textTruncate { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + .u-positionOrigin { position: relative; } @@ -892,12 +898,6 @@ ol.tabs li { border-radius: 0 8px 8px 0; } -.contain-text { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - .separator { margin: 20px 0; position: relative;