developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final Ray's modifications

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/user_attribute_models/_attribute_model.html.erb
+7 -11
View File
@@ -20,17 +20,13 @@
<% if attribute_model.new_record? %>
<a href="#" class="delete"><%= t(:delete) %></a>
<% else %>
<% if attribute_model.is_built_in? %>
<a href="#" class="change_built_in" id="<%= attribute_model.id %>">
<span style="display:<%= attribute_model.is_disabled? ? 'none' : 'inline' %>"><%= t(:disable) %></span>
<span style="display:<%= attribute_model.is_disabled? ? 'inline' : 'none' %>"><%= t(:enable) %></span>
</a>
<%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][disabled]", attribute_model.is_disabled? , :class => 'built_in_state' %>
<% else %>
<a href="#" class="remove_existing_record delete"><%= t(:delete) %></a>
<%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][should_destroy]", nil , :class => 'should_destroy' %>
<% end %>
<% if attribute_model.is_built_in? %>
<a href="#" class="change_built_in switch" id="<%= attribute_model.id %>"></a>
<%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][disabled]", attribute_model.is_disabled? , :class => 'built_in_state' %>
<% else %>
<a href="#" class="remove_existing_record delete"><%= t(:delete) %></a>
<%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][should_destroy]", nil , :class => 'should_destroy' %>
<% end %>
<%= f.hidden_field :id %>
<%= f.hidden_field :key %>
<% end %>
app/views/admin/user_attribute_models/_form.html.erb
+2 -2
View File
@@ -1,5 +1,5 @@
<div id="UserRole_block" class="roles_block">
<h2>User Role</h2>
<h2><%= t("admin.user_#{@attribute}") %></h2>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
@@ -68,7 +68,7 @@
});
$('#attributes_block a.change_built_in').click(function(){
$(this).children().toggle();
$(this).parent().toggleClass('disable');
var $am = $(this).next('.built_in_state')
$am.attr('value', ($am.attr('value') == "false") ? "true" : "false");
});
app/views/admin/user_attribute_models/edit.html.erb
+6 -13
View File
@@ -1,21 +1,14 @@
<% content_for :body_id do %>roles_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 -%>
<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
<div id="porfile">
<%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_model_path(@user_role_model)") do |f| %>
<%= f.error_messages %>
<%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => false } %>
<div class='buttom clear'>
<%= f.submit t('update') %> <%= link_back %>
<div id="update" class='buttom clear'>
<%= link_to t('update'), "#", :onclick=>"$('#edit_user_role_model_#{@user_attribute_model.id}').submit()" %>
</div>
<div id="back" class='buttom clear'>
<%= link_back %>
</div>
<% end -%>
</div>
app/views/admin/user_attribute_models/index.html.erb
+14 -42
View File
@@ -1,60 +1,32 @@
<% content_for :body_id do %>roles_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 -%>
<!-- <table>
<tr>
<th><%= t("admin.#{@attribute}") %></th>
<th><%= t('admin.key') %></th>
<th><%= t('admin.action') %></th>
</tr>
<% @user_attribute_models.each do |user_attribute_model| %>
<tr>
<td><%= user_attribute_model.i18n_variable[I18n.locale] %></td>
<td><%= user_attribute_model.key %></td>
<td>
<%= link_to t(:edit), eval("edit_admin_user_#{@attribute}_model_path(user_attribute_model)") %> |
<% if user_attribute_model.is_built_in? %>
<%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : 'inline'}" %>
<%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'inline' : 'none'}" %>
<% else %>
<%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :confirm => t('sure?'), :method => :delete %>
<% end %>
</td>
</tr>
<% end %>
</table> -->
<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
<div class="main_list">
<div id="add_new" class="buttom clear">
<%= link_to t('admin.new_user_role'), new_admin_user_role_model_path %>
<%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
</div>
<ul>
<li class="list_head clear">
<span class="roles">Roles</span>
<span class="<%= @attribute %>s"><%= t("admin.#{@attribute}") %></span>
<span class="action">Action</span>
</li>
<% @user_attribute_models.each do |user_attribute_model| %>
<li class="list_item clear">
<span class="roles <%= user_attribute_model.i18n_variable[:key].downcase %>"><%= user_attribute_model.i18n_variable[I18n.locale] %></span>
<li id="attribute_<%= user_attribute_model.id %>" class="list_item <%= "#{user_attribute_model.is_disabled? ? 'disable' : ''}" %> clear">
<span class="<%= @attribute %>s <%= user_attribute_model.i18n_variable[:key].downcase %>"><%= user_attribute_model.i18n_variable[I18n.locale] %></span>
<span class="action">
<%= link_to t(:edit), eval("edit_admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'edit' %>
<%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete unless user_attribute_model.is_built_in? %>
<% if user_attribute_model.is_built_in? %>
<%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : ''}", :class => 'switch' %>
<%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? '' : 'none'}", :class => 'switch' %>
<% else %>
<%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
<% end %>
</span>
</li>
<% end %>
</ul>
<div id="add_new" class="buttom clear">
<%= link_to t('admin.new_user_role'), new_admin_user_role_model_path %>
<%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
</div>
</div>
app/views/admin/user_attribute_models/new.html.erb
+6 -13
View File
@@ -1,21 +1,14 @@
<% content_for :body_id do %>roles_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 -%>
<% content_for :body_id do %><%= "#{@attribute}s_list" %><% end -%>
<div id="porfile">
<%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_models_path") do |f| %>
<%= f.error_messages %>
<%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => true } %>
<div class='buttom clear'>
<%= f.submit t('create') %> <%= link_back %>
<div id="create" class='buttom clear'>
<%= link_to t('create'), "#", :onclick=>"$('#new_user_attribute_model').submit()" %>
</div>
<div id="back" class='buttom clear'>
<%= link_back %>
</div>
<% end -%>
</div>
app/views/admin/user_attribute_models/toggle_enable.js.erb
+2 -1
View File
@@ -1,2 +1,3 @@
$("#enable_<%= @user_attribute_model.id %>").toggle();
$("#disable_<%= @user_attribute_model.id %>").toggle();
$("#disable_<%= @user_attribute_model.id %>").toggle();
$("#attribute_<%= @user_attribute_model.id %>").toggleClass('disable');
app/views/admin/users/_form.html.erb
+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>
app/views/admin/users/edit.html.erb
+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>
app/views/admin/users/index.html.erb
-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">
app/views/admin/users/new.html.erb
+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>
app/views/admin/users/show.html.erb
-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">