Changeset 376:e3fd223da7f8

Timestamp:

06/16/11 13:01:26 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

themes

Message:

Configuration des polices - step 1 : family

Location:

themes/ductile

Files:

• _config.php (modified) (4 diffs)
• _public.php (modified) (2 diffs)
• locales/fr/main.po (modified) (1 diff)

themes/ductile/_config.php

@@ -13 +13 @@
 
 l10n::set(dirname(__FILE__).'/locales/'.$_lang.'/main');
+
+$fonts = array(
+     __('default') => '',
+     __('Ductile primary') => 'Ductile body',
+     __('Ductile secondary') => 'Ductile alternate',
+     __('Times New Roman') => 'Times New Roman',
+     __('Georgia') => 'Georgia',
+     __('Garamond') => 'Garamond',
+     __('Helvetica/Arial') => 'Helvetica/Arial',
+     __('Verdana') => 'Verdana',
+     __('Trebuchet MS') => 'Trebuchet MS',
+     __('Impact') => 'Impact',
+     __('Monospace') => 'Monospace'
+);
 
 function adjustColor($c)
@@ -40 +54 @@
      'body_link_c' => null,
      'body_link_v_c' => null,
-     'body_link_f_c' => null
+     'body_link_f_c' => null,
+     'body_font' => null,
+     'alternate_font' => null
 );
 
@@ -59 +75 @@
           $ductile_user['body_link_v_c'] = adjustColor($_POST['body_link_v_c']);
           
+          $ductile_user['body_font'] = $_POST['body_font'];
+          $ductile_user['alternate_font'] = $_POST['alternate_font'];
+          
           $core->blog->settings->addNamespace('themes');
           $core->blog->settings->themes->put('ductile_style',serialize($ductile_user));
@@ -74 +93 @@
 }
 
+echo '<fieldset><legend>'.__('Fonts').'</legend>'.
+'<p class="field"><label for="body_font">'.__('Main font:').' '.
+form::combo('body_font',$fonts,$ductile_user['body_font']).'</label></p>'.
+
+'<p class="field"><label for="alternate_font">'.__('Alternate font:').' '.
+form::combo('alternate_font',$fonts,$ductile_user['alternate_font']).'</label></p>'.
+'</fieldset>';
+
 echo '<fieldset><legend>'.__('Links').'</legend>'.
 '<p class="field"><label for="body_link_c">'.__('Links color:').' '.

themes/ductile/_public.php

@@ -43 +43 @@
           # Properties
 
+          # Main font
+          $main_font_selectors = 'body, #supranav li a span, #comments.me, a.comment-number';
+          self::prop($css,$main_font_selectors,'font-family',self::fontDef($s['body_font']));
+
+          # Alternate font
+          $alternate_font_selectors = '#blogdesc, #supranav li, #content-info, #subcategories, #comments-feed, #sidebar h2, #sidebar h3, #footer p';
+          self::prop($css,$alternate_font_selectors,'font-family',self::fontDef($s['alternate_font']));
+
+          # Link colors
           self::prop($css,'a','color',$s['body_link_c']);
           self::prop($css,'a:visited','color',$s['body_link_v_c']);
           self::prop($css,'a:hover, a:focus, a:active','color',$s['body_link_f_c']);
 
+          # Style directives
           $res = '';
           foreach ($css as $selector => $values) {
@@ -59 +69 @@
      }
 
+     protected static $fonts = array(
+          'Ductile body' => '"Century Schoolbook", "Century Schoolbook L", Georgia, serif',
+          'Ductile alternate' => '"Franklin gothic medium", "arial narrow", "DejaVu Sans Condensed", "helvetica neue", helvetica, sans-serif',
+          'Times New Roman' => 'Cambria, "Hoefler Text", Utopia, "Liberation Serif", "Nimbus Roman No9 L Regular", Times, "Times New Roman", serif',
+          'Georgia' => 'Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif," "Bitstream Vera Serif", "Liberation Serif", Georgia, serif',
+          'Garamond' => '"Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Baskerville, "Bookman Old Style", "Bitstream Charter", "Nimbus Roman No9 L", Garamond, "Apple Garamond", "ITC Garamond Narrow", "New Century Schoolbook", "Century Schoolbook", "Century Schoolbook L", Georgia, serif',
+          'Helvetica/Arial' => 'Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif',
+          'Verdana' => 'Corbel, "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", "DejaVu Sans", "Bitstream Vera Sans", "Liberation Sans", Verdana, "Verdana Ref", sans-serif',
+          'Trebuchet MS' => '"Segoe UI", Candara, "Bitstream Vera Sans", "DejaVu Sans", "Bitstream Vera Sans", "Trebuchet MS", Verdana, "Verdana Ref", sans-serif',
+          'Impact' => 'Impact, Haettenschweiler, "Franklin Gothic Bold", Charcoal, "Helvetica Inserat", "Bitstream Vera Sans Bold", "Arial Black", sans-serif',
+          'Monospace' => 'Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace'
+     );
+
+     protected static function fontDef($c)
+     {
+          return isset(self::$fonts[$c]) ? self::$fonts[$c] : null;
+     }
+
      protected static function prop(&$css,$selector,$prop,$value)
      {

themes/ductile/locales/fr/main.po

@@ -1 +1 @@
 msgid "Style sheet upgraded."
 msgstr "Feuille de style mise à jour."
+
+msgid "Fonts"
+msgstr "Polices de caractère"
+
+msgid "Main font:"
+msgstr "Famille de police principale :"
+
+msgid "Alternate font:"
+msgstr "Famille de police secondaire :"
+
+msgid "Ductile primary"
+msgstr "Principale de Ductile"
+
+msgid "Ductile secondary"
+msgstr "Secondaire de Ductile"
+
+msgid "Times New Roman"
+msgstr "Times New Roman"
+
+msgid "Georgia"
+msgstr "Georgia"
+
+msgid "Garamond"
+msgstr "Garamond"
+
+msgid "Helvetica/Arial"
+msgstr "Helvetica/Arial"
+
+msgid "Verdana"
+msgstr "Verdana"
+
+msgid "Trebuchet MS"
+msgstr "Trebuchet MS"
+
+msgid "Impact"
+msgstr "Impact"
+
+msgid "Monospace"
+msgstr "Monospace"