Compare commits
No commits in common. "ntu_cph" and "master" have entirely different histories.
|
@ -16,13 +16,8 @@
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= rf.title %></th>
|
<td><%= rf.title %></td>
|
||||||
<% if rf.key == 'homepage' %>
|
<td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
|
||||||
<% @url = nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %>
|
|
||||||
<td><a href="<%= @url %>" target="_blank"><%= @url %></a></td>
|
|
||||||
<% else %>
|
|
||||||
<td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
|
|
||||||
<% end %>
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= item.title %></th>
|
<td><%= item.title %></td>
|
||||||
<td><%= nl2br(show_attribute_value(@member.get_attribute_value(item).get_value_by_locale(I18n.locale))) rescue '' %></td>
|
<td><%= nl2br(show_attribute_value(@member.get_attribute_value(item).get_value_by_locale(I18n.locale))) rescue '' %></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@
|
||||||
<div class="o-members-pic"><%= show_avatar(member) %></div>
|
<div class="o-members-pic"><%= show_avatar(member) %></div>
|
||||||
<ul class="o-members-info">
|
<ul class="o-members-info">
|
||||||
<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
|
<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
|
||||||
<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale) rescue ""
|
<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
|
||||||
if @job_title != 'NoData' and !@job_title.blank?
|
if @job_title != 'NoData' and !@job_title.blank?
|
||||||
%>
|
%>
|
||||||
<li><b class="o-members-label"><%= @job_title_field.title %></b><%= @job_title %></li>
|
<li><b class="o-members-label"><%= @job_title_field.title %></b><%= @job_title %></li>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
if !@category.blank?
|
if !@category.blank?
|
||||||
%>
|
%>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t('category')%></th>
|
<td><%= t('category')%></td>
|
||||||
<td><%= show_attribute_value(@member.role_categorys.where(:role_id=>@member_role[0]['_id']).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
|
<td><%= show_attribute_value(@member.role_categorys.where(:role_id=>@member_role[0]['_id']).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
@ -23,22 +23,22 @@
|
||||||
if @job_title != 'NoData' and !@job_title.blank? and @job_title_field.to_show == true
|
if @job_title != 'NoData' and !@job_title.blank? and @job_title_field.to_show == true
|
||||||
%>
|
%>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= @job_title_field.title %></th>
|
<td><%= @job_title_field.title %></td>
|
||||||
<td><%= @job_title %></td>
|
<td><%= @job_title %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t('users.name')%></th>
|
<td><%= t('users.name')%></td>
|
||||||
<td><%= @member.name%></td>
|
<td><%= @member.name%></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t('users.email')%></th>
|
<td><%= t('users.email')%></td>
|
||||||
<td><a href="mailto:<%= @member.email %>"><%= @member.email %></a></td>
|
<td><a href="mailto:<%= @member.email %>"><%= @member.email %></a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% if !@member.office_tel.blank? %>
|
<% if !@member.office_tel.blank? %>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t('users.office_tel')%></th>
|
<td><%= t('users.office_tel')%></td>
|
||||||
<td><%= @member.office_tel%></td>
|
<td><%= @member.office_tel%></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
<% @profile_data.each do |item| %>
|
<% @profile_data.each do |item| %>
|
||||||
<% if !item[:value].blank? %>
|
<% if !item[:value].blank? %>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= item[:name] %></th>
|
<td><%= item[:name] %></td>
|
||||||
<td><%= show_attribute_value(item[:value]) %></td>
|
<td><%= show_attribute_value(item[:value]) %></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
|
Loading…
Reference in New Issue