Ignore:
Timestamp:
2010/12/13 15:54:36 (16 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19718
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/Smarty/templates/admin/design/bloc.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fbloc.tpl
data/Smarty/templates/admin/design/css.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fcss.tpl
data/Smarty/templates/admin/design/header.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fheader.tpl
data/Smarty/templates/admin/design/main_edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fmain_edit.tpl
data/Smarty/templates/admin/design/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fsubnavi.tpl
data/Smarty/templates/admin/order/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Findex.tpl
data/Smarty/templates/admin/order/status.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fstatus.tpl
data/Smarty/templates/admin/system/parameter.tpl 17571@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fsystem%2Fparameter.tpl
data/class/pages/admin/design/LC_Page_Admin_Design.php 15680@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design.php
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php 15687@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Bloc.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
html/js/site.js site.js-20101208110316-7ungq6kj49bhw4d1-7
html/user_data/packages/admin/css/admin_contents.css 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fcss%2Fadmin_contents.css
bzr:mapping-version:
v4
bzr:merge:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2448
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/design/bloc.tpl [email protected]
data/Smarty/templates/admin/design/css.tpl [email protected]
data/Smarty/templates/admin/design/header.tpl [email protected]
data/Smarty/templates/admin/design/main_edit.tpl [email protected]
data/Smarty/templates/admin/design/subnavi.tpl [email protected]
data/Smarty/templates/admin/order/index.tpl [email protected]
data/Smarty/templates/admin/order/status.tpl [email protected]
data/Smarty/templates/admin/system/parameter.tpl [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design.php [email protected]
data/class/pages/admin/design/LC_Page_Admin_Design_Bloc.php [email protected]
html/js/site.js [email protected]
html/user_data/packages/admin/css/admin_contents.css [email protected]
bzr:timestamp:
2010-12-13 15:54:32.665999889 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2010-12-13T06:54:32.666000Z
Message:
  • #382(管理画面XHTMLに変更)
    • r19715 の続き
    • 拡大/縮小ボタンを修正
    • 「全てを選択/解除」をチェックボックスに修正
  • #626(表記の統一性の向上)
    • デザイン管理のタイトルを統一
Location:
branches/version-2_5-dev/data/Smarty/templates/admin
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl

    r19715 r19719  
    2626<input type="hidden" name="bloc_id" value="<!--{$bloc_id}-->" /> 
    2727  <!--{* ▼ブロック設定ここから *}--> 
    28   <h2>ブロック設定</h2> 
    2928 
    3029  <!--{if $arrBlocData.tpl_path != '' and $preview == on}--> 
    … …  
    5251     <td colspan="2"> 
    5352       <textarea name="bloc_html" rows="<!--{$text_row}-->" style="width: 100%;"><!--{$arrBlocData.tpl_data|smarty:nodefaults}--></textarea> 
    54             <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /> 
    55             <div> 
    56                  <button type="button" onClick="ChangeSize(this, bloc_html, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button> 
    57             </div> 
    58         </td> 
    59     </tr> 
     53      <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /> 
     54      <div> 
     55         <button type="button" onClick="ChangeSize(this, bloc_html, 50, 13, html_area_row)">拡大</button> 
     56      </div> 
     57    </td> 
     58  </tr> 
    6059 </table> 
    6160  <div class="btn"> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl

    r19715 r19719  
    4141      <td> 
    4242        <textarea name="css" cols=90 rows=<!--{$area_row}--> align="left" wrap=off style="width: 650px;"><!--{$css_data}--></textarea> 
     43        <input type="hidden" name="area_row" value="<!--{$area_row}-->" /> 
    4344        <div class="btn"> 
    44           <button type="button" onClick="ChangeSize(this, css, 50, 30, area_row)"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button> 
     45          <button type="button" onClick="ChangeSize(this, css, 50, 30, area_row)">拡大</button> 
    4546        </div> 
    4647      </td> 
    … …  
    8586</div> 
    8687</form> 
    87  
    88 <script type="text/javascript"> 
    89   function ChangeSize(button, TextArea, Max, Min, row_tmp){ 
    90     if(TextArea.rows <= Min){ 
    91       TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max; 
    92     }else{ 
    93       TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min; 
    94     } 
    95   } 
    96 </script> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl

    r19715 r19719  
    8787 
    8888<script type="text/javascript"> 
    89   /* テキストエリアの大きさを変更する */ 
    90   function ChangeSize(button, TextArea, Max, Min, row_tmp){ 
    91     if(TextArea.rows <= Min){ 
    92       TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max; 
    93     }else{ 
    94       TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min; 
    95     } 
    96   } 
    97    
    9889  /* ブラウザの種類をセットする */ 
    9990  function lfnSetBrowser(form, item){ 

  • branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl

    r19715 r19719  
    9393    <textarea name="tpl_data" rows=<!--{$text_row}--> style="width: 100%;"><!--{$arrPageData.tpl_data|escape|smarty:nodefaults}--></textarea> 
    9494    <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /> 
     95    <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button> 
    9596  </div> 
    9697      </td> 
    9798    </tr> 
    98   </table> 
    99   <div class="btn"> 
    100     <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button> 
    101   </div> 
    10299  </table> 
    103100 

  • branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl

    r19715 r19719  
    2727      <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> 
    2828      <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> 
    29       <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> 
     29      <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> 
    3030      <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> 
    31       <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> 
     31      <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> 
    3232      <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> 
    3333      <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> 
    … …  
    3838      <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> 
    3939      <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> 
    40       <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> 
     40      <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> 
    4141      <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> 
    42       <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> 
     42      <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> 
    4343      <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> 
    4444      <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> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl

    r19715 r19719  
    7777    } 
    7878     
    79     function fnBoxChecked(check){ 
    80         var fm = document.form1; 
    81         var max = fm["pdf_order_id[]"].length; 
    82         if (max) { 
    83             for (var i=0; i<max; i++) { 
    84                 fm["pdf_order_id[]"][i].checked = check; 
     79    $(function() { 
     80        $('#pdf_check').change(function() { 
     81            if ($(this).attr('checked')) { 
     82                $('input[name=pdf_order_id[]]').attr('checked', true); 
     83            } else { 
     84                $('input[name=pdf_order_id[]]').attr('checked', false); 
    8585            } 
    86         } else { 
    87             fm["pdf_order_id[]"].checked = check; 
    88         } 
    89     } 
    90      
     86        }); 
     87    }); 
    9188//--> 
    9289</script> 
    … …  
    326323            <th>全商品発送日</th> 
    327324            <th>対応状況</th> 
    328             <th> 
    329                 帳票<br /> 
    330                 <a href="javascript:;" onclick="fnBoxChecked(true);">全て選択</a> 
    331                 <a href="javascript:;" onclick="fnBoxChecked(false);">全て解除</a> 
    332             </th> 
     325            <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" /></th> 
    333326            <th>編集</th> 
    334327            <th>メール</th> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl

    r19715 r19719  
    2222 */ 
    2323*}--> 
     24<script type="text/javascript">//<![CDATA[ 
     25    $(function() { 
     26        $('#move_check').change(function() { 
     27            if ($(this).attr('checked')) { 
     28                $('input[name=move[]]').attr('checked', true); 
     29            } else { 
     30                $('input[name=move[]]').attr('checked', false); 
     31            } 
     32        }); 
     33    }); 
     34//]]> 
     35</script> 
    2436<form name="form1" id="form1" method="POST" action="?" > 
    2537<input type="hidden" name="mode" value="" /> 
    … …  
    3143    <div class="btn"> 
    3244    <!--{foreach key=key item=item from=$arrORDERSTATUS}--> 
    33       <a 
     45      <button 
     46        type="button" 
    3447        style="padding-right: 1em;" 
    3548        <!--{if $key != $SelectedStatus}--> 
    … …  
    3750          onclick="document.form1.search_pageno.value='1'; fnModeSubmit('search','status','<!--{$key}-->' );" 
    3851        <!--{/if}--> 
    39       ><!--{$item}--></a> 
     52      ><!--{$item}--></button> 
    4053    <!--{/foreach}--> 
    4154    </div> 
    … …  
    4356  <!--{* 登録テーブルここから *}--> 
    4457  <!--{if $tpl_linemax > 0 }--> 
    45   <div> 
     58  <div class="btn"> 
    4659    <select name="change_status"> 
    4760      <option value="" selected="selected" style="<!--{$Errormes|sfGetErrorColor}-->" >選択してください</option> 
    … …  
    5770  <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->もしくは、削除に変更時には、在庫数を手動で戻してください。</span><br /> 
    5871 
    59   <p> 
     72  <p class="remark"> 
    6073    <!--{$tpl_linemax}-->件が該当しました。 
    6174    <!--{$tpl_strnavi}--> 
    6275  </p> 
    6376 
    64   <div class="btn"> 
    65     <button type="button" onclick="fnBoxChecked(true);"><span>全て選択</span></button> 
    66     <button type="button" onclick="fnBoxChecked(false);"><span>全て解除</span></button> 
    67   </div> 
    68  
    6977  <table class="list center"> 
    7078    <tr> 
    71       <th>選択</th> 
     79      <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" /></th> 
    7280      <th>対応状況</th> 
    7381      <th>注文番号</th> 
    … …  
    7684      <th>支払方法</th> 
    7785      <th>購入金額（円）</th> 
    78       <th>入金日<br>発送日</th> 
     86      <th>入金日</th> 
     87      <th>発送日</th> 
    7988    </tr> 
    8089    <!--{section name=cnt loop=$arrStatus}--> 
    … …  
    8998      <td><!--{$arrPayment[$payment_id]|escape}--></td> 
    9099      <td class="right"><!--{$arrStatus[cnt].total|number_format}--></td> 
    91       <td><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--><br> 
    92       <!--{if $arrStatus[cnt].status eq 5}--><!--{$arrStatus[cnt].commit_date|sfDispDBDate:false}--><!--{else}-->未発送<!--{/if}--></td> 
     100      <td><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--></td> 
     101      <td><!--{if $arrStatus[cnt].status eq 5}--><!--{$arrStatus[cnt].commit_date|sfDispDBDate:false}--><!--{else}-->未発送<!--{/if}--></td> 
    93102    </tr> 
    94103    <!--{/section}--> 
    95104  </table> 
    96105  <input type="hidden" name="move[]" value="" /> 
    97  
    98   <div class="btn"> 
    99     <button type="button" onclick="fnBoxChecked(true);"><span>全て選択</span></button> 
    100     <button type="button" onclick="fnBoxChecked(false);"><span>全て解除</span></button> 
    101   </div> 
    102106 
    103107  <p><!--{$tpl_strnavi}--></p> 
    … …  
    156160  } 
    157161 
    158   function fnBoxChecked(check){ 
    159     var count; 
    160     var fm = document.form1; 
    161     var max = fm["move[]"].length; 
    162     for(count=0; count<max; count++){ 
    163       fm["move[]"][count].checked = check; 
    164     } 
    165   } 
    166  
    167162//--> 
    168163</script> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl

    r19715 r19719  
    2525<input type="hidden" name="mode" value="update" /> 
    2626<div id="basis" class="contents-main"> 
    27   <p class="remark red fs12st"> 
     27  <p class="remark attention"> 
    2828    パラメータの値がPHP定数として設定されます。<br /> 
    2929    文字列は「&quot;」で囲んで下さい。<br /> 
Note: See TracChangeset for help on using the changeset viewer.