Changeset 503:a4f39cc10d7a for plugins/blowupConfig

Timestamp:

07/04/11 08:52:37 (14 years ago)

Author:

kozlika

Branch:

themes

Parents:

502:d002906f0b30 (diff), 501:ead05faef1e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Je récupère la 2.4 à jour pour la branche themes

Files:

• plugins/blowupConfig/index.php (modified) (19 diffs)
• plugins/blowupConfig/index.php (modified) (1 diff)

plugins/blowupConfig/index.php

@@ -24 +24 @@
      'body_bg_c' => null,
      'body_bg_g' => 'light',
-     
+
      'body_txt_f' => null,
      'body_txt_s' => null,
      'body_txt_c' => null,
      'body_line_height' => null,
-     
+
      'top_image' => 'default',
      'top_height' => null,
      'uploaded' => null,
-     
+
      'blog_title_hide' => null,
      'blog_title_f' => null,
@@ -40 +40 @@
      'blog_title_a' => null,
      'blog_title_p' => null,
-     
+
      'body_link_c' => null,
      'body_link_f_c' => null,
      'body_link_v_c' => null,
-     
+
      'sidebar_position' => null,
      'sidebar_text_f' => null,
@@ -59 +59 @@
      'sidebar_link_f_c' => null,
      'sidebar_link_v_c' => null,
-     
+
      'date_title_f' => null,
      'date_title_s' => null,
      'date_title_c' => null,
-     
+
      'post_title_f' => null,
      'post_title_s' => null,
@@ -71 +71 @@
      'post_commentmy_bg_c' => null,
      'post_commentmy_c' => null,
-     
+
      'prelude_c' => null,
      'footer_f' => null,
@@ -78 +78 @@
      'footer_l_c' => null,
      'footer_bg_c' => null,
+
+     'extra_css' => null
 );
 
@@ -108 +110 @@
           $blowup_user['body_txt_c'] = blowupConfig::adjustColor($_POST['body_txt_c']);
           $blowup_user['body_line_height'] = blowupConfig::adjustFontSize($_POST['body_line_height']);
-          
+
           $blowup_user['blog_title_hide'] = (integer) !empty($_POST['blog_title_hide']);
           $update_blog_title = !$blowup_user['blog_title_hide'] && (
@@ -115 +117 @@
                !empty($_POST['blog_title_p'])
           );
-          
+
           if ($update_blog_title)
           {
@@ -124 +126 @@
                $blowup_user['blog_title_p'] = blowupConfig::adjustPosition($_POST['blog_title_p']);
           }
-          
+
           $blowup_user['body_link_c'] = blowupConfig::adjustColor($_POST['body_link_c']);
           $blowup_user['body_link_f_c'] = blowupConfig::adjustColor($_POST['body_link_f_c']);
           $blowup_user['body_link_v_c'] = blowupConfig::adjustColor($_POST['body_link_v_c']);
-          
+
           $blowup_user['sidebar_text_f'] = $_POST['sidebar_text_f'];
           $blowup_user['sidebar_text_s'] = blowupConfig::adjustFontSize($_POST['sidebar_text_s']);
@@ -142 +144 @@
           $blowup_user['sidebar_link_f_c'] = blowupConfig::adjustColor($_POST['sidebar_link_f_c']);
           $blowup_user['sidebar_link_v_c'] = blowupConfig::adjustColor($_POST['sidebar_link_v_c']);
-          
+
           $blowup_user['sidebar_position'] = ($_POST['sidebar_position'] == 'left') ? 'left' : null;
-          
+
           $blowup_user['date_title_f'] = $_POST['date_title_f'];
           $blowup_user['date_title_s'] = blowupConfig::adjustFontSize($_POST['date_title_s']);
           $blowup_user['date_title_c'] = blowupConfig::adjustColor($_POST['date_title_c']);
-          
+
           $blowup_user['post_title_f'] = $_POST['post_title_f'];
           $blowup_user['post_title_s'] = blowupConfig::adjustFontSize($_POST['post_title_s']);
@@ -154 +156 @@
           $blowup_user['post_comment_c'] = blowupConfig::adjustColor($_POST['post_comment_c']);
           $blowup_user['post_commentmy_c'] = blowupConfig::adjustColor($_POST['post_commentmy_c']);
-          
-          
+
+
           $blowup_user['footer_f'] = $_POST['footer_f'];
           $blowup_user['footer_s'] = blowupConfig::adjustFontSize($_POST['footer_s']);
@@ -161 +163 @@
           $blowup_user['footer_l_c'] = blowupConfig::adjustColor($_POST['footer_l_c']);
           $blowup_user['footer_bg_c'] = blowupConfig::adjustColor($_POST['footer_bg_c']);
-          
+
+
+          $blowup_user['extra_css'] = blowupConfig::cleanCSS($_POST['extra_css']);
+
           if ($can_write_images)
           {
@@ -168 +173 @@
                     $uploaded = blowupConfig::imagesPath().'/'.$blowup_user['uploaded'];
                }
-               
+
                if (!empty($_FILES['upfile']) && !empty($_FILES['upfile']['name'])) {
                     files::uploadStatus($_FILES['upfile']);
@@ -174 +179 @@
                     $blowup_user['uploaded'] = basename($uploaded);
                }
-               
+
                $blowup_user['top_image'] = in_array($_POST['top_image'],$top_images) ? $_POST['top_image'] : 'default';
-               
+
                $blowup_user['body_bg_c'] = blowupConfig::adjustColor($_POST['body_bg_c']);
                $blowup_user['body_bg_g'] = in_array($_POST['body_bg_g'],$gradient_types) ? $_POST['body_bg_g'] : '';
@@ -184 +189 @@
                blowupConfig::createImages($blowup_user,$uploaded);
           }
-          
+
           $core->blog->settings->addNamespace('themes');
           $core->blog->settings->themes->put('blowup_style',serialize($blowup_user));
           $core->blog->triggerBlog();
-          
+
           http::redirect($p_url.'&upd=1');
      }
@@ -233 +238 @@
 
 echo '<form id="theme_config" action="'.$p_url.'" method="post" enctype="multipart/form-data">';
-          
+
 echo '<fieldset><legend>'.__('General').'</legend>';
 
@@ -240 +245 @@
      '<p class="field"><label for="body_bg_c">'.__('Background color:').' '.
      form::field('body_bg_c',7,7,$blowup_user['body_bg_c'],'colorpicker').'</label></p>'.
-     
+
      '<p class="field"><label for="body_bg_g">'.__('Background color fill:').' '.
      form::combo('body_bg_g',$gradient_types,$blowup_user['body_bg_g']).'</label></p>';
@@ -304 +309 @@
           $preview_image = 'index.php?pf=blowupConfig/alpha-img/page-t/'.$blowup_user['top_image'].'.png';
      }
-     
+
      echo
      '<fieldset><legend>'.__('Top image').'</legend>'.
@@ -310 +315 @@
      form::combo('top_image',$top_images,($blowup_user['top_image'] ? $blowup_user['top_image'] : 'default')).'</label></p>'.
      '<p>'.__('Choose "Custom..." to upload your own image.').'</p>'.
-     
+
      '<p id="uploader"><label for="upfile">'.__('Add your image:').
      ' ('.sprintf(__('JPEG or PNG file, 800 pixels wide, maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.
      '<input type="file" name="upfile" id="upfile" size="35" />'.
      '</label></p>'.
-     
+
      '<h3>'.__('Preview').'</h3>'.
      '<div class="grid" style="width:800px;border:1px solid #ccc;">'.
@@ -425 +430 @@
 '</fieldset>';
 
+echo
+'<fieldset><legend>'.__('Additional CSS').'</legend>'.
+'<p>'.form::textarea('extra_css',72,5,html::escapeHTML($blowup_user['extra_css']),'maximal','',false,'title="'.__('Additional CSS').'"').'</p>'.
+'</fieldset>';
+
+
+
 // Import / Export configuration
 $tmp_array = array();

plugins/blowupConfig/index.php

@@ -223 +223 @@
 echo
 '<h2>'.html::escapeHTML($core->blog->name).
-' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; '.__('Blowup configuration').'</h2>'.
+' &rsaquo; <a href="blog_theme.php">'.__('Blog appearance').'</a> &rsaquo; <span class="page-title">'.__('Blowup configuration').'</span></h2>'.
 '<p><a class="back" href="blog_theme.php">'.__('back').'</a></p>';