Changeset 1081:862f566d2372

Timestamp:

12/18/12 15:59:40 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Just for fun, Ductile may now use web fonts (from Google, Adobe and similar providers)

Location:

themes/ductile

Files:

• _config.php (modified) (5 diffs)
• _public.php (modified) (1 diff)
• locales/fr/admin.po (modified) (1 diff)

themes/ductile/_config.php

@@ -44 +44 @@
 }
 
-
-
 $contexts = array(
      'default' => __('Home (first page)'),
@@ -67 +65 @@
      __('Impact') => 'Impact',
      __('Monospace') => 'Monospace'
+);
+
+$webfont_apis = array(
+     __('none') => '',
+     __('javascript (Adobe)') => 'js',
+     __('stylesheet (Google)') => 'css'
 );
 
@@ -227 +231 @@
      // CSS
      'body_font' => null,
+     'body_webfont_family' => null,
+     'body_webfont_url' => null,
+     'body_webfont_api' => null,
      'alternate_font' => null,
+     'alternate_webfont_family' => null,
+     'alternate_webfont_url' => null,
+     'alternate_webfont_api' => null,
      'blog_title_w' => null,
      'blog_title_s' => null,
@@ -368 +378 @@
           if ($conf_tab == 'css') {
                $ductile_user['body_font'] = $_POST['body_font'];
+               $ductile_user['body_webfont_family'] = $_POST['body_webfont_family'];
+               $ductile_user['body_webfont_url'] = $_POST['body_webfont_url'];
+               $ductile_user['body_webfont_api'] = $_POST['body_webfont_api'];
+
                $ductile_user['alternate_font'] = $_POST['alternate_font'];
+               $ductile_user['alternate_webfont_family'] = $_POST['alternate_webfont_family'];
+               $ductile_user['alternate_webfont_url'] = $_POST['alternate_webfont_url'];
+               $ductile_user['alternate_webfont_api'] = $_POST['alternate_webfont_api'];
 
                $ductile_user['blog_title_w'] = (integer) !empty($_POST['blog_title_w']);
@@ -507 +524 @@
 echo '<h3>'.__('General settings').'</h3>';
 
-echo '<fieldset><legend>'.__('Fonts').'</legend>'.
+echo '<fieldset><legend>'.__('Fonts').'</legend>';
+
+echo '<div class="two-cols">';
+echo '<div class="col">';
+echo
 '<p class="field"><label for="body_font">'.__('Main:').' '.
 form::combo('body_font',$fonts,$ductile_user['body_font']).'</label>'.
 (!empty($ductile_user['body_font']) ? ' '.fontDef($ductile_user['body_font']) : '').
 '</p>'.
-
+'<p class="form-note">'.__('Set main font to default to use webfont below.').'</p> '.
+'<p class="field"><label for="body_webfont_family">'.__('Webfont family:').'</label> '.
+form::field('body_webfont_family',25,255,$ductile_user['body_webfont_family']).'</p>'.
+'<p class="field"><label for="body_webfont_url">'.__('Webfont URL:').'</label> '.
+form::field('body_webfont_url',50,255,$ductile_user['body_webfont_url']).'</p>'.
+'<p class="field"><label for="body_webfont_url">'.__('Webfont API:').' '.
+form::combo('body_webfont_api',$webfont_apis,$ductile_user['body_webfont_api']).'</label>'.'</p>';
+echo '</div>';
+echo '<div class="col">';
+echo
 '<p class="field"><label for="alternate_font">'.__('Secondary:').' '.
 form::combo('alternate_font',$fonts,$ductile_user['alternate_font']).'</label>'.
 (!empty($ductile_user['alternate_font']) ? ' '.fontDef($ductile_user['alternate_font']) : '').
 '</p>'.
-'</fieldset>';
+'<p class="form-note">'.__('Set secondary font to default to use webfont below.').'</p> '.
+'<p class="field"><label for="alternate_webfont_family">'.__('Webfont family:').'</label> '.
+form::field('alternate_webfont_family',25,255,$ductile_user['alternate_webfont_family']).'</p>'.
+'<p class="field"><label for="alternate_webfont_url">'.__('Webfont URL:').'</label> '.
+form::field('alternate_webfont_url',50,255,$ductile_user['alternate_webfont_url']).'</p>'.
+'<p class="field"><label for="alternate_webfont_api">'.__('Webfont API:').' '.
+form::combo('alternate_webfont_api',$webfont_apis,$ductile_user['alternate_webfont_api']).'</label>'.'</p>';
+echo '</div>';
+echo '</div>';
+echo '</fieldset>';
 
 echo '<div class="two-cols">';

themes/ductile/_public.php

@@ -250 +250 @@
                $core->blog->settings->system->themes_url.'/'.$core->blog->settings->system->theme.
                '/ductile.js"></script>'."\n";
+
+          echo self::ductileWebfontHelper();
+     }
+
+     public static function ductileWebfontHelper()
+     {
+          $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;
+          }
+
+          $ret = '';
+          $css = array();
+          $uri = array();
+          if (!isset($s['body_font']) || ($s['body_font'] == '')) {
+               // See if webfont defined for main font
+               if (isset($s['body_webfont_api']) && isset($s['body_webfont_family']) && isset($s['body_webfont_url'])) {
+                    $uri[] = $s['body_webfont_url'];
+                    switch ($s['body_webfont_api']) {
+                         case 'js':
+                              $ret .= sprintf('<script type="text/javascript" src="%s"></script>',$s['body_webfont_url'])."\n";
+                              break;
+                         case 'css':
+                              $ret .= sprintf('<link type="text/css" href="%s" rel="stylesheet" />',$s['body_webfont_url'])."\n";
+                              break;
+                    }
+                    # Main font
+                    $selectors = 'body, .supranav li a span, #comments.me, a.comment-number';
+                    self::prop($css,$selectors,'font-family',$s['body_webfont_family']);
+               }
+          }
+          if (!isset($s['alternate_font']) || ($s['alternate_font'] == '')) {
+               // See if webfont defined for secondary font
+               if (isset($s['alternate_webfont_api']) && isset($s['alternate_webfont_family']) && isset($s['alternate_webfont_url'])) {
+                    if (!in_array($s['alternate_webfont_url'], $uri)) {
+                         switch ($s['alternate_webfont_api']) {
+                              case 'js':
+                                   $ret .= sprintf('<script type="text/javascript" src="%s"></script>',$s['alternate_webfont_url'])."\n";
+                                   break;
+                              case 'css':
+                                   $ret .= sprintf('<link type="text/css" href="%s" rel="stylesheet" />',$s['alternate_webfont_url'])."\n";
+                                   break;
+                         }
+                    }
+                    # Secondary font
+                    $selectors = '#blogdesc, .supranav, #content-info, #subcategories, #comments-feed, #sidebar h2, #sidebar h3, #footer';
+                    self::prop($css,$selectors,'font-family',$s['alternate_webfont_family']);
+               }
+          }
+          # Style directives
+          $res = '';
+          foreach ($css as $selector => $values) {
+               $res .= $selector." {\n";
+               foreach ($values as $k => $v) {
+                    $res .= $k.':'.$v.";\n";
+               }
+               $res .= "}\n";
+          }
+          if ($res != '') {
+               $ret .= '<style type="text/css">'."\n".$res.'</style>'."\n";
+          }
+
+          return $ret;
      }
      

themes/ductile/locales/fr/admin.po

@@ -110 +110 @@
 msgstr "Secondaire :"
 
+msgid "none"
+msgstr "aucune"
+
+msgid "javascript (Adobe)"
+msgstr "javascript (Adobe)"
+
+msgid "stylesheet (Google)"
+msgstr "feuille de style (Google)"
+
+msgid "Set main font to default to use webfont below."
+msgstr "Mettre la police de caractère principale à Défaut pour utiliser la fonte web ci-dessous."
+
+msgid "Set secondary font to default to use webfont below."
+msgstr "Mettre la police de caractère secondaire à Défaut pour utiliser la fonte web ci-dessous."
+
+msgid "Webfont family:"
+msgstr "Famille"
+
+msgid "Webfont URL:"
+msgstr "URL de la fonte web"
+
+msgid "Webfont API:"
+msgstr "Type d'API"
+
 msgid "Ductile primary"
 msgstr "Principale de Ductile"