Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename .contain-text to .u-textTruncate

Browse source
This commit is contained in:
Felix Niklas 2014-09-04 15:03:32 +02:00
parent f7b4ac30ad
commit 4996c6fb95
10 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco
View file

@ -3,7 +3,7 @@
<% for item in @items: %> <% for item in @items: %>
<li <% if item.active: %>class="active"<% end %>> <li <% if item.active: %>class="active"<% end %>>
<a class="horizontal center" href="<%= item.target %>"> <a class="horizontal center" href="<%= item.target %>">
<span class="local contain-text"><%- @T(item.name) %></span> <span class="local u-textTruncate"><%- @T(item.name) %></span>
<span class="badge"><%= item.count %></span> <span class="badge"><%= item.count %></span>
</a> </a>
</li> </li>

20
app/assets/javascripts/app/views/dashboard.jst.eco
View file

@ -15,8 +15,8 @@
<div class="stat-amount"></div> <div class="stat-amount"></div>
</div> </div>
</div> </div>
<div class="stat-label contain-text">My handling time: 25 minutes</div> <div class="stat-label u-textTruncate">My handling time: 25 minutes</div>
<div class="stat-detail contain-text">Average: 13%</div> <div class="stat-detail u-textTruncate">Average: 13%</div>
</div> </div>
</div> </div>
<div class="column"> <div class="column">
@ -25,8 +25,8 @@
<div class="stat-graphic flex horizontal centered"> <div class="stat-graphic flex horizontal centered">
<div class="mood icon bad-state"></div> <div class="mood icon bad-state"></div>
</div> </div>
<div class="stat-label contain-text">3% of my tickets escalated.</div> <div class="stat-label u-textTruncate">3% of my tickets escalated.</div>
<div class="stat-detail contain-text">Average: 17%</div> <div class="stat-detail u-textTruncate">Average: 17%</div>
</div> </div>
</div> </div>
<div class="column"> <div class="column">
@ -90,8 +90,8 @@
</div> </div>
<div class="stat-all-tickets icon"></div> <div class="stat-all-tickets icon"></div>
</div> </div>
<div class="stat-label contain-text">Tickets of my Group: 78 of 234</div> <div class="stat-label u-textTruncate">Tickets of my Group: 78 of 234</div>
<div class="stat-detail contain-text">Average: 22%</div> <div class="stat-detail u-textTruncate">Average: 22%</div>
</div> </div>
</div> </div>
<div class="column"> <div class="column">
@ -100,8 +100,8 @@
<div class="stat-graphic flex horizontal centered"> <div class="stat-graphic flex horizontal centered">
<div class="in-process icon supergood-state"></div> <div class="in-process icon supergood-state"></div>
</div> </div>
<div class="stat-label contain-text">74% are currently in process</div> <div class="stat-label u-textTruncate">74% are currently in process</div>
<div class="stat-detail contain-text">Average: 62%</div> <div class="stat-detail u-textTruncate">Average: 62%</div>
</div> </div>
</div> </div>
<div class="column"> <div class="column">
@ -110,8 +110,8 @@
<div class="stat-graphic flex horizontal centered"> <div class="stat-graphic flex horizontal centered">
<div class="reopening icon ok-state"></div> <div class="reopening icon ok-state"></div>
</div> </div>
<div class="stat-label contain-text">7% are being reopened</div> <div class="stat-label u-textTruncate">7% are being reopened</div>
<div class="stat-detail contain-text">Average: 6%</div> <div class="stat-detail u-textTruncate">Average: 6%</div>
</div> </div>
</div> </div>
</div> </div>

6
app/assets/javascripts/app/views/getting_started.jst.eco
View file

@ -1,9 +1,9 @@
<div class="fullHeight vertical center justified"> <div class="fullHeight vertical center justified">
<div class="hero-unit"> <div class="hero-unit">
<ol class="horizontal tabs progress-tabs tabs-condensed"> <ol class="horizontal tabs progress-tabs tabs-condensed">
<li class="create_admin tab contain-text active"><%- @T( 'Create Admin' ) %></li> <li class="create_admin tab u-textTruncate active"><%- @T( 'Create Admin' ) %></li>
<li class="invite_agents tab contain-text"><%- @T( 'Invite Agents' ) %></li> <li class="invite_agents tab u-textTruncate"><%- @T( 'Invite Agents' ) %></li>
<li class="configure_channels tab contain-text"><%- @T( 'Configure Channels' ) %></li> <li class="configure_channels tab u-textTruncate"><%- @T( 'Configure Channels' ) %></li>
</ol> </ol>
<% if @master_user: %> <% if @master_user: %>
<div class="master_user hero-left"> <div class="master_user hero-left">

2
app/assets/javascripts/app/views/navigation/personal.jst.eco
View file

@ -20,7 +20,7 @@
<% end %> <% end %>
<li class="<% if @active_tab[item.target] : %>active<% end %>"> <li class="<% if @active_tab[item.target] : %>active<% end %>">
<a href="<%= item.target %>" class="horizontal"> <a href="<%= item.target %>" class="horizontal">
<span class="flex contain-text"><%- @T( item.name ) %></span> <span class="flex u-textTruncate"><%- @T( item.name ) %></span>
<% if item['count'] isnt undefined: %><span class="badge count"><%= item['count'] %></span><% end %> <% if item['count'] isnt undefined: %><span class="badge count"><%= item['count'] %></span><% end %>
<% if item.iconClass: %><span class="<%= item.iconClass %> icon"></span><% end %> <% if item.iconClass: %><span class="<%= item.iconClass %> icon"></span><% end %>
</a> </a>

2
app/assets/javascripts/app/views/navigation/result.jst.eco
View file

@ -4,7 +4,7 @@
<li> <li>
<a href="<%- item.url %>" class="<%= item.class %> horizontal center icon-switch" data-id="<%= item.id %>"> <a href="<%- item.url %>" class="<%= item.class %> horizontal center icon-switch" data-id="<%= item.id %>">
<div class="<%= item.iconClass %> icon"></div> <div class="<%= item.iconClass %> icon"></div>
<div class="flex contain-text"> <div class="flex u-textTruncate">
<% console.log area.name %> <% console.log area.name %>
<% if area.name is "Ticket": %> <% if area.name is "Ticket": %>
<%= item.display %> - <%= item.display %> -

10
app/assets/javascripts/app/views/popover/ticket.jst.eco
View file

@ -14,22 +14,22 @@
<div class="horizontal two-columns wrap"> <div class="horizontal two-columns wrap">
<div class="column"> <div class="column">
<h3>#</h3> <h3>#</h3>
<div class="contain-text"><%- @P( @ticket.number ) %></div> <div class="u-textTruncate"><%- @P( @ticket.number ) %></div>
</div> </div>
<div class="column"> <div class="column">
<h3><%- @T( 'State' ) %></h3> <h3><%- @T( 'State' ) %></h3>
<div class="contain-text"><%- @P( @ticket.state.name ) %></div> <div class="u-textTruncate"><%- @P( @ticket.state.name ) %></div>
</div> </div>
<div class="column"> <div class="column">
<h3><%- @T( 'Priority' ) %></h3> <h3><%- @T( 'Priority' ) %></h3>
<div class="contain-text"><%- @T( @ticket.priority.name ) %></div> <div class="u-textTruncate"><%- @T( @ticket.priority.name ) %></div>
</div> </div>
<div class="column"> <div class="column">
<h3><%- @T( 'Age' ) %></h3> <h3><%- @T( 'Age' ) %></h3>
<div class="contain-text"><%- @P( @ticket.humanTime ) %></div> <div class="u-textTruncate"><%- @P( @ticket.humanTime ) %></div>
</div> </div>
<div class="column"> <div class="column">
<h3><%- @T( 'Group' ) %></h3> <h3><%- @T( 'Group' ) %></h3>
<div class="contain-text"><%- @P( @ticket.group ) %></div> <div class="u-textTruncate"><%- @P( @ticket.group ) %></div>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/task_widget_tasks.jst.eco
View file

@ -3,7 +3,7 @@
<div class="icon-holder centered"> <div class="icon-holder centered">
<div class="<%= item.data.iconClass %> icon<% if item.task.notify: %> modified<% end %>"></div> <div class="<%= item.data.iconClass %> icon<% if item.task.notify: %> modified<% end %>"></div>
</div> </div>
<div class="name contain-text flex"><%= item.data.head %></div> <div class="name u-textTruncate flex"><%= item.data.head %></div>
<div class="close-task button horizontal centered"> <div class="close-task button horizontal centered">
<div class="close close-task icon" title="<%- @T('close') %>" data-type="close"></div> <div class="close close-task icon" title="<%- @T('close') %>" data-type="close"></div>
</div> </div>

2
app/assets/javascripts/app/views/ticket_zoom.jst.eco
View file

@ -32,7 +32,7 @@
<div class="sidebar-holder vertical"> <div class="sidebar-holder vertical">
<div class="sidebar bottom-form-shadow flex"> <div class="sidebar bottom-form-shadow flex">
<div class="horizontal center"> <div class="horizontal center">
<h2 class="flex contain-text"></h2> <h2 class="flex u-textTruncate"></h2>
<div class="close-sidebar centered u-clickable"> <div class="close-sidebar centered u-clickable">
<div class="arrow-right icon"></div> <div class="arrow-right icon"></div>
</div> </div>

16
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -7,26 +7,26 @@
<div class="article-meta top"> <div class="article-meta top">
<% if article.from: %> <% if article.from: %>
<div class="horizontal article-meta-row" title="<%- @Ti( 'From' ) %>: <%= article.from %>"> <div class="horizontal article-meta-row" title="<%- @Ti( 'From' ) %>: <%= article.from %>">
<div class="article-meta-key contain-text"><%- @T( 'From' ) %></div> <div class="article-meta-key u-textTruncate"><%- @T( 'From' ) %></div>
<div class="article-meta-value flex contain-text"><%= article.from %></div> <div class="article-meta-value flex u-textTruncate"><%= article.from %></div>
</div> </div>
<% end %> <% end %>
<% if article.to: %> <% if article.to: %>
<div class="horizontal article-meta-row" title="<%- @Ti( 'To' ) %>: <%= article.to %>"> <div class="horizontal article-meta-row" title="<%- @Ti( 'To' ) %>: <%= article.to %>">
<div class="article-meta-key contain-text"><%- @T( 'To' ) %></div> <div class="article-meta-key u-textTruncate"><%- @T( 'To' ) %></div>
<div class="article-meta-value flex contain-text"><%= article.to %></div> <div class="article-meta-value flex u-textTruncate"><%= article.to %></div>
</div> </div>
<% end %> <% end %>
<% if article.cc: %> <% if article.cc: %>
<div class="horizontal article-meta-row" title="<%- @Ti( 'Kopie' ) %>: <%= article.cc %>"> <div class="horizontal article-meta-row" title="<%- @Ti( 'Kopie' ) %>: <%= article.cc %>">
<div class="article-meta-key contain-text"><%- @T( 'Kopie' ) %></div> <div class="article-meta-key u-textTruncate"><%- @T( 'Kopie' ) %></div>
<div class="article-meta-value flex contain-text"><%= article.cc %></div> <div class="article-meta-value flex u-textTruncate"><%= article.cc %></div>
</div> </div>
<% end %> <% end %>
<% if article.subject: %> <% if article.subject: %>
<div class="horizontal article-meta-row" title="<%- @Ti( 'Subject' ) %>: <%= article.subject %>"> <div class="horizontal article-meta-row" title="<%- @Ti( 'Subject' ) %>: <%= article.subject %>">
<div class="article-meta-key contain-text"><%- @T( 'Subject' ) %></div> <div class="article-meta-key u-textTruncate"><%- @T( 'Subject' ) %></div>
<div class="article-meta-value flex contain-text"><%= article.subject %></div> <div class="article-meta-value flex u-textTruncate"><%= article.subject %></div>
</div> </div>
<% end %> <% end %>
</div> </div>

12
app/assets/stylesheets/zzz.css.erb
View file

@ -25,6 +25,12 @@ small {
user-select: none; user-select: none;
} }
.u-textTruncate {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.u-positionOrigin { .u-positionOrigin {
position: relative; position: relative;
} }
@ -892,12 +898,6 @@ ol.tabs li {
border-radius: 0 8px 8px 0; border-radius: 0 8px 8px 0;
} }
.contain-text {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.separator { .separator {
margin: 20px 0; margin: 20px 0;
position: relative; position: relative;