layout

thyseus · Mar 25, 2014 · 8825692 · 8825692
1 parent c324595
commit 8825692
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/modules/registration/views/registration/recovery.php b/modules/registration/views/registration/recovery.php
@@ -14,22 +14,22 @@
 echo '<h2>'.Yum::t('Password recovery').'</h2>';
 ?>
 
-<div class="form">
+
 <?php echo CHtml::beginForm(); ?>
 
 	<?php echo CHtml::errorSummary($form); ?>
 
-	<div class="row">
+	<div class="row-fluid">
 		<?php echo CHtml::activeLabel($form,'login_or_email'); ?>
 		<?php echo CHtml::activeTextField($form,'login_or_email') ?>
 		<?php echo CHtml::error($form,'login_or_email'); ?>
 		<p class="hint"><?php echo Yum::t("Please enter your user name or email address."); ?></p>
 	</div>
 
-	<div class="row submit">
-		<?php echo CHtml::submitButton(Yum::t('Restore')); ?>
+	<div class="row-fluid submit">
+		<?php echo CHtml::submitButton(Yum::t('Restore'), array('class'=>'btn')); ?>
 	</div>
 
 <?php echo CHtml::endForm(); ?>
-</div><!-- form -->
+
 <?php } ?>
diff --git a/modules/registration/views/registration/registration.php b/modules/registration/views/registration/registration.php
@@ -2,7 +2,7 @@
 
 <?php $this->breadcrumbs = array(Yum::t('Registration')); ?>
 
-<div class="form">
+
 <?php $activeform = $this->beginWidget('CActiveForm', array(
   'id'=>'registration-form',
   'enableAjaxValidation'=>true,
@@ -15,37 +15,37 @@
 <?php echo CHtml::errorSummary(array($form, $profile)); ?>
 
 <?php if(!Yum::module('registration')->registration_by_email) { ?>
-<div class="row">
+<div class="row-fluid">
   <div class="span12"> <?php
 echo $activeform->labelEx($form,'username');
 echo $activeform->textField($form,'username');
 ?> </div></div>
 <?php } ?>
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12"> <?php
 echo $activeform->labelEx($profile,'email');
 echo $activeform->textField($profile,'email');
 ?> </div></div>
 
-  <div class="row"><div class="span12"> <?php
+  <div class="row-fluid"><div class="span12"> <?php
 echo $activeform->labelEx($profile,'firstname');
 echo $activeform->textField($profile,'firstname');
 ?> </div></div>
 
-  <div class="row"><div class="span12"> <?php
+  <div class="row-fluid"><div class="span12"> <?php
 echo $activeform->labelEx($profile,'lastname');
 echo $activeform->textField($profile,'lastname');
 ?> </div></div>
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12">
 <?php echo $activeform->labelEx($form,'password'); ?>
 <?php echo $activeform->passwordField($form,'password'); ?>
 </div>
 </div>
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12">
 <?php echo $activeform->labelEx($form,'verifyPassword'); ?>
 <?php echo $activeform->passwordField($form,'verifyPassword'); ?>
@@ -54,7 +54,7 @@
 <?php if(extension_loaded('gd')
 && !Yum::module()->debug
 && Yum::module('registration')->enableCaptcha): ?>
-  <div class="row">
+  <div class="row-fluid">
       <div class="span12">
     <?php echo CHtml::activeLabelEx($form,'verifyCode'); ?>
     <div>
@@ -67,11 +67,11 @@
   </div></div>
   <?php endif; ?>
 
-  <div class="row submit">
+  <div class="row-fluid submit">
     <div class="span12">
     <?php echo CHtml::submitButton(Yum::t('Registration'), array('class'=>'btn')); ?>
         </div>
   </div>
 
 <?php $this->endWidget(); ?>
-</div><!-- form -->
+
diff --git a/modules/user/views/user/login.php b/modules/user/views/user/login.php
@@ -36,7 +36,7 @@
 
 
 
-<div class="row-fluid">
+<div class="row-fluid-fluid">
 
 <?php if($model->hasErrors()) { ?>
 <div class="alert">
@@ -94,7 +94,7 @@
 <?php } ?>
 
 
-<div class="row">
+<div class="row-fluid">
 <div class="span12">
 
   <p class="hint">
@@ -116,11 +116,12 @@
 </div>
 
 
-<div class="row">
-<div class="span12">
+<div class="row-fluid">
+<div class="span3">
 <div class="buttons">
-<?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?>
+<p><?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?></p>
 </div>
+<div class="alert alert-danger"> You can register <?php echo CHtml::link('here', Yum::module('registration')->registrationUrl);?></div>
 </div>
 </div>
 

diff --git a/modules/user/views/user/login_debug.php b/modules/user/views/user/login_debug.php
@@ -101,11 +101,13 @@
 </div>
 
 <div class="row-fluid">
-<div class="span12">
+<div class="span3">
 <div class="buttons">
-<?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?>
+<p><?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?></p>
 </div>
 
+<div class="alert alert-danger"> You can register <?php echo CHtml::link('here', Yum::module('registration')->registrationUrl);?></div>
+
 </div>
 </div>
 </div>