Changeset 5758

Timestamp:

05/22/08 15:30:42 (6 months ago)

Author:

uta

Message:

2008/05/22 sync

Files:

• rubricks_core/trunk/components/system/account_controller.rb (modified) (2 diffs)
• rubricks_core/trunk/components/system/admin_menu_controller.rb (modified) (5 diffs)
• rubricks_core/trunk/components/system/admin_trails/_main_trails_filter.rhtml (modified) (2 diffs)
• rubricks_core/trunk/components/system/admin_trails/user_select_window.rhtml (modified) (1 diff)
• rubricks_core/trunk/components/system/admin_trails_controller.rb (modified) (1 diff)
• rubricks_core/trunk/components/system/admin_trails_helper.rb (modified) (1 diff)
• rubricks_core/trunk/components/system/calendar/show_detail.rhtml (modified) (1 diff)
• rubricks_core/trunk/components/system/common (added)
• rubricks_core/trunk/components/system/common/_refuse_guest.rhtml (added)
• rubricks_core/trunk/components/system/languages/chinese.rb (modified) (1 diff)
• rubricks_core/trunk/components/system/languages/english.rb (modified) (1 diff)
• rubricks_core/trunk/components/system/languages/japanese.rb (modified) (2 diffs)
• rubricks_core/trunk/components/system/preload/_admin_trails.rhtml (modified) (1 diff)
• rubricks_core/trunk/components/system/search/atom.rxml (modified) (2 diffs)
• rubricks_core/trunk/components/system/search/no_result.rxml (modified) (2 diffs)
• rubricks_core/trunk/components/system/search_controller.rb (modified) (2 diffs)
• rubricks_core/trunk/components/system/system_mailer.rb (modified) (1 diff)
• rubricks_core/trunk/components/system/system_mailer/password_changed_chinese.rhtml (added)
• rubricks_core/trunk/components/system/system_mailer/password_changed_english.rhtml (added)
• rubricks_core/trunk/components/system/system_mailer/password_changed_japanese.rhtml (added)
• rubricks_core/trunk/components/system/user/group_select.rhtml (modified) (1 diff)
• rubricks_core/trunk/components/system/user/user_select.rhtml (modified) (3 diffs)
• rubricks_core/trunk/components/system/user_controller.rb (modified) (4 diffs)
• rubricks_core/trunk/components/system/user_management/_group_show_tab_user_belongs_to.rhtml (modified) (1 diff)
• rubricks_core/trunk/components/system/user_management/main.rhtml (modified) (2 diffs)

rubricks_core/trunk/components/system/account_controller.rb

@@ -18 +18 @@
-        ActiveRecord::Base.transaction do
-          ru.certified = ''
+          ru.ignore_csrf_validation = true
-          ru.save!
-          if params[:login] == 'true'
@@ -132 +133 @@
-      ActiveRecord::Base.transaction do
-        ru.certified = ''
+        ru.ignore_csrf_validation = true
-        ru.save!
-        rubricks_logger({:action_type => :update, :component_name => 'auth', :component_display_name => '[_Common_Authentication]', :data => ru})

rubricks_core/trunk/components/system/admin_menu_controller.rb

@@ -24 +24 @@
-    @clear_ajax_history = true
-    headers["Content-Type"] = "text/javascript"
-template => '/system/admin_menu/update.rjs
+action => 'update
-  end
-
@@ -43 +43 @@
-    @clear_ajax_history = true
-    headers["Content-Type"] = "text/javascript"
-template => '/system/admin_menu/update.rjs
+action => 'update
-  end
-
@@ -88 +88 @@
-    @clear_ajax_history = true
-    headers["Content-Type"] = "text/javascript"
-template => '/system/admin_menu/update.rjs
+action => 'update
-  end
-
@@ -105 +105 @@
-      rubricks_logger({:action_type => :detail, :data => @menu_icon})
-    else
-template => '/system/admin_menu/
+action => '
-    end
-  end
@@ -143 +143 @@
-    @refresh = true
-    headers["Content-Type"] = "text/javascript"
-template => '/system/admin_menu/update.rjs
+action => 'update
-  end
-end

rubricks_core/trunk/components/system/admin_trails/_main_trails_filter.rhtml

@@ -3 +3 @@
-    <tr class="rubricks_general_table_even">
-      <td style="width:15%;"><%= hl('[_Common_Date]') %></td>
-
-
-
-
-
-
-
-
-
+
-    </tr>
-    <tr class="rubricks_general_table_even">
-      <td><%= hl('[_Common_UserName]') %></td>
-      <td>
-
-
-
+
+
+
+
-      </td>
-    </tr>
@@ -52 +45 @@
-<%= render :partial => 'main_trails_filter_user_select_window' %>
-<script type="text/javascript">
-, function() {rubricks.system.admin_trails.trails_filter_date_begin_set();}
-, function() {rubricks.system.admin_trails.trails_filter_date_end_set();}
+
+
-</script>

rubricks_core/trunk/components/system/admin_trails/user_select_window.rhtml

@@ -7 +7 @@
-    before_submit: function(idArray, dataArray) {
-      rubricks.system.admin_trails.user_select_window_close();
-      var value;
-      if(dataArray.length == 0) {
-        rubricks.system.admin_trails.trails_filter_user_name_clear();
-      } else {
-
-
+
-      }
-    }

rubricks_core/trunk/components/system/admin_trails_controller.rb

@@ -73 +73 @@
-  private
-  def fix_find_conditions(trails_filter)
- unless RubricksTrail.filter_default?(trails_filter)
+
-    find_conditions = {} if find_conditions.blank? || find_conditions[:conditions].blank?
-    return find_conditions

rubricks_core/trunk/components/system/admin_trails_helper.rb

@@ -1 +1 @@
-module System::AdminTrailsHelper
+  def render_filter_period
+    html  = []
+    html << text_field('filter_conditions', 'trails_date_begin', {:class => 'input_text_inactive focus background_readonly', :size => 10, :readonly => 'readonly'})
+    html << %Q|<span id="datepicker_trails_date_begin_picker_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DatePicker]')}"><span id="datepicker_trails_date_begin_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span>|
+    html << %Q|<span id="datepicker_trails_date_begin_cancel_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DateClear]')}" onclick="rubricks.system.admin_trails.trails_filter_date_begin_clear();"><span id="datepicker_trails_date_begin_cancel_button" class="rubricks_icon icon_dateclear">&nbsp;</span></span>|
+    html << hl('[_Common_RangeMark]')
+    html << text_field('filter_conditions', 'trails_date_end',   {:class => 'input_text_inactive focus background_readonly', :size => 10, :readonly => 'readonly'})
+    html << %Q|<span id="datepicker_trails_date_end_picker_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DatePicker]')}"><span id="datepicker_trails_date_end_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span>|
+    html << %Q|<span id="datepicker_trails_date_end_cancel_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DateClear]')}" onclick="rubricks.system.admin_trails.trails_filter_date_end_clear();"><span id="datepicker_trails_date_end_cancel_button" class="rubricks_icon icon_dateclear">&nbsp;</span></span>|
+    html << rollover_swap('datepicker_trails_date_begin_picker_form', 'datepicker_trails_date_begin_cancel_form', 'datepicker_trails_date_end_picker_form', 'datepicker_trails_date_end_cancel_form')
+    return html.join('')
+  end
+
-  def selectable_table_options
-    return {

rubricks_core/trunk/components/system/calendar/show_detail.rhtml

@@ -79 +79 @@
-        return false;
-      }
-
-
-
+
+
-</script>

rubricks_core/trunk/components/system/languages/chinese.rb

@@ -34 +34 @@
-      '_System_Account_MessageReissueConfirm'                       => 'å¯†ç ä¿®æ”¹æ–¹æ³•å·²ç»å‘åˆ°æ³šå†Œé‚®ç®±äº†ã€‚è¯·æŒ‰ç
-§é‚®ä»¶äž­çš„æ–¹æ³•ä¿®æ”¹å¯†ç ã€‚',
+      '_System_Account_PasswordChangedSubject'                      => '[%s] å¯†ç ä¿®æ”¹å®Œæ¯•çš„é€šçŸ¥',
-      '_System_Account_Register'                                    => '泚册垐号',
-      '_System_Account_ReissueMail'                                 => '邮箱地址',

rubricks_core/trunk/components/system/languages/english.rb

@@ -29 +29 @@
-      '_System_Account_MessageReissue'                              => 'Please change your password.',
-      '_System_Account_MessageReissueConfirm'                       => 'To change your password, confirm the mail please.',
+      '_System_Account_PasswordChangedSubject'                      => '[%s] Your password was changed',
-      '_System_Account_Register'                                    => 'Register',
-      '_System_Account_ReissueMail'                                 => 'Mail address : ',

rubricks_core/trunk/components/system/languages/japanese.rb

@@ -38 +38 @@
-      '_System_Account_MessageReissue'                              => 'パスワヌドを倉曎しおください。',
-      '_System_Account_MessageReissueConfirm'                       => '登録アドレス宛にパスワヌドの倉曎方法を蚘茉したメヌルを送信したした。メヌルの指瀺に埓っおパスワヌドを倉曎しおください。',
+      '_System_Account_PasswordChangedSubject'                      => '[%s] パスワヌド倉曎完了のお知らせ',
-      '_System_Account_Register'                                    => 'ナヌザ登録',
-      '_System_Account_ReissueMail'                                 => '登録メヌルアドレス',
@@ -442 +443 @@
-      '_System_Attachment_UploadError'                              => 'アップロヌドに倱敗したした。ファむルが䞍正です。',
-      '_System_Attachment_UploadErrorByUnfocus'                     => 'アップロヌドに倱敗したした。アップロヌド時にはポップアップからフォヌカスを倖さないでください。',
-Œ
+®
-      '_System_Attachment_InvalidLink'                              => '添付ファむルぞのリンクが䞍正です。',
-      '_System_Block_Calendar'                                      => 'カレンダヌ',

rubricks_core/trunk/components/system/preload/_admin_trails.rhtml

@@ -2 +2 @@
-  count:                    0,
-  export_max:               <%= RubricksTrail::EXPORT_MAX %>,
-  filter_default:           {
-    'trails_date':              "<%= hl(RubricksTrail::FILTER_DEFAULT[:trails_date]) %>",
-    'trails_target_component':  "<%= hl(RubricksTrail::FILTER_DEFAULT[:trails_target_component]) %>",
-    'trails_user_name':         "<%= hl(RubricksTrail::FILTER_DEFAULT[:trails_user_name]) %>",
-    'trails_user_name_raw':     "<%= RubricksTrail::FILTER_DEFAULT[:trails_user_name] %>"
-  },
-  msg_export_all:           "<%= hl('[_System_AdminTrails_MessageExport][_System_AdminTrails_MessageExportCaution][_Common_ExportConfirm]') %>",
-  msg_export_limit:         "<%= hl('[_System_AdminTrails_MessageExport]') + hl(['[_System_AdminTrails_MessageExportLimit]', RubricksTrail::EXPORT_MAX, RubricksTrail::EXPORT_MAX]) + hl('[_System_AdminTrails_MessageExportCaution][_Common_ExportConfirm]') %>",

rubricks_core/trunk/components/system/search/atom.rxml

@@ -2 +2 @@
-xml.feed :xmlns => 'http://www.w3.org/2005/Atom', 'xml:lang' => @site_info[:language] do
-  xml.title         html_escape(@site_info[:title]), {:type => 'text'}
-'Rubricks Search'
+html_escape(@site_info[:subtitle])
-  xml.link          :type => 'application/xhtml+xml', :rel => 'alternate', :href => html_escape(@site_info[:site_url])
-  xml.link          :type => 'application/atom+xml',  :rel => 'self',      :href => html_escape(@site_info[:self])
-  xml.updated       html_escape(@entry_list.first[:date].strftime("%Y-%m-%dT%H:%M:%SZ"))
-search
+permalink
-  xml.author {
-    xml.name        html_escape(@site_info[:author][:name])
@@ -12 +12 @@
-  }
-  xml.generator     'Rubricks', {:type => 'text', :uri => html_escape('http://rubricks.org/')}
-@site_info[:icon]
-@site_info[:logo]
+image_path(@site_info[:icon])
+image_path(@site_info[:logo])
-  @entry_list.each do |entry|
-    xml.entry do

rubricks_core/trunk/components/system/search/no_result.rxml

@@ -2 +2 @@
-xml.feed :xmlns => 'http://www.w3.org/2005/Atom', 'xml:lang' => @site_info[:language] do
-  xml.title         html_escape(@site_info[:title]), {:type => 'text'}
-'Rubricks Search'
+html_escape(@site_info[:subtitle])
-  xml.link          :type => 'application/xhtml+xml', :rel => 'alternate', :href => html_escape(@site_info[:site_url])
-  xml.link          :type => 'application/atom+xml',  :rel => 'self',      :href => html_escape(@site_info[:self])
-  xml.updated       ''
-search
+permalink
-  xml.author {
-    xml.name        html_escape(@site_info[:author][:name])
@@ -12 +12 @@
-  }
-  xml.generator     'Rubricks', {:type => 'text', :uri => html_escape('http://rubricks.org/')}
-@site_info[:icon]
-@site_info[:logo]
+image_path(@site_info[:icon])
+image_path(@site_info[:logo])
-end

rubricks_core/trunk/components/system/search_controller.rb

@@ -2 +2 @@
-  define_page
-  uses_component_template_root
+  authorize_by_server :actions => ['atom']
-
-  def main
@@ -16 +17 @@
-
-  def atom
-    image_dir     = "/images/themes/#{RubricksConfig.get('site_default_theme')}"
-    self_url      = url_for(:controller => '/system/search', :action => 'atom')
-    search_action = url_for(:controller => '/system/search')
-    site_url      = url_for(:controller => '/')
-    @site_info = {
-self_url
+url_for(:controller => '/system/search', :action => 'atom')
-      :language     => RubricksLib.lang_code,
-      :title        => RubricksConfig.get('site_name'),
+      :subtitle     => RubricksLib.l(RubricksMenuItem.find_by_controller('/system/search').title),
-      :author       => {
-        :name       => RubricksConfig.get('mail_from_name'),
-        :email      => RubricksConfig.get('mail_from_address')
-      },
-image_path("#{image_dir}/favicon.ico")
-image_path("#{image_dir}/logo.gif")
-site_url
-search       => search_action
+"/images/themes/#{RubricksLib.current_theme_name}/favicon.ico"
+"/images/themes/#{RubricksLib.current_theme_name}/logo.gif"
+url_for(:controller => '/')
+permalink    => url_for(:controller => '/system/search'),
-    }
-    q = (params[:q]) ? params[:q].slice(/.{0,255}/m) : ''

rubricks_core/trunk/components/system/system_mailer.rb

@@ -24 +24 @@
-  end
-
+  def password_changed(name, recipient)
+    template    "password_changed_#{RubricksLib.current_lang}"
+    recipients  recipient
+    subject     multi_lang!(sprintf(RubricksLib.l('[_System_Account_PasswordChangedSubject]'), RubricksConfig.get('site_name')))
+    from        multi_lang!(system_mail_address)
+    body(:name => name, :site_name => RubricksConfig.get('site_name'))
+  end
+
-  def reissue_password(name, recipient, key, path)
-    template    "reissue_password_#{RubricksLib.current_lang}"

rubricks_core/trunk/components/system/user/group_select.rhtml

@@ -79 +79 @@
-      </div>
-    <% else %>
-
+ rubricks_general_filter_border
-        <%= simple_render_component('/system/user', 'group_list', {:options => @options}) %>
-      </div>

rubricks_core/trunk/components/system/user/user_select.rhtml

@@ -112 +112 @@
-  <tr>
-    <td class="system_user_select_list">
-
+ background_user_select_title rubricks_general_filter_border
-        <%= hl(@options[:str_list_title]) %>
-      </div>
-      <div id="<%= hl(@options[:prefix]) %>filter_area" class="background_white">
-
+ rubricks_general_filter_border
-          <input type="hidden" name="options" value="<%= hl(@params_options) %>" />
-          <div class="system_user_select_filter_line">
@@ -142 +142 @@
-        <% end %>
-      </div>
-
+ rubricks_general_filter_border
-        <%= simple_render_component('/system/user', 'user_list', {:options => @options}) %>
-      </div>
@@ -156 +156 @@
-    </td>
-    <td class="system_user_select_list">
-
+ background_user_select_title rubricks_general_filter_border
-        <%= hl(@options[:str_selected_title]) %>
-      </div>
-      <% form_tag({:controller => '/'}, {:id => "#{hl(@options[:prefix])}form"}) do %>
-
+ rubricks_general_filter_border
-          <select id="<%= hl(@options[:prefix]) %>selected" size="12" multiple="multiple" class="system_user_select_selected background_white"></select>
-          <script type="text/javascript">

rubricks_core/trunk/components/system/user_controller.rb

@@ -5 +5 @@
-  def group_list
-    @options            = fix_options(params[:options])
-
+.json_fix_special_char
-    @rg                 = RubricksGroup.find_effective_group(params[:id]) rescue nil
-    conditions          = (@rg) ? ['effective = true and private_component_id = ? and parent_id = ?', @options[:private_component_id], @rg.id] : ['effective = true and private_component_id = ? and parent_id is NULL', @options[:private_component_id]]
@@ -23 +23 @@
-      :str_submit_button    => '[_Common_Decide]',
-    }.merge(input_options)
-
+.json_fix_special_char
-    @group_tree = (group_tree?) ? true : false
-    if @group_tree
@@ -41 +41 @@
-  def user_list
-    @options            = merge_options(params)
-
+.json_fix_special_char
-    @pages, @ru_list    = paginate(:rubricks_user, @options[:paginate])
-  end
@@ -63 +63 @@
-    }.merge(input_options)
-    @options[:limit_msg]  ||= (@options[:limit] <= 1) ? '[_System_User_MessageUserLimitSingle]' : RubricksLib.hl(['[_System_User_MessageUserLimitMultiple]', @options[:limit]])
-
+.json_fix_special_char
-    @ru_list                = (@options[:default].blank?) ? [] : RubricksUser.find_effective_user(:all, @options[:default])
-  end

rubricks_core/trunk/components/system/user_management/_group_show_tab_user_belongs_to.rhtml

@@ -2 +2 @@
-<% render_tab_box_panel do %>
-  <div class="background_white">
+    <% form_remote_tag(:update => 'users_belongs_to_frame', :url => {:controller => params[:controller].sub(%r(^/?), '/'), :action => 'group_show_user_list', :id => @rg.id}, :html => {:id => 'group_user_sort_form', :class => 'rubricks_general_sort'}) do %>
+      <select id="group_user_sort_key"   name="group_user_sort[key]"   onchange="rubricks.common.fire_onsubmit('group_user_sort_form');">
+        <%= options_for_select([[hl('[_Common_SortKeyUserName]'), 'user_name'], [hl('[_Common_SortKeyUserId]'), 'user_id']], session[:system_sort_key]) %>
+      </select>
+      <select id="group_user_sort_order" name="group_user_sort[order]" onchange="rubricks.common.fire_onsubmit('group_user_sort_form');">
+        <%= options_for_select([[hl('[_Common_Asc]'), 'asc'], [hl('[_Common_Desc]'), 'desc']], session[:system_sort_order]) %>
+      </select>
+    <% end %>
-    <% if @options[:flg_edit_group] %>
-      <% unless (@rg.id == RubricksGroup::GUEST_GROUP_ID || @rg.id == RubricksGroup::REGISTERED_GROUP_ID) %>

rubricks_core/trunk/components/system/user_management/main.rhtml

@@ -49 +49 @@
-<div class="rubricks_general_frame_borderless">
-  <% render_operation_bar do %>
-age
+rint_action
-      <input type="hidden" id="user_management_print_target" name="print[target]" value="" />
-      <input type="hidden" id="user_management_print_id"     name="print[id]"     value="" />
@@ -55 +55 @@
-      <span id="print_button" class="buttons disabled darkicon_print textcolor_white" onclick="rubricks.system.admin_user.functions.print_control();"><%= hl('[_Common_Print]') %></span>
-    <% end %>
-age
+rint_action
-      <input type="hidden" id="user_management_list_print_target" name="print[target]" value="user_list" />
-      <input type="hidden" id="user_management_list_print_page"   name="print[page]"   value="" />