From 50f98abfd3a9843c8e4ac0433a4fbf41757be46e Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Mon, 16 Mar 2015 22:12:16 -0400 Subject: Merge and improve pull-request #666 (custom stylesheet) --- app/Schema/Mysql.php | 8 +++++++- app/Schema/Postgres.php | 8 +++++++- app/Schema/Sqlite.php | 8 +++++++- app/Template/config/application.php | 3 +++ app/Template/layout.php | 4 ++++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php index b4db10a4..a78ffacf 100644 --- a/app/Schema/Mysql.php +++ b/app/Schema/Mysql.php @@ -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) { diff --git a/app/Schema/Postgres.php b/app/Schema/Postgres.php index 331205fa..2396000f 100644 --- a/app/Schema/Postgres.php +++ b/app/Schema/Postgres.php @@ -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) { diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php index 551e186e..0e0512d0 100644 --- a/app/Schema/Sqlite.php +++ b/app/Schema/Sqlite.php @@ -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) { diff --git a/app/Template/config/application.php b/app/Template/config/application.php index 26f3743e..f6c9db94 100644 --- a/app/Template/config/application.php +++ b/app/Template/config/application.php @@ -20,6 +20,9 @@ formSelect('application_date_format', $date_formats, $values, $errors) ?>

+ formLabel(t('Custom Stylesheet'), 'application_stylesheet') ?> + formTextarea('application_stylesheet', $values, $errors) ?>
+
diff --git a/app/Template/layout.php b/app/Template/layout.php index 9290a21e..68028240 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -17,6 +17,10 @@ css($this->u('app', 'colors'), false) ?> css('assets/css/app.css') ?> + config->get('application_stylesheet')): ?> + + + -- cgit v1.2.3