Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9d6f7d78e | ||
|
|
79bc9240b7 |
No files matched your search
@@ -16,6 +16,7 @@ class User
|
||||
field :first_name, localize: true
|
||||
field :last_name, localize: true
|
||||
field :email
|
||||
field :email_hidden, :type => Boolean, :default => false
|
||||
field :sex, :default => 'unknown'
|
||||
field :office_tel
|
||||
field :cache_dept,type: Hash
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
<%= stylesheet_link_tag "lib/main-list" %>
|
||||
<%= stylesheet_link_tag "lib/filter" %>
|
||||
<%= stylesheet_link_tag "lib/member" %>
|
||||
<%= stylesheet_link_tag "lib/togglebox" %>
|
||||
|
||||
<% end -%>
|
||||
<% content_for :page_specific_javascript do -%>
|
||||
|
||||
@@ -94,7 +94,13 @@
|
||||
<%= f.email_field :email %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<%= f.label "Disable email", :class=>"control-label muted" %>
|
||||
<div class="controls">
|
||||
<%= f.check_box :email_hidden %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ID Number -->
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.sid"),:class=>"control-label muted" %>
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
<%= link_to("<i class='icon-edit'></i> #{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
|
||||
<%= link_to("<i class='icons-cycle'></i> #{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-mini" ) if is_admin?%>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="member-roles" class="nano">
|
||||
|
||||
Vendored
+8
-3
@@ -1,5 +1,5 @@
|
||||
<% # encoding: utf-8 %>
|
||||
|
||||
<!-- useless comment -->
|
||||
<section>
|
||||
|
||||
<div class="side"></div>
|
||||
@@ -38,7 +38,10 @@
|
||||
<%= @job_title %>
|
||||
</li>
|
||||
<% end %>
|
||||
<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
|
||||
|
||||
<% if !member.email_hidden? %>
|
||||
<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
|
||||
<% end %>
|
||||
<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
|
||||
</ul>
|
||||
</li>
|
||||
@@ -79,7 +82,9 @@
|
||||
%>
|
||||
<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b><%= @job_title %></li>
|
||||
<% end %>
|
||||
<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
|
||||
<% if !member.email_hidden? %>
|
||||
<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
|
||||
<% end %>
|
||||
<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
+2
-1
@@ -9,11 +9,12 @@
|
||||
<td><%= t('users.name')%></td>
|
||||
<td><%= @member.name%></td>
|
||||
</tr>
|
||||
<% if !@member.email_hidden? %>
|
||||
<tr>
|
||||
<td><%= t('users.email')%></td>
|
||||
<td><a href="mailto:<%= @member.email %>"><%= @member.email %></a></td>
|
||||
</tr>
|
||||
|
||||
<% end %>
|
||||
<% if !@member.office_tel.blank? %>
|
||||
<tr>
|
||||
<td><%= t('users.office_tel')%></td>
|
||||
|
||||
Reference in new issue
Block a user