markup

Digital-Peak · May 30, 2017 · 9e85f1c · 9e85f1c
1 parent 55eebdc
commit 9e85f1c
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 140 deletions.
diff --git a/installation/html/helper.php b/installation/html/helper.php
diff --git a/installation/model/forms/site.xml b/installation/model/forms/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fieldset>
+	<fieldset name="site">
 		<field
 			name="language"
 			type="installation.language"
@@ -85,4 +85,80 @@
 			<option value="0">JNO</option>
 		</field>
 	</fieldset>
+	<fieldset name="database">
+		<fieldset name="basic">
+			<field
+					name="db_type"
+					type="databaseconnection"
+					id="db_type"
+					class="custom-select form-control"
+					label="INSTL_DATABASE_TYPE_LABEL"
+					supported="mysqli,pdomysql,postgresql"
+					required="true"
+					default="mysqli"
+					filter="string"
+			/>
+			<field
+					name="db_host"
+					type="text"
+					id="db_host"
+					class="form-control"
+					label="INSTL_DATABASE_HOST_LABEL"
+					default="localhost"
+					required="true"
+			/>
+			<field
+					name="db_user"
+					type="text"
+					id="db_user"
+					class="form-control"
+					label="INSTL_DATABASE_USER_LABEL"
+					required="true"
+			/>
+			<field
+					name="db_pass"
+					type="password"
+					id="db_pass"
+					class="form-control"
+					label="INSTL_DATABASE_PASSWORD_LABEL"
+					autocomplete="off"
+					filter="raw"
+			/>
+			<field
+					name="db_name"
+					type="text"
+					id="db_name"
+					class="form-control"
+					label="INSTL_DATABASE_NAME_LABEL"
+					required="true"
+			/>
+		</fieldset>
+
+		<!-- Advanced Settings -->
+		<fieldset name="advanced">
+			<field
+					name="db_old"
+					type="radio"
+					id="db_old"
+					class="btn-group"
+					label="INSTL_DATABASE_OLD_PROCESS_LABEL"
+					default="backup"
+					required="true"
+			>
+				<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
+				<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
+			</field>
+			<field
+					name="db_prefix"
+					type="installation.prefix"
+					id="db_prefix"
+					class="form-control"
+					label="INSTL_DATABASE_PREFIX_LABEL"
+					required="true"
+					validate="installation.prefix"
+					message="INSTL_DATABASE_PREFIX_MSG"
+					autocomplete="off"
+			/>
+		</fieldset>
+	</fieldset>
 </form>
diff --git a/installation/view/database/tmpl/default.php b/installation/view/database/tmpl/default.php
@@ -11,7 +11,6 @@
 
 /* @var InstallationViewDefault $this */
 ?>
-<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate">
 	<div class="btn-toolbar justify-content-end">
 		<div class="btn-group">

diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php
@@ -21,7 +21,6 @@
 JS
 );
 ?>
-<?php echo JHtml::_('InstallationHtml.helper.stepbarlanguages'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate">
 	<div class="btn-toolbar justify-content-end">
 		<div class="btn-group">

diff --git a/installation/view/ftp/tmpl/default.php b/installation/view/ftp/tmpl/default.php
@@ -10,7 +10,6 @@
 
 /* @var InstallationViewDefault $this */
 ?>
-<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate">
 	<div class="btn-toolbar justify-content-end">
 		<div class="btn-group">

diff --git a/installation/view/languages/tmpl/default.php b/installation/view/languages/tmpl/default.php
@@ -23,7 +23,6 @@ function installLanguages() {
 	}
 </script>
 
-<?php echo JHtml::_('InstallationHtml.helper.stepbarlanguages'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate">
 	<div class="btn-toolbar justify-content-end">
 		<div class="btn-group">

diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php
@@ -11,7 +11,6 @@
 
 /* @var InstallationViewDefault $this */
 ?>
-<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <div class="btn-toolbar justify-content-end">
 	<div class="btn-group">
 		<a href="#" class="btn btn-primary" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
@@ -80,3 +79,64 @@
 	<input type="hidden" name="format" value="json">
 	<?php echo JHtml::_('form.token'); ?>
 </form>
+<form action="index.php" method="post" id="adminForm" class="form-validate">
+	<div class="btn-toolbar justify-content-end">
+		<div class="btn-group">
+			<a class="btn btn-secondary" href="#" onclick="return Install.goToPage('site');" rel="prev" title="<?php echo JText::_('JPREVIOUS'); ?>"><span class="fa fa-arrow-left"></span> <?php echo JText::_('JPREVIOUS'); ?></a>
+			<a class="btn btn-primary" href="#" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
+		</div>
+	</div>
+	<h3><?php echo JText::_('INSTL_DATABASE'); ?></h3>
+	<hr>
+	<div class="row">
+		<div class="col-md-6">
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_type'); ?>
+				<?php echo $this->form->getInput('db_type'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_TYPE_DESC'); ?></p>
+			</div>
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_host'); ?>
+				<?php echo $this->form->getInput('db_host'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_HOST_DESC'); ?></p>
+			</div>
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_user'); ?>
+				<?php echo $this->form->getInput('db_user'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_USER_DESC'); ?></p>
+			</div>
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_pass'); ?>
+				<?php // Disables autocomplete ?> <input type="password" style="display:none">
+				<?php echo $this->form->getInput('db_pass'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_PASSWORD_DESC'); ?></p>
+			</div>
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_name'); ?>
+				<?php echo $this->form->getInput('db_name'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_NAME_DESC'); ?></p>
+			</div>
+		</div>
+		<div class="col-md-6">
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_prefix'); ?>
+				<?php echo $this->form->getInput('db_prefix'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_PREFIX_DESC'); ?></p>
+			</div>
+			<div class="form-group">
+				<?php echo $this->form->getLabel('db_old'); ?>
+				<?php echo $this->form->getInput('db_old'); ?>
+				<p class="form-text text-muted small"><?php echo JText::_('INSTL_DATABASE_OLD_PROCESS_DESC'); ?></p>
+			</div>
+		</div>
+	</div>
+	<div class="btn-toolbar justify-content-end">
+		<div class="btn-group">
+			<a class="btn btn-secondary" href="#" onclick="return Install.goToPage('site');" rel="prev" title="<?php echo JText::_('JPREVIOUS'); ?>"><span class="fa fa-arrow-left"></span> <?php echo JText::_('JPREVIOUS'); ?></a>
+			<a  class="btn btn-primary" href="#" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNEXT'); ?>"><span class="fa fa-arrow-right icon-white"></span> <?php echo JText::_('JNEXT'); ?></a>
+		</div>
+	</div>
+	<input type="hidden" name="task" value="database">
+	<input type="hidden" name="format" value="json">
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
@@ -16,7 +16,6 @@
 $useftp = file_exists($path) ? !is_writable($path) : !is_writable(JPATH_CONFIGURATION . '/');
 $prev = $useftp ? 'ftp' : 'database';
 ?>
-<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate">
 	<div class="btn-toolbar justify-content-end">
 		<div class="btn-group">