Changeset 6012

Show
Ignore:
Timestamp:
06/24/09 12:14:34 (1 year ago)
Author:
uta
Message:

merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • rubricks_core/trunk/components/system/account/_user_show_edit_content.rhtml

    r5990 r6012  
    5757        <input type="checkbox" class="check" id="rubricks_user_edit_display_email" name="rubricks_user_edit[display_email]"<%= (@ru.display_email) ? ' checked' : '' %> /><label for="rubricks_user_edit_display_email"><%= hl('[_Common_DisplayEmail]') %></label> 
    5858      </p> 
     59      <p><%= hl('[_System_User_MailDescription]') %></p> 
    5960    </td> 
    6061  </tr> 

  • rubricks_core/trunk/components/system/account/_user_show_print_content.rhtml

    r5990 r6012  
    77  <tr class="rubricks_general_table_even"> 
    88    <td><%= hl('[_Common_UserId]') %></td> 
    9     <td><div class="overflow_auto"><%= render_user_status(@ru) %><%= hl(@ru.login_name) %></div></td> 
     9    <td> 
     10      <div class="overflow_auto"> 
     11        <% if @ru.effective %> 
     12          <%= render_user_status(@ru) %><%= hl(@ru.login_name) %> 
     13        <% else %> 
     14          [<%= hl('[_Common_Deleted]') %>] 
     15        <% end %> 
     16      </div> 
     17    </td> 
    1018    <td rowspan="5"> 
    1119      <div> 
    …… 
    4351          <%= render_email(@ru, {:admin => true, :all => true, :limit => 255}) %> 
    4452          <p><%= (@ru.display_email) ? hl('[_System_UserManagement_EmailPublished]') : hl('[_System_UserManagement_EmailUnpublished]') %></p> 
     53          <p><%= hl('[_System_User_MailDescription]') %></p> 
    4554        <% else %> 
    4655          <%= render_email(@ru, {:all => true, :limit => 255}) %> 

  • rubricks_core/trunk/components/system/admin_config/_main_tab_holiday.rhtml

    r5911 r6012  
    1 <% render_float_button('admin_config_holiday_fba1') do %> 
    2   <div id="tab_holiday_delete_window_form" class="float_button_right_inactive swap"> 
    3     <span id="tab_holiday_delete_window_button" class="buttons icon_delete" onclick="rubricks.system.admin_config.holiday_delete_confirm();"><%= hl('[_Common_Delete]') %></span> 
    4   </div> 
    5   <div id="tab_holiday_edit_window_form" class="float_button_right_inactive swap"> 
    6     <span id="tab_holiday_edit_window_button" class="buttons icon_edit" onclick="rubricks.system.admin_config.holiday_edit_window_open();"><%= hl('[_Common_Edit]') %></span> 
    7   </div> 
    8 <% end %> 
     1  <div style="width:95%; margin:0 auto;"> 
     2  <% render_float_button('admin_config_holiday_fba1') do %> 
     3    <% if RubricksConfig.get('site_ineffective_holiday') %> 
     4      <div class="float_button_left_inactive swap" <%= rollover_attributes %>> 
     5        <span class="buttons icon_month" onclick="<%= remote_function(:url => {:controller => '/system/admin_config', :action => 'holiday_update_effective', :site_ineffective_holiday => 'false'}, :loading => 'rubricks.common.rubricks_wait_message_open()', :loaded => 'rubricks.common.rubricks_wait_message_close()') %>"><%= hl('[_System_Calendar_EffectiveHoliday]') %></span> 
     6      </div> 
     7    <% else %> 
     8      <div class="float_button_left_inactive swap" <%= rollover_attributes %>> 
     9        <span class="buttons icon_dateclear" onclick="<%= remote_function(:url => {:controller => '/system/admin_config', :action => 'holiday_update_effective', :site_ineffective_holiday => 'true'}, :with => '{site_ineffective_holiday: this.value, tab: rubricks.system.admin_config.tab_box.selected.succ()}', :loading => 'rubricks.common.rubricks_wait_message_open()', :loaded => 'rubricks.common.rubricks_wait_message_close()') %>"><%= hl('[_System_Calendar_IneffectiveHoliday]') %></span> 
     10      </div> 
     11    <% end %> 
     12    <div id="tab_holiday_delete_window_form" class="float_button_right_inactive swap"> 
     13      <span id="tab_holiday_delete_window_button" class="buttons icon_delete" onclick="rubricks.system.admin_config.holiday_delete_confirm();"><%= hl('[_Common_Delete]') %></span> 
     14    </div> 
     15    <div id="tab_holiday_edit_window_form" class="float_button_right_inactive swap"> 
     16      <span id="tab_holiday_edit_window_button" class="buttons icon_edit" onclick="rubricks.system.admin_config.holiday_edit_window_open();"><%= hl('[_Common_Edit]') %></span> 
     17    </div> 
     18  <% end %> 
     19</div> 
    920<div id="calendar" style="width:95%; margin:0 auto;"></div> 
    1021<br class="cl" /> 
    …… 
    1425  rubricks.system.admin_config.delete_params = null; 
    1526  rubricks.system.admin_config.calendar = new Calendar('calendar', { 
     27    regularHoliday:    <%= RubricksConfig.get('site_ineffective_holiday') ? "[]" : "[0, 6]" %>, 
    1628    holidays:          <%= @rch_list.to_json %>, 
    1729    initDate:          new Date(<%= hl(@today.year) %>, <%= hl(@today.month - 1) %>, <%= hl(@today.day) %>), 

  • rubricks_core/trunk/components/system/admin_config/_main_tab_mail.rhtml

    r5990 r6012  
    1111        <td style="width:70%;"></td> 
    1212      </tr> 
    13       <% unless @configuration[:disable_items][:mail_from_name] %> 
     13      <% unless @configuration[:disable_items][:mail_from] %> 
    1414        <tr class="rubricks_general_table_even"> 
    1515          <td><%= hl('[_System_AdminConfig_ItemMailFromName]') %></td> 
    1616          <td><div class="overflow_auto"><%= hl(RubricksConfig.get('mail_from_name')) %></div></td> 
    1717        </tr> 
    18       <% end %> 
    19       <% unless @configuration[:disable_items][:mail_from_address] %> 
    2018        <tr class="rubricks_general_table_even"> 
    2119          <td><%= hl('[_System_AdminConfig_ItemMailFromAddress]') %></td> 
    2220          <td><div class="overflow_auto"><%= hl(RubricksConfig.get('mail_from_address')) %></div></td> 
    2321        </tr> 
     22        <% unless @configuration[:disable_items][:mail_from_unified] %> 
     23          <tr class="rubricks_general_table_even"> 
     24            <td><%= hl('[_System_AdminConfig_ItemMailFromUnified]') %></td> 
     25            <td><%= (RubricksConfig.get('mail_from_unified')) ? hl('[_Common_Yes]') : hl('[_Common_No]') %></td> 
     26          </tr> 
     27        <% end %> 
    2428      <% end %> 
    2529      <% unless @configuration[:disable_items][:mail_method] %> 
    …… 
    8185            <td style="width:70%;"></td> 
    8286          </tr> 
    83           <% unless @configuration[:disable_items][:mail_from_name] %> 
     87          <% unless @configuration[:disable_items][:mail_from] %> 
    8488            <tr class="rubricks_general_table_even"> 
    8589              <td><%= hl('[_System_AdminConfig_ItemMailFromName]') %></td> 
    …… 
    8993              </td> 
    9094            </tr> 
    91           <% end %> 
    92           <% unless @configuration[:disable_items][:mail_from_address] %> 
    9395            <tr class="rubricks_general_table_even"> 
    9496              <td><%= hl('[_System_AdminConfig_ItemMailFromAddress]') %></td> 
    …… 
    98100              </td> 
    99101            </tr> 
     102            <% unless @configuration[:disable_items][:mail_from_unified] %> 
     103              <tr class="rubricks_general_table_even"> 
     104                <td><%= hl('[_System_AdminConfig_ItemMailFromUnified]') %></td> 
     105                <td> 
     106                  <select id="rubricks_config_mail_from_unified" name="rubricks_config[mail_from_unified]" size="1" style="max-width:100%;"> 
     107                    <option value="true"  <%= (RubricksConfig.get('mail_from_unified'))  ? 'selected="selected"' : '' %>><%= hl('[_Common_Yes]') %></option> 
     108                    <option value="false" <%= (!RubricksConfig.get('mail_from_unified')) ? 'selected="selected"' : '' %>><%= hl('[_Common_No]') %></option> 
     109                  </select> 
     110                </td> 
     111              </tr> 
     112            <% end %> 
    100113          <% end %> 
    101114          <% unless @configuration[:disable_items][:mail_method] %> 

  • rubricks_core/trunk/components/system/admin_config_controller.rb

    r5895 r6012  
    8989    end 
    9090    headers['Content-Type'] = 'text/javascript' 
     91  end 
     92 
     93  def holiday_update_effective 
     94    ActiveRecord::Base.transaction do 
     95      flash.now[:admin_config_tab] = 8 
     96      value = (params[:site_ineffective_holiday] == 'true') ? 'true' : 'false' 
     97      RubricksConfig.set('site_ineffective_holiday', value) 
     98      RubricksConfig.cache 
     99    end 
    91100  end 
    92101 

  • rubricks_core/trunk/components/system/admin_menu/show.rhtml

    r5887 r6012  
    2323            <td><%= hl('[_System_AdminMenu_IconName]') %></td> 
    2424            <td><%= hl(@menu_icon.title) %></td> 
    25             <td class="text_center" rowspan="2"><img src="<%= image_path(@icon_url) %>" width="70" height="70" alt="<%= hl(@menu_icon.title) %>" /></td> 
     25            <td class="text_center" rowspan="2"><img src="<%= image_path(@icon_url) %>" width="70" height="70" alt="<%= hl(@menu_icon.title) %>" title="<%= hl(@menu_icon.title) %>" /></td> 
    2626          </tr> 
    2727          <tr class="rubricks_general_table_even"> 

  • rubricks_core/trunk/components/system/admin_menu_helper.rb

    r5887 r6012  
    3939    menu_item_id = hl(menu_item.id) 
    4040    html  = %Q|<li id="sortable_item_#{menu_item_id}" class="system_admin_menu_sortable_item background_white cursor_move dot_line overflow_auto">| 
    41     html += %Q|<div id="sortable_item_#{menu_item_id}_edit_form" class="float_button_left_inactive swap" #{rollover_attributes}><span id="sortable_item_#{menu_item_id}_edit_button" class="buttons icon_edit" onclick="rubricks.system.admin_menu.menu_item_edit_window_open(this.id);">&nbsp;</span></div>| 
    42     html += %Q|<div id="sortable_item_#{menu_item_id}_delete_form" class="float_button_left_inactive swap" #{rollover_attributes}><span id="sortable_item_#{menu_item_id}_delete_button" class="buttons icon_delete" onclick="rubricks.system.admin_menu.menu_item_delete_id = this.id; #{render_confirm_window('[_Common_Delete_Confirm]', 'rubricks.system.admin_menu.menu_item_delete(rubricks.system.admin_menu.menu_item_delete_id);')}">&nbsp;</span></div>| if menu_item.external_url 
     41    html += %Q|<div id="sortable_item_#{menu_item_id}_edit_form" class="float_button_left_inactive swap" #{rollover_attributes}><span id="sortable_item_#{menu_item_id}_edit_button" class="buttons icon_edit" onclick="rubricks.system.admin_menu.menu_item_edit_window_open(this.id);" title="#{hl('[_Common_Edit]')}">&nbsp;</span></div>| 
     42    html += %Q|<div id="sortable_item_#{menu_item_id}_delete_form" class="float_button_left_inactive swap" #{rollover_attributes}><span id="sortable_item_#{menu_item_id}_delete_button" class="buttons icon_delete" onclick="rubricks.system.admin_menu.menu_item_delete_id = this.id; #{render_confirm_window('[_Common_Delete_Confirm]', 'rubricks.system.admin_menu.menu_item_delete(rubricks.system.admin_menu.menu_item_delete_id);')}" title="#{hl('[_Common_Delete]')}">&nbsp;</span></div>| if menu_item.external_url 
    4343    html += %Q|<div id="sortable_item_#{menu_item_id}_title" class="system_admin_menu_sortable_item_title">#{hl(menu_item.title)}</div>| 
    4444    html += %Q|<div id="sortable_item_#{menu_item_id}_external_url" class="display_none">#{(menu_item.external_url) ? hl(menu_item.external_url) : ''}</div>| 

  • rubricks_core/trunk/components/system/calendar/show.rhtml

    r5848 r6012  
    88          size:              'small', 
    99          holidays:          <%= @holidays.to_json %>, 
     10          regularHoliday:    <%= RubricksConfig.get('site_ineffective_holiday') ? "[]" : "[0, 6]" %>, 
    1011          schedules:         <%= @schedules.to_json %>, 
    1112          initDate:          new Date(<%= hl(@today.year) %>, <%= hl(@today.month - 1) %>, <%= hl(@today.day) %>), 

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

    r5965 r6012  
    116116          displayType:         "<%= initial_calendar_type %>", 
    117117          holidays:            <%= @holidays.to_json %>, 
     118          regularHoliday:      <%= RubricksConfig.get('site_ineffective_holiday') ? "[]" : "[0, 6]" %>, 
    118119          schedules:           rubricks.system.calendar.schedules, 
    119120          initDate:            rubricks.system.calendar.date, 

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

    r5990 r6012  
    1515      '_System_Account_ErrorEdit'                                   => 'Failed to update account information.', 
    1616      '_System_Account_ErrorLogin'                                  => 'Username or Password is invalid.', 
     17      '_System_Account_ErrorLoginChangePasswordByPc'                => 'The password of your account is out of date, please login with PC and change it.', 
    1718      '_System_Account_ErrorLoginContactAdmin'                      => ' Please contact the administrator.', 
    1819      '_System_Account_ErrorLoginInvalid'                           => 'This account is expired.', 
    …… 
    7778      '_System_AdminConfig_ItemMailFromAddress'                     => 'Mail Sender Address', 
    7879      '_System_AdminConfig_ItemMailFromName'                        => 'Mail Sender Name', 
     80      '_System_AdminConfig_ItemMailFromUnified'                     => 'All mails are set to above name & address', 
    7981      '_System_AdminConfig_ItemMailMethod'                          => 'Mail Method', 
    8082      '_System_AdminConfig_ItemMailSmtpAccount'                     => '[SMTP] Account Name', 
    …… 
    275277      '_System_AdminUser_ErrorUserImportByUserValidationNotUnique'  => 'Failed to import users. (line %d : %s is already used)', 
    276278      '_System_AdminUser_ErrorUserImportByUserValidationWithColumn' => 'Failed to import users because user information is invalid. (line %d, column %s)', 
     279      '_System_AdminUser_ErrorUserInitialize'                       => 'Failed to initialize the user.', 
     280      '_System_AdminUser_ErrorUserInitializeSelf'                   => 'You can not initialize your own.', 
    277281      '_System_AdminUser_ErrorUserInvalidate'                       => 'Failed to invalidate the user.', 
    278282      '_System_AdminUser_ErrorUserInvalidateSelf'                   => 'You can not invalidate your own.', 
    …… 
    305309      '_System_AdminUser_MessageUserImageUpload'                    => 'The user image is uploaded.', 
    306310      '_System_AdminUser_MessageUserImport'                         => 'The user data are imported.', 
     311      '_System_AdminUser_MessageUserInitialize'                     => 'The user is initialized.', 
     312      '_System_AdminUser_MessageUserInitializeConfirm'              => 'Are you sure to initialize the user?', 
    307313      '_System_AdminUser_MessageUserInvalidate'                     => 'The user is invalidated.', 
    308314      '_System_AdminUser_MessageUserInvalidateConfirm'              => 'Are you sure to invalidate the user?', 
    …… 
    438444      '_System_User_ImageDescription3'                              => 'Both of width and height are 130px.', 
    439445      '_System_User_ImageWindow'                                    => 'User Image', 
     446      '_System_User_MailDescription'                                => '* Mail from each component is sent to the first address', 
    440447      '_System_User_MessageUserLimitMultiple'                       => 'You can select within &d users.', 
    441448      '_System_User_MessageUserLimitSingle'                         => 'You can not select multiple users.', 
    …… 
    473480      '_System_UserManagement_UserImageUpload'                      => 'User Image Upload', 
    474481      '_System_UserManagement_UserImport'                           => 'User Import', 
     482      '_System_UserManagement_UserInitialize'                       => 'User Initialize', 
    475483      '_System_UserManagement_UserInvalidate'                       => 'User Invalidate', 
    476484      '_System_UserManagement_UserLock'                             => 'User Lock', 

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

    r5990 r6012  
    2020報の曎新に倱敗したした。', 
    2121      '_System_Account_ErrorLogin'                                  => 'ナヌザ名もしくはパスワヌドが違いたす。', 
     22      '_System_Account_ErrorLoginChangePasswordByPc'                => '該圓アカりントのパスワヌドは有効期限が切れおいたす。PCからログむンの䞊パスワヌドを倉曎しおください。', 
    2223      '_System_Account_ErrorLoginContactAdmin'                      => '管理耠
    2324に連絡しおください。', 
    …… 
    101102      '_System_AdminConfig_ItemDashboardDefaultSkinName'            => 'デフォルトスキン', 
    102103      '_System_AdminConfig_ItemDashboardWidgetName'                 => 'りィゞェット', 
    103       '_System_AdminConfig_ItemMailFromAddress'                     => 'Fromアドレス', 
    104       '_System_AdminConfig_ItemMailFromName'                        => 'メヌル送信耠
     104      '_System_AdminConfig_ItemMailFromAddress'                     => 'システムから送信されるメヌルの送信å 
     105ƒã‚¢ãƒ‰ãƒ¬ã‚¹', 
     106      '_System_AdminConfig_ItemMailFromName'                        => 'システムから送信されるメヌルの送信耠
    105107名', 
     108      '_System_AdminConfig_ItemMailFromUnified'                     => 'å 
     109šãŠã®ãƒ¡ãƒŒãƒ«ã®é€ä¿¡å 
     110ƒã‚’䞊蚘に統䞀する', 
    106111      '_System_AdminConfig_ItemMailMethod'                          => 'メヌル送信方法', 
    107112      '_System_AdminConfig_ItemMailSmtpAccount'                     => '[SMTP] アカりント名', 
    …… 
    334339      '_System_AdminUser_ErrorUserImportByUserValidationWithColumn' => '%d行目の%sがナヌザのå 
    335340¥åŠ›æ¡ä»¶ã‚’満たしおいたせん。', 
     341      '_System_AdminUser_ErrorUserInitialize'                       => 'ナヌザの初期化に倱敗したした。', 
     342      '_System_AdminUser_ErrorUserInitializeSelf'                   => '自分を初期化するこずはできたせん。', 
    336343      '_System_AdminUser_ErrorUserInvalidate'                       => 'ナヌザの無効化に倱敗したした。', 
    337344      '_System_AdminUser_ErrorUserInvalidateSelf'                   => '自分を無効化するこずはできたせん。', 
    …… 
    374381      '_System_AdminUser_MessageUserImport'                         => 'ナヌザ惠
    375382報をむンポヌトしたした。', 
     383      '_System_AdminUser_MessageUserInitialize'                     => 'ナヌザを初期化したした。', 
     384      '_System_AdminUser_MessageUserInitializeConfirm'              => '初期化をするこずによっお、該圓ナヌザが今たでに登録したデヌタを線集・削陀するこずはできなくなりたす。たた、所属しおいたグルヌプや組織から倖れたす。ナヌザを初期化しおよろしいですか', 
    376385      '_System_AdminUser_MessageUserInvalidate'                     => 'ナヌザを無効化したした。', 
    377386      '_System_AdminUser_MessageUserInvalidateConfirm'              => 'ナヌザを無効化しおよろしいですか', 
    …… 
    467476      '_System_Block_WaitingApproval'                               => '承認埠
    468477ちコンテンツ', 
     478      '_System_Calendar_EffectiveHoliday'                           => '土日を䌑日ずしお扱う', 
    469479      '_System_Calendar_FinishDateTime'                             => '終了日時', 
    470480      '_System_Calendar_Title'                                      => 'タむトル', 
    …… 
    473483      '_System_Calendar_TitleCalendar'                              => 'カレンダヌ', 
    474484      '_System_Calendar_TitleHoliday'                               => '䌑日蚭定', 
     485      '_System_Calendar_IneffectiveHoliday'                         => '土日を䌑日ずしお扱わない', 
    475486      '_System_Calendar_StartDateTime'                              => '開始日時', 
    476487      '_System_Calendar_WeekendHide'                                => '土日非衚瀺', 
    …… 
    552563      '_System_User_ImageDescription3'                              => '画像は瞊130px、暪130pxで衚瀺されたす。', 
    553564      '_System_User_ImageWindow'                                    => 'プロフィヌル画像', 
     565      '_System_User_MailDescription'                                => '※各機胜から送信されるメヌルは1番目のアドレス宛に送信されたす', 
    554566      '_System_User_MessageUserLimitMultiple'                       => '指定可胜なナヌザは%d人たでです。', 
    555567      '_System_User_MessageUserLimitSingle'                         => '耇数のナヌザを指定するこずはできたせん。', 
    …… 
    601613      '_System_UserManagement_UserImport'                           => 'ナヌザ惠
    602614報むンポヌト', 
     615      '_System_UserManagement_UserInitialize'                       => 'ナヌザ初期化', 
    603616      '_System_UserManagement_UserInvalidate'                       => 'ナヌザ無効化', 
    604617      '_System_UserManagement_UserLock'                             => 'ナヌザロック', 

  • rubricks_core/trunk/components/system/mobile_controller.rb

    r5990 r6012  
    3636      rubricks_logger({:action_type => :login, :component_name => 'auth', :component_display_name => '[_Common_Authentication]', :note => ['[_System_Login_Failure]', params[:login][:login_name]], :data => {'[_Common_UserId]' => params[:login][:login_name]}}) 
    3737      flash[:login_message] = login_result[:login_message] 
     38      flash[:login_message] = '[_System_Account_ErrorLoginChangePasswordByPc]' if flash[:login_message].match(RubricksLib.hl('[_System_Login_MessageChangePassword]')) 
    3839      if RubricksLib::LOGIN_URL[:mobile].is_a?(Hash) 
    3940        redirect_to RubricksLib::LOGIN_URL[:mobile] 

  • rubricks_core/trunk/components/system/tiny_mce_attachment/entry_file_attachment.rhtml

    r5887 r6012  
    22  <% validate_form('file_attach_submit_button') do %> 
    33    <div id="file_attachment_iframe"></div> 
    4     <% form_tag({:action => 'create_file_link'}, {:multipart => true, :onsubmit  => "rubricks.common.AjaxUploader.submit('file_attachment_iframe', this, {onComplete:function(result) {if(result == 'error') {alert('#{hl('[_System_Attachment_UploadError]')}'); return false;}createContent(result, function() { alert('#{hl('[_System_Attachment_UploadErrorByUnfocus]')}'); });}});"}) do %> 
     4    <% form_tag({:action => 'create_file_link'}, {:multipart => true, :onsubmit  => "$('file_attach_submit_button').disabled=true;Element.addClassName('file_attach_submit_button', 'disabled');rubricks.common.AjaxUploader.submit('file_attachment_iframe', this, {onComplete:function(result) {if(result == 'error') {$('file_attach_submit_button').disabled=false;Element.removeClassName('file_attach_submit_button', 'disabled');alert('#{hl('[_System_Attachment_UploadError]')}'); return false;}createContent(result, function() { alert('#{hl('[_System_Attachment_UploadErrorByUnfocus]')}'); });}});"}) do %> 
    55      <%= hidden_field_tag("type", params[:type]); %> 
    66      <div><%= hl('[_System_Attachment_FileUpload1]') %></div> 

  • rubricks_core/trunk/components/system/tiny_mce_attachment/entry_image_attachment.rhtml

    r5887 r6012  
    22  <% validate_form('image_attach_submit_button') do %> 
    33    <div id="imag_attachment_iframe"></div> 
    4     <% form_tag({:action => 'create_file_link'}, {:multipart => true, :onsubmit => "rubricks.common.AjaxUploader.submit('imag_attachment_iframe', this, {onComplete: function(result) {if(result == 'error') {alert('#{hl('[_System_Attachment_UploadError]')}'); return false;} createContent(result, function() { alert('#{hl('[_System_Attachment_UploadErrorByUnfocus]')}'); });}});"}) do %> 
     4    <% form_tag({:action => 'create_file_link'}, {:multipart => true, :onsubmit => "$('image_attach_submit_button').disabled=true;Element.addClassName('image_attach_submit_button', 'disabled');rubricks.common.AjaxUploader.submit('imag_attachment_iframe', this, {onComplete: function(result) {if(result == 'error') {$('image_attach_submit_button').disabled=false;Element.removeClassName('image_attach_submit_button', 'disabled');alert('#{hl('[_System_Attachment_UploadError]')}'); return false;} createContent(result, function() { alert('#{hl('[_System_Attachment_UploadErrorByUnfocus]')}'); });}});"}) do %> 
    55      <%= hidden_field_tag("type", params[:type]); %> 
    66      <div><%= hl('[_System_Attachment_ImageUpload1]') %></div> 

  • rubricks_core/trunk/components/system/toolbar/theme_changer.rhtml

    r5098 r6012  
    1 <li id="rubricks_toolbar_theme_changer" class="rubricks_toolbar_theme_changer"> 
    2   <% form_tag({:controller => '/system/account', :action => 'change_theme'}, {:id => 'rubricks_toolbar_theme_changer_form'}) do %> 
    3     <input type="hidden" id="rubricks_toolbar_theme_changer_id" name="id" value="" /> 
    4     <input type="submit" id="rubricks_toolbar_theme_changer_buton" class="display_none" /> 
    5   <% end %> 
    6   <% @rt_list.each do |rt| %> 
    7     <% unless @ru.rubricks_theme_id == rt.id %> 
    8       <%= image_tag(rt.path_of_theme_changer, {:size => '20x20', :alt => rt.name, :title => rt.name, :class => 'cursor_pointer', :onclick => "$('rubricks_toolbar_theme_changer_id').value = #{hl(rt.id)}; #{render_confirm_window(RubricksLib.hl('[_System_ThemeChanger_Confirm]', rt.name), %q|rubricks.common.fire_submit('rubricks_toolbar_theme_changer_form', 'rubricks_toolbar_theme_changer_buton');|)}"})  %> 
     1<% if RubricksConfig.get_editable_ru_columns['_Common_ThemeName'] %> 
     2  <li id="rubricks_toolbar_theme_changer" class="rubricks_toolbar_theme_changer"> 
     3    <% form_tag({:controller => '/system/account', :action => 'change_theme'}, {:id => 'rubricks_toolbar_theme_changer_form'}) do %> 
     4      <input type="hidden" id="rubricks_toolbar_theme_changer_id" name="id" value="" /> 
     5      <input type="submit" id="rubricks_toolbar_theme_changer_buton" class="display_none" /> 
    96    <% end %> 
    10   <% end %> 
    11 </li> 
     7    <% @rt_list.each do |rt| %> 
     8      <% unless @ru.rubricks_theme_id == rt.id %> 
     9        <%= image_tag(rt.path_of_theme_changer, {:size => '20x20', :alt => rt.name, :title => rt.name, :class => 'cursor_pointer', :onclick => "$('rubricks_toolbar_theme_changer_id').value = #{hl(rt.id)}; #{render_confirm_window(RubricksLib.hl('[_System_ThemeChanger_Confirm]', rt.name), %q|rubricks.common.fire_submit('rubricks_toolbar_theme_changer_form', 'rubricks_toolbar_theme_changer_buton');|)}"})  %> 
     10      <% end %> 
     11    <% end %> 
     12  </li> 
     13<% end %> 

  • rubricks_core/trunk/components/system/user_management/_user_show_edit_content.rhtml

    r5990 r6012  
    4141        <input type="checkbox" class="check" id="rubricks_user_edit_display_email" name="rubricks_user_edit[display_email]"<%= (@ru.display_email) ? ' checked' : '' %> /><label for="rubricks_user_edit_display_email"><%= hl('[_Common_DisplayEmail]') %></label> 
    4242      </p> 
     43      <p><%= hl('[_System_User_MailDescription]') %></p> 
    4344    </td> 
    4445  </tr> 

  • rubricks_core/trunk/components/system/user_management/_user_show_print_content.rhtml

    r5990 r6012  
    4040        <%= render_email(@ru, {:admin => true, :all => true, :limit => 255}) %> 
    4141        <p><%= (@ru.display_email) ? hl('[_System_UserManagement_EmailPublished]') : hl('[_System_UserManagement_EmailUnpublished]') %></p> 
     42        <p><%= hl('[_System_User_MailDescription]') %></p> 
    4243      </div> 
    4344    </td> 

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

    r5990 r6012  
    1414    msg_user_image_delete_confirm:  "<%= hl(@options[:msg_user_image_delete_confirm]) %>", 
    1515    msg_user_invalidate_confirm:    "<%= hl(@options[:msg_user_invalidate_confirm]) %>", 
     16    msg_user_initialize_confirm:    "<%= hl(@options[:msg_user_initialize_confirm]) %>", 
    1617    msg_user_lock_confirm:          "<%= hl(@options[:msg_user_lock_confirm]) %>", 
    1718    msg_user_not_selected:          "<%= hl(@options[:msg_user_not_selected]) %>", 
    …… 
    3536    url_user_import_window:         "<%= url_for(:controller => params[:controller].sub(%r(^/?), '/'), :action => 'user_import_window') %>", 
    3637    url_user_invalidate:            "<%= url_for(:controller => params[:controller].sub(%r(^/?), '/'), :action => 'user_invalidate') %>", 
     38    url_user_initialize:            "<%= url_for(:controller => params[:controller].sub(%r(^/?), '/'), :action => 'user_initialize') %>", 
    3739    url_user_list:                  "<%= url_for(:controller => params[:controller].sub(%r(^/?), '/'), :action => 'user_list') %>", 
    3840    url_user_lock:                  "<%= url_for(:controller => params[:controller].sub(%r(^/?), '/'), :action => 'user_lock') %>", 

  • rubricks_core/trunk/components/system/user_management/user_show.rhtml

    r5990 r6012  
    66          <% render_float_button('admin_user_fba2') do %> 
    77            <% if @ru.effective %> 
     8              <% if RubricksUser::USER_MANAGEMENT_LIMITATION[:initializable] && !my_user?(@ru) %> 
     9                <div id="user_initialize_form" class="float_button_right_inactive swap"> 
     10                  <span id="user_initialize_confirm_button" class="buttons icon_user_refresh" onclick="rubricks.system.admin_user.functions.user_initialize_confirm(<%= hl(@ru.id) %>);"><%= hl('[_Common_Initialize]') %></span> 
     11                </div> 
     12              <% end %> 
    813              <% if RubricksUser::USER_MANAGEMENT_LIMITATION[:deletable] && !my_user?(@ru) %> 
    914                <div id="user_invalidate_form" class="float_button_right_inactive swap">