Skip to content

Commit

Permalink
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Jan 4, 2016
2 parents ea22f6d + e83620f commit f8dca27
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 44 deletions.
9 changes: 4 additions & 5 deletions application/views/installer/dbconfig_view.php
View file
Expand Up @@ -10,7 +10,6 @@
<?php echo CHtml::errorSummary($model, null, null, array('class' => 'errors')); ?>
</div>
<?php eT("Note: All fields marked with (*) are required."); ?>
<fieldset>
<legend><?php eT("Database configuration"); ?></legend>
<?php
$rows = array();
Expand Down Expand Up @@ -55,14 +54,14 @@
}

?>
</fieldset>
<br />
<div class="row">
<div class="col-md-3" >
<div class="col-md-4" >
<input class="btn btn-default" type="button" value="<?php eT('Previous'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/precheck"); ?>', '_top')" />
</div>
<div class="col-md-3" style="text-align: center;">
<div class="col-md-4" style="text-align: center;">
</div>
<div class="col-md-3" style="text-align: right;">
<div class="col-md-4" style="text-align: right;">
<?php echo CHtml::submitButton(gT("Next"), array('class' => 'btn btn-default')); ?>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions application/views/installer/dbsettings_view.php
View file
Expand Up @@ -9,12 +9,12 @@
<?php if (isset($adminoutputText)) echo $adminoutputText; ?>

<div class="row">
<div class="col-md-3" >
<div class="col-md-4" >
<input class="btn btn-default" type="button" value="<?php eT('Previous'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/database"); ?>', '_top')" />
</div>
<div class="col-md-3" style="text-align: center;">
<div class="col-md-4" style="text-align: center;">
</div>
<div class="col-md-3" style="text-align: right;">
<div class="col-md-4" style="text-align: right;">
<?php
if (isset($next))
{
Expand Down
8 changes: 4 additions & 4 deletions application/views/installer/license_view.php
View file
Expand Up @@ -12,14 +12,14 @@


<div class="row navigator">
<div class="col-md-3">
<div class="col-md-4">
<input class="btn btn-default" type="button" value="<?php eT("Previous"); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/install/welcome"); ?>', '_top')" />
</div>
<div class="col-md-3"></div>
<div class="col-md-3">
<div class="col-md-4"></div>
<div class="col-md-4">
<input class="btn btn-default" type="submit" value="<?php eT('I accept'); ?>" />
</div>
</div>
</form>
</div>
</div>
</div>
8 changes: 3 additions & 5 deletions application/views/installer/optconfig_view.php
View file
Expand Up @@ -11,7 +11,6 @@
<?php echo CHtml::errorSummary($model, null, null, array('class' => 'errors')); ?>
</div>
<?php ?>
<fieldset>
<legend><?php
eT("You can leave these settings blank and change them later");
?>
Expand Down Expand Up @@ -74,13 +73,12 @@
echo CHtml::closeTag('div');
}
?>
</fieldset>
<div class="row navigator">
<div class="col-md-3">
<div class="col-md-4">
<input class="btn btn-default" type="button" value="<?php eT("Previous"); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/welcome"); ?>', '_top')" />
</div>
<div class="col-md-3"></div>
<div class="col-md-3">
<div class="col-md-4"></div>
<div class="col-md-4">
<?php echo CHtml::submitButton(gT("Next"), array('class' => 'btn btn-default')); ?>
</div>
</div>
Expand Down
13 changes: 5 additions & 8 deletions application/views/installer/precheck_view.php
View file
Expand Up @@ -41,7 +41,6 @@ function dirReport($dir, $write)
<div class="col-md-9">
<h2><?php echo $title; ?></h2>
<p><?php echo $descp; ?></p>
<fieldset>
<legend><?php eT("Minimum requirements"); ?></legend>

<table class='table-striped'>
Expand Down Expand Up @@ -104,8 +103,7 @@ function dirReport($dir, $write)
</tr>
</tbody>
</table>
</fieldset>
<fieldset>
<br/>
<legend><?php eT('Optional modules'); ?></legend>
<table class='table-striped'>
<thead>
Expand Down Expand Up @@ -144,20 +142,19 @@ function dirReport($dir, $write)
</tbody>

</table>
</fieldset>
<div class="row navigator">
<div class="col-md-3" >
<div class="col-md-4" >
<input class="btn btn-default" type="button" value="<?php eT('Previous'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/license"); ?>', '_top')" />
</div>
<div class="col-md-3">
<div class="col-md-4">
<input class="btn btn-default" type="button" value="<?php eT('Check again'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/precheck"); ?>', '_top')" />
</div>
<div class="col-md-3">
<div class="col-md-4">

<?php if (isset($next) && $next== TRUE) { ?>
<input class="btn btn-default" type="button" value="<?php eT('Next'); ?>" onclick="javascript: window.open('<?php echo $this->createUrl("installer/database"); ?>', '_top')" />
<?php } ?>
</div>
</div>
</div>
</div>
</div>
33 changes: 16 additions & 17 deletions application/views/installer/welcome_view.php
View file
Expand Up @@ -5,31 +5,30 @@
<div class="col-md-9">
<h2><?php echo $title; ?></h2>

<?php echo CHtml::form(array("installer/welcome"), 'post'); ?>
<fieldset>
<?php echo CHtml::form(array("installer/welcome"), 'post', array('class' => 'form-vertical')); ?>
<legend><?php eT('Language selection'); ?></legend>
<div class="row">
<div class="span6">
<?php
echo CHtml::label(gT('Please select your preferred language:'), 'installerLang');
?>
<br/><br/>
</div>
<div class="col-md-3">
<?php
echo CHtml::dropDownList('installerLang', 'en', $languages, array('id' => 'installerLang', 'class'=>'form-control', 'encode' => false));
?>
<br/><br/>
<div class='form-group'>
<div class="span6 col-md-12">
<?php
echo CHtml::label(gT('Please select your preferred language:'), 'installerLang', array('class' => 'control-label'));
?>
<br/><br/>
</div>
<div class="col-md-3">
<?php
echo CHtml::dropDownList('installerLang', 'en', $languages, array('id' => 'installerLang', 'class'=>'form-control', 'encode' => false));
?>
<br/><br/>
</div>
</div>
</div>
<?php
echo CHtml::tag('p', array(), gT('Your preferred language will be used through out the installation process.'));
?>
</fieldset>
<div class="row navigator">
<div class="col-md-3"></div>
<div class="col-md-3"></div>
<div class="col-md-3">
<div class="col-md-8"></div>
<div class="col-md-4">
<input class='btn btn-default' type="submit" value="<?php eT('Start installation'); ?>" />
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions application/views/layouts/installer.php
View file
Expand Up @@ -11,8 +11,7 @@
<?php
App()->getClientScript()->registerPackage('jqueryui');
App()->bootstrap->register();
App()->getClientScript()->registerPackage('lime-bootstrap-Sea_Green');

App()->getClientScript()->registerCssFile(App()->baseUrl . '/styles/Sea_Green/css/lime-admin.css');
App()->getClientScript()->registerCssFile(App()->baseUrl . '/installer/css/main.css');

$script = "$(function() {
Expand Down

0 comments on commit f8dca27

Please sign in to comment.