Index: /branches/version-2/data/Smarty/templates/default/campaign/active/header.tpl
===================================================================
--- /branches/version-2/data/Smarty/templates/default/campaign/active/header.tpl	(revision 17049)
+++ /branches/version-2/data/Smarty/templates/default/campaign/active/header.tpl	(revision 17752)
@@ -1,3 +1,2 @@
-<!--{printXMLDeclaration}--><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--{*
  * This file is part of EC-CUBE
@@ -26,14 +25,14 @@
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.USER_DIR}-->css/common.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/common.css" type="text/css" media="all" />
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.SITE_URL}-->rss/index.php" />
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/css.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/navi.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
 <script type="text/javascript" src="<!--{$TPL_DIR}-->js/site.js"></script>
-<title>テストの店/トップページ</title>
+<title><!--{$arrSiteInfo.shop_name|escape}-->/<!--{$tpl_title|escape}--></title>
 <meta name="author" content="<!--{$arrPageLayout.author|escape}-->" />
 <meta name="description" content="<!--{$arrPageLayout.description|escape}-->" />
 <meta name="keywords" content="<!--{$arrPageLayout.keyword|escape}-->" />
-
 <script type="text/javascript">//<![CDATA[
     <!--{$tpl_javascript}-->
@@ -41,12 +40,26 @@
 </script>
 </head>
+
 <body onload="preLoadImg('<!--{$TPL_DIR}-->'); <!--{$tpl_onload}-->">
-<noscript>
-  <p>JavaScript を有効にしてご利用下さい.</p>
-</noscript>
+<!--▼HEADER-->
+<div id="header">
+    <h1><a href="<!--{$smarty.const.SITE_URL}-->"><em>EC-CUBE CLOTHES STORE</em></a></h1>
+    
+    <div id="information">
+        <ul>
+            <li><a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/header/member_on.gif','member');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/header/member.gif','member');"><img src="<!--{$TPL_DIR}-->img/header/member.gif" width="98" height="26" alt="会員登録" name="member"></a></li
+            ><li><a href="<!--{$smarty.const.URL_DIR}-->cart/index.php" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/header/cartin_on.gif','cartin');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/header/cartin.gif','cartin');"><img src="<!--{$TPL_DIR}-->img/header/cartin.gif" width="120" height="26" alt="買い物かごを確認" name="cartin"></a></li>
+        </ul>
+    </div>
+    
+    <div id="mainnavi">
 
-<a name="top" id="top"></a>
-<div id="header"></div>
-<div id="container">
-<div id="one_column">
-
+        <ul>
+            <li><a href="<!--{$smarty.const.SITE_URL}-->" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/header/home_on.jpg','home');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/header/home.jpg','home');"><img src="<!--{$TPL_DIR}-->img/header/home.jpg" width="82" height="40" alt="HOME" name="home"></a></li
+            ><li><a href="<!--{$smarty.const.URL_DIR}-->abouts/index.php" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/header/about_on.jpg','about');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/header/about.jpg','about');"><img src="<!--{$TPL_DIR}-->img/header/about.jpg" width="129" height="40" alt="当サイトについて" name="about"></a></li
+            ><li><a href="<!--{$smarty.const.SSL_URL}-->mypage/login.php" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/header/mypage_on.jpg','mypage');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/header/mypage.jpg','mypage');"><img src="<!--{$TPL_DIR}-->img/header/mypage.jpg" width="90" height="40" alt="MYページ" name="mypage"></a></li
+            ><li><a href="<!--{$smarty.const.SSL_URL}-->contact/index.php" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/header/contact_on.jpg','contact');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/header/contact.jpg','contact');"><img src="<!--{$TPL_DIR}-->img/header/contact.jpg" width="106" height="40" alt="お問い合わせ" name="contact"></a></li>
+        </ul>
+    </div>
+</div>
+<!--▲HEADER-->
Index: /branches/version-2/data/Smarty/templates/default/campaign/active/contents.tpl
===================================================================
--- /branches/version-2/data/Smarty/templates/default/campaign/active/contents.tpl	(revision 16583)
+++ /branches/version-2/data/Smarty/templates/default/campaign/active/contents.tpl	(revision 17752)
@@ -26,2 +26,88 @@
   </div>
 </div>
+
+<!--{*ログインフォーム*}-->
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *}-->
+<div id="under02column">
+ <div id="under02title"><h2><!--★タイトル★-->ログイン</h2></div>
+  <div id="under02column_login">
+    <form name="login_mypage" id="login_mypage" method="post" action="./login_check.php" onsubmit="return fnCheckLogin('login_mypage')">
+    <input type="hidden" name="mode" value="login" />
+    
+    <div class="loginarea">
+      <div class="totalloginarea">
+        <div class="totalloginblock">
+          <p><em>会員登録がお済みのお客様</em></p><br />
+          <p class="inputtext">会員の方は、登録時に入力されたメールアドレスとパスワードでログインしてください。</p>
+        </div>
+        <div class="inputbox">
+        <!--{assign var=key value="mypage_login_email"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <p><img src="<!--{$TPL_DIR}-->img/login/mailadress.gif" width="94" height="10" alt="メールアドレス">&nbsp;
+          <input type="text" name="<!--{$key}-->"
+          value="<!--{$tpl_login_email|escape}-->"
+          maxlength="<!--{$arrForm[$key].length}-->"
+          style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;"
+          size="40" class="box300" />
+        <span class="mini">
+          <!--{assign var=key value="mypage_login_memory"}-->
+          <input type="checkbox" name="<!--{$key}-->" value="1" <!--{$tpl_login_memory|sfGetChecked:1}--> id="login_memory" />
+          <label for="login_memory">会員メールアドレスをコンピューターに記憶させる</label>
+        </p>
+        <p class="passwd">
+        <!--{assign var=key value="mypage_login_pass"}-->
+         <span class="attention"><!--{$arrErr[$key]}--></span>
+         <img src="<!--{$TPL_DIR}-->img/login/password.gif"
+              width="94" height="11" alt="パスワード" />
+         &nbsp;<input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box300" />
+        </p>
+        </div>
+      </div>
+    
+        <div class="tblareabtn">
+          <input type="image" onMouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/login/b_login_on.jpg',this)" onMouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/login/b_login.jpg',this)" src="<!--{$TPL_DIR}-->img/login/b_login.jpg" width="128" height="32" alt="ログイン" name="log" id="log" class="box140">
+        </div>
+    
+        <p class="inputtext02">
+                  ・パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL}-->forget/index.php" onClick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/index.php','forget','600','400'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+                  ・メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.SSL_URL}-->contact/index.php">お問い合わせページ</a>からお問い合わせください。
+        </p>
+    </div>
+
+    <div class="loginarea">
+        <div class="totalloginarea">
+                <div class="totalloginblock02">
+                    <p><em>まだ会員登録されていないお客様</em><br />
+                    会員登録をすると便利なMyページをご利用いただけます。<br />
+                    また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。</p>
+                </div>
+         </div>
+            
+         <div class="inputbox02">
+             <a href="<!--{$smarty.const.SITE_URL}-->entry/kiyaku.php" onMouseOver="chgImg('<!--{$TPL_DIR}-->img/login/b_gotoentry_on.jpg','b_gotoentry');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/login/b_gotoentry.jpg','b_gotoentry');"><img src="<!--{$TPL_DIR}-->img/login/b_gotoentry.jpg" width="128" height="32" alt="新規会員登録" border="0" name="b_gotoentry"></a>　
+         </div>
+        </div>
+    </div>
+</form>
+</div>
+</div>
Index: /branches/version-2/data/Smarty/templates/default/campaign/active/footer.tpl
===================================================================
--- /branches/version-2/data/Smarty/templates/default/campaign/active/footer.tpl	(revision 16583)
+++ /branches/version-2/data/Smarty/templates/default/campaign/active/footer.tpl	(revision 17752)
@@ -20,8 +20,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+
+<!--▼FOTTER-->
+<div id="fotterarea">
+	<div id="pagetop"><a href="/index.php"><img src="<!--{$TPL_DIR}-->img/common/pagetop.gif" width="120" height="16" alt="PAGE TOP" /></a></div>
+	<div id="fotternavi">
+
+		<div class="lownavi"><a href="/order/index.php"><img src="<!--{$TPL_DIR}-->img/common/low.gif" width="118" height="10" alt="特定商取引に関する法律"></a></div>
+		<div class="copy"><img src="<!--{$TPL_DIR}-->img/common/copyright.gif" width="158" height="8" alt="(C)EC-CUBE ALL RIGHTS RESERVED."></div>
+	</div>
 </div>
-</div>
-<div id="pagetop"><a href="#top"><img src="<!--{$TPL_DIR}-->img/common/pagetop.gif" width="100" height="10" alt="このページのTOPへ" /></a></div>
-<div id="fotter">Copyright(C)2000-2007 EC-CUBE All rights reserved.</div>
-</body>
-</html>
+<!--▲FOTTER-->
