Commit a3a46173 authored by Tino Goratsch's avatar Tino Goratsch

some more minor styling improvements

parent ef37890f
......@@ -74,8 +74,8 @@ class Translator
*/
public function languagePackExists($locale)
{
return !preg_match('=/=',
$locale) && is_file($this->appPath->getModulesDir() . 'ACP3/System/Resources/i18n/' . $locale . '.xml') === true;
return !preg_match('=/=', $locale)
&& is_file($this->appPath->getModulesDir() . 'ACP3/System/Resources/i18n/' . $locale . '.xml') === true;
}
/**
......
......@@ -145,6 +145,10 @@
top: 7px;
}
}
input[placeholder],
textarea[placeholder] {
font-style: italic;
}
/* Pagination */
.pagination {
margin: 0 0 10px;
......
......@@ -23,6 +23,13 @@
}
}
input,
textarea {
&[placeholder] {
font-style: italic;
}
}
/* Pagination */
.pagination {
margin: 0 0 10px;
......
......@@ -84,21 +84,22 @@ class Index extends AbstractAction
$this->executePost($this->request->getPost()->all());
}
$this->view->assign('time_zones', $this->dateHelper->getTimeZones(date_default_timezone_get()));
$defaults = [
'db_host' => 'localhost',
'db_pre' => 'acp3_',
'db_pre' => '',
'db_user' => '',
'db_name' => '',
'user_name' => 'admin',
'user_name' => '',
'mail' => '',
'date_format_long' => $this->date->getDateFormatLong(),
'date_format_short' => $this->date->getDateFormatShort(),
'title' => 'ACP3',
];
$this->view->assign('form', array_merge($defaults, $this->request->getPost()->all()));
return [
'time_zones' => $this->dateHelper->getTimeZones(date_default_timezone_get()),
'form' => array_merge($defaults, $this->request->getPost()->all())
];
}
/**
......
......@@ -17,9 +17,12 @@
<label for="db-host" class="col-sm-2 control-label required">{lang t="install|db_hostname"}</label>
<div class="col-sm-10">
<input class="form-control" type="text" name="db_host" id="db-host" value="{$form.db_host}" required>
<p class="help-block">{lang t="install|db_hostname_description"}</p>
<input class="form-control"
type="text"
name="db_host"
id="db-host"
value="{$form.db_host}"
placeholder="{lang t="install|db_hostname_description"}" required>
</div>
</div>
<div class="form-group">
......@@ -33,7 +36,12 @@
<label for="db-password" class="col-sm-2 control-label">{lang t="install|db_password"}</label>
<div class="col-sm-10">
<input class="form-control" type="password" name="db_password" id="db-password" value=""></div>
<input class="form-control"
type="password"
name="db_password"
id="db-password"
placeholder="{lang t="install|optional"}">
</div>
</div>
<div class="form-group">
<label for="db-name" class="col-sm-2 control-label required">{lang t="install|db_name"}</label>
......@@ -46,7 +54,13 @@
<label for="db-pre" class="col-sm-2 control-label">{lang t="install|db_table_prefix"}</label>
<div class="col-sm-10">
<input class="form-control" type="text" name="db_pre" id="db-pre" value="{$form.db_pre}"></div>
<input class="form-control"
type="text"
name="db_pre"
id="db-pre"
value="{$form.db_pre}"
placeholder="{lang t="install|optional"}">
</div>
</div>
</div>
<div id="tabs-2" class="tab-pane fade">
......
......@@ -19,7 +19,7 @@
<![CDATA[Aus folgenden Gründen konnte keine Verbindung zur Datenbank hergestellt werden:<br /><pre>%s</pre>]]></item>
<item key="db_connection_settings">Verbindungsdaten zur Datenbank</item>
<item key="db_hostname">Hostname</item>
<item key="db_hostname_description">Meistens &quot;localhost&quot;.</item>
<item key="db_hostname_description"><![CDATA[Meistens &quot;localhost&quot;]]></item>
<item key="db_name">Datenbankname</item>
<item key="db_password">Passwort</item>
<item key="db_table_prefix">Tabellenpräfix</item>
......@@ -67,6 +67,7 @@
Bitte versuchen Sie es in einigen Minuten erneut.
</item>
<item key="on">an</item>
<item key="optional">(optional)</item>
<item key="overview">Übersicht</item>
<item key="pages_contact">Kontakt</item>
<item key="pages_files">Downloads</item>
......
......@@ -19,7 +19,7 @@
<![CDATA[The connection to the database failed. Details below:<br /><pre>%s</pre>]]></item>
<item key="db_connection_settings">Database connection settings</item>
<item key="db_hostname">Hostname</item>
<item key="db_hostname_description">Usually &quot;localhost&quot;.</item>
<item key="db_hostname_description"><![CDATA[Usually &quot;localhost&quot;]]></item>
<item key="db_name">Database name</item>
<item key="db_password">Password</item>
<item key="db_table_prefix">Table prefix</item>
......@@ -65,6 +65,7 @@
Please try again in a few minutes.
</item>
<item key="on">on</item>
<item key="optional">(optional)</item>
<item key="overview">Overview</item>
<item key="pages_contact">Contact</item>
<item key="pages_files">Downloads</item>
......
......@@ -69,6 +69,10 @@
top: 7px;
}
}
input[placeholder],
textarea[placeholder] {
font-style: italic;
}
/* Pagination */
.pagination {
margin: 0 0 10px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment