Integration of Ray' modifications
This commit is contained in:
chris2tof committed
1 parent
c4810274ec
commit
861237d65b
39 files changed
+804
-175
No files matched your search
@@ -7,7 +7,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Department</td>
|
||||
<td>Design Deptartment</td>
|
||||
<td>Computer Science</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Version</td>
|
||||
@@ -19,14 +19,15 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Visitor Counter</td>
|
||||
<td>1112201</td>
|
||||
<td>2,201</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Site Status</td>
|
||||
<td>Available</td>
|
||||
<td>Registration Status</td>
|
||||
<td><%= render 'registration' %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Updates</td>
|
||||
<td><%= render 'update' %></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<%= render 'registration' %>
|
||||
|
||||
<%= render 'update' %>
|
||||
</div>
|
||||
@@ -1,12 +1,16 @@
|
||||
<% content_for :secondary do %>
|
||||
<ul class="list">
|
||||
<li><%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path"), :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<div id='roles_list'>
|
||||
<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>
|
||||
</div>
|
||||
<% end -%>
|
||||
|
||||
<h1><%= t("admin.list_user_#{@attribute}s") %></h1>
|
||||
|
||||
<table>
|
||||
<!-- <table>
|
||||
<tr>
|
||||
<th><%= t("admin.#{@attribute}") %></th>
|
||||
<th><%= t('admin.key') %></th>
|
||||
@@ -29,4 +33,26 @@
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
</table> -->
|
||||
|
||||
<div id="add_new" class="clear">
|
||||
<%= link_to t('admin.new_user_role'), new_admin_user_role_model_path %>
|
||||
</div>
|
||||
<ul>
|
||||
<li class="list_head clear">
|
||||
<span class="roles">Roles</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[I18n.locale].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? %>
|
||||
</span>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<div id="add_new" class="clear">
|
||||
<%= link_to t('admin.new_user_role'), new_admin_user_role_model_path %>
|
||||
</div>
|
||||
@@ -6,7 +6,7 @@
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label><%= t('panel.my_avatar') %></label>
|
||||
<label><%= t('admin.my_avatar') %></label>
|
||||
<%= image_tag(@user.avatar.thumb.url) if @user.avatar? %>
|
||||
<%= file_field_tag 'file' %>
|
||||
<%= hidden_field_tag :avatar_cache %>
|
||||
@@ -18,14 +18,14 @@
|
||||
<%= f.text_field :email %>
|
||||
</p>
|
||||
<p>
|
||||
<%= t('panel.admin') %>
|
||||
<%= t('admin.admin') %>
|
||||
<%= f.check_box :admin %>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<% if @user_info_models %>
|
||||
<fieldset>
|
||||
<legend><%= t('panel.infos') %></legend>
|
||||
<legend><%= t('admin.info') %></legend>
|
||||
<% @user_info_models.each do |ua| %>
|
||||
<fieldset>
|
||||
<%= render :partial => 'user_attribute',
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
<% if @user_role_models %>
|
||||
<fieldset id="roles" <%= raw(' style="display: none;"') unless (@user.active_roles.size > 0 rescue nil) %>>
|
||||
<legend><%= t('panel.roles') %></legend>
|
||||
<legend><%= t('admin.roles') %></legend>
|
||||
<% @user_role_models.each do |ua| %>
|
||||
<fieldset id="role_<%= ua.key %>" <%= raw(' style="display: none;"') unless (@user.active_roles.include?(ua.key) rescue nil) %>>
|
||||
<%= render :partial => 'user_attribute',
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,14 +1,14 @@
|
||||
<% content_for :secondary do %>
|
||||
<ul class="list">
|
||||
<li><%= link_to t(:new_user, :scope => :panel), new_panel_user_path, :class => 'button positive' %></li>
|
||||
<li><%= link_to t('admin.new_user'), new_admin_user_path, :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<h1><%= t('panel.user_panel') %></h1>
|
||||
<h1><%= t('admin.user_panel') %></h1>
|
||||
|
||||
<%= form_for @user, :url => panel_user_path(@user), :html => { :multipart => true } do |f| %>
|
||||
<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %>
|
||||
<%= f.error_messages %>
|
||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
<% content_for :secondary do %>
|
||||
<div id='user_list'>
|
||||
<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>
|
||||
</div>
|
||||
<% end -%>
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<div id="add_new" class="clear">
|
||||
<%= link_to t('admin.new_user'), new_admin_user_path %>
|
||||
</div>
|
||||
<ul>
|
||||
<li class="list_head clear">
|
||||
<span class="roles">Roles</span>
|
||||
<span class="name">Name</span>
|
||||
<span class="email">Email</span>
|
||||
<span class="admin">Admin</span>
|
||||
<span class="action">Action</span>
|
||||
</li>
|
||||
<% @users.each do |user| %>
|
||||
<li class="list_item clear">
|
||||
<span class="roles <%= user.get_roles.downcase %>"><%= user.get_roles %></span>
|
||||
<span class="name"><%= user.name ? user.name : 'bob' %></span>
|
||||
<span class="email"><%= user.email %></span>
|
||||
<span class="admin"><%= user.admin ? t(:yes_) : t(:no_) %></span>
|
||||
<span class="action">
|
||||
<%= link_to t(:show), admin_user_path(user), :class => 'show' %>
|
||||
<%= link_to t(:edit), edit_admin_user_path(user), :class => 'edit' %>
|
||||
<%= link_to t(:delete), admin_user_path(user), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
|
||||
</span>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
<div id="add_new" class="clear">
|
||||
<%= link_to t('admin.new_user'), new_admin_user_path %>
|
||||
</div>
|
||||
@@ -1,12 +1,12 @@
|
||||
<% content_for :secondary do %>
|
||||
<ul class="list">
|
||||
<li><%= link_to t(:new_user, :scope => :panel), new_panel_user_path, :class => 'button positive' %></li>
|
||||
<li><%= link_to t('admin.new_user'), new_admin_user_path, :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<h1><%= t('panel.user_panel') %></h1>
|
||||
<h1><%= t('admin.user_panel') %></h1>
|
||||
|
||||
<%= form_for @user, :url => panel_users_path, :html => { :multipart => true } do |f| %>
|
||||
<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %>
|
||||
<%= f.error_messages %>
|
||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<% content_for :secondary do %>
|
||||
<ul class="list">
|
||||
<li><%= link_to t(:new_user, :scope => :panel), new_panel_user_path, :class => 'button positive' %></li>
|
||||
<li><%= link_to t('admin.new_user'), new_admin_user_path, :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<h1><%= t('panel.user_panel') %></h1>
|
||||
<h1><%= t('admin.user_panel') %></h1>
|
||||
|
||||
<%= image_tag(@user.avatar.thumb.url) rescue nil %>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<% if @user_info_models %>
|
||||
<fieldset>
|
||||
<legend><%= t('panel.infos') %></legend>
|
||||
<legend><%= t('admin.info') %></legend>
|
||||
<% @user_info_models.each do |am| %>
|
||||
<%= render :partial => 'show_user_attribute', :locals => {:am => am, :object => @user.get_info_from_model_key(am.key)} %>
|
||||
<% end -%>
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
<% if @user.active_roles.size > 0 %>
|
||||
<fieldset>
|
||||
<legend><%= t('panel.roles') %></legend>
|
||||
<legend><%= t('admin.roles') %></legend>
|
||||
<% @user.get_active_role_models.each do |am| %>
|
||||
<%= render :partial => 'show_user_attribute', :locals => {:am => am, :object => @user.get_role_from_model_key(am.key)} %>
|
||||
<% end -%>
|
||||
@@ -0,0 +1,10 @@
|
||||
<ul id="orblist">
|
||||
<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.member'), admin_users_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
|
||||
</ul>
|
||||
@@ -1,67 +1,57 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>R4</title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag "admin", :media => "screen, projection" %>
|
||||
<%= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= yield :page_specific_css %>
|
||||
<%= csrf_meta_tag %>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>R4</title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag "admin", :media => "screen, projection" %>
|
||||
<%= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= yield :page_specific_css %>
|
||||
<%= csrf_meta_tag %>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="panel_banner_link" >
|
||||
|
||||
<div id="orbit">
|
||||
<ul id="orblist">
|
||||
<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.user_info'), admin_user_info_models_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.user_role'), admin_user_role_models_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="hmenu">
|
||||
<div class="lang">
|
||||
<%= render 'layouts/lang_menu' %>
|
||||
<div id="panel_banner_link" >
|
||||
|
||||
<div id="orbit">
|
||||
<%= render 'layouts/drop_down_menu' %>
|
||||
</div>
|
||||
|
||||
<div class="hmenu">
|
||||
<div class="lang">
|
||||
<%= render 'layouts/lang_menu' %>
|
||||
</div>
|
||||
|
||||
<%= render 'devise/menu/login_items' %>
|
||||
</div>
|
||||
|
||||
<%= render 'devise/menu/login_items' %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div id="panel_container">
|
||||
|
||||
</div>
|
||||
<div id="panel_container">
|
||||
|
||||
|
||||
|
||||
<div id="panel_content">
|
||||
<div class="secondary">
|
||||
<div class="secondary2">
|
||||
<%= yield :secondary %>
|
||||
<div id="panel_content">
|
||||
<div class="secondary">
|
||||
<div class="secondary2">
|
||||
<%= yield :secondary %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="main">
|
||||
<div class="main2">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tertiary"><%= yield :tertiary %></div>
|
||||
</div>
|
||||
|
||||
<div id="panel_footer">
|
||||
<p>Rulingcom</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="main">
|
||||
<div class="main2">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tertiary"><%= yield :tertiary %></div>
|
||||
</div>
|
||||
|
||||
<div id="panel_footer">
|
||||
<p>Rulingcom</p>
|
||||
</div>
|
||||
</div>
|
||||
<%= yield :page_specific_javascript %>
|
||||
<%= yield :page_specific_javascript %>
|
||||
</body>
|
||||
</html>
|
||||
@@ -23,18 +23,8 @@
|
||||
|
||||
<div id="panel_banner_link" >
|
||||
|
||||
<div id="orbit">
|
||||
<ul id="orblist">
|
||||
<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.user_info'), admin_user_info_models_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.user_role'), admin_user_role_models_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
|
||||
<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
|
||||
</ul>
|
||||
<div id="orbit">
|
||||
<%= render 'layouts/drop_down_menu' %>
|
||||
</div>
|
||||
|
||||
<div class="hmenu">
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>R4</title>
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag 'admin', "member", 'messy', :media => "screen, projection" %>
|
||||
<%#= stylesheet_link_tag "application" %>
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= yield :page_specific_css %>
|
||||
<%= csrf_meta_tag %>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="content">
|
||||
<div id="hmenu">
|
||||
<div id="orbit">
|
||||
<%= render 'layouts/drop_down_menu' %>
|
||||
</div>
|
||||
<div class="hmenu">
|
||||
<div class="lang">
|
||||
<%= render 'layouts/lang_menu' %>
|
||||
</div>
|
||||
|
||||
<%= render 'devise/menu/login_items' %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="sidebar">
|
||||
<div id="search">
|
||||
<input id="user_search" name="user[username]" size="30" type="text" />
|
||||
</div>
|
||||
<%= yield :secondary %>
|
||||
</div>
|
||||
|
||||
<div id="main">
|
||||
<div class="main_list">
|
||||
<%= yield %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<%= yield :page_specific_javascript %>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,33 +0,0 @@
|
||||
<% content_for :secondary do %>
|
||||
<ul class="list">
|
||||
<li><%= link_to t('panel.new_user'), new_panel_user_path, :class => 'button positive' %></li>
|
||||
</ul>
|
||||
<% end -%>
|
||||
|
||||
<%= flash_messages %>
|
||||
|
||||
<h1><%= t('panel.list_users') %></h1>
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th><%= t('panel.roles') %></th>
|
||||
<th><%= t('panel.name') %></th>
|
||||
<th><%= t('panel.email') %></th>
|
||||
<th><%= t('panel.admin') %></th>
|
||||
<th><%= t('panel.action') %></th>
|
||||
</tr>
|
||||
|
||||
<% @users.each do |user| %>
|
||||
<tr>
|
||||
<td><%= user.get_roles %></td>
|
||||
<td><%= user[:name] %></td>
|
||||
<td><%= user.email %></td>
|
||||
<td><%= user.admin ? t(:yes_) : t(:no_) %></td>
|
||||
<td>
|
||||
<%= link_to t(:show), panel_user_path(user) %> |
|
||||
<%= link_to t(:edit), edit_panel_user_path(user) %> |
|
||||
<%= link_to t(:delete), panel_user_path(user), :confirm => t('sure?'), :method => :delete %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</table>
|
||||
Reference in new issue
Block a user