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

refactor userList

Browse source
This commit is contained in:
Felix Niklas 2016-03-23 15:15:38 +01:00
parent 77eccea2c9
commit 436dab6a1a
5 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco
View file

@ -860,11 +860,11 @@
<hr> <hr>
<label>Members</label> <label>Members</label>
<ul class="userList"> <div class="userList">
<li> <div class="userList-entry">
<span class="avatar unique size-40 user-popover" data-id="2" data-original-title="" style="background-position: -96.5079185759074px -112.28590086669901px;" title="">NB</span> <a class="user-popover" data-id="2" data-original-title="" href="#user/profile/2" title="">Nicole Braun</a> <span class="avatar unique size-40 user-popover" data-id="2" data-original-title="" style="background-position: -96.5079185759074px -112.28590086669901px;" title="">NB</span> <a class="userList-entry user-popover" data-id="2" data-original-title="" href="#user/profile/2" title="">Nicole Braun</a>
</li> </div>
</ul> </div>
</div> </div>
</div> </div>

10
app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
View file

@ -602,11 +602,11 @@
</div> </div>
<hr> <hr>
<label>Members</label> <label>Members</label>
<ul class="userList"> <div class="userList">
<li> <div class="userList-entry">
<span class="avatar unique size-40 user-popover" data-id="2" data-original-title="" style="background-position: -96.5079185759074px -112.28590086669901px;" title="">NB</span> <a class="user-popover" data-id="2" data-original-title="" href="#user/profile/2" title="">Nicole Braun</a> <span class="avatar unique size-40 user-popover" data-id="2" data-original-title="" style="background-position: -96.5079185759074px -112.28590086669901px;" title="">NB</span> <a class="userList-entry user-popover" data-id="2" data-original-title="" href="#user/profile/2" title="">Nicole Braun</a>
</li> </div>
</ul> </div>
</div> </div>
</div> </div>
<div class="tabsSidebar-tabs"> <div class="tabsSidebar-tabs">

6
app/assets/javascripts/app/views/organization_profile/object.jst.eco
View file

@ -27,11 +27,11 @@
<% if @organization.members: %> <% if @organization.members: %>
<div class="profile-section profile-memberSection"> <div class="profile-section profile-memberSection">
<label><%- @T('Members') %></label> <label><%- @T('Members') %></label>
<div class="profile-details horizontal wrap"> <div class="userList">
<% for user in @organization.members: %> <% for user in @organization.members: %>
<div class="profile-organizationMember"> <div class="userList-entry">
<%- user.avatar("40") %> <%- user.avatar("40") %>
<a href="<%- user.uiUrl() %>" class="user-popover" data-id="<%- user.id %>"><%= user.displayName() %></a> <a href="<%- user.uiUrl() %>" class="userList-name user-popover" data-id="<%- user.id %>"><%= user.displayName() %></a>
</div> </div>
<% end %> <% end %>
</div> </div>

10
app/assets/javascripts/app/views/widget/organization.jst.eco
View file

@ -23,16 +23,16 @@
<% if @organization.members: %> <% if @organization.members: %>
<hr> <hr>
<user class="sidebar-block"> <div class="sidebar-block">
<label><%- @T('Members') %></label> <label><%- @T('Members') %></label>
<ul class="userList"> <div class="userList">
<% for user in @organization.members: %> <% for user in @organization.members: %>
<li> <div class="userList-entry">
<%- user.avatar("40") %> <%- user.avatar("40") %>
<a href="<%- user.uiUrl() %>" class="user-popover" data-id="<%- user.id %>"> <a href="<%- user.uiUrl() %>" class="userList-name user-popover" data-id="<%- user.id %>">
<%= user.displayName() %> <%= user.displayName() %>
</a> </a>
<% end %> <% end %>
</ul> </div>
</div> </div>
<% end %> <% end %>

16
app/assets/stylesheets/zammad.scss
View file

@ -5877,17 +5877,19 @@ footer {
list-style: none; list-style: none;
padding: 0; padding: 0;
li { .userList-entry {
position: relative;
margin: 10px 0; margin: 10px 0;
display: flex;
align-items: center;
&:last-child {
margin-bottom: 0;
}
} }
a { .userList-name {
@extend .u-textTruncate; @extend .u-textTruncate;
position: absolute; margin-left: 7px;
top: 10px;
right: 0px;
left: 48px;
} }
} }