From 5bbc4bb4b04519036946db961ddea551fdf2eb6c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 19 May 2013 21:22:01 +0400 Subject: [PATCH] move stylesheets to css/, reference default tt-rss stylesheets from default.css to make custom themes easier --- classes/article.php | 2 +- classes/handler/public.php | 8 ++++---- classes/opml.php | 2 +- classes/pref/prefs.php | 2 +- cdm.css => css/cdm.css | 0 prefs.css => css/prefs.css | 0 tt-rss.css => css/tt-rss.css | 0 utility.css => css/utility.css | 0 include/functions.php | 2 +- include/login_form.php | 2 +- include/sanity_check.php | 2 +- index.php | 6 +++--- install/index.php | 2 +- plugins/auth_internal/init.php | 2 +- prefs.php | 6 +++--- register.php | 2 +- themes/default.css | 3 +++ update.php | 2 +- 18 files changed, 23 insertions(+), 20 deletions(-) rename cdm.css => css/cdm.css (100%) rename prefs.css => css/prefs.css (100%) rename tt-rss.css => css/tt-rss.css (100%) rename utility.css => css/utility.css (100%) diff --git a/classes/article.php b/classes/article.php index e9f86f298..398132d12 100644 --- a/classes/article.php +++ b/classes/article.php @@ -44,7 +44,7 @@ class Article extends Handler_Protected { } else if ($mode == "raw") { if ($_REQUEST['html']) { header("Content-Type: text/html"); - print ''; + print ''; } $article = format_article($id, false); diff --git a/classes/handler/public.php b/classes/handler/public.php index 7fa744107..3e868d56e 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -382,7 +382,7 @@ class Handler_Public extends Handler { header('Content-Type: text/html; charset=utf-8'); print "Tiny Tiny RSS"; - stylesheet_tag("utility.css"); + stylesheet_tag("css/utility.css"); javascript_tag("lib/prototype.js"); javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"); print " @@ -553,7 +553,7 @@ class Handler_Public extends Handler { print " Tiny Tiny RSS - + @@ -735,7 +735,7 @@ class Handler_Public extends Handler { header('Content-Type: text/html; charset=utf-8'); print "Tiny Tiny RSS"; - stylesheet_tag("utility.css"); + stylesheet_tag("css/utility.css"); javascript_tag("lib/prototype.js"); print " @@ -835,7 +835,7 @@ class Handler_Public extends Handler { Database Updater - + diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php index 87c8555c0..3c38ab8bf 100644 --- a/plugins/auth_internal/init.php +++ b/plugins/auth_internal/init.php @@ -51,7 +51,7 @@ class Auth_Internal extends Plugin implements IAuthModule { $return = urlencode($_REQUEST["return"]); ?> Tiny Tiny RSS - +
diff --git a/prefs.php b/prefs.php index 93b7cbb78..2cee534b1 100644 --- a/prefs.php +++ b/prefs.php @@ -33,13 +33,13 @@ Tiny Tiny RSS : <?php echo __("Preferences") ?> - - diff --git a/register.php b/register.php index 5bc6563b0..f50ef14a4 100644 --- a/register.php +++ b/register.php @@ -93,7 +93,7 @@ Create new account - + diff --git a/themes/default.css b/themes/default.css index e69de29bb..83e15257b 100644 --- a/themes/default.css +++ b/themes/default.css @@ -0,0 +1,3 @@ +@import "../css/tt-rss.css"; +@import "../css/cdm.css"; +@import "../css/prefs.css"; diff --git a/update.php b/update.php index f542a390b..5e4a5ab79 100755 --- a/update.php +++ b/update.php @@ -47,7 +47,7 @@ Tiny Tiny RSS data update script. - +