layout

thyseus · Mar 25, 2014 · 8cfd562 · 8cfd562
2 parents 8825692 + fe835ff
commit 8cfd562
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/modules/registration/views/registration/activation_failure.php b/modules/registration/views/registration/activation_failure.php
@@ -1,4 +1,4 @@
-<h2> <?php echo Yum::t('Activation did not work'); ?> </h2>
+<h1> <?php echo Yum::t('Activation did not work'); ?> </h1>
 
 <?php if($error == -1) echo Yum::t('The user is already activated'); ?>
 <?php if($error == -2) echo Yum::t('Wrong activation Key'); ?>

diff --git a/modules/registration/views/registration/activation_success.php b/modules/registration/views/registration/activation_success.php
@@ -1,4 +1,4 @@
-<h2> <?php echo Yum::t('Your account has been activated'); ?> </h2>
+<h1> <?php echo Yum::t('Your account has been activated'); ?> </h1>
 
 <p> <?php Yum::t('Click {here} to go to the login form', array(
 			'{here}' => CHtml::link(Yum::t('here'), Yum::module()->loginUrl

diff --git a/modules/registration/views/registration/recovery.php b/modules/registration/views/registration/recovery.php
@@ -7,7 +7,7 @@
 
 ?>
 <?php if(Yum::hasFlash()) {
-echo '<div class="success">';
+echo '<div class="alert alert-success">';
 echo Yum::getFlash(); 
 echo '</div>';
 } else {
@@ -19,16 +19,21 @@
 
 	<?php echo CHtml::errorSummary($form); ?>
 
-	<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-fluid submit">
+
+
 		<?php echo CHtml::submitButton(Yum::t('Restore'), array('class'=>'btn')); ?>
-	</div>
+
+
 
 <?php echo CHtml::endForm(); ?>
 

diff --git a/modules/registration/views/registration/registration.php b/modules/registration/views/registration/registration.php
@@ -2,7 +2,10 @@
 
 <?php $this->breadcrumbs = array(Yum::t('Registration')); ?>
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> fe835ff5957c362c26b938d679d70d13c4d7c496
 <?php $activeform = $this->beginWidget('CActiveForm', array(
   'id'=>'registration-form',
   'enableAjaxValidation'=>true,
@@ -74,4 +77,7 @@
   </div>
 
 <?php $this->endWidget(); ?>
+<<<<<<< HEAD
 
+=======
+>>>>>>> fe835ff5957c362c26b938d679d70d13c4d7c496
diff --git a/modules/user/views/user/login_debug.php b/modules/user/views/user/login_debug.php
@@ -103,10 +103,17 @@
 <div class="row-fluid">
 <div class="span3">
 <div class="buttons">
-<p><?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?></p>
+
+<p><?php echo CHtml::submitButton(Yum::t('Login'), array('class' => 'btn')); ?> </p>
+
+</div>
+
+<div class="alert alert-error">
+	Click <?   echo CHtml::link(Yum::t("Registration"),
+    Yum::module('registration')->registrationUrl); ?> if you are not registered.
+
 </div>
 
-<div class="alert alert-danger"> You can register <?php echo CHtml::link('here', Yum::module('registration')->registrationUrl);?></div>
 
 </div>
 </div>