Changeset 5887

Show
Ignore:
Timestamp:
07/28/08 16:59:35 (4 months ago)
Author:
uta
Message:

2008/07/28 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r5848 r5887  
    2626            redirect_to :controller => '/' 
    2727          else 
    28             System::SystemMailer.set_config 
    2928            begin 
    30               System::SystemMailer.deliver_account_approval(ru.login_name, ru.email_by_admin) 
     29              System::SystemMailer.deliver_account_approval(ru) 
    3130              flash[:top_page] = '[_System_Account_MessageAdmit]' 
    3231            rescue Exception => ex 
    …… 
    8685        when 'user' 
    8786          path = "#{base_path}#{request.path}".sub(/create$/, 'activate_user') 
    88           System::SystemMailer.set_config 
    8987          begin 
    90             System::SystemMailer.deliver_admit_user(ru.login_name, ru.email_by_admin, ru.certified, path) 
     88            System::SystemMailer.deliver_admit_user(ru, path) 
    9189          rescue Exception => ex 
    9290            logger.error(ex.message) 
    …… 
    9896        when 'admin' 
    9997          path = "#{base_path}#{request.path}".sub(/create$/, 'activate_user') 
    100           System::SystemMailer.set_config 
    10198          begin 
    102             System::SystemMailer.deliver_admit_admin(ru.login_name, RubricksConfig.get('mail_from_address'), ru.certified, ru.email_by_admin, path) 
     99            System::SystemMailer.deliver_admit_admin(ru, path) 
    103100          rescue Exception => ex 
    104101            logger.error(ex.message) 
    …… 
    161158        ru.certified = RubricksLib.make_random_string(12) 
    162159        ru.save! 
    163         System::SystemMailer.set_config 
    164160        begin 
    165           System::SystemMailer.deliver_reissue_password(ru.login_name, ru.email_by_admin, ru.certified, path) 
     161          System::SystemMailer.deliver_reissue_password(ru, path) 
    166162        rescue Exception => ex 
    167163          logger.error(ex.message) 

  • rubricks_core/trunk/components/system/admin_block/_show_addable_blocks_window.rhtml

    r5610 r5887  
    55  <div id="edit_addable_blocks_area"></div> 
    66  <div class="rubricks_layout_buttons"> 
    7     <input id="addable_block_window_close_button" type="button" value="<%= hl('[_Common_Close]') %>" onclick="rubricks.system.admin_block.addable_blocks_window_close();" class="submit_inactive submit_normal swap"> 
     7    <input id="addable_block_window_close_button" type="button" value="<%= hl('[_Common_Close]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_block.addable_blocks_window_close();" class="submit_inactive submit_normal swap" /> 
    88  </div> 
    9   <%= rollover_swap('addable_block_window_close_button') %> 
    109<% end %> 

  • rubricks_core/trunk/components/system/admin_component/_main_component_install_window.rhtml

    r5610 r5887  
    1313      <tr class="rubricks_general_table_even"> 
    1414        <td class="rubricks_layout_buttons"> 
    15           <input type="submit" id="component_install_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Install]') %>" onclick="rubricks.system.admin_component.component_install_window.close();" /> 
    16           <input type="button" id="component_install_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_component.component_install_window.close();" /> 
    17           <%= rollover_swap('component_install_button', 'component_install_cancel_button') %> 
     15          <input type="submit" id="component_install_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Install]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_component.component_install_window.close();" /> 
     16          <input type="button" id="component_install_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>"  <%= rollover_attributes %> onclick="rubricks.system.admin_component.component_install_window.close();" /> 
    1817        </td> 
    1918      </tr> 

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

    r5781 r5887  
    2222        <tr class="rubricks_general_table_even"> 
    2323          <td class="rubricks_layout_buttons" colspan="2"> 
    24             <input type="submit" id="holiday_edit_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Save]') %>" /> 
    25             <input type="button" id="holiday_edit_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_config.holiday_edit_window_close();" /> 
    26             <%= rollover_swap('holiday_edit_button', 'holiday_edit_cancel_button') %> 
     24            <input type="submit" id="holiday_edit_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Save]') %>"   <%= rollover_attributes %> /> 
     25            <input type="button" id="holiday_edit_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_config.holiday_edit_window_close();" /> 
    2726          </td> 
    2827        </tr> 

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

    r5781 r5887  
    3737              <p class="dot_line"> 
    3838                <%= hl('[_Common_SampleWithNumber]', '01') %> 
    39                 <a href="<%= url_for(:controller => '/system/admin_config', :action => 'sample_csv', :id => 1) %>" title="Sample1" style="text-decoration:none;"><span id="holiday_csv_sample1_button" class="icon_frame_inactive swap"><span class="rubricks_icon icon_file">&nbsp;</span></span></a> 
     39                <a href="<%= url_for(:controller => '/system/admin_config', :action => 'sample_csv', :id => 1) %>" title="Sample1" style="text-decoration:none;"><span id="holiday_csv_sample1_button" class="icon_frame_inactive swap" <%= rollover_attributes %>><span class="rubricks_icon icon_file">&nbsp;</span></span></a> 
    4040              </p> 
    4141            </div> 
    42             <%= rollover_swap('holiday_csv_sample1_button') %> 
    4342          </td> 
    4443        </tr> 
    …… 
    4847      </div> 
    4948      <div class="rubricks_layout_buttons"> 
    50         <input type="submit" id="holiday_import_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Yes]') %>" onclick="rubricks.system.admin_config.holiday_import_window_close();"> 
    51         <input type="button" id="holiday_import_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_No]') %>"  onclick="rubricks.system.admin_config.holiday_import_window_close();"> 
    52         <%= rollover_swap('holiday_import_button', 'holiday_import_cancel_button') %> 
     49        <input type="submit" id="holiday_import_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Yes]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_config.holiday_import_window_close();"> 
     50        <input type="button" id="holiday_import_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_No]') %>"  <%= rollover_attributes %> onclick="rubricks.system.admin_config.holiday_import_window_close();"> 
    5351      </div> 
    5452    <% end %> 

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

    r5781 r5887  
    2626        <tr class="rubricks_general_table_even"> 
    2727          <td class="rubricks_layout_buttons" colspan="2"> 
    28             <input type="button" id="menu_item_edit_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Edit]') %>" onclick="rubricks.system.admin_menu.menu_item_edit();" disabled="disabled" /> 
    29             <input type="button" id="menu_item_edit_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_menu.menu_item_edit_window_close();" /> 
    30             <%= rollover_swap('menu_item_edit_button', 'menu_item_edit_cancel_button') %> 
     28            <input type="button" id="menu_item_edit_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Edit]') %>"   <%= rollover_attributes %> onclick="rubricks.system.admin_menu.menu_item_edit();" disabled="disabled" /> 
     29            <input type="button" id="menu_item_edit_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_menu.menu_item_edit_window_close();" /> 
    3130          </td> 
    3231        </tr> 

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

    r5781 r5887  
    110110                  <div id="admin_menu_fba5"> 
    111111                    <div id="menu_item_create_form" class="float_button_right_inactive swap"> 
    112                       <span id="menu_item_create_button" class="buttons icon_new" onclick="rubricks.system.admin_menu.menu_item_create(<%= hl(@menu_icon.id) %>);"><%= hl('[_Common_New]') %></span> 
     112                      <span id="menu_item_create_button" class="buttons icon_new" <%= rollover_attributes %> onclick="rubricks.system.admin_menu.menu_item_create(<%= hl(@menu_icon.id) %>);"><%= hl('[_Common_New]') %></span> 
    113113                    </div> 
    114                     <%= rollover_swap('menu_item_create_form') %> 
    115114                  </div> 
    116115                  <br class="cl" /> 

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

    r5744 r5887  
    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"><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"><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);">&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 
    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>| 
    4545    html += %Q|</li>| 
    46     html += %Q|<script type="text/javascript">| 
    47     html += %Q|rubricks.common.Rollover.swap('sortable_item_#{menu_item_id}_edit_form');| 
    48     html += %Q|rubricks.common.Rollover.swap('sortable_item_#{menu_item_id}_delete_form');| if menu_item.external_url 
    49     html += %Q|</script>| 
    5046    return html 
    5147  end 

  • rubricks_core/trunk/components/system/admin_skin/install_window.rhtml

    r5610 r5887  
    1818        <tr class="rubricks_general_table_even"> 
    1919          <td class="rubricks_layout_buttons"> 
    20             <input type="submit" id="skin_install_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Install]') %>" onclick="rubricks.system.admin_skin.skin_install_window.close();" /> 
    21             <input type="button" id="skin_install_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_skin.skin_install_window.close();" /> 
    22             <%= rollover_swap('skin_install_button', 'skin_install_cancel_button') %> 
     20            <input type="submit" id="skin_install_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Install]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_skin.skin_install_window.close();" /> 
     21            <input type="button" id="skin_install_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>"  <%= rollover_attributes %> onclick="rubricks.system.admin_skin.skin_install_window.close();" /> 
    2322          </td> 
    2423        </tr> 

  • rubricks_core/trunk/components/system/admin_theme/install_window.rhtml

    r5610 r5887  
    1818        <tr class="rubricks_general_table_even"> 
    1919          <td class="rubricks_layout_buttons"> 
    20             <input type="submit" id="theme_install_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Install]') %>" onclick="rubricks.system.admin_theme.theme_install_window.close();" /> 
    21             <input type="button" id="theme_install_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_theme.theme_install_window.close();" /> 
    22             <%= rollover_swap('theme_install_button', 'theme_install_cancel_button') %> 
     20            <input type="submit" id="theme_install_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Install]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_theme.theme_install_window.close();" /> 
     21            <input type="button" id="theme_install_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>"  <%= rollover_attributes %> onclick="rubricks.system.admin_theme.theme_install_window.close();" /> 
    2322          </td> 
    2423        </tr> 

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

    r5758 r5887  
    1010        <input type="hidden" id="filter_conditions_trails_user_name"         name="filter_conditions[trails_user_name]" /> 
    1111        <input type="text"   id="filter_conditions_trails_user_name_display" name="filter_conditions[trails_user_name_display]" class="background_readonly" size="24" readonly="readonly" /> 
    12         <span id="trails_user_select_window_form" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelect]') %>" onclick="rubricks.system.admin_trails.user_select_window_open();"><span id="trails_user_select_window_button" class="rubricks_icon icon_user">&nbsp;</span></span><span id="trails_user_select_clear_form" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelectClear]') %>" onclick="rubricks.system.admin_trails.trails_filter_user_name_clear();"><span id="trails_user_select_clear_button" class="rubricks_icon icon_user_remove">&nbsp;</span></span> 
    13         <%= rollover_swap('trails_user_select_window_form', 'trails_user_select_clear_form') %> 
     12        <span id="trails_user_select_window_form" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelect]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_trails.user_select_window_open();"><span id="trails_user_select_window_button" class="rubricks_icon icon_user">&nbsp;</span></span><span id="trails_user_select_clear_form" class="icon_frame_inactive swap" title="<%= hl('[_Common_UserSelectClear]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_trails.trails_filter_user_name_clear();"><span id="trails_user_select_clear_button" class="rubricks_icon icon_user_remove">&nbsp;</span></span> 
    1413      </td> 
    1514    </tr> 

  • rubricks_core/trunk/components/system/admin_trails/_show_buttons.rhtml

    r5610 r5887  
    22  <td class="rubricks_layout_buttons" colspan="3"> 
    33    <% form_tag({:controller => '/'}, {:id => 'trails_detail_close_form'}) do %> 
    4       <input type="button" id="trails_detail_close_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Close]') %>" onclick="rubricks.system.admin_trails.trails_detail_window_close();" /> 
    5       <%= rollover_swap('trails_detail_close_button') %> 
     4      <input type="button" id="trails_detail_close_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Close]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_trails.trails_detail_window_close();" /> 
    65    <% end %> 
    76  </td> 

  • rubricks_core/trunk/components/system/admin_trails/setting_window.rhtml

    r5781 r5887  
    2121    <tr class="rubricks_general_table_even"> 
    2222      <td id="trails_setting_buttons" class="rubricks_layout_buttons" colspan="4"> 
    23         <input type="submit" id="trails_setting_submit_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Save]') %>"   onclick="rubricks.system.admin_trails.trails_setting_window_close();" /> 
    24         <input type="button" id="trails_setting_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_trails.trails_setting_window_close();" /> 
    25         <%= rollover_swap('trails_setting_submit_button', 'trails_setting_cancel_button') %> 
     23        <input type="submit" id="trails_setting_submit_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Save]') %>"   <%= rollover_attributes %> onclick="rubricks.system.admin_trails.trails_setting_window_close();" /> 
     24        <input type="button" id="trails_setting_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" <%= rollover_attributes %> onclick="rubricks.system.admin_trails.trails_setting_window_close();" /> 
    2625      </td> 
    2726    </tr> 

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

    r5758 r5887  
    33    html  = [] 
    44    html << text_field('filter_conditions', 'trails_date_begin', {:class => 'input_text_inactive focus background_readonly', :size => 10, :readonly => 'readonly'}) 
    5     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>| 
    6     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>| 
     5    html << %Q|<span id="datepicker_trails_date_begin_picker_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DatePicker]')}" #{rollover_attributes}><span id="datepicker_trails_date_begin_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span>| 
     6    html << %Q|<span id="datepicker_trails_date_begin_cancel_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DateClear]')}" #{rollover_attributes} 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>| 
    77    html << hl('[_Common_RangeMark]') 
    88    html << text_field('filter_conditions', 'trails_date_end',   {:class => 'input_text_inactive focus background_readonly', :size => 10, :readonly => 'readonly'}) 
    9     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>| 
    10     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>| 
    11     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') 
     9    html << %Q|<span id="datepicker_trails_date_end_picker_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DatePicker]')}"   #{rollover_attributes}><span id="datepicker_trails_date_end_picker_button" class="rubricks_icon icon_datepicker">&nbsp;</span></span>| 
     10    html << %Q|<span id="datepicker_trails_date_end_cancel_form" class="icon_frame_inactive swap" title="#{hl('[_Common_DateClear]')}"    #{rollover_attributes} 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>| 
    1211    return html.join('') 
    1312  end 

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

    r5834 r5887  
    4949  <div id="calendar_detail_list" style="display:none;"></div> 
    5050  <div class="rubricks_layout_buttons" style="margin-top: 5px;"> 
    51     <input id="calendar_close_button" type="button" class="submit_inactive submit_normal swap" onclick="rubricks.system.calendar.calendar_window.close();" value="<%= hl('[_Common_Close]') %>" /> 
     51    <input id="calendar_close_button" type="button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Close]') %>" <%= rollover_attributes %> onclick="rubricks.system.calendar.calendar_window.close();" /> 
    5252  </div> 
    53   <%= rollover_swap("calendar_close_button") %> 
    5453</div> 
    5554 

  • rubricks_core/trunk/components/system/dashboard/_index_config.rhtml

    r5781 r5887  
    3535        <tr> 
    3636          <td class="rubricks_layout_buttons" colspan="3"> 
    37             <%= submit_tag hl('[_Common_Update]'), :class => 'submit_inactive submit_normal swap', :id => 'dashboard_personalize_button' %> 
    38             <%= rollover_swap('dashboard_personalize_button') %> 
     37            <input id="dashboard_personalize_button" type="submit" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Update]') %>" <%= rollover_attributes %> /> 
    3938          </td> 
    4039        </tr> 

  • rubricks_core/trunk/components/system/login/_login_form.rhtml

    r5781 r5887  
    99    </dl> 
    1010    <div class="rubricks_layout_buttons"> 
    11       <input type="submit" id="login_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Login]') %>"> 
    12       <%= (@inline) ? rollover_swap('login_button') : '' %> 
     11      <input type="submit" id="login_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Login]') %>" <%= (@inline) ? rollover_attributes : '' %> /> 
    1312    </div> 
    1413  </div> 

  • rubricks_core/trunk/components/system/login/_login_plate_register_window.rhtml

    r5781 r5887  
    7272        <tr class="rubricks_general_table_even"> 
    7373          <td class="rubricks_layout_buttons" colspan="2"> 
    74             <input type="submit" id="account_create_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Register]') %>" onclick="rubricks.system.login.rubricks_register();" /> 
    75             <input type="button" id="account_create_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.login.rubricks_register_cancel();" /> 
    76             <%= rollover_swap('account_create_button', 'account_create_cancel_button') %> 
     74            <input type="submit" id="account_create_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Register]') %>" <%= rollover_attributes %> onclick="rubricks.system.login.rubricks_register();" /> 
     75            <input type="button" id="account_create_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>"   <%= rollover_attributes %> onclick="rubricks.system.login.rubricks_register_cancel();" /> 
    7776          </td> 
    7877        </tr> 

  • rubricks_core/trunk/components/system/login/_login_plate_reissue_password_window.rhtml

    r5781 r5887  
    1919        <tr class="rubricks_general_table_even"> 
    2020          <td class="rubricks_layout_buttons" colspan=2> 
    21             <input type="submit" id="reissue_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Submit]') %>" disabled="disabled" onclick="rubricks.system.login.rubricks_reissue_password();" /> 
    22             <input type="button" id="reissue_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.login.rubricks_reissue_password_cancel();" /> 
    23             <%= rollover_swap('reissue_button', 'reissue_cancel_button') %> 
     21            <input type="submit" id="reissue_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Submit]') %>" <%= rollover_attributes %> onclick="rubricks.system.login.rubricks_reissue_password();" disabled="disabled" /> 
     22            <input type="button" id="reissue_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" <%= rollover_attributes %> onclick="rubricks.system.login.rubricks_reissue_password_cancel();" /> 
    2423          </td> 
    2524        </tr> 

  • rubricks_core/trunk/components/system/menu/index.rhtml

    r5791 r5887  
    22<%= render :partial => 'index_style' %> 
    33<div class="rubricks_menu_screen"> 
    4   <div id="rubricks_menu_left_button" class="rubricks_menu_left_inactive swap" onmouseover="rubricks.common.menu.slide('left');" onmouseout="rubricks.common.menu.stop();"></div> 
     4  <div id="rubricks_menu_left_button" class="rubricks_menu_left_inactive swap" <%= rollover_attributes(:onmouseover => %q|rubricks.common.menu.slide('left');|, :onmouseout => %q|rubricks.common.menu.stop();|) %>></div> 
    55  <div class="rubricks_menu_center"> 
    66    <div id="menu_frame" class="rubricks_menu_frame"> 
    …… 
    99    <div id="menu_frame_width_dummy" style="width:100%; height:0px;"></div> 
    1010  </div> 
    11   <div id="rubricks_menu_right_button" class="rubricks_menu_right_inactive swap" onmouseover="rubricks.common.menu.slide('right');" onmouseout="rubricks.common.menu.stop();"></div> 
    12   <script type="text/javascript"> 
    13     Event.stop_caching_observer(); 
    14     rubricks.common.Rollover.swap('rubricks_menu_left_button'); 
    15     rubricks.common.Rollover.swap('rubricks_menu_right_button'); 
    16     Event.start_caching_observer(); 
    17   </script> 
     11  <div id="rubricks_menu_right_button" class="rubricks_menu_right_inactive swap" <%= rollover_attributes(:onmouseover => %q|rubricks.common.menu.slide('right');|, :onmouseout => %q|rubricks.common.menu.stop();|) %>></div> 
    1812</div> 
    1913<%= render :partial => 'index_cache' %> 

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

    r5758 r5887  
    11class System::SystemMailer < RubricksMailer 
    2   def account_approval(name, recipient) 
    3     template    "account_approval_#{RubricksLib.current_lang}" 
    4     recipients  recipient 
    5     subject     multi_lang!(sprintf(RubricksLib.l('[_System_Account_AccountApprovalSubject]'), RubricksConfig.get('site_name'))) 
    6     from        multi_lang!(system_mail_address) 
    7     body(:name => name, :site_name => RubricksConfig.get('site_name')) 
     2  def account_approval(ru) 
     3    template    "account_approval_#{ru.language}" 
     4    recipients  ru.email_by_admin 
     5    from        system_mail_address 
     6    subject     ['[_System_Account_AccountApprovalSubject]', RubricksConfig.get('site_name')] 
     7    body        :name => ru.name, :site_name => RubricksConfig.get('site_name') 
    88  end 
    99 
    10   def admit_admin(name, recipient, key, from, path) 
    11     template    "admit_admin_#{RubricksLib.current_lang}" 
    12     recipients  recipient 
    13     subject     multi_lang!(sprintf(RubricksLib.l('[_System_Account_AdmitAdminSubject]') , RubricksConfig.get('site_name')), name, from) 
    14     from        multi_lang!(system_mail_address) 
    15     body(:name => name, :site_name => RubricksConfig.get('site_name'), :key => key, :path => path) 
     10  def admit_admin(ru, path) 
     11    template    "admit_admin_#{ru.language}" 
     12    recipients  ru.email_by_admin 
     13    from        system_mail_address 
     14    subject     ['[_System_Account_AdmitAdminSubject]', RubricksConfig.get('site_name'), ru.login_name, ru.email_by_admin] 
     15    body        :name => ru.name, :site_name => RubricksConfig.get('site_name'), :key => ru.certified, :path => path 
    1616  end 
    1717 
    18   def admit_user(name, recipient, key, path) 
    19     template    "admit_user_#{RubricksLib.current_lang}" 
    20     recipients  recipient 
    21     subject     multi_lang!(sprintf(RubricksLib.l('[_System_Account_AdmitUserSubject]'), RubricksConfig.get('site_name')), name, recipient) 
    22     from        multi_lang!(system_mail_address) 
    23     body(:name => name, :site_name => RubricksConfig.get('site_name'), :key => key, :path => path) 
     18  def admit_user(ru, path) 
     19    template    "admit_user_#{ru.language}" 
     20    recipients  ru.email_by_admin 
     21    from        system_mail_address 
     22    subject     ['[_System_Account_AdmitUserSubject]', RubricksConfig.get('site_name'), ru.login_name, ru.email_by_admin] 
     23    body        :name => ru.name, :site_name => RubricksConfig.get('site_name'), :key => ru.certified, :path => path 
    2424  end 
    2525 
    26   def password_changed(name, recipient) 
    27     template    "password_changed_#{RubricksLib.current_lang}" 
    28     recipients  recipient 
    29     subject     multi_lang!(sprintf(RubricksLib.l('[_System_Account_PasswordChangedSubject]'), RubricksConfig.get('site_name'))) 
    30     from        multi_lang!(system_mail_address) 
    31     body(:name => name, :site_name => RubricksConfig.get('site_name')) 
     26  def password_changed(ru) 
     27    template    "password_changed_#{ru.language}" 
     28    recipients  ru.email_by_admin 
     29    from        system_mail_address 
     30    subject     ['[_System_Account_PasswordChangedSubject]', RubricksConfig.get('site_name')] 
     31    body        :name => ru.name, :site_name => RubricksConfig.get('site_name') 
    3232  end 
    3333 
    34   def reissue_password(name, recipient, key, path) 
    35     template    "reissue_password_#{RubricksLib.current_lang}" 
    36     recipients  recipient 
    37     subject     multi_lang!(sprintf(RubricksLib.l('[_System_Account_ReissuePasswordSubject]'), RubricksConfig.get('site_name'))) 
    38     from        multi_lang!(system_mail_address) 
    39     body(:name => name, :site_name => RubricksConfig.get('site_name'), :key => key, :path => path) 
     34  def reissue_password(ru, path) 
     35    template    "reissue_password_#{ru.language}" 
     36    recipients  ru.email_by_admin 
     37    from        system_mail_address 
     38    subject     ['[_System_Account_ReissuePasswordSubject]', RubricksConfig.get('site_name')] 
     39    body        :name => ru.name, :site_name => RubricksConfig.get('site_name'), :key => ru.certified, :path => path 
    4040  end 
    4141 
    42   def script(subject, body, recipient, from) 
     42  def script(subject, message, recipient, from) 
    4343    recipients  recipient 
    4444    subject     subject 
    4545    from        from 
    46     body(:body => body) 
     46    body        :message => message 
    4747  end 
    4848end 

  • rubricks_core/trunk/components/system/system_mailer/script.rhtml

    r3161 r5887  
    1 <%= @body %> 
     1<%= @message %> 

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

    r5781 r5887  
    1111      <%= validate 'input_file', [{:required => true}] %> 
    1212      <div style="float:right; padding-top:10px;"> 
    13         <input type="submit" id="file_attach_submit_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Save]') %>" /> 
    14         <input type="button" id="file_attach_cancel_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Cancel]') %>" onclick="window.close();" /> 
    15         <%= rollover_swap('file_attach_submit_button', 'file_attach_cancel_button') %> 
     13        <input type="submit" id="file_attach_submit_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Save]') %>"   <%= rollover_attributes %> /> 
     14        <input type="button" id="file_attach_cancel_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Cancel]') %>" <%= rollover_attributes %> onclick="window.close();" /> 
    1615      </div> 
    1716    <% end %> 

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

    r5781 r5887  
    1111      <%= validate 'input_file', [{:required => true}, {:regexp => {:value => '/.+\.(gif|jpeg|jpg|png)$/i', :msg => hl('[_System_Attachment_InvalidFile]')}}] %> 
    1212      <div style="float:right; padding-top:10px;"> 
    13         <input type="submit" id="image_attach_submit_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Save]') %>" /> 
    14         <input type="button" id="image_attach_cancel_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Cancel]') %>" onclick="window.close();" /> 
    15         <%= rollover_swap('image_attach_submit_button', 'image_attach_cancel_button') %> 
     13        <input type="submit" id="image_attach_submit_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Save]') %>"   <%= rollover_attributes %> /> 
     14        <input type="button" id="image_attach_cancel_button" class="submit_inactive swap submit_normal" value="<%= hl('[_Common_Cancel]') %>" <%= rollover_attributes %> onclick="window.close();" /> 
    1615      </div> 
    1716    <% end %> 

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

    r5414 r5887  
    66        <div> 
    77          <%= hl('[_Common_Unlogin]') %> 
    8           <input id="rubricks_login_page_button" type="submit" class="submit_inactive swap" value="<%= hl('[_Common_Login]') %>" onclick="SelectableTableManager.destroy();" tabindex="-1" /> 
     8          <input type="submit" id="rubricks_login_page_button" class="submit_inactive swap" value="<%= hl('[_Common_Login]') %>" <%= rollover_attributes %> onclick="SelectableTableManager.destroy();" tabindex="-1" /> 
    99        </div> 
    1010      <% end %> 
    …… 
    1414          <% user_name, popup = RubricksLib.clip_string(RubricksLib.current_user.name, 12) %> 
    1515          <span id="rubricks_login_user_info" <%= popup %>><%= hl('[_Common_LoginAs]', user_name.unescapeHTML) %></span> 
    16           <input id="rubricks_logout_button" type="submit" class="submit_inactive swap" value="<%= hl('[_Common_Logout]') %>" tabindex="-1" /> 
     16          <input type="submit" id="rubricks_logout_button" class="submit_inactive swap" value="<%= hl('[_Common_Logout]') %>" <%= rollover_attributes %> tabindex="-1" /> 
    1717        </div> 
    1818      <% end %> 
    …… 
    2020  </div> 
    2121  <div class="rubricks_toolbar_login_right"></div> 
    22   <script type="text/javascript"> 
    23     Event.stop_caching_observer(); 
    24     rubricks.common.Rollover.swap('rubricks_login_page_button'); 
    25     rubricks.common.Rollover.swap('rubricks_logout_button'); 
    26     Event.start_caching_observer(); 
    27   </script> 
    2822</li> 

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

    r5120 r5887  
    33    <div> 
    44      <input type="text" id="q_toolbar" name="q_toolbar" class="input_text_inactive focus" size="12" maxlength="255" tabindex="-1" /> 
    5       <input type="submit" id="toolbar_search_button" class="submit_inactive swap" value="<%= hl('[_Common_Search]') %>" tabindex="-1" /> 
    6       <script type="text/javascript"> 
    7         Event.stop_caching_observer(); 
    8         rubricks.common.Rollover.swap('toolbar_search_button'); 
    9         Event.start_caching_observer(); 
    10       </script> 
     5      <input type="submit" id="toolbar_search_button" class="submit_inactive swap" value="<%= hl('[_Common_Search]') %>" <%= rollover_attributes %> tabindex="-1" /> 
    116    </div> 
    127  <% end %> 

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

    r5758 r5887  
    8686  <% form_tag({:controller => '/'}, {:id => "#{hl(@options[:prefix])}form"}) do %> 
    8787    <div class="system_user_select_buttons"> 
    88       <input type="button" id="<%= hl(@options[:prefix]) %>submit_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_submit_button]) %>" onclick="rubricks.system.user.group_select.<%= hl(@options[:prefix]) %>.submit();" /> 
    89       <input type="button" id="<%= hl(@options[:prefix]) %>cancel_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_cancel_button]) %>" onclick="rubricks.system.user.group_select.<%= hl(@options[:prefix]) %>.cancel();" /> 
    90       <%= rollover_swap("#{hl(@options[:prefix])}submit_button", "#{hl(@options[:prefix])}cancel_button") %> 
     88      <input type="button" id="<%= hl(@options[:prefix]) %>submit_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_submit_button]) %>" <%= rollover_attributes %> onclick="rubricks.system.user.group_select.<%= hl(@options[:prefix]) %>.submit();" /> 
     89      <input type="button" id="<%= hl(@options[:prefix]) %>cancel_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_cancel_button]) %>" <%= rollover_attributes %> onclick="rubricks.system.user.group_select.<%= hl(@options[:prefix]) %>.cancel();" /> 
    9190    </div> 
    9291  <% end %> 

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

    r5791 r5887  
    150150    <td class="system_user_select_arrow"> 
    151151      <div class="system_user_select_arrow"> 
    152         <span id="<%= hl(@options[:prefix]) %>l_to_r_form" class="icon_frame_inactive swap"><span id="<%= hl(@options[:prefix]) %>l_to_r_button" class="rubricks_icon icon_arrow_right cursor_pointer" onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.add();">&nbsp;</span></span> 
     152        <span id="<%= hl(@options[:prefix]) %>l_to_r_form" class="icon_frame_inactive swap" <%= rollover_attributes %>><span id="<%= hl(@options[:prefix]) %>l_to_r_button" class="rubricks_icon icon_arrow_right cursor_pointer" onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.add();">&nbsp;</span></span> 
    153153      </div> 
    154154      <div class="system_user_select_arrow"> 
    155         <span id="<%= hl(@options[:prefix]) %>r_to_l_form" class="icon_frame_inactive swap"><span id="<%= hl(@options[:prefix]) %>r_to_l_button" class="rubricks_icon icon_arrow_left cursor_pointer" onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.remove();">&nbsp;</span></span> 
     155        <span id="<%= hl(@options[:prefix]) %>r_to_l_form" class="icon_frame_inactive swap" <%= rollover_attributes %>><span id="<%= hl(@options[:prefix]) %>r_to_l_button" class="rubricks_icon icon_arrow_left cursor_pointer" onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.remove();">&nbsp;</span></span> 
    156156      </div> 
    157       <%= rollover_swap("#{hl(@options[:prefix])}l_to_r_form", "#{hl(@options[:prefix])}r_to_l_form") %> 
    158157    </td> 
    159158    <td class="system_user_select_list"> 
    …… 
    174173        </div> 
    175174        <div class="system_user_select_buttons"> 
    176           <input type="button" id="<%= hl(@options[:prefix]) %>submit_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_submit_button]) %>" onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.submit();" /> 
    177           <input type="button" id="<%= hl(@options[:prefix]) %>cancel_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_cancel_button]) %>" onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.cancel();" /> 
    178           <%= rollover_swap("#{hl(@options[:prefix])}submit_button", "#{hl(@options[:prefix])}cancel_button") %> 
     175          <input type="button" id="<%= hl(@options[:prefix]) %>submit_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_submit_button]) %>" <%= rollover_attributes %> onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.submit();" /> 
     176          <input type="button" id="<%= hl(@options[:prefix]) %>cancel_button" class="submit_inactive submit_normal swap" value="<%= hl(@options[:str_cancel_button]) %>" <%= rollover_attributes %> onclick="rubricks.system.user.user_select.<%= hl(@options[:prefix]) %>.cancel();" /> 
    179177        </div> 
    180178      <% end %> 

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

    r5616 r5887  
    2929      <p class="dot_line"> 
    3030        <%= hl('[_Common_SampleWithNumber]', '01') %> 
    31         <a href="<%= url_for(:controller => '/system/admin_user', :action => 'sample_csv', :id => 1) %>" title="Sample1" style="text-decoration:none;"><span id="user_csv_sample1_button" class="icon_frame_inactive swap"><span class="rubricks_icon icon_file">&nbsp;</span></span></a> 
     31        <a href="<%= url_for(:controller => '/system/admin_user', :action => 'sample_csv', :id => 1) %>" title="Sample1" style="text-decoration:none;"><span id="user_csv_sample1_button" class="icon_frame_inactive swap" <%= rollover_attributes %>><span class="rubricks_icon icon_file">&nbsp;</span></span></a> 
    3232      </p> 
    3333      <p class="dot_line"> 
    3434        <%= hl('[_Common_SampleWithNumber]', '02') %> 
    35         <a href="<%= url_for(:controller => '/system/admin_user', :action => 'sample_csv', :id => 2) %>" title="Sample2" style="text-decoration:none;"><span id="user_csv_sample2_button" class="icon_frame_inactive swap"><span class="rubricks_icon icon_file">&nbsp;</span></span></a> 
     35        <a href="<%= url_for(:controller => '/system/admin_user', :action => 'sample_csv', :id => 2) %>" title="Sample2" style="text-decoration:none;"><span id="user_csv_sample2_button" class="icon_frame_inactive swap" <%= rollover_attributes %>><span class="rubricks_icon icon_file">&nbsp;</span></span></a> 
    3636      </p> 
    37       <%= rollover_swap('user_csv_sample1_button', 'user_csv_sample2_button') %> 
    3837    </div> 
    3938  </td> 

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

    r5781 r5887  
    2323        <tr class="rubricks_general_table_even"> 
    2424          <td class="rubricks_layout_buttons" colspan="2"> 
    25             <input type="submit" id="group_create_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Save]') %>" onclick="rubricks.system.admin_user.functions.group_create_window_close();" disabled="disabled" /> 
    26             <input type="button" id="group_create_cancel_button" class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Cancel]') %>" onclick="rubricks.system.admin_user.functions.group_create_window_close();" /> 
    27             <%= rollover_swap('group_create_button', 'group_create_cancel_button') %> 
     25            <input type="submit" id="group_create_button"        class="submit_inactive submit_normal swap" value="<%= hl('[_Common_Save]') %>"   <%= rollover_attributes %> onclick="rubricks.system.admin_user.functions.group_create_window_close();" disabled="disabled" />