Skip to content

Commit

Permalink
Patch install step 2-3 to 1-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nivcoo @Eywek
nivcoo authored and Eywek committed Apr 28, 2018
1 parent 21f2c49 commit 7b31cf2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 17 deletions.
9 changes: 4 additions & 5 deletions app/View/Install/index.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<div class="tab-content">
<div class="tab-pane active" id="tabsleft-tab2">
<h1><?= $Lang->get('INSTALL__STEP_2_TITLE') ?></h1>
<p><?= $Lang->get('INSTALL__STEP_2_DESC') ?></p>
<h1><?= $Lang->get('INSTALL__STEP_1_TITLE') ?></h1>
<p><?= $Lang->get('INSTALL__STEP_1_DESC') ?></p>

<form id="step3">
<div class="ajax-msg-step3"></div>
Expand All @@ -29,7 +29,6 @@
<div id="input"></div>
<li class="next finish hidden" style="display: none;"><a href="javascript:;"><?= $Lang->get('GLOBAL__END') ?></a></li>
<ul class="pager wizard">
<li class="previous disabled"><a href="javascript:;"><?= $Lang->get('GLOBAL__PREVIOUS') ?></a></li>
<li class="next" style="display: inline;"><a id="tabsleft-link" href="javascript:;"><?= $Lang->get('GLOBAL__NEXT') ?></a></li>
<li class="next finish hidden" style="display: none;"><a href="javascript:;"><?= $Lang->get('GLOBAL__END') ?></a></li>
</ul>
Expand All @@ -38,8 +37,8 @@
</div>
<div class="tab-pane" id="tabsleft-tab3">

<h1><?= $Lang->get('INSTALL__STEP_3_TITLE') ?></h1>
<div class="alert alert-success"><?= $Lang->get('INSTALL__STEP_3_DESC') ?></div>
<h1><?= $Lang->get('INSTALL__STEP_2_TITLE') ?></h1>
<div class="alert alert-success"><?= $Lang->get('INSTALL__STEP_2_DESC') ?></div>

<p>
<a href="<?= $this->Html->url(array('controller' => 'install', 'action' => 'end')) ?>" class="btn btn-block btn-success"><?= $Lang->get('INSTALL__GO_TO_INDEX') ?></a>
Expand Down
8 changes: 4 additions & 4 deletions app/View/Layouts/install.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@
<ul class="nav nav-tabs nav-pills nav-stacked col-xs-6 col-sm-3" style="max-width: 300px;">

<li role="presentation"><a
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_2_TITLE') ?></a>
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_1_TITLE') ?></a>
</li>
<li role="presentation" class="active"><a
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_3_TITLE') ?></a>
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_2_TITLE') ?></a>
</li>
</ul>
<?php } else { ?>
<div id="tabsleft" class="tabbable tabs-left">
<ul class="nav nav-tabs nav-pills nav-stacked col-xs-6 col-sm-3" style="max-width: 300px;">
<li role="presentation" class=""><a href="#tabsleft-tab2" data-toggle="tab" data-toggle="tab"
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_2_TITLE') ?></a>
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_1_TITLE') ?></a>
</li>
<li role="presentation" class=""><a href="#tabsleft-tab3" data-toggle="tab"
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_3_TITLE') ?></a>
title="<?= $Lang->get('INSTALL__NO_SKIP') ?>"><?= $Lang->get('INSTALL__STEP_2_TITLE') ?></a>
</li>
</ul>
<?php } ?>
Expand Down
6 changes: 2 additions & 4 deletions lang/en_US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,9 @@
"THEME__ERROR_INSTALL_UNZIP": "The theme could not be installed, check that the app / View / Themed folder is available for writing.",

"INSTALL__STEP_1_TITLE": "Step 1",
"INSTALL__STEP_1_DESC": "Please enter your license key available on your mineweb.org member area",
"INSTALL__STEP_1_DESC": "You can now configure your Administrator account",
"INSTALL__STEP_2_TITLE": "Step 2",
"INSTALL__STEP_2_DESC": "You can now configure your Administrator account",
"INSTALL__STEP_3_TITLE": "Step 3",
"INSTALL__STEP_3_DESC": "You have completed the installation of the CMS successfully! CMS configuration can be in the admin panel. Click the button below to switch to use.",
"INSTALL__STEP_2_DESC": "You have completed the installation of the CMS successfully! CMS configuration can be in the admin panel. Click the button below to switch to use.",
"INSTALL__ALREADY_INSTALLED": "Your site is already installed, if you want to reinstall it you must delete the file <code>/config/install.txt </code> and <code>/config/installed.txt </code>. ",
"INSTALL__GO_TO_INDEX": "Switch to use",
"INSTALL__INSTALL": "Installation",
Expand Down
6 changes: 2 additions & 4 deletions lang/fr_FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,9 @@
"THEME__ERROR_INSTALL_UNZIP": "Le thème n'a pas pu être installé, vérifiez que le dossier app/View/Themed soit disponible en écriture.",

"INSTALL__STEP_1_TITLE": "Étape 1",
"INSTALL__STEP_1_DESC": "Veuillez entrer votre clé de licence disponible sur votre espace membre de mineweb.org",
"INSTALL__STEP_1_DESC": "Vous pouvez maintenant configurer votre compte Administrateur",
"INSTALL__STEP_2_TITLE": "Étape 2",
"INSTALL__STEP_2_DESC": "Vous pouvez maintenant configurer votre compte Administrateur",
"INSTALL__STEP_3_TITLE": "Étape 3",
"INSTALL__STEP_3_DESC": "Vous avez terminé l'installation du CMS avec succès ! La configuration du CMS peut être dans le panel admin. Cliquez sur le bouton ci-dessous pour passer à l'utilisation.",
"INSTALL__STEP_2_DESC": "Vous avez terminé l'installation du CMS avec succès ! La configuration du CMS peut être dans le panel admin. Cliquez sur le bouton ci-dessous pour passer à l'utilisation."
"INSTALL__ALREADY_INSTALLED": "Votre site est déjà installé, si vous souhaitez le réinstaller vous devez supprimer le fichier <code>\/config\/install.txt<\/code> et <code>\/config\/installed.txt<\/code>.",
"INSTALL__GO_TO_INDEX":"Passer à l'utilisation",
"INSTALL__INSTALL":"Installation",
Expand Down

0 comments on commit 7b31cf2

Please sign in to comment.