Changeset 22488


Ignore:
Timestamp:
2013/01/31 12:53:29 (8 years ago)
Author:
m_uehara
Message:

#2092 r22476 - r22482 間のコミットをマージします。

Location:
branches/version-2_12-multilang
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-multilang/data/Smarty/templates/admin/order/pdf_input.tpl

    r22456 r22488  
    3737 
    3838    $(function(){ 
    39         console.log(ymd); 
     39        //console.log(ymd); 
    4040        var dateFormat = $.datepicker.regional['<!--{$smarty.const.LANG_CODE}-->'].dateFormat; 
    4141 
  • branches/version-2_12-multilang/data/Smarty/templates/admin/total/index.tpl

    r22456 r22488  
    3131    var search_startmonth_m   = '<!--{$arrForm.search_startmonth_m.value|h}-->'; 
    3232    var search_start_m_ymd = $.datepicker.formatDate(dateFormat, new Date(search_startyear_m, search_startmonth_m - 1)); 
    33     console.log(search_start_m_ymd); 
     33    //console.log(search_start_m_ymd); 
    3434    $("#datepickersearch_start_m").val(search_start_m_ymd); 
    3535    <!--{/if}--> 
  • branches/version-2_12-multilang/html/install/sql/insert_data_en-US.sql

    r22462 r22488  
    520520INSERT INTO dtb_module (module_id, module_code, module_name, sub_data, auto_update_flg, del_flg, create_date, update_date) VALUES (0, '0', 'patch', NULL, 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    521521 
    522 INSERT INTO dtb_news (news_id, news_date, rank, news_title, news_comment, news_url, news_select, link_method, creator_id, create_date, update_date, del_flg) VALUES (1, CURRENT_TIMESTAMP, 1, 'The site is now open!', 'Various goods that support your lifestyle, whether you live alone or you need something for your office, will be delivered to your house! Various goods that support your lifestyle, whether you live alone or you need something for your office, will be delivered to your house! Various goods that support your lifestyle, whether you live alone or you need something for your office, will be delivered to your house!', NULL, 0, NULL, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0); 
     522INSERT INTO dtb_news (news_id, news_date, rank, news_title, news_comment, news_url, news_select, link_method, creator_id, create_date, update_date, del_flg) VALUES (1, CURRENT_TIMESTAMP, 1, 'The site is now open!', 'Various goods that support your lifestyle, whether you live alone or you need something for your office, we have it! The best products at the best prices can only be found here. Buy a shirt for your mother or get one for your boss. Thank you and come again!', NULL, 0, NULL, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0); 
    523523 
    524524INSERT INTO dtb_pagelayout (device_type_id, page_id, page_name, url, filename, header_chk, footer_chk, edit_flg, author, description, keyword, update_url, create_date, update_date) VALUES (10, 0, 'Preview data', 'preview', NULL, 1, 1, 1, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
Note: See TracChangeset for help on using the changeset viewer.