Changeset 378:a103e2765a14

Timestamp:

06/16/11 23:11:22 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

themes

Message:

Configuration des polices - step 2 : couleurs et graisse des liens + divers

Location:

themes/ductile

Files:

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

themes/ductile/_config.php

@@ -52 +52 @@
 
 $ductile_base = array(
-     'body_link_c' => null,
+     'body_link_w' => null,
      'body_link_v_c' => null,
      'body_link_f_c' => null,
@@ -71 +71 @@
      try
      {
-          $ductile_user['body_link_c'] = adjustColor($_POST['body_link_c']);
+          $ductile_user['body_link_w'] = (integer) !empty($_POST['body_link_w']);
+
+          $ductile_user['body_link_v_c'] = adjustColor($_POST['body_link_v_c']);
           $ductile_user['body_link_f_c'] = adjustColor($_POST['body_link_f_c']);
-          $ductile_user['body_link_v_c'] = adjustColor($_POST['body_link_v_c']);
           
           $ductile_user['body_font'] = $_POST['body_font'];
@@ -97 +98 @@
 form::combo('body_font',$fonts,$ductile_user['body_font']).'</label></p>'.
 
-'<p class="field"><label for="alternate_font">'.__('Alternate font:').' '.
+'<p class="field"><label for="alternate_font">'.__('Secondary 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:').' '.
-form::field('body_link_c',7,7,$ductile_user['body_link_c'],'colorpicker').'</label></p>'.
+echo '<fieldset><legend>'.__('Inside posts links').'</legend>'.
+'<p class="field"><label for="body_link_w">'.__('Links in bold:').' '.
+form::checkbox('body_link_w',1,$ductile_user['body_link_w']).'</label>'.'</p>'.
 
-'<p class="field"><label for="body_link_v_c">'.__('Visited links color:').' '.
-form::field('body_link_v_c',7,7,$ductile_user['body_link_v_c'],'colorpicker').'</label></p>'.
+'<p class="field"><label for="body_link_v_c">'.__('Normal and visited links color:').'</label> '.
+form::field('body_link_v_c',7,7,$ductile_user['body_link_v_c'],'colorpicker').'</p>'.
 
-'<p class="field"><label for="body_link_f_c">'.__('Focus links color:').' '.
-form::field('body_link_f_c',7,7,$ductile_user['body_link_f_c'],'colorpicker').'</label></p>'.
+'<p class="field"><label for="body_link_f_c">'.__('Active, hover and focus links color:').'</label> '.
+form::field('body_link_f_c',7,7,$ductile_user['body_link_f_c'],'colorpicker').'</p>'.
 '</fieldset>';
 

themes/ductile/_public.php

@@ -45 +45 @@
           # Main font
           $main_font_selectors = 'body, #supranav li a span, #comments.me, a.comment-number';
-          if isset($s['body_font']) self::prop($css,$main_font_selectors,'font-family',self::fontDef($s['body_font']));
+          if (isset($s['body_font'])) 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';
-          if isset($s['alternate_font']) self::prop($css,$alternate_font_selectors,'font-family',self::fontDef($s['alternate_font']));
+          # Secondary font
+          $alternate_font_selectors = '#blogdesc, #supranav, #content-info, #subcategories, #comments-feed, #sidebar h2, #sidebar h3, #footer p';
+          if (isset($s['alternate_font'])) self::prop($css,$alternate_font_selectors,'font-family',self::fontDef($s['alternate_font']));
+          
+          # Inside posts links font weight
+          $links = '.post-excerpt a, .post-content a';
+          if (isset($s['body_link_w'])) self::prop($css,$links,'font-weight',($s['body_link_w'] ? 'bold' : 'normal'));
 
-          # Link colors
-          if isset($s['body_link_c']) self::prop($css,'a','color',$s['body_link_c']);
-          if isset($s['body_link_v_c']) self::prop($css,'a:visited','color',$s['body_link_v_c']);
-          if isset($s['body_link_f_c']) self::prop($css,'a:hover, a:focus, a:active','color',$s['body_link_f_c']);
+          # Inside posts links colors (normal, visited)
+          $links_selectors = '.post-excerpt a:link, .post-excerpt a:visited, .post-content a:link, .post-content a:visited';
+          if (isset($s['body_link_v_c'])) self::prop($css,$links_selectors,'color',$s['body_link_v_c']);
+
+          # Inside posts links colors (hover, active, focus)
+          $links_alternate_selectors = '.post-excerpt a:hover, .post-excerpt a:active, .post-excerpt a:focus, .post-content a:hover, .post-content a:active, .post-content a:focus';
+          if (isset($s['body_link_f_c'])) self::prop($css,$links_alternate_selectors,'color',$s['body_link_f_c']);
 
           # Style directives

themes/ductile/locales/fr/main.po

@@ -1 +1 @@
 msgid "Style sheet upgraded."
 msgstr "Feuille de style mise à jour."
+
+msgid "Links in bold:"
+msgstr "Liens en gras :"
+
+msgid "Inside posts links"
+msgstr "Liens dans les billets"
+
+msgid "Normal and visited links color:"
+msgstr "Couleur des liens normaux et visités :"
+
+msgid "Active, hover and focus links color:"
+msgstr "Couleur des liens actifs, survolés et ayant le focus :"
 
 msgid "Fonts"
@@ -8 +20 @@
 msgstr "Famille de police principale :"
 
-msgid "Alternate font:"
+msgid "Secondary font:"
 msgstr "Famille de police secondaire :"