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

Changes for sub_roles

Browse Source 
Issues: update doesn't create new i18n_variables, role form has bugs
This commit is contained in:
chris2tof committed 2011-12-18 10:07:42 +08:00
1 parent d23cf152da
commit d27d7a623c
62 files changed
+508 -1142
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/attribute_form.js.erb
+25
View File
@@ -0,0 +1,25 @@
$('.attributes_block a.delete').live('click', function(){
$(this).parents('.list_item').remove();
});
$('#attributes a.remove_existing_record').live('click', function(){
$(this).next('.should_destroy').attr('value', 1);
$("#attribute_" + $(this).prev().attr('value')).hide();
});
$('#attributes_block a.switch').live('click', function(){
$(this).parent().toggleClass('disable');
var $am = $(this).next('.built_in_state')
$am.attr('value', ($am.attr('value') == "false") ? "true" : "false");
});
$('.select_type select').live('change', function(){
if(this.value == 'select')
{
$(this).next().show();
}
else
{
$(this).next().hide();
}
});
app/assets/javascripts/page_edit.js
+7 -4
View File
@@ -1,4 +1,7 @@
$("div.editable").live("mouseenter mouseleave",
function (event) {
$(this).children('.edit_link').toggle();
});
$("div.editable").live("mouseenter mouseleave", function (event) {
$(this).children('.edit_link').toggle();
});
$("#page_design_id").live('change', function() {
$.getScript($(this).attr('rel') + '/' + $(this).val() + '/reload_themes');
});
app/assets/javascripts/site_editor.js
+1
View File
@@ -6,4 +6,5 @@
//
//= require jquery
//= require jquery_ujs
//= require page_edit
//= require side_bar_history
app/assets/javascripts/user_attribute_model_form.js
-33
View File
@@ -1,33 +0,0 @@
$('#attributes_block a.delete').live('click', function(){
$(this).parent().parent().parent().remove();
});
$('#attributes_block a.add').click(function(){
$('#attributes').append("<%= escape_javascript(render(:partial => 'admin/user_attribute_models/attribute_model', :object => @user_attribute_model.attribute_models.build)) %>");
});
$('#attributes_block a.remove_existing_record').click(function(){
$(this).next('.should_destroy').attr('value', 1);
$(this).parent().parent().hide();
});
$('#attributes_block a.change_built_in').click(function(){
$(this).parent().toggleClass('disable');
var $am = $(this).next('.built_in_state')
$am.attr('value', ($am.attr('value') == "false") ? "true" : "false");
});
$('.select_mulitlingual input').live('click', function(){
$(this).next().attr('value', this.checked);
});
$('.select_type select').live('change', function(){
if(this.value == 'select')
{
$(this).next().show();
}
else
{
$(this).next().hide();
}
});
app/assets/javascripts/user_form.js
+2 -2
View File
@@ -1,6 +1,6 @@
$(document).ready(function(){
$('#user_active_role').change(function(){
$('#role_models .roles_block').hide();
$('#active_role').change(function(){
$('#roles .attributes_block').hide();
$('#'+this.value+'_block').toggle();
});
});
app/assets/stylesheets/_form.html.erb
-57
View File
@@ -1,57 +0,0 @@
<div id="UserRole_block" class="roles_block <%= @class %>">
<h2><%= t("admin.user_#{@attribute}") %></h2>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t('admin.key') %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
</tr>
</thead>
<tbody>
<tr class="list_item">
<td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @user_attribute_model.key %></td>
<% @site_valid_locales.each do |locale| %>
<td>
<%= text_field_tag "user_#{@attribute}_model[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :style => "width:150px" %>
</td>
<% end %>
</tr>
</tbody>
</table>
</div>
</div>
<div id="attributes_block" class="roles_block <%= @class %>">
<h2>Attributes</h2>
<div class="info_input">
<table id='attributes' border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
<td><%= t('admin.key') %></td>
<td><%= t('admin.multilingual') %></td>
<% @site_valid_locales.each do |locale| %>
<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
<% end %>
<td><%= t('admin.type')%></td>
<td>&nbsp;</td>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="5"><a href="#" class="add"><%= t(:add) %></a></td>
</tr>
</tfoot>
<tbody>
<%= render :partial => 'admin/user_attribute_models/attribute_model', :collection => @user_attribute_model.attribute_models %>
</tbody>
</table>
</div>
</div>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "user_attribute_model_form" %>
<% end -%>
app/assets/stylesheets/admin_back_end.css.erb
+4 -4
View File
@@ -222,7 +222,7 @@ h1 {
.main_list ul {
clear:both;
}
#porfile {
#profile {
padding-top: 100px;
}
/*add_buttom*/
@@ -336,10 +336,10 @@ h1 {
padding: 0;
width: 140px;
}
#porfile .users{
#profile .users{
margin-left: 180px;
}
.roles_block {
.attributes_block {
background: url(<%= asset_path "75.png" %>) repeat left top;
min-width:710px;
margin-bottom:50px;
@@ -352,7 +352,7 @@ h1 {
-webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
}
.roles_block h2 {
.attributes_block h2 {
color: #FFFFFF;
font-weight: normal;
margin: 0;