Changeset 15056 for branches/beta/html/install/user_data/include/bloc

Timestamp:

2007/07/18 10:17:57 (19 years ago)

Author:

adati

Message:

relブランチのマージ(r12156-r15055)

Location:

branches/beta/html/install/user_data/include/bloc

Files:

• best5.tpl (modified) (2 diffs)
• login.tpl (modified) (1 diff)

branches/beta/html/install/user_data/include/bloc/best5.tpl

@@ -15 +15 @@
         <td>
         
-        <!--{if $arrBestProducts[cnt].main_list_image != ""}--><!--{assign var=image_path value="`$smarty.const.IMAGE_SAVE_DIR`/`$arrBestProducts[cnt].main_list_image`"}--><!--{else}--><!--{assign var=image_path value="`$smarty.const.NO_IMAGE_DIR`"}--><!--{/if}-->
+        <!--{if $arrBestProducts[cnt].main_list_image != ""}--><!--{assign var=image_path value="`$arrBestProducts[cnt].main_list_image`"}--><!--{else}--><!--{assign var=image_path value="`$smarty.const.NO_IMAGE_DIR`"}--><!--{/if}-->
         
         <table width="190" border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -48 +48 @@
         <!--{assign var=cnt2 value=`$smarty.section.cnt.iteration*$smarty.section.cnt.step-1` }-->
         <!--{if $arrBestProducts[$cnt2]|count > 0}-->
-            <!--{if $arrBestProducts[$cnt2].main_list_image != ""}--><!--{assign var=image_path value="`$smarty.const.IMAGE_SAVE_DIR`/`$arrBestProducts[$cnt2].main_list_image`"}--><!--{else}--><!--{assign var=image_path value="`$smarty.const.NO_IMAGE_DIR`"}--><!--{/if}-->
+            <!--{if $arrBestProducts[$cnt2].main_list_image != ""}--><!--{assign var=image_path value="`$arrBestProducts[$cnt2].main_list_image`"}--><!--{else}--><!--{assign var=image_path value="`$smarty.const.NO_IMAGE_DIR`"}--><!--{/if}-->
             <table width="190" border="0" cellspacing="0" cellpadding="0" summary=" ">
                 <tr valign="top">

branches/beta/html/install/user_data/include/bloc/login.tpl

@@ -6 +6 @@
 <!--¢§¥í¥°¥¤¥ó¤³¤³¤«¤é-->
 <!--{if $smarty.post.url == ""}-->
-    <!--{assign var=url value="`$smarty.server.REQUEST_URI`"}-->
+    <!--{if sfIsHTTPS()}-->
+        <!--{assign var=url value="https://`$smarty.server.HTTP_HOST``$smarty.server.REQUEST_URI`"}-->
+    <!--{else}-->
+        <!--{assign var=url value="http://`$smarty.server.HTTP_HOST``$smarty.server.REQUEST_URI`"}-->
+    <!--{/if}-->
 <!--{else}-->
     <!--{assign var=url value="`$smarty.post.url`"}-->