リビジョン 787484d2

差分を見る:

app/Controller/TopController.php
47 47 
 * index
48 48 
 */
49 49 
	public function index() {
50 
		if($this->Auth->user()){
51 
					$this->redirect('/users/login_top');
52 
		}
50 53 
	}
51 54 
/**
52 55 
 * privacy_policy
app/Controller/UsersController.php
139 139 
	    }else{
140 140 
	    // 本登録に無効なURL
141 141 
	        $this->Session->setFlash( 'Invalid activation URL');
142 
			return $this->redirect(array('controller' => 'top', 'action' => 'index'));
142 
			return $this->redirect(array('controller' => 'top', 'action' => 'error'));
143 143 
	    }
144 144 
	}
145 145
......
219 219 
		}
220 220 
		if ($this->request->is('post')) {
221 221 
			if ($this->Auth->login()) {
222 
		 //    $options = array('conditions' => array('User.email' => $this->Auth->user('User.email'),'User.status' => 1));
223 
			// $this->request->data = $this->User->find('first', $options);
224 
			// $this->set('user', $this->request->data);
225 222 
				if($this->Auth->user('status') == 1){
226 223 
					$this->redirect('/Users/login_top');
227 224 
				}else{
app/View/Layouts/procedure.ctp
66 66 
				<li><a href="/top/aboutus" alt="">運営会社情報</a></li>
67 67 
				<li><a href="/top/contact" alt="">お問い合わせ</a></li>
68 68 
			</ul>
69 
			<a href="index.html"><img class="logo" src="/img/footer_logo01.png" alt=""></a>
69 
			<a href="/top/index"><img class="logo" src="/img/footer_logo01.png" alt=""></a>
70 70 
			<hr>
71 71 
			<img class="logo" src="/img/footer_logo02.png" alt="">
72 72 
		</div>
app/webroot/css/main.css
661 661 
	-moz-border-radius: 5px;
662 662 
	border-radius: 5px;
663 663 
}
664 
<<<<<<< HEAD
665 664 
article.contact dl dd div input span,
666 665 
article.contact dl dd div textarea span{
667 666 
	margin: 0px;
668 
=======
667 
}
668 

  		




  669
  669
  
    
article.contact dl dd div.input span{


  		




  670
  670
  
    
	margin: 0 0 0 120px;


  		




  671
  
  
    
>>>>>>> develop


  		




  672
  671
  
    
}


  		




  673
  672
  
    

  		




  674
  673
  
    
article.contact dl dd textarea {


  		




  ......




  793
  792
  
    
	list-style-position: outside;


  		




  794
  793
  
    
}


  		




  795
  794
  
    

  		




  796
  
  
    
l {


  		




  797
  
  
    
	margin-bottom: 12px;


  		




  798
  
  
    
	list-style-position: outside;


  		




  799
  
  
    
}


  		




  
  795
  
    

  		




  800
  796
  
    

  		




  801
  797
  
    
/* Login Top */


  		




  802
  798
  
    

  		












他の形式にエクスポート:  Unified diff