#502 Change templates set through administration UI #705

Knah-Tsaeb · 2016-12-07T11:11:07Z

Hi,
I make a theme changer refer #502 and #22.
In this change,

I decide to tpl dir cannot be set, is always tpl (like plugins dir), but I think is not really a problem. All theme are in tpl dir.
I move the original theme in tpl/Default
I add in configure page a new select option (old theme need to be update)
I have test with fresh install and update from old config format
I add a new function for return list of available theme and I put it on applications/Utils.php ( no idea if is a good place)
I not move image from images to tpl/Default/images, for not break other theme.

Have a nice day !

Knah-Tsaeb · 2016-12-07T11:27:38Z

Huuuuu, test fail : (
I'm not using test, if anyone can look a problem.

ArthurHoaro · 2016-12-07T11:33:43Z

Hi! Thanks for your contribution!
You can run and fix tests using make test in Shaarli's root directory.

A few general remarks though:

why did you hard code tpl instead of using raintpl_dir+theme settings?
prefer lower case folder name (default).
the CSS should also be moved under the theme directory.
the doc/ folder is ~~auto~~ generated from Github's wiki.

Knah-Tsaeb · 2016-12-07T12:20:11Z

why did you hard code tpl instead of using raintpl_dir+theme settings?

Why not ? I don't find a good reason for personalise this setting. But why not.

prefer lower case folder name (default).

Me not ;-), I consider a name of template like proper name like title of book or music. Is a personal preference and vision, not a rule or law.

the CSS should also be moved under the theme directory.

Sorry I not precise for CSS, yes they move into tpl folder, and the user.css keep in inc dir for non breaking existing user personalisation.

the doc/ folder is auto generated from Github's wiki.

Ok my bad, I undo this.

I try to fix test tomorrow, now is children time.

ArthurHoaro · 2016-12-07T15:59:06Z

Why not ? I don't find a good reason for personalise this setting. But why not.

Someone might be already using it, and there is no apparent reason to remove this feature.

Me not ;-), I consider a name of template like proper name like title of book or music

Maybe, but I was talking about the folder name: all folders are in lower case in Shaarli (well, except in tests). That's not very important, but I'd like to keep consistency.

Good luck with the tests, feel free to ask if you need help.

Knah-Tsaeb · 2016-12-08T10:06:26Z

Ok, one test fail on my machine, but work on Travis, yeah \o/

ArthurHoaro

Hi! I've reviewed your PR and made a bunch of comments to improve it. Nothing major, but it requires attention.

ArthurHoaro · 2016-12-08T12:21:24Z

index.php

@@ -1173,6 +1175,8 @@ function renderPage($conf, $pluginManager)
        else // Show the configuration form.
        {
            $PAGE->assign('title', $conf->get('general.title'));
+            $PAGE->assign('theme', $conf->get('resource.theme'));
+            $PAGE->assign('theme_avaible', getAllTheme());


s/avaible/available/

Yep sorry, I fix it soon.

ArthurHoaro · 2016-12-08T12:29:10Z

tpl/default/daily.html

@@ -28,9 +28,9 @@
    </div>

    <div class="dailyTitle">
-        <img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">
+        <img src="../../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">


In RainTPL you can use src="images/floral_left.png#", the # meaning it will create a path from the root directory.
But aren't these image theme related?

ArthurHoaro · 2016-12-08T12:31:18Z

tpl/default/includes.html

-<link type="text/css" rel="stylesheet" href="../inc/reset.css" />
-<link type="text/css" rel="stylesheet" href="../inc/shaarli.css" />
-{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="../inc/user.css" />{/if}
+<link type="text/css" rel="stylesheet" href="reset.css" />


A CSS subfolder would be cleaner.

Same for awesomplete lib and blazy lib JS ? And awesomplete CSS ?

Hmm... no. While it's true that it linked to the theme, custom theme might also use them. So I'd say that we keep them in inc/.

ArthurHoaro · 2016-12-08T12:31:44Z

tpl/default/linklist.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link type="text/css" rel="stylesheet" href="../inc/awesomplete.css" />
+    <link type="text/css" rel="stylesheet" href="../../inc/awesomplete.css" />


Same comment regarding relative path.

ArthurHoaro · 2016-12-08T12:33:19Z

tpl/default/shaarli.css

@@ -846,7 +846,7 @@ div.dailyEntryThumbnail {
    width: 100%;
    text-align: center;
    background-color: rgb(128, 128, 128);
-    background: url(../images/50pc_transparent.png);
+    background: url(../../images/50pc_transparent.png);


All these images should go under tpl/default/images, except, eventually, the logo.

ArthurHoaro · 2016-12-08T12:34:00Z

application/Utils.php

+
+function getAllTheme()
+{
+    $allTheme = glob('tpl/*', GLOB_ONLYDIR);


pass the resource.raintpl_tpl parameter to the function, and use it.

Yes I forgot this passage.

ArthurHoaro · 2016-12-08T12:37:43Z

application/PageBuilder.php

@@ -79,7 +79,7 @@ private function initialize()
        $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);
+        $this->tpl->assign('conf', $this->conf->get('resource.theme', 'default'));


My comment isn't clear here, but this isn't set just to pass the theme name. The whole configuration manager is passed in conf variable because themes can use custom settings and need to access them.

Add this instead:

$this->tpl->assign('theme', $this->conf->get('resource.theme', 'default'));

I don't understand but OK.

Sorry, I made a mistake. You assign the theme variable in index.php. You can actually let this file untouched (keep assign('conf', $this->conf);).

ArthurHoaro · 2016-12-08T12:44:14Z

index.php

@@ -1148,6 +1149,7 @@ function renderPage($conf, $pluginManager)
            $conf->set('general.timezone', $tz);
            $conf->set('general.title', escape($_POST['title']));
            $conf->set('general.header_link', escape($_POST['titleLink']));
+            $conf->set('resource.theme', escape($_POST['theme']));


It might be a good idea to delete the page cache after writing this conf:

invalidateCaches($conf->get('resource.page_cache'));

That work without clearing cache. But I can add it.

…tc.)

…tests, etc.)" This reverts commit f78c9ee.

#502 Change templates set through administration UI

d33763a

ArthurHoaro added enhancement in review template HTML rendering labels Dec 7, 2016

ArthurHoaro added this to the 0.9.0 milestone Dec 7, 2016

ArthurHoaro added in progress and removed in review labels Dec 7, 2016

Knah-Tsaeb added 4 commits December 8, 2016 09:38

Reset doc file

057fb68

Rename Default to default

81b9c01

Restore custum tpl dir

a197ef5

Fix unit test

0f473ee

ArthurHoaro requested changes Dec 8, 2016

View reviewed changes

Some ajust on advice of ArthurHoaro

daf2be4

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 3, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

4af3036

…tc.)

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 3, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

71be646

…tc.)

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 3, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

1c8276e

…tc.)

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 3, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

e37e0b6

…tc.)

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 3, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

2169ea8

…tc.)

ArthurHoaro mentioned this pull request Jan 3, 2017

Theme manager: improvements #732

Merged

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 5, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

0ec4ac8

…tc.)

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 5, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

a0df065

…tc.)

virtualtam mentioned this pull request Jan 5, 2017

[Announcements] Releases / Roadmap #353

Closed

20 tasks

ArthurHoaro closed this in #732 Jan 6, 2017

ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this pull request Jan 7, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

8b3074b

…tc.)

virtualtam mentioned this pull request Feb 10, 2017

How to change theme #780

Closed

portailp pushed a commit to PortailPro/Shaarli that referenced this pull request Mar 20, 2017

Minor improvements regarding shaarli#705 (coding style, unit tests, e…

f78c9ee

…tc.)

portailp added a commit to PortailPro/Shaarli that referenced this pull request Mar 20, 2017

Revert "Minor improvements regarding shaarli#705 (coding style, unit …

a37bbe4

…tests, etc.)" This reverts commit f78c9ee.

portailp added a commit to PortailPro/Shaarli that referenced this pull request Mar 20, 2017

Revert "Minor improvements regarding shaarli#705 (coding style, unit …

0ac43e0

…tests, etc.)" This reverts commit f78c9ee.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#502 Change templates set through administration UI #705

#502 Change templates set through administration UI #705

Knah-Tsaeb commented Dec 7, 2016

Knah-Tsaeb commented Dec 7, 2016

ArthurHoaro commented Dec 7, 2016 •

edited

Knah-Tsaeb commented Dec 7, 2016

ArthurHoaro commented Dec 7, 2016

Knah-Tsaeb commented Dec 8, 2016

ArthurHoaro left a comment

ArthurHoaro Dec 8, 2016

Knah-Tsaeb Dec 8, 2016

ArthurHoaro Dec 8, 2016

ArthurHoaro Dec 8, 2016

Knah-Tsaeb Dec 8, 2016

ArthurHoaro Dec 8, 2016

ArthurHoaro Dec 8, 2016

ArthurHoaro Dec 8, 2016

ArthurHoaro Dec 8, 2016

Knah-Tsaeb Dec 8, 2016

ArthurHoaro Dec 8, 2016

Knah-Tsaeb Dec 8, 2016

ArthurHoaro Dec 8, 2016

ArthurHoaro Dec 8, 2016

Knah-Tsaeb Dec 8, 2016

#502 Change templates set through administration UI #705

#502 Change templates set through administration UI #705

Conversation

Knah-Tsaeb commented Dec 7, 2016

Knah-Tsaeb commented Dec 7, 2016

ArthurHoaro commented Dec 7, 2016 • edited

Knah-Tsaeb commented Dec 7, 2016

ArthurHoaro commented Dec 7, 2016

Knah-Tsaeb commented Dec 8, 2016

ArthurHoaro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ArthurHoaro commented Dec 7, 2016 •

edited