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

Fixed html escaping of richtext elements. Move to one column layout. two column was not practical.

Browse source
This commit is contained in:
Martin Edenhofer 2015-01-27 16:13:28 +01:00
parent 153d325e84
commit f89f6fc47d
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,14 @@
<hr> <hr>
<div class="horizontal two-columns"> <div>
<% for row in @organizationData: %> <% for row in @organizationData: %>
<% if @organization[row.name]: %> <% if @organization[row.name]: %>
<div class="column"> <div class="column">
<h3><%- @T( row.display ) %></h3> <h3><%- @T( row.display ) %></h3>
<div><%- @L( @P( @organization[row.name] ) ) %></div> <% if row.tag is 'richtext': %>
<div><%- @organization[row.name] %></div>
<% else: %>
<div><%- @L( @P( @organization[row.name] ) ) %></div>
<% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>

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

@ -2,18 +2,22 @@
<div class="user-organization"><a href="<%- @user.organization.uiUrl() %>"><%= @user.organization.displayName() %></a></div> <div class="user-organization"><a href="<%- @user.organization.uiUrl() %>"><%= @user.organization.displayName() %></a></div>
<% end %> <% end %>
<hr> <hr>
<div class="horizontal two-columns"> <div>
<% for row in @userData: %> <% for row in @userData: %>
<% if @user[row.name]: %> <% if @user[row.name]: %>
<div class="column"> <div class="column">
<h3><%- @T( row.display ) %></h3> <h3><%- @T( row.display ) %></h3>
<div><%- @L( @P( @user[row.name] ) ) %></div> <% if row.tag is 'richtext': %>
<div><%- @user[row.name] %></div>
<% else: %>
<div><%- @L( @P( @user[row.name] ) ) %></div>
<% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
<% if !_.isEmpty(@user['accounts']): %> <% if !_.isEmpty(@user['accounts']): %>
<div class="customer-info"> <div class="customer-info">
<strong><%- @T( 'Linked Accounts' ) %></strong><br/> <h3><%- @T( 'Linked Accounts' ) %></h3>
<% for account of @user['accounts']: %> <% for account of @user['accounts']: %>
<a href="<%= @user['accounts'][account]['link'] %>" target="_blank"><%= account %></a> <a href="<%= @user['accounts'][account]['link'] %>" target="_blank"><%= account %></a>
<% end %> <% end %>
@ -22,7 +26,7 @@
<% if !_.isEmpty( @user['links'] ): %> <% if !_.isEmpty( @user['links'] ): %>
<% for link in @user['links']: %> <% for link in @user['links']: %>
<div class="customer-info"> <div class="customer-info">
<strong><%- @T( link['title'] ) %></strong><br/> <h3><%- @T( link['title'] ) %></h3>
<% for item in link['items']: %> <% for item in link['items']: %>
<% if item['url']: %> <% if item['url']: %>
<a href="<%= item['url'] %>" title="<%- @Ti( item['title'] ) %>" style="<%= item['style'] %>" data-type="<%= item['data'] %>" class="<%= item['class'] %>" <% if link.new_window: %>target="_blank"<% end %>> <a href="<%= item['url'] %>" title="<%- @Ti( item['title'] ) %>" style="<%= item['style'] %>" data-type="<%= item['data'] %>" class="<%= item['class'] %>" <% if link.new_window: %>target="_blank"<% end %>>