developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

This commit is contained in:
chris 2012-10-15 14:09:58 +08:00
parent 334e5b464c 31b583228d
commit 5913f73850
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/admin/users_new_interface/_user_basic.html.erb
View File

@ -2,22 +2,28 @@
<div class="map-block back"> <div class="map-block back">
<h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4> <h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4>
<form class="form-horizontal">
<div class="form-horizontal">
<div class="control-group"> <div class="control-group">
<%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br /> <%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br />
<div class="controls"> <div class="controls">
<%= f.email_field :email %> <%= f.email_field :email %>
</div> </div>
</div> </div>
</div>
<div class="form-horizontal">
<div class="control-group"> <div class="control-group">
<%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %> <%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %>
<div class="controls"> <div class="controls">
<%= f.password_field :password %> <%= f.password_field :password %>
</div> </div>
</div> </div>
</div>
<div class="form-horizontal">
<div class="control-group"> <div class="control-group">
<%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %> <%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %>
<div class="controls">
<div class="controls"> <div class="controls">
<%= f.password_field :password_confirmation %> <%= f.password_field :password_confirmation %>
</div> </div>

1
app/views/layouts/_side_bar.html.erb
View File

@ -41,6 +41,7 @@
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %> <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %> <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %> <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
<%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %> <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>