Changeset 407267

Timestamp:

07/09/2011 05:59:36 AM (15 years ago)

Author:

n33rav

Message:

• Advanced option for excluding/including blogs
• Fix for tinymce to work with Wordpress 3.2
• Improved options page layout

Location:

wpms-global-content/trunk

Files:

• assets/css/admin.css (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wpms-global-content.php (modified) (3 diffs)
• wpmsgc-options.php (modified) (4 diffs)

wpms-global-content/trunk/assets/css/admin.css

@@ -1 @@
-#wpmsgc-options h1 {
-    font-family: Georgia, "Times New Roman", Times, Serif;
-    font-weight: normal;
-    font-size: 2.2em;
+#wpmsgc-options form{
+    width:794px;
+    background: #ECECEC;
+    padding: 8px 8px 0 8px;
+    margin-top: 10px;
 }
-.form-table tr:hover{
-    background-color:#eeeeee;
+#wpmsgc-options form > table{
+    width:794px;
+    background: #FFF;
+    margin: 0;
 }
-#wpmsgc-options h1.v-trial {
-    float: left;
-    margin: 5px 0 0 0;
+#wpmsgc-options form table td.label{
+    width: 110px;
 }
-div.wpmsgc-option h3 {
-    margin: 15px 0 0 0;
-    padding: 15px 15px 15px 40px;
-    font-size: 1.2em;
-    color: #4e4c41;
-    background: #f1f1f1 url(../images/toggle.gif) no-repeat 10px 13px;
-    border: 1px solid #e6e6e6;
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;
-    cursor: pointer;
+#wpmsgc-options form table td{
+    border-bottom: 1px solid #DFDFDF;
 }
-div.wpmsgc-option h3.open {
-    -moz-border-radius: 6px 6px 0 0;
-    -webkit-border-top-left-radius: 6px;
-    -webkit-border-top-right-radius: 6px;
-    background-position: 10px -27px;
+#wpmsgc-options form input[type=text]{
+    width: 250px;
 }
-div.wpmsgc-option h3 span {
-    font-size: .9em;
-    font-weight: normal;
-    float: right;
-    color: #aaa;
-}
-div.wpmsgc-option-body {
-    margin: 0;
-    padding: 15px;
-    background: #fbfbfa;
-    border: 1px solid #e6e6e6;
-    border-top: none;
-    -moz-border-radius: 0 0 6px 6px;
-    -webkit-border-bottom-left-radius: 6px;
-    -webkit-border-bottom-right-radius: 6px;
+#wpmsgc-options form textarea{
+    width: 550px;
+    height: 200px;
 }
 
-div.wpmsgc-notice, div.wpmsgc-info {
-    margin:15px 0 0;
-    padding: 20px;
-    -moz-border-radius: 6px;
-    -webkit-border-radius: 6px;    
-    padding:10px 2em;
+#wpmsgc-options span.notice{
+    color:#F00;
 }
-div.wpmsgc-notice{
-    background: #ffcccc;
-    border: 1px solid #ff3366;
-}
-div.wpmsgc-info{
-    background: #ccffcc;
-    border: 1px solid #33cc00;
-}
-span.wpmsgc-notice{
-    color:#ff0000;
-}
-
-.wpmsgctextarea{
-    width:100%;
-    height:200px;
-}
-
-

wpms-global-content/trunk/readme.txt

@@ -4 +4 @@
 Donate Link: http://www.vareen.co.cc/
 Requires at least: 3.0
-Tested up to: 3.1.2
-Stable tag: 1.0.1
+Tested up to: 3.2
+Stable tag: 1.1
 
 WPMS Global Content allow wordpress multisite network admin to set common header and footer content.
@@ -27 +27 @@
 
 == Changelog ==
+= 1.1 =
+* Advanced option for excluding/including blogs
+* Fix for tinymce to work with Wordpress 3.2
+* Improved options page layout
+
 = 1.0.1 =
 * Fix plugin name in readme file

wpms-global-content/trunk/wpms-global-content.php

@@ -4 +4 @@
  * Plugin URI: http://www.vareen.co.cc/
  * Description: WPMS Global Content allow wordpress multisite network admin to set common header and footer content.
- * Version: 1.0.1
+ * Version: 1.1
  * Author: Neerav Dobaria
  * Author URI: http://www.vareen.co.cc
@@ -58 +58 @@
 
                 add_filter("plugin_action_links_" . WPMSGC_BASENAME, array(&$this, 'action_links'));
-                add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
+
+                // since wp 3.2 function name has been changed
+                if(get_bloginfo('version') >= 3.2){
+                    add_action( 'admin_print_footer_scripts', 'wp_preload_dialogs', 30 );
+                } else {
+                    add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
+                }
             } else {
+                $include = $this->options['include'];
                 $exclude = explode(',', $this->options['exclude']);
-                if (!in_array($blog_id, $exclude)) {
-                    add_action('init', array(&$this, 'load_script'));
-                    add_filter('wp_footer', array(&$this, 'add_global_content'));
-                }
+
+                // return nothing if blog in exclude list
+                if ($include and !in_array($blog_id, $exclude))
+                    return;
+
+                // return nothing if blog not in include list
+                if (!$include and in_array($blog_id, $exclude))
+                    return;
+
+                add_action('init', array(&$this, 'load_script'));
+                add_filter('wp_footer', array(&$this, 'add_global_content'));
             }
         }
@@ -118 +132 @@
         {
             $default = array(
+                'include' => '0',
                 'exclude' => '1',
                 'header' => 'This will be displayed in header.',

wpms-global-content/trunk/wpmsgc-options.php

@@ -10 +10 @@
 
             <tr valign="top">
-                <th scope="row">Exclude Following Blogs</th>
+                <td class="label" scope="row">Exclude/Include</td>
                 <td>
+                    <input name="wpmsgc[include]"
+                           value="0" <?php echo ($wpmsgcopts['include']) ? '' : 'checked="checked"'; ?>
+                           type="radio"/> Exclude Following&nbsp;&nbsp;&nbsp;
+                    <input name="wpmsgc[include]"
+                           value="1" <?php echo ($wpmsgcopts['include']) ? 'checked="checked"' : ''; ?>
+                           type="radio"/> Include Following
+                    <br/>
                     <input type="text" name="wpmsgc[exclude]" value="<?php echo $wpmsgcopts['exclude']?>"/>
                     <br/>
-                    <small>Comma separated list of blog ids you want to exclude. Leave this fiel empty if you want to
-                        show it on all blogs.
+                    <small>Comma separated list of blog ids you want to exclude/include.
+                        Select Exclude Following and leave textbox empty if you want to show it on all blogs.
                     </small>
                 </td>
@@ -21 +28 @@
 
             <tr valign="top">
-                <th scope="row">Header Content</th>
+                <td scope="row">Header Content</td>
                 <td>
                     <p align="right">
@@ -35 +42 @@
 
             <tr valign="top">
-                <th scope="row">Footer Content</th>
+                <td scope="row">Footer Content</td>
                 <td>
                     <p align="right">
@@ -56 +63 @@
     <p>If you find this plugin useful, please donate to continue development of this and several other plugins</p>
 
-    <form method="get" action="https://www.paypal.com/cgi-bin/webscr">
+    <form style="background:none;" method="get" action="https://www.paypal.com/cgi-bin/webscr">
         <div class="paypal-donations"><input type="hidden" value="_donations" name="cmd">
             <input type="hidden" value="[email protected]" name="business">