From 81b9c01366448bcf708adb8e0c4809f39198b45b Mon Sep 17 00:00:00 2001 From: Knah Tsaeb Date: Thu, 8 Dec 2016 09:46:34 +0100 Subject: [PATCH] Rename Default to default --- application/PageBuilder.php | 2 +- application/config/ConfigManager.php | 2 +- index.php | 2 +- tpl/{Default => default}/404.html | 0 tpl/{Default => default}/addlink.html | 0 tpl/{Default => default}/changepassword.html | 0 tpl/{Default => default}/changetag.html | 0 tpl/{Default => default}/configure.html | 0 tpl/{Default => default}/daily.html | 0 tpl/{Default => default}/dailyrss.html | 0 tpl/{Default => default}/editlink.html | 0 tpl/{Default => default}/export.bookmarks.html | 0 tpl/{Default => default}/export.html | 0 tpl/{Default => default}/feed.atom.html | 0 tpl/{Default => default}/feed.rss.html | 0 tpl/{Default => default}/import.html | 0 tpl/{Default => default}/includes.html | 0 tpl/{Default => default}/install.html | 0 tpl/{Default => default}/linklist.html | 0 tpl/{Default => default}/linklist.paging.html | 0 tpl/{Default => default}/loginform.html | 0 tpl/{Default => default}/opensearch.html | 0 tpl/{Default => default}/page.footer.html | 0 tpl/{Default => default}/page.header.html | 0 tpl/{Default => default}/page.html | 0 tpl/{Default => default}/picwall.html | 0 tpl/{Default => default}/pluginsadmin.html | 0 tpl/{Default => default}/readme.txt | 0 tpl/{Default => default}/reset.css | 0 tpl/{Default => default}/shaarli.css | 0 tpl/{Default => default}/tagcloud.html | 0 tpl/{Default => default}/tools.html | 0 32 files changed, 3 insertions(+), 3 deletions(-) rename tpl/{Default => default}/404.html (100%) rename tpl/{Default => default}/addlink.html (100%) rename tpl/{Default => default}/changepassword.html (100%) rename tpl/{Default => default}/changetag.html (100%) rename tpl/{Default => default}/configure.html (100%) rename tpl/{Default => default}/daily.html (100%) rename tpl/{Default => default}/dailyrss.html (100%) rename tpl/{Default => default}/editlink.html (100%) rename tpl/{Default => default}/export.bookmarks.html (100%) rename tpl/{Default => default}/export.html (100%) rename tpl/{Default => default}/feed.atom.html (100%) rename tpl/{Default => default}/feed.rss.html (100%) rename tpl/{Default => default}/import.html (100%) rename tpl/{Default => default}/includes.html (100%) rename tpl/{Default => default}/install.html (100%) rename tpl/{Default => default}/linklist.html (100%) rename tpl/{Default => default}/linklist.paging.html (100%) rename tpl/{Default => default}/loginform.html (100%) rename tpl/{Default => default}/opensearch.html (100%) rename tpl/{Default => default}/page.footer.html (100%) rename tpl/{Default => default}/page.header.html (100%) rename tpl/{Default => default}/page.html (100%) rename tpl/{Default => default}/picwall.html (100%) rename tpl/{Default => default}/pluginsadmin.html (100%) rename tpl/{Default => default}/readme.txt (100%) rename tpl/{Default => default}/reset.css (100%) rename tpl/{Default => default}/shaarli.css (100%) rename tpl/{Default => default}/tagcloud.html (100%) rename tpl/{Default => default}/tools.html (100%) diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 7cddb71..6ba028a 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -79,7 +79,7 @@ class PageBuilder $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false)); $this->tpl->assign('token', getToken($this->conf)); // To be removed with a proper theme configuration. - $this->tpl->assign('conf', $this->conf->get('resource.theme', 'Default')); + $this->tpl->assign('conf', $this->conf->get('resource.theme', 'default')); } /** diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 77804b8..dbce69a 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php @@ -296,7 +296,7 @@ class ConfigManager $this->setEmpty('resource.updates', 'data/updates.txt'); $this->setEmpty('resource.log', 'data/log.txt'); $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt'); - $this->setEmpty('resource.theme', 'Default'); + $this->setEmpty('resource.theme', 'default'); $this->setEmpty('resource.raintpl_tmp', 'tmp/'); $this->setEmpty('resource.thumbnails_cache', 'cache'); $this->setEmpty('resource.page_cache', 'pagecache'); diff --git a/index.php b/index.php index 16d1e46..317e8e1 100644 --- a/index.php +++ b/index.php @@ -122,7 +122,7 @@ if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) { $conf = new ConfigManager(); $conf->setEmpty('general.timezone', date_default_timezone_get()); $conf->setEmpty('general.title', 'Shared links on '. escape(index_url($_SERVER))); -$conf->setEmpty('resource.theme', 'Default'); +$conf->setEmpty('resource.theme', 'default'); RainTPL::$tpl_dir = 'tpl/'.$conf->get('resource.theme').'/'; // template directory RainTPL::$cache_dir = $conf->get('resource.raintpl_tmp'); // cache directory diff --git a/tpl/Default/404.html b/tpl/default/404.html similarity index 100% rename from tpl/Default/404.html rename to tpl/default/404.html diff --git a/tpl/Default/addlink.html b/tpl/default/addlink.html similarity index 100% rename from tpl/Default/addlink.html rename to tpl/default/addlink.html diff --git a/tpl/Default/changepassword.html b/tpl/default/changepassword.html similarity index 100% rename from tpl/Default/changepassword.html rename to tpl/default/changepassword.html diff --git a/tpl/Default/changetag.html b/tpl/default/changetag.html similarity index 100% rename from tpl/Default/changetag.html rename to tpl/default/changetag.html diff --git a/tpl/Default/configure.html b/tpl/default/configure.html similarity index 100% rename from tpl/Default/configure.html rename to tpl/default/configure.html diff --git a/tpl/Default/daily.html b/tpl/default/daily.html similarity index 100% rename from tpl/Default/daily.html rename to tpl/default/daily.html diff --git a/tpl/Default/dailyrss.html b/tpl/default/dailyrss.html similarity index 100% rename from tpl/Default/dailyrss.html rename to tpl/default/dailyrss.html diff --git a/tpl/Default/editlink.html b/tpl/default/editlink.html similarity index 100% rename from tpl/Default/editlink.html rename to tpl/default/editlink.html diff --git a/tpl/Default/export.bookmarks.html b/tpl/default/export.bookmarks.html similarity index 100% rename from tpl/Default/export.bookmarks.html rename to tpl/default/export.bookmarks.html diff --git a/tpl/Default/export.html b/tpl/default/export.html similarity index 100% rename from tpl/Default/export.html rename to tpl/default/export.html diff --git a/tpl/Default/feed.atom.html b/tpl/default/feed.atom.html similarity index 100% rename from tpl/Default/feed.atom.html rename to tpl/default/feed.atom.html diff --git a/tpl/Default/feed.rss.html b/tpl/default/feed.rss.html similarity index 100% rename from tpl/Default/feed.rss.html rename to tpl/default/feed.rss.html diff --git a/tpl/Default/import.html b/tpl/default/import.html similarity index 100% rename from tpl/Default/import.html rename to tpl/default/import.html diff --git a/tpl/Default/includes.html b/tpl/default/includes.html similarity index 100% rename from tpl/Default/includes.html rename to tpl/default/includes.html diff --git a/tpl/Default/install.html b/tpl/default/install.html similarity index 100% rename from tpl/Default/install.html rename to tpl/default/install.html diff --git a/tpl/Default/linklist.html b/tpl/default/linklist.html similarity index 100% rename from tpl/Default/linklist.html rename to tpl/default/linklist.html diff --git a/tpl/Default/linklist.paging.html b/tpl/default/linklist.paging.html similarity index 100% rename from tpl/Default/linklist.paging.html rename to tpl/default/linklist.paging.html diff --git a/tpl/Default/loginform.html b/tpl/default/loginform.html similarity index 100% rename from tpl/Default/loginform.html rename to tpl/default/loginform.html diff --git a/tpl/Default/opensearch.html b/tpl/default/opensearch.html similarity index 100% rename from tpl/Default/opensearch.html rename to tpl/default/opensearch.html diff --git a/tpl/Default/page.footer.html b/tpl/default/page.footer.html similarity index 100% rename from tpl/Default/page.footer.html rename to tpl/default/page.footer.html diff --git a/tpl/Default/page.header.html b/tpl/default/page.header.html similarity index 100% rename from tpl/Default/page.header.html rename to tpl/default/page.header.html diff --git a/tpl/Default/page.html b/tpl/default/page.html similarity index 100% rename from tpl/Default/page.html rename to tpl/default/page.html diff --git a/tpl/Default/picwall.html b/tpl/default/picwall.html similarity index 100% rename from tpl/Default/picwall.html rename to tpl/default/picwall.html diff --git a/tpl/Default/pluginsadmin.html b/tpl/default/pluginsadmin.html similarity index 100% rename from tpl/Default/pluginsadmin.html rename to tpl/default/pluginsadmin.html diff --git a/tpl/Default/readme.txt b/tpl/default/readme.txt similarity index 100% rename from tpl/Default/readme.txt rename to tpl/default/readme.txt diff --git a/tpl/Default/reset.css b/tpl/default/reset.css similarity index 100% rename from tpl/Default/reset.css rename to tpl/default/reset.css diff --git a/tpl/Default/shaarli.css b/tpl/default/shaarli.css similarity index 100% rename from tpl/Default/shaarli.css rename to tpl/default/shaarli.css diff --git a/tpl/Default/tagcloud.html b/tpl/default/tagcloud.html similarity index 100% rename from tpl/Default/tagcloud.html rename to tpl/default/tagcloud.html diff --git a/tpl/Default/tools.html b/tpl/default/tools.html similarity index 100% rename from tpl/Default/tools.html rename to tpl/default/tools.html