Changeset 810:143528f926c6

Timestamp:

03/29/12 13:34:24 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Ductile theme 1.1 : Add optional logo URL in configuration. A media selector should be nice but I don't know how to implement it, until now.

Location:

themes/ductile

Files:

• _config.php (modified) (3 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (2 diffs)
• locales/en/help/help.html (modified) (1 diff)
• locales/fr/admin.po (modified) (1 diff)
• locales/fr/help/help.html (modified) (1 diff)
• tpl/_top.html (modified) (1 diff)

themes/ductile/_config.php

@@ -221 +221 @@
      // HTML
      'subtitle_hidden' => null,
+     'logo_src' => null,
      // CSS
      'body_font' => null,
@@ -322 +323 @@
           if ($conf_tab == 'html') {
                $ductile_user['subtitle_hidden'] = (integer) !empty($_POST['subtitle_hidden']);
+               $ductile_user['logo_src'] = $_POST['logo_src'];
 
                $ductile_stickers = array();
@@ -427 +429 @@
      echo '<p>'.sprintf(__('To configure the top menu go to the <a href="%s">Simple Menu administration page</a>.'),'plugin.php?p=simpleMenu').'</p>';
 }
+echo '<p class="field"><label for"logo_src">'.__('Logo URL:').' '.
+     form::field('logo_src',40,255,$ductile_user['logo_src']).'</label>'.'</p>';
 echo '</fieldset>';
 

themes/ductile/_define.php

@@ -15 +15 @@
      /* Description*/         "Mediaqueries compliant elegant theme",
      /* Author */             "Dotclear Team",
-     /* Version */            '1.0',
+     /* Version */            '1.1',
      /* Properties */         array(
                                         'standalone_config' => true

themes/ductile/_public.php

@@ -22 +22 @@
 $core->tpl->addBlock('EntryIfContentIsCut',array('tplDuctileTheme','EntryIfContentIsCut'));
 $core->tpl->addValue('ductileNbEntryPerPage',array('tplDuctileTheme','ductileNbEntryPerPage'));
+$core->tpl->addValue('ductileLogoSrc',array('tplDuctileTheme','ductileLogoSrc'));
 
 class tplDuctileTheme
@@ -100 +101 @@
           $local_attr = array('src' => '_entry-'.($model ? $model : $default).'.html');
           return $core->tpl->includeFile($local_attr);
+     }
+
+     public static function ductileLogoSrc($attr)
+     {
+          global $core;
+
+          $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_style');
+          if ($s === null) {
+               return;
+          }
+          $s = @unserialize($s);
+          if (!is_array($s)) {
+               return;
+          }
+          
+          $img_url = $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.'/img/logo.png';
+          if (isset($s['logo_src'])) {
+               if ($s['logo_src'] !== null) {
+                    if ($s['logo_src'] != '') {
+                         if ((substr($s['logo_src'],0,1) == '/') || (parse_url($s['logo_src'],PHP_URL_SCHEME) != '')) {
+                              // absolute URL
+                              $img_url = $s['logo_src'];
+                         } else {
+                              // relative URL (base = img folder of ductile theme)
+                              $img_url = $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.'/img/'.$s['logo_src'];
+                         }
+                    }
+               }
+          }
+          
+          return $img_url;
      }
 

themes/ductile/locales/en/help/help.html

@@ -15 +15 @@
 
 <p>If the plugin "Simple menu" is installed and active, you can click on the designated link to configure the header's menu. (main menu?)</p>
+
+<p>Specify an URL of the logo to be used instead of default one. If the URL doesn't start with an <code>/</code> then it will be a relative URL from the <code>img</code> folder of the theme (put <code>logo.png</code>, for example, is similar to using the default logo). Clear this field to come back to the default configuration.</p>
 
   <dt>Stickers</dt>

themes/ductile/locales/fr/admin.po

@@ -10 +10 @@
 msgid "Hide blog description:"
 msgstr "Cacher la description du blog :"
+
+msgid "Logo URL:"
+msgstr "URL du logo :"
 
 msgid "To configure the top menu go to the <a href=\"%s\">Simple Menu administration page</a>."

themes/ductile/locales/fr/help/help.html

@@ -16 +16 @@
 <p>Cochez la case qui suit « Cacher la description du blog » pour ne pas afficher la description du blog habituellement affichée sous le titre.</p>
 <p>Vous pouvez, si l'extension « Menu Simple » est installée et active, cliquer sur le lien indiqué pour paramétrer le menu affiché en entête.</p>
+<p>Vous pouvez indiquer l'URL d'un logo à utiliser à la place du logo par défaut. Si l'URL ne débute pas par un <code>/</code> il s'agira d'une URL relative au dossier <code>img</code> du thème (mettre <code>logo.png</code> revient par exemple à utiliser le logo par défaut). Videz ce champ pour revenir à la configuration par défaut.</p>
 
 <h4>Étiquettes (« stickers »)</h4>

themes/ductile/tpl/_top.html

@@ -2 +2 @@
      
      <div id="top">
-          <p id="logo" class="nosmall"><a href="{{tpl:BlogURL}}"><img src="{{tpl:BlogThemeURL}}/img/logo.png" alt="{{tpl:lang Home}}" /></a></p>
+          <p id="logo" class="nosmall"><a href="{{tpl:BlogURL}}"><img src="{{tpl:ductileLogoSrc}}" alt="{{tpl:lang Home}}" /></a></p>
           <h1><a href="{{tpl:BlogURL}}"><span>{{tpl:BlogName encode_html="1"}}</span></a></h1>
           <p id="blogdesc" class="nosmall">{{tpl:BlogDescription}}</p>