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

format popovers

Browse source
This commit is contained in:
Felix Niklas 2015-01-14 23:45:18 +01:00
parent 62de61f508
commit 1b1771afd5
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/javascripts/app/views/popover/organization.jst.eco
View file

@ -1,18 +1,20 @@
<hr>
<div class="horizontal two-columns">
<% for row in @organizationData: %> <% for row in @organizationData: %>
<% if @organization[row.name]: %> <% if @organization[row.name]: %>
<% if row.tag is 'richtext': %> <div class="column">
<div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @organization[row.name] %></div> <h3><%- @T( row.display ) %></h3>
<% else: %> <div class="u-textTruncate"><%- @L( @P( @organization[row.name] ) ) %></div>
<div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @L( @P( @organization[row.name] ) ) %></div> </div>
<% end %>
<% end %> <% end %>
<% end %> <% end %>
</div>
<% if @organization.members: %> <% if @organization.members: %>
<hr> <hr>
<%- @T('Members') %> <h3><%- @T('Members') %></h3>
<ul>
<% for user in @organization.members: %> <% for user in @organization.members: %>
<li><%= user.displayName() %></li> <div class="person">
<%= user.displayName() %>
</div>
<% end %> <% end %>
</ul>
<% end %> <% end %>

15
app/assets/javascripts/app/views/popover/user.jst.eco
View file

@ -1,15 +1,14 @@
<% if @user['organization']: %> <% if @user['organization']: %>
<div class="customer-info"> <div class="user-organization"><a href="<%- @user.organization.uiUrl() %>"><%= @user.organization.displayName() %></a></div>
<%- @P( @user['organization'] ) %>
</div>
<% end %> <% end %>
<hr>
<div class="horizontal two-columns">
<% for row in @userData: %> <% for row in @userData: %>
<% if @user[row.name]: %> <% if @user[row.name]: %>
<% if row.tag is 'richtext': %> <div class="column">
<div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @user[row.name] %></div> <h3><%- @T( row.display ) %></h3>
<% else: %> <div class="u-textTruncate"><%- @L( @P( @user[row.name] ) ) %></div>
<div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @L( @P( @user[row.name] ) ) %></div> </div>
<% end %>
<% end %> <% end %>
<% end %> <% end %>
<% if !_.isEmpty(@user['accounts']): %> <% if !_.isEmpty(@user['accounts']): %>

5
app/assets/stylesheets/zammad.css.scss
View file

@ -2637,6 +2637,11 @@ footer {
color: #a1a4a7; color: #a1a4a7;
} }
.popover .user-organization {
margin-bottom: 8px;
margin-top: -4px;
}
.popover hr { .popover hr {
margin: 8px 0; margin: 8px 0;
} }