[Svn-src-all:832] [version-2_5-dev 19719] * #382(管理画面XHTMLに変更)
nanasess
admin ＠ mail.ec-cube.net
2010年 12月 13日 (月) 15:54:36 JST
Subversion committed to /home/svn/open 19719
http://svn.ec-cube.net/open_trac/changeset/19719
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2010-12-13 15:54:36 +0900 (月, 13 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
* #382(管理画面XHTMLに変更)
* r19715 の続き
* 拡大/縮小ボタンを修正
* 「全てを選択/解除」をチェックボックスに修正
* #626(表記の統一性の向上)
* デザイン管理のタイトルを統一
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
U branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
U branches/version-2_5-dev/data/install.php
U branches/version-2_5-dev/html/js/site.js
U branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -25,7 +25,6 @@
<input type="hidden" name="mode" value="" />
<input type="hidden" name="bloc_id" value="<!--{$bloc_id}-->" />
<!--{* ▼ブロック設定ここから *}-->
- <h2>ブロック設定</h2>
<!--{if $arrBlocData.tpl_path != '' and $preview == on}-->
<h3>プレビュー：</h3>
@@ -51,12 +50,12 @@
<tr>
<td colspan="2">
<textarea name="bloc_html" rows="<!--{$text_row}-->" style="width: 100%;"><!--{$arrBlocData.tpl_data|smarty:nodefaults}--></textarea>
- <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
- <div>
- <button type="button" onClick="ChangeSize(this, bloc_html, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
- </div>
- </td>
- </tr>
+ <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
+ <div>
+ <button type="button" onClick="ChangeSize(this, bloc_html, 50, 13, html_area_row)">拡大</button>
+ </div>
+ </td>
+ </tr>
</table>
<div class="btn">
<button type='button' name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','','');"><span>登録する</span></button>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -40,8 +40,9 @@
<th>CSS内容</th>
<td>
<textarea name="css" cols=90 rows=<!--{$area_row}--> align="left" wrap=off style="width: 650px;"><!--{$css_data}--></textarea>
+ <input type="hidden" name="area_row" value="<!--{$area_row}-->" />
<div class="btn">
- <button type="button" onClick="ChangeSize(this, css, 50, 30, area_row)"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
+ <button type="button" onClick="ChangeSize(this, css, 50, 30, area_row)">拡大</button>
</div>
</td>
</tr>
@@ -84,13 +85,3 @@
</div>
</form>
-
-<script type="text/javascript">
- function ChangeSize(button, TextArea, Max, Min, row_tmp){
- if(TextArea.rows <= Min){
- TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
- }else{
- TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
- }
- }
-</script>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -86,15 +86,6 @@
<!--{* ▲フッター編集ここまで *}-->
<script type="text/javascript">
- /* テキストエリアの大きさを変更する */
- function ChangeSize(button, TextArea, Max, Min, row_tmp){
- if(TextArea.rows <= Min){
- TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
- }else{
- TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
- }
- }
-
/* ブラウザの種類をセットする */
function lfnSetBrowser(form, item){
browser_type = 0;
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -92,14 +92,11 @@
<div>
<textarea name="tpl_data" rows=<!--{$text_row}--> style="width: 100%;"><!--{$arrPageData.tpl_data|escape|smarty:nodefaults}--></textarea>
<input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
+ <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
</div>
</td>
</tr>
</table>
- <div class="btn">
- <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
- </div>
- </table>
<div class="btn">
<button type='button' name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','confirm','','');"><span>登録する</span></button>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -26,9 +26,9 @@
<ul class="level2">
<li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
<li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
- <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック編集</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック設定</span></a></li>
<li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
- <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS編集</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS設定</span></a></li>
<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
<li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート追加</span></a></li>
</ul>
@@ -37,9 +37,9 @@
<ul class="level2">
<li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
<li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
- <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック編集</span></a></li>
+ <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック設定</span></a></li>
<li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
- <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS編集</span></a></li>
+ <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS設定</span></a></li>
<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
<li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
</ul>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -76,18 +76,15 @@
fm.action = tmpAction;
}
- function fnBoxChecked(check){
- var fm = document.form1;
- var max = fm["pdf_order_id[]"].length;
- if (max) {
- for (var i=0; i<max; i++) {
- fm["pdf_order_id[]"][i].checked = check;
+ $(function() {
+ $('#pdf_check').change(function() {
+ if ($(this).attr('checked')) {
+ $('input[name=pdf_order_id[]]').attr('checked', true);
+ } else {
+ $('input[name=pdf_order_id[]]').attr('checked', false);
}
- } else {
- fm["pdf_order_id[]"].checked = check;
- }
- }
-
+ });
+ });
//-->
</script>
<div id="order" class="contents-main">
@@ -325,11 +322,7 @@
<th>購入金額(円)</th>
<th>全商品発送日</th>
<th>対応状況</th>
- <th>
- 帳票<br />
- <a href="javascript:;" onclick="fnBoxChecked(true);">全て選択</a>
- <a href="javascript:;" onclick="fnBoxChecked(false);">全て解除</a>
- </th>
+ <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" /></th>
<th>編集</th>
<th>メール</th>
<th>削除</th>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -21,6 +21,18 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
*}-->
+<script type="text/javascript">//<![CDATA[
+ $(function() {
+ $('#move_check').change(function() {
+ if ($(this).attr('checked')) {
+ $('input[name=move[]]').attr('checked', true);
+ } else {
+ $('input[name=move[]]').attr('checked', false);
+ }
+ });
+ });
+//]]>
+</script>
<form name="form1" id="form1" method="POST" action="?" >
<input type="hidden" name="mode" value="" />
<input type="hidden" name="status" value="<!--{if $arrForm.status == ""}-->1<!--{else}--><!--{$arrForm.status}--><!--{/if}-->" />
@@ -30,19 +42,20 @@
<h2>抽出条件</h2>
<div class="btn">
<!--{foreach key=key item=item from=$arrORDERSTATUS}-->
- <a
+ <button
+ type="button"
style="padding-right: 1em;"
<!--{if $key != $SelectedStatus}-->
href="#"
onclick="document.form1.search_pageno.value='1'; fnModeSubmit('search','status','<!--{$key}-->' );"
<!--{/if}-->
- ><!--{$item}--></a>
+ ><!--{$item}--></button>
<!--{/foreach}-->
</div>
<h2>ステータス変更</h2>
<!--{* 登録テーブルここから *}-->
<!--{if $tpl_linemax > 0 }-->
- <div>
+ <div class="btn">
<select name="change_status">
<option value="" selected="selected" style="<!--{$Errormes|sfGetErrorColor}-->" >選択してください</option>
<!--{foreach key=key item=item from=$arrORDERSTATUS}-->
@@ -56,26 +69,22 @@
</div>
<span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->もしくは、削除に変更時には、在庫数を手動で戻してください。</span><br />
- <p>
+ <p class="remark">
<!--{$tpl_linemax}-->件が該当しました。
<!--{$tpl_strnavi}-->
</p>
- <div class="btn">
- <button type="button" onclick="fnBoxChecked(true);"><span>全て選択</span></button>
- <button type="button" onclick="fnBoxChecked(false);"><span>全て解除</span></button>
- </div>
-
<table class="list center">
<tr>
- <th>選択</th>
+ <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" /></th>
<th>対応状況</th>
<th>注文番号</th>
<th>受注日</th>
<th>顧客名</th>
<th>支払方法</th>
<th>購入金額（円）</th>
- <th>入金日<br>発送日</th>
+ <th>入金日</th>
+ <th>発送日</th>
</tr>
<!--{section name=cnt loop=$arrStatus}-->
<!--{assign var=status value="`$arrStatus[cnt].status`"}-->
@@ -88,18 +97,13 @@
<!--{assign var=payment_id value=`$arrStatus[cnt].payment_id`}-->
<td><!--{$arrPayment[$payment_id]|escape}--></td>
<td class="right"><!--{$arrStatus[cnt].total|number_format}--></td>
- <td><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--><br>
- <!--{if $arrStatus[cnt].status eq 5}--><!--{$arrStatus[cnt].commit_date|sfDispDBDate:false}--><!--{else}-->未発送<!--{/if}--></td>
+ <td><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--></td>
+ <td><!--{if $arrStatus[cnt].status eq 5}--><!--{$arrStatus[cnt].commit_date|sfDispDBDate:false}--><!--{else}-->未発送<!--{/if}--></td>
</tr>
<!--{/section}-->
</table>
<input type="hidden" name="move[]" value="" />
- <div class="btn">
- <button type="button" onclick="fnBoxChecked(true);"><span>全て選択</span></button>
- <button type="button" onclick="fnBoxChecked(false);"><span>全て解除</span></button>
- </div>
-
<p><!--{$tpl_strnavi}--></p>
<!--{elseif $arrStatus != "" & $tpl_linemax == 0}-->
@@ -155,14 +159,5 @@
}
}
- function fnBoxChecked(check){
- var count;
- var fm = document.form1;
- var max = fm["move[]"].length;
- for(count=0; count<max; count++){
- fm["move[]"][count].checked = check;
- }
- }
-
//-->
</script>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl 2010-12-13 06:54:36 UTC (rev 19719)
@@ -24,7 +24,7 @@
<form name="form1" id="form1" method="post" action="?">
<input type="hidden" name="mode" value="update" />
<div id="basis" class="contents-main">
- <p class="remark red fs12st">
+ <p class="remark attention">
パラメータの値がPHP定数として設定されます。<br />
文字列は「"」で囲んで下さい。<br />
設定値によってはサイトが機能しなくなる場合もありますので、十分ご注意下さい。
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design.php 2010-12-13 06:54:36 UTC (rev 19719)
@@ -48,7 +48,7 @@
$this->tpl_subnavi = 'design/subnavi.tpl';
$this->tpl_subno = "layout";
$this->tpl_mainno = "design";
- $this->tpl_subtitle = 'レイアウト編集';
+ $this->tpl_subtitle = 'レイアウト設定';
$masterData = new SC_DB_MasterData_Ex();
$this->arrTarget = $masterData->getMasterData("mtb_target");
}
変更: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 2010-12-13 06:54:36 UTC (rev 19719)
@@ -49,7 +49,7 @@
$this->text_row = 13;
$this->tpl_subno = "bloc";
$this->tpl_mainno = "design";
- $this->tpl_subtitle = 'ブロック編集';
+ $this->tpl_subtitle = 'ブロック設定';
}
/**
変更: branches/version-2_5-dev/html/js/site.js
===================================================================
--- branches/version-2_5-dev/html/js/site.js 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/html/js/site.js 2010-12-13 06:54:36 UTC (rev 19719)
@@ -362,9 +362,9 @@
function ChangeSize(button, TextArea, Max, Min, row_tmp){
if(TextArea.rows <= Min){
- TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
+ TextArea.rows=Max; button.value="縮小"; row_tmp.value=Max; button.innerHTML="縮小";
}else{
- TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
+ TextArea.rows =Min; button.value="拡大"; row_tmp.value=Min; button.innerHTML="拡大";
}
}
変更: branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css 2010-12-13 01:53:23 UTC (rev 19718)
+++ branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css 2010-12-13 06:54:36 UTC (rev 19719)
@@ -66,8 +66,6 @@
text-align: center;
vertical-align: middle;
}
-table.form th { width: 25%; }
-table.form td { width: 75%; }
table.form thead th { text-align: center; width: auto; }
input[type='submit'],
Svn-src-all メーリングリストの案内