[Svn-src-all:3279] [version-2_12-multilang 22180] #1995
adachi
admin ＠ mail.ec-cube.net
2012年 12月 28日 (金) 21:34:25 JST
Subversion committed to /home/svn/open 22180
http://svn.ec-cube.net/open_trac/changeset/22180
┌────────────────────────────┐
│更新者 : adachi │
│更新日時: 2012-12-28 21:34:25 +0900 (金, 28 12月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1995
管理画面対応
不要な処理を削除
datepickerローカライズのファイル名を変更
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-multilang/data/Smarty/templates/admin/main_frame.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default/site_frame.tpl
A branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker-ja.js
D branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker.js
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/main_frame.tpl 2012-12-28 12:08:25 UTC (rev 22179)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/main_frame.tpl 2012-12-28 12:34:25 UTC (rev 22180)
@@ -32,6 +32,8 @@
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/reset.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_file_manager.css" type="text/css" media="all" />
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/locales/<!--{$smarty.const.LANG_CODE}-->.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/locale.js.php"></script>
<!--{if $tpl_mainno eq "basis" && $tpl_subno eq "index"}-->
<!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}-->
<script type="text/javascript" src="https://maps-api-ssl.google.com/maps/api/js?sensor=false"></script>
@@ -51,7 +53,7 @@
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/jquery-ui-1.8.24.custom.min.js"></script>
<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/smoothness/jquery-ui-1.8.24.custom.css" type="text/css" media="all" />
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/jquery-ui-i18n.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/ui-datepicker.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/ui-datepicker-<!--{$smarty.const.LANG_CODE}-->.js"></script>
<!--{/if}-->
<title><!--{$smarty.const.ADMIN_TITLE}--></title>
<link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
変更: branches/version-2_12-multilang/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default/site_frame.tpl 2012-12-28 12:08:25 UTC (rev 22179)
+++ branches/version-2_12-multilang/data/Smarty/templates/default/site_frame.tpl 2012-12-28 12:34:25 UTC (rev 22180)
@@ -29,7 +29,7 @@
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/import.css" type="text/css" media="all" />
<link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.HTTP_URL}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" />
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/locales/<!--{$smarty.const.LANG_CODE}-->.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/locale.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/locale.js.php"></script>
<!--{if $tpl_page_category == "abouts"}-->
<!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}-->
<script type="text/javascript" src="https://maps-api-ssl.google.com/maps/api/js?sensor=false"></script>
@@ -59,10 +59,6 @@
<!--{$tpl_javascript}-->
$(function(){
- cube_i18n.lang_code = '<!--{$smarty.const.LANG_CODE}-->';
- cube_i18n.root_path = '<!--{$smarty.const.ROOT_URLPATH}-->';
- //cube_i18n.load();
-
<!--{$tpl_onload}-->
});
コピーによる追加: branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker-ja.js (コピー元: リビジョン 22179, branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker.js)
===================================================================
--- branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker-ja.js (rev 0)
+++ branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker-ja.js 2012-12-28 12:34:25 UTC (rev 22180)
@@ -0,0 +1,51 @@
+$(function(){
+ $.datepicker.setDefaults( $.datepicker.regional[ "ja" ] );
+ $( "#datepicker" ).datepicker({
+ beforeShowDay: function(date) {
+ if(date.getDay() == 0) {
+ return [true,"date-sunday"];
+ } else if(date.getDay() == 6){
+ return [true,"date-saturday"];
+ } else {
+ return [true];
+ }
+ },changeMonth: 'true'
+ ,changeYear: 'true'
+ ,onSelect: function(dateText, inst){
+ setDate(dateText);
+ },
+ showButtonPanel: true,
+ beforeShow: showAdditionalButton,
+ onChangeMonthYear: showAdditionalButton
+ });
+
+ $("#datepicker").blur( function() {
+ var dateText = $(this).val();
+ setDate(dateText);
+ });
+
+});
+
+var showAdditionalButton = function (input) {
+ setTimeout(function () {
+ var buttonPane = $(input)
+ .datepicker("widget")
+ .find(".ui-datepicker-buttonpane");
+ var btn = $('<button class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" type="button">Clear</button>');
+ btn
+ .unbind("click")
+ .bind("click", function () {
+ $.datepicker._clearDate(input);
+ $("*[name=year]").val("");
+ $("*[name=month]").val("");
+ $("*[name=day]").val("");
+ });
+ btn.appendTo(buttonPane);
+ }, 1);
+};
+function setDate(dateText){
+var dates = dateText.split('/');
+$("*[name=year]").val(dates[0]);
+$("*[name=month]").val(dates[1]);
+$("*[name=day]").val(dates[2]);
+}
\ No newline at end of file
削除: branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker.js
===================================================================
--- branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker.js 2012-12-28 12:08:25 UTC (rev 22179)
+++ branches/version-2_12-multilang/html/js/jquery.ui/ui-datepicker.js 2012-12-28 12:34:25 UTC (rev 22180)
@@ -1,51 +0,0 @@
-$(function(){
- $.datepicker.setDefaults( $.datepicker.regional[ "ja" ] );
- $( "#datepicker" ).datepicker({
- beforeShowDay: function(date) {
- if(date.getDay() == 0) {
- return [true,"date-sunday"];
- } else if(date.getDay() == 6){
- return [true,"date-saturday"];
- } else {
- return [true];
- }
- },changeMonth: 'true'
- ,changeYear: 'true'
- ,onSelect: function(dateText, inst){
- setDate(dateText);
- },
- showButtonPanel: true,
- beforeShow: showAdditionalButton,
- onChangeMonthYear: showAdditionalButton
- });
-
- $("#datepicker").blur( function() {
- var dateText = $(this).val();
- setDate(dateText);
- });
-
-});
-
-var showAdditionalButton = function (input) {
- setTimeout(function () {
- var buttonPane = $(input)
- .datepicker("widget")
- .find(".ui-datepicker-buttonpane");
- var btn = $('<button class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" type="button">Clear</button>');
- btn
- .unbind("click")
- .bind("click", function () {
- $.datepicker._clearDate(input);
- $("*[name=year]").val("");
- $("*[name=month]").val("");
- $("*[name=day]").val("");
- });
- btn.appendTo(buttonPane);
- }, 1);
-};
-function setDate(dateText){
-var dates = dateText.split('/');
-$("*[name=year]").val(dates[0]);
-$("*[name=month]").val(dates[1]);
-$("*[name=day]").val(dates[2]);
-}
\ No newline at end of file
Svn-src-all メーリングリストの案内