Skip to content

Commit

Permalink
Dev Missing div in register form
Browse files Browse the repository at this point in the history
  • Loading branch information
c-schmitz committed Aug 11, 2016
1 parent 7c2f0e4 commit 07b2614
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 42 deletions.
77 changes: 39 additions & 38 deletions application/views/register/registerForm.php
@@ -1,52 +1,53 @@
<?php echo CHtml::form($urlAction,'post',array('id'=>'limesurvey', 'role' => 'form', 'class' => 'form-horizontal col-sm-12 col-md-10 col-md-offset-1')); ?>
<input type="hidden" name="lang" value="<?php echo $sLanguage; ?>" id="register_lang" />
<div class='form-group col-sm-12'>
<label for='register_firstname' class='control-label col-md-4'><?php eT("First name:"); ?></label>
<div class="col-sm-12 col-md-6">
<?php echo CHtml::textField('register_firstname', $sFirstName,array('id'=>'register_firstname','class'=>'form-control input-sm')); ?>
</div>
<input type="hidden" name="lang" value="<?php echo $sLanguage; ?>" id="register_lang" />
<div class='form-group col-sm-12'>
<label for='register_firstname' class='control-label col-md-4'><?php eT("First name:"); ?></label>
<div class="col-sm-12 col-md-6">
<?php echo CHtml::textField('register_firstname', $sFirstName,array('id'=>'register_firstname','class'=>'form-control input-sm')); ?>
</div>
<div class='form-group col-sm-12'>
<label for='register_lastname' class='control-label col-md-4'><?php eT("Last name:"); ?></label>
<div class="col-sm-12 col-md-6">
</div>
<div class='form-group col-sm-12'>
<label for='register_lastname' class='control-label col-md-4'><?php eT("Last name:"); ?></label>
<div class="col-sm-12 col-md-6">
<?php echo CHtml::textField('register_lastname', $sLastName,array('id'=>'register_lastname','class'=>'form-control input-sm')); ?>
</div>
</div>
<div class='form-group col-sm-12'>
<label for='register_email' class='control-label col-md-4'><?php eT("Email address:"); ?></label>
<div class="col-sm-12 col-md-6">
</div>
<div class='form-group col-sm-12'>
<label for='register_email' class='control-label col-md-4'><?php eT("Email address:"); ?></label>
<div class="col-sm-12 col-md-6">
<?php echo CHtml::textField('register_email', $sEmail,array('id'=>'register_email','class'=>'form-control input-sm','required'=>'required')); ?>
</div>
</div>
<?php foreach($aExtraAttributes as $key=>$aExtraAttribute){ ?>
<div class='form-group col-sm-12'>
<label for="register_<?php echo $key; ?>" class='control-label col-md-4'><?php echo $aExtraAttribute['caption']; ?><?php echo $aExtraAttribute['mandatory'] == 'Y' ? '*' : ""; ?></label>
<div class="col-sm-12 col-md-6">
</div>
<?php foreach($aExtraAttributes as $key=>$aExtraAttribute){ ?>
<div class='form-group col-sm-12'>
<label for="register_<?php echo $key; ?>" class='control-label col-md-4'><?php echo $aExtraAttribute['caption']; ?><?php echo $aExtraAttribute['mandatory'] == 'Y' ? '*' : ""; ?></label>
<div class="col-sm-12 col-md-6">
<?php echo CHtml::textField("register_{$key}", $aAttribute[$key],array('id'=>"register_{$key}",'class'=>'form-control input-sm')); ?>
</div>
</div>
</div>
<?php } ?>
<?php if($bCaptcha){ ?>
<div class='form-group col-sm-12'>
<label for="loadsecurity" class='control-label col-md-4 col-sm-12'>
<p class="col-sm-6 col-md-12 remove-padding"><?php eT("Please enter the letters you see below:"); ?></p>
<span class="col-sm-6 col-md-12">
<?php $this->widget('CCaptcha',
array(
'buttonOptions'=>array('class'=> 'btn btn-xs btn-info'),
'buttonType' => 'button',
'buttonLabel' => gt('Reload image')
)); ?>
</span>
</label>
<div class="col-md-6 col-sm-12">
<div>&nbsp;</div>
<?php echo CHtml::textField('loadsecurity', '',array('id'=>'loadsecurity','class'=>'form-control input-sm','required'=>'required')); ?>
</div>
<?php if($bCaptcha){ ?>
<div class='form-group col-sm-12'>
<label for="loadsecurity" class='control-label col-md-4 col-sm-12'>
<p class="col-sm-6 col-md-12 remove-padding"><?php eT("Please enter the letters you see below:"); ?></p>
<span class="col-sm-6 col-md-12">
<?php $this->widget('CCaptcha',
array(
'buttonOptions'=>array('class'=> 'btn btn-xs btn-info'),
'buttonType' => 'button',
'buttonLabel' => gt('Reload image')
)); ?>
</span>
</label>
<div class="col-md-6 col-sm-12">
<div>&nbsp;</div>
<?php echo CHtml::textField('loadsecurity', '',array('id'=>'loadsecurity','class'=>'form-control input-sm','required'=>'required')); ?>
</div>
</div>
<?php } ?>
<div class='form-group col-sm-12'>
<div class="col-sm-12 col-md-3 col-md-offset-9">
<div class='form-group col-sm-12'>
<div class="col-sm-12 col-md-3 col-md-offset-9">
<?php echo CHtml::submitButton(gT("Continue",'unescaped'),array('class'=>'btn-default btn-block btn','id'=>'register','name'=>'register')); ?>
</div>
</div>
<?php echo CHtml::endForm(); ?>
6 changes: 2 additions & 4 deletions docs/release_notes.txt
Expand Up @@ -45,7 +45,7 @@ Changes from 2.50+ (build 160804) to 2.50+ (build 160810) Aug 10, 2016
-Fixed issue #11524: Unstyled error message when trying to repeatedly activate a survey (Carsten Schmitz)
-Fixed issue #11525: Wrong JS at template.js breaks certain survey features (markusfluer)
-Fixed issue: Corrected wording (markusfluer)
-Fixed issue: csv-paticipant import always fails (markusfluer)
-Fixed issue: CSV participant import always fails (markusfluer)
-Fixed issue: Quick add using a single ajax for each row (markusfluer)
#Updated translation: Dutch by Han
#Updated translation: Dutch (Informal) by Han
Expand All @@ -54,17 +54,15 @@ Changes from 2.50+ (build 160804) to 2.50+ (build 160810) Aug 10, 2016
#Updated translation: German by c_schmitz
#Updated translation: German (Informal) by c_schmitz
#Updated translation: Indonesian by radhwaw
#Updated translation: Italian by c_schmitz, lfanfoni
#Updated translation: Italian by lfanfoni
#Updated translation: Italian (Informal) by c_schmitz, lfanfoni
#Updated translation: Italian (Informal) by lfanfoni
#Updated translation: Latvian by marcic
#Updated translation: Latvian (Informal) by marcic
#Updated translation: Norwegian (Bokmål) by pmonstad
#Updated translation: Norwegian (Nynorsk) by pmonstad
#Updated translation: Polish by elisa
#Updated translation: Polish (Informal) by elisa
#Updated translation: Spanish (Spain) by c_schmitz, aesteban
#Updated translation: Spanish (Spain) by aesteban

Changes from 2.50+ (build 160731) to 2.50+ (build 160804) Aug 4, 2016
-Fixed issue #11483: Bad visualization (markusfluer)
Expand Down

0 comments on commit 07b2614

Please sign in to comment.