Changeset 22876 for branches/version-2_12-dev/data/Smarty

Timestamp:

2013/06/24 10:43:03 (13 years ago)

Author:

m_uehara

Message:

#2127,#2130,#2220,#2260,#2270,#2274 のコミットを差し戻し

Location:

branches/version-2_12-dev/data/Smarty/templates

Files:

• admin/order/index.tpl (modified) (2 diffs)
• admin/order/pdf_input.tpl (modified) (2 diffs)
• admin/order/status.tpl (modified) (3 diffs)
• admin/products/category.tpl (modified) (2 diffs)
• sphone/contact/index.tpl (modified) (1 diff)

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

@@ -75 +75 @@
         fm.action = tmpAction;
     }
-
-
+    
+    
     function fnSelectMailCheckSubmit(action){
 
@@ -104 +104 @@
             return false;
         }
-
+        
         fm.mode.value="mail_select";
         fm.action=action;

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

@@ -95 +95 @@
         <td><!--{if $arrErr.msg1}--><span class="attention"><!--{$arrErr.msg1}--></span><!--{/if}-->
             1行目：<input type="text" name="msg1" size="40" value="<!--{$arrForm.msg1|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN*3/5}-->"/><br />
-            <!--{if $arrErr.msg2}--><span class="attention"><!--{$arrErr.msg2}--></span><!--{/if}-->
+            <!--{if $arrErr.msg2}--><span class="attention"><!--{$arrErr.msg1}--></span><!--{/if}-->
             2行目：<input type="text" name="msg2" size="40" value="<!--{$arrForm.msg2|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN*3/5}-->"/><br />
             <!--{if $arrErr.msg3}--><span class="attention"><!--{$arrErr.msg3}--></span><!--{/if}-->
@@ -104 +104 @@
     <tr>
         <th>備考</th>
-        <td><!--{if $arrErr.etc1}--><span class="attention"><!--{$arrErr.etc1}--></span><!--{/if}-->
-            1行目：<input type="text" name="etc1" size="40" value="<!--{$arrForm.etc1|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
-            <!--{if $arrErr.etc2}--><span class="attention"><!--{$arrErr.etc2}--></span><!--{/if}-->
-            2行目：<input type="text" name="etc2" size="40" value="<!--{$arrForm.etc2|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
-            <!--{if $arrErr.etc3}--><span class="attention"><!--{$arrErr.etc3}--></span><!--{/if}-->
-            3行目：<input type="text" name="etc3" size="40" value="<!--{$arrForm.etc3|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+        <td>
+            1行目：<input type="text" name="etc1" size="40" value="" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+            <!--{if $arrErr.etc2}--><span class="attention"><!--{$arrErr.msg1}--></span><!--{/if}-->
+            2行目：<input type="text" name="etc2" size="40" value="" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+            <!--{if $arrErr.etc3}--><span class="attention"><!--{$arrErr.msg3}--></span><!--{/if}-->
+            3行目：<input type="text" name="etc3" size="40" value="" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
             <span style="font-size: 80%;">※未入力時は表示されません。</span><br />
         </td>

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

@@ -65 +65 @@
         </p>
 
-        <table class="list">
+        <table class="list center">
             <col width="5%" />
-            <col width="10%" />
-            <col width="8%" />
-            <col width="13%" />
+            <col width="7%" />
+            <col width="9%" />
+            <col width="15%" />
             <col width="20%" />
             <col width="10%" />
@@ -76 +76 @@
             <col width="12%" />
             <tr>
-                <th><label for="move_check">選択<br /></label> <input type="checkbox" name="move_check" id="move_check" onclick="fnAllCheck(this, 'input[name=move[]]')" /></th>
+                <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" onclick="fnAllCheck(this, 'input[name=move[]]')" /></th>
                 <th>対応状況</th>
                 <th>注文番号</th>
@@ -89 +89 @@
             <!--{assign var=status value="`$arrStatus[cnt].status`"}-->
             <tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
-                <td class="center"><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
-                <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
-                <td class="center"><a href="#" onclick="fnOpenWindow('./disp.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrStatus[cnt].order_id}--></a></td>
-                <td class="center"><!--{$arrStatus[cnt].create_date|sfDispDBDate}--></td>
-                <td><!--{$arrStatus[cnt].order_name01|h}--> <!--{$arrStatus[cnt].order_name02|h}--></td>
+                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
+                <td><!--{$arrORDERSTATUS[$status]}--></td>
+                <td><a href="#" onclick="fnOpenWindow('./disp.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrStatus[cnt].order_id}--></a></td>
+                <td><!--{$arrStatus[cnt].create_date|sfDispDBDate:false}--></td>
+                <td><!--{$arrStatus[cnt].order_name01|h}--><!--{$arrStatus[cnt].order_name02|h}--></td>
                 <!--{assign var=payment_id value=`$arrStatus[cnt].payment_id`}-->
-                <td class="center"><!--{$arrPayment[$payment_id]|h}--></td>
+                <td><!--{$arrPayment[$payment_id]|h}--></td>
                 <td class="right"><!--{$arrStatus[cnt].total|number_format}--></td>
-                <td class="center"><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--></td>
-                <td class="center"><!--{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}-->

branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl

@@ -67 +67 @@
                     <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
                 <!--{/if}-->
-                <!--{$disp_name|sfCutString:10:false|h|escape}--></a><br />
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
             <!--{else}-->
                 <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
-                <!--{$disp_name|sfCutString:10:false|h|escape}--></a><br />
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
             <!--{/if}-->
 
@@ -122 +122 @@
                 <td>
                 <!--{if $arrList[cnt].level != $smarty.const.LEVEL_MAX}-->
-                    <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrList[cnt].category_id}-->); return false"><!--{$arrList[cnt].category_name|h|escape}--></a>
+                    <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrList[cnt].category_id}-->); return false"><!--{$arrList[cnt].category_name|h}--></a>
                 <!--{else}-->
-                    <!--{$arrList[cnt].category_name|h|escape}-->
+                    <!--{$arrList[cnt].category_name|h}-->
                 <!--{/if}-->
                 </td>

branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl

@@ -111 +111 @@
                 <span class="attention"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
                 <input type="tel" name="tel01"
-                       value="<!--{$arrForm.tel01.value|default:$arrData.tel01|h}-->"
-                       maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
-                       style="<!--{$arrErr.tel01|sfGetErrorColor}-->"
-                       class="boxShort text data-role-none" />&nbsp;－&nbsp;
-                <input type="tel" name="tel02"
-                       value="<!--{$arrForm.tel02.value|default:$arrData.tel02|h}-->"
-                       maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
-                       style="<!--{$arrErr.tel02|sfGetErrorColor}-->"
-                       class="boxShort text data-role-none" />&nbsp;－&nbsp;
-                <input type="tel" name="tel03"
-                       value="<!--{$arrForm.tel03.value|default:$arrData.tel03|h}-->"
-                       maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
-                       style="<!--{$arrErr.tel03|sfGetErrorColor}-->"
-                       class="boxShort text data-role-none" />
+                    value="<!--{$arrForm.tel01.value|default:$arrData.tel01|h}-->"
+                    maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
+                    style="<!--{$arrErr.tel01|sfGetErrorColor}-->"
+                    class="boxShort text data-role-none" />&nbsp;－&nbsp;<input type="tel" name="tel02" value="<!--{$arrForm.tel02.value|default:$arrData.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr.tel02|sfGetErrorColor}-->" class="boxShort text data-role-none" />&nbsp;－&nbsp;<input type="text" name="tel03" value="<!--{$arrForm.tel03.value|default:$arrData.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr.tel03|sfGetErrorColor}-->" class="boxShort text data-role-none" />
             </dd>