Changeset 2890:c1b1065d00e2 for plugins/themeEditor

Timestamp:

12/29/14 14:00:13 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Display name of parent theme, if any, and name of templateset used by the edited theme, closes #2028

Location:

plugins/themeEditor

Files:

• _define.php (modified) (1 diff)
• class.themeEditor.php (modified) (3 diffs)

plugins/themeEditor/_define.php

@@ -16 +16 @@
      /* Description*/         "Theme Editor",
      /* Author */             "Olivier Meunier",
-     /* Version */            '1.1',
+     /* Version */            '1.2',
      array(
           'type'         =>        'plugin'

plugins/themeEditor/class.themeEditor.php

@@ -20 +20 @@
      protected $tplset_theme;
 
+     protected $parent_name;
      protected $tplset_name;
 
@@ -38 +39 @@
                if ($parent_theme) {
                     $this->parent_theme = path::real($this->core->blog->themes_path.'/'.$parent_theme);
+                    $this->parent_name = $parent_theme;
                }
                $tplset = $this->core->themes->moduleInfo($this->core->blog->settings->system->theme,'tplset');
@@ -78 +80 @@
                }
                $list .= ($list_theme != '' ? sprintf('<li class="group-file">'.__('From theme:').'<ul>%s</ul></li>',$list_theme) : '');
-               $list .= ($list_parent != '' ? sprintf('<li class="group-file">'.__('From parent:').'<ul>%s</ul></li>',$list_parent) : '');
-               $list .= ($list_tpl != '' ? sprintf('<li class="group-file">'.__('From template set:').'<ul>%s</ul></li>',$list_tpl) : '');
+               $list .= ($list_parent != '' ? sprintf('<li class="group-file">'.__('From parent:').' %s<ul>%s</ul></li>',
+                    $this->parent_name,$list_parent) : '');
+               $list .= ($list_tpl != '' ? sprintf('<li class="group-file">'.__('From template set:').' %s<ul>%s</ul></li>',
+                    $this->tplset_name,$list_tpl) : '');
           } else {
                foreach ($files as $k => $v)