Changeset 23230 for branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts

Timestamp:

2013/09/19 11:49:03 (11 years ago)

Author:

m_uehara

Message:

#2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ

Location:

branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts

Files:

• bloc/news.tpl (modified) (1 diff)
• form_personal_input.tpl (modified) (3 diffs)

branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl

@@ -140 +140 @@
                         //コメントをセット(iphone4の場合、innerHTMLの再描画が行われない為、タイマーで無理やり再描画させる)
                         setTimeout( function() {
-                            $("#newsComment").html(news.news_comment.replace(/\n/g,"<br />"));
+                            news.news_comment == null ? $("#newsComment").html("") : $("#newsComment").html(news.news_comment.replace(/\n/g,"<br />"));
                         }, 10);
-
                         $.mobile.changePage('#windowcolumn', {transition: "slideup"});
                         //ダイアログが開き終わるまで待機

branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl

@@ -34 +34 @@
 </dd>
 
-<dt>お名前(フリガナ)&nbsp;<span class="attention">※</span></dt>
+<dt>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}-->&nbsp;<span class="attention">※</span><!--{/if}--></dt>
 <dd>
     <!--{assign var=key1 value="`$prefix`kana01"}-->
@@ -44 +44 @@
 </dd>
 
-<dt>郵便番号&nbsp;<span class="attention">※</span></dt>
+<dt>会社名</dt>
+<dd>
+    <!--{assign var=key1 value="`$prefix`company_name"}-->
+    <!--{if $arrErr[$key1]}-->
+        <div class="attention"><!--{$arrErr[$key1]}--></div>
+    <!--{/if}-->
+    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxLong text data-role-none" />
+</dd>
+
+<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+<dt>国&nbsp;<span class="attention">※</span></dt>
+<dd>
+    <!--{assign var=key1 value="`$prefix`country_id"}-->
+    <!--{if $arrErr[$key1]}-->
+        <div class="attention"><!--{$arrErr[$key1]}--></div>
+    <!--{/if}-->
+    <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
+        <option value="" selected="selected">国を選択</option>
+        <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+    </select>
+</dd>
+
+<dt>ZIP CODE</dt>
+<dd>
+    <!--{assign var=key1 value="`$prefix`zipcode"}-->
+    <!--{if $arrErr[$key1]}-->
+        <div class="attention"><!--{$arrErr[$key1]}--></div>
+    <!--{/if}-->
+    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" />
+</dd>
+
+<!--{else}-->
+<!--{assign var=key1 value="`$prefix`country_id"}-->
+<input type="hidden" name="<!--{$key1}-->" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+<!--{/if}-->
+
+<dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}-->&nbsp;<span class="attention">※</span><!--{/if}--></dt>
 <dd>
     <!--{assign var=key1 value="`$prefix`zip01"}-->
@@ -109 +145 @@
 
     <!--{if $emailMobile}-->
-        <dt>携帯メールアドレス&nbsp;<span class="attention">※</span></dt>
+        <dt>携帯メールアドレス</dt>
         <dd>
             <!--{assign var=key1 value="`$prefix`email_mobile"}-->