Final Ray's modifications

This commit is contained in:
chris2tof committed 2011-11-19 21:47:18 +08:00
1 parent dac6348402
commit ad9f9bbf5c
19 files changed
+122 -135

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@
<%#= file_field_tag 'file' %>
<%#= hidden_field_tag :avatar_cache %>
<a id="upload" href="#"> Choose a file... </a>
<%= f.text_field :email %>
<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value='E-Mail';}", :value => "E-Mail", :class => 'user_mail' %>
<label>
<%= f.check_box :admin %><span>Admin</span>
</label>
+5 -12
View File
@@ -1,21 +1,14 @@
<% content_for :body_id do %>user_list<% end -%>
<% content_for :secondary do %>
<div class="member_setup">
<h1>Member Setup</h1>
<ul class="list">
<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
<li class="set_2"><%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %></li>
</ul>
</div>
<% end -%>
<div id="porfile">
<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %>
<%= f.error_messages %>
<%= render :partial => 'form', :locals => { :f => f } %>
<div class='buttom clear'>
<%= f.submit t('update') %> <%= link_back %>
<div id="update" class='buttom clear'>
<%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
</div>
<div id="back" class='buttom clear'>
<%= link_back %>
</div>
<% end -%>
</div>
-12
View File
@@ -1,17 +1,5 @@
<% content_for :body_id do %>user_list<% end -%>
<% content_for :secondary do %>
<div class="member_setup">
<h1>Member Setup</h1>
<ul class="list">
<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
<li class="set_2"><%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %></li>
</ul>
</div>
<% end -%>
<div class="main_list">
<%= flash_messages %>
<div id="add_new" class="buttom clear">
+5 -12
View File
@@ -1,21 +1,14 @@
<% content_for :body_id do %>user_list<% end -%>
<% content_for :secondary do %>
<div class="member_setup">
<h1>Member Setup</h1>
<ul class="list">
<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
<li class="set_2"><%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %></li>
</ul>
</div>
<% end -%>
<div id="porfile">
<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %>
<%= f.error_messages %>
<%= render :partial => 'form', :locals => { :f => f } %>
<div id="confirm" class='buttom clear'>
<%= f.submit t('create') %> <%= link_back %>
<div id="create" class='buttom clear'>
<%= link_to t('create'), "#", :onclick=>"$('#new_user').submit()" %>
</div>
<div id="back" class='buttom clear'>
<%= link_back %>
</div>
<% end -%>
</div>
-10
View File
@@ -1,15 +1,5 @@
<% content_for :body_id do %>user_list<% end -%>
<% content_for :secondary do %>
<div class="member_setup">
<h1>Member Setup</h1>
<ul class="list">
<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
<li class="set_2"><%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %></li>
</ul>
</div>
<% end -%>
<div id="porfile">
<div id="person">