Merge and improve pull-request #666 (custom stylesheet)

This commit is contained in:
Frederic Guillot 2015-03-16 22:12:16 -04:00
parent 32fb1f65c5
commit 50f98abfd3
5 changed files with 28 additions and 3 deletions

View File

@ -6,7 +6,13 @@ use PDO;
use Core\Security;
use Model\Link;
const VERSION = 53;
const VERSION = 54;
function version_54($pdo)
{
$rq = $pdo->prepare('INSERT INTO settings VALUES (?, ?)');
$rq->execute(array('application_stylesheet', ''));
}
function version_53($pdo)
{

View File

@ -6,7 +6,13 @@ use PDO;
use Core\Security;
use Model\Link;
const VERSION = 34;
const VERSION = 35;
function version_35($pdo)
{
$rq = $pdo->prepare('INSERT INTO settings VALUES (?, ?)');
$rq->execute(array('application_stylesheet', ''));
}
function version_34($pdo)
{

View File

@ -6,7 +6,13 @@ use Core\Security;
use PDO;
use Model\Link;
const VERSION = 52;
const VERSION = 53;
function version_53($pdo)
{
$rq = $pdo->prepare('INSERT INTO settings VALUES (?, ?)');
$rq->execute(array('application_stylesheet', ''));
}
function version_52($pdo)
{

View File

@ -20,6 +20,9 @@
<?= $this->formSelect('application_date_format', $date_formats, $values, $errors) ?><br/>
<p class="form-help"><?= t('ISO format is always accepted, example: "%s" and "%s"', date('Y-m-d'), date('Y_m_d')) ?></p>
<?= $this->formLabel(t('Custom Stylesheet'), 'application_stylesheet') ?>
<?= $this->formTextarea('application_stylesheet', $values, $errors) ?><br/>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
</div>

View File

@ -17,6 +17,10 @@
<?= $this->css($this->u('app', 'colors'), false) ?>
<?= $this->css('assets/css/app.css') ?>
<?php if ($this->config->get('application_stylesheet')): ?>
<style><?= $this->e($this->config->get('application_stylesheet')) ?></style>
<?php endif ?>
<link rel="icon" type="image/png" href="assets/img/favicon.png">
<link rel="apple-touch-icon" href="assets/img/touch-icon-iphone.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/img/touch-icon-ipad.png">