commit 787484d2f72485b2fba9cce492afef7006eaea77
Author: hasse <hasegawa@i-hearts.jp>
Date:   Fri Mar 11 02:42:57 2016 -0500

    app/webroot/css/main.cssの競合箇所調整

diff --git a/app/Controller/TopController.php b/app/Controller/TopController.php
index 177fcd5..5a9720d 100755
--- a/app/Controller/TopController.php
+++ b/app/Controller/TopController.php
@@ -47,6 +47,9 @@ class TopController extends AppController {
  * index
  */
 	public function index() {
+		if($this->Auth->user()){
+					$this->redirect('/users/login_top');                          
+		}
 	}
 /**
  * privacy_policy
diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 1ef6740..7d9ebac 100755
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -139,7 +139,7 @@ class UsersController extends AppController {
 	    }else{
 	    // 本登録に無効なURL
 	        $this->Session->setFlash( 'Invalid activation URL');
-			return $this->redirect(array('controller' => 'top', 'action' => 'index'));
+			return $this->redirect(array('controller' => 'top', 'action' => 'error'));
 	    }
 	}
 	
@@ -219,9 +219,6 @@ class UsersController extends AppController {
 		}
 		if ($this->request->is('post')) {
 			if ($this->Auth->login()) {
-		 //    $options = array('conditions' => array('User.email' => $this->Auth->user('User.email'),'User.status' => 1));
-			// $this->request->data = $this->User->find('first', $options);
-			// $this->set('user', $this->request->data);
 				if($this->Auth->user('status') == 1){
 					$this->redirect('/Users/login_top');                          
 				}else{
diff --git a/app/View/Layouts/procedure.ctp b/app/View/Layouts/procedure.ctp
index 81740d1..4ef15a6 100755
--- a/app/View/Layouts/procedure.ctp
+++ b/app/View/Layouts/procedure.ctp
@@ -66,7 +66,7 @@
 				<li><a href="/top/aboutus" alt="">運営会社情報</a></li>
 				<li><a href="/top/contact" alt="">お問い合わせ</a></li>
 			</ul>
-			<a href="index.html"><img class="logo" src="/img/footer_logo01.png" alt=""></a>
+			<a href="/top/index"><img class="logo" src="/img/footer_logo01.png" alt=""></a>
 			<hr>
 			<img class="logo" src="/img/footer_logo02.png" alt="">
 		</div>
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index faf2df9..ec30a54 100755
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -661,14 +661,13 @@ article.contact dl dd textarea {
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 }
-<<<<<<< HEAD
 article.contact dl dd div input span,
 article.contact dl dd div textarea span{
 	margin: 0px;
-=======
+}
+
 article.contact dl dd div.input span{
 	margin: 0 0 0 120px;
->>>>>>> develop
 }
 
 article.contact dl dd textarea {
@@ -793,10 +792,7 @@ article.legacy section ul li ul	{
 	list-style-position: outside;
 }
 
-l {
-	margin-bottom: 12px;
-	list-style-position: outside;
-}
+
 
 /* Login Top */