Changeset 22488 for branches

Timestamp:

2013/01/31 12:53:29 (11 years ago)

Author:

m_uehara

Message:

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

Location:

branches/version-2_12-multilang

Files:

• data/Smarty/templates/admin/order/pdf_input.tpl (modified) (1 diff)
• data/Smarty/templates/admin/total/index.tpl (modified) (1 diff)
• html/install/sql/insert_data_en-US.sql (modified) (1 diff)
• html/user_data/packages/default_en-US/img/banner/bnr_top_main.jpg (modified) (previous)
• html/user_data/packages/default_en-US/img/banner/bnr_top_main_on.jpg (modified) (previous)

branches/version-2_12-multilang/data/Smarty/templates/admin/order/pdf_input.tpl

@@ -37 +37 @@
 
     $(function(){
-        console.log(ymd);
+        //console.log(ymd);
         var dateFormat = $.datepicker.regional['<!--{$smarty.const.LANG_CODE}-->'].dateFormat;
 

branches/version-2_12-multilang/data/Smarty/templates/admin/total/index.tpl

@@ -31 +31 @@
     var search_startmonth_m   = '<!--{$arrForm.search_startmonth_m.value|h}-->';
     var search_start_m_ymd = $.datepicker.formatDate(dateFormat, new Date(search_startyear_m, search_startmonth_m - 1));
-    console.log(search_start_m_ymd);
+    //console.log(search_start_m_ymd);
     $("#datepickersearch_start_m").val(search_start_m_ymd);
     <!--{/if}-->

branches/version-2_12-multilang/html/install/sql/insert_data_en-US.sql

@@ -520 +520 @@
 INSERT 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);
 
-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);
+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, 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);
 
 INSERT 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);