Changeset 517648

Timestamp:

03/11/2012 09:11:47 PM (14 years ago)

Author:

smartredfox

Message:

• Fixed initial style not set (BUG)
• Added editor button to insert shortcode (FEATURE)
• Added shortcode wizard to insert shortcode (FEATURE)
• Now reads custom css files from a folder in your theme directory (stops files getting wiped after upgrade).

Location:

pretty-file-lister/trunk

Files:

• PrettyFileList.php (modified) (10 diffs)
• includes (added)
• includes/button_popup.php (added)
• includes/tinymce.css (added)
• js/customcodes.js (added)
• js/prettygen.js (added)
• js/style_previewer.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)

pretty-file-lister/trunk/PrettyFileList.php

@@ -4 +4 @@
    Plugin URI: http://www.smartredfox.com/prettylist
    Description: A plugin that lists files attached to the current post/page.
-   Version: 0.1
+   Version: 0.2
    Author: James Botham
    Author URI: http://www.smartredfox.com
@@ -21 +21 @@
         if(!is_admin())
         {
-            add_shortcode('prettyfilelist', array($this, 'prettyfilelist_shortcode'));          
+            add_shortcode('prettyfilelist', array($this, 'prettyfilelist_shortcode'));
         }
     }
@@ -51 +51 @@
             //Attach save event for Settings page
             add_filter( 'attachment_fields_to_save', array($this,'srf_attachment_field_prettylist_save'), 10, 2 );              
+            //Add shortcode button
+            add_action('init', array($this,'add_button'));
         }
     }  
@@ -88 +90 @@
         return $html;
     }
-  
+
     //Add Stylesheet
     public function prettyfilelist_stylesheets()
@@ -94 +96 @@
         //Get user selected stylesheet if any
         $options['stylesheet_to_use'] = get_option('stylesheet_to_use'); 
-
-        $stylesheet_url = PRETTY_FILE_LIST_URL . '/styles/prettylist.css';
-
+        $option = $options['stylesheet_to_use'];
+        $stylesheet_url = PRETTY_FILE_LIST_URL . 'styles/prettylinks.css';
+
+        //Add our prettylist stylesheet
         if($options['stylesheet_to_use'] != ""){
-            //Add our prettylist stylesheet
-            $stylesheet_url = PRETTY_FILE_LIST_URL . '/styles/' . $options['stylesheet_to_use'];    
-        }
+            //See if the selected style has a hash in it (this means it's an alt style)
+            if(strpos($options['stylesheet_to_use'],'#') > 0){
+                //See if the file exists in the template directory first
+                //if(!file_exists($stylesheet_url)){
+                $cleanOption = str_replace("#", "", $option);
+                $stylesheet_url = (get_bloginfo('template_url') . '/prettystyles/' . $cleanOption);
+                //}
+            }
+            else{
+                //If not, fallback to plugin version
+                $stylesheet_url = (PRETTY_FILE_LIST_URL . 'styles/' . $options['stylesheet_to_use']);
+            }
+        }
+        
+        //echo $stylesheet_url;
         
         wp_register_style('srfprettylistStyleSheets', $stylesheet_url);
-        wp_enqueue_style( 'srfprettylistStyleSheets');  
+        wp_enqueue_style( 'srfprettylistStyleSheets');
     }  
     
@@ -216 +231 @@
     function srf_prettylist_admin_scripts()
     {
-      $params = array('pluginUrl' => PRETTY_FILE_LIST_URL);  
+      $params = array('pluginUrl' => PRETTY_FILE_LIST_URL,'altPluginUrl' => get_bloginfo('template_directory') . '/prettystyles/');
       wp_register_script('prettylistpreviewer', PRETTY_FILE_LIST_URL . '/js/style_previewer.js');
       wp_localize_script('prettylistpreviewer', 'prettylistScriptParams', $params );
@@ -245 +260 @@
       }
 
-      //path to directory to scan
+      //Path to directories to scan
       $directory = PRETTY_FILE_LIST_PATH . '/styles/';
+      $altDirectory = get_template_directory() . '/prettystyles/';
       
       //get all css files with a .css extension.
       $styles = glob($directory . "*.css");
+      $altStyles = glob($altDirectory . "*.css");  
       
       //Get our options
       $options['stylesheet_to_use'] = get_option('stylesheet_to_use');
 
-      //Display options form
-      echo '<div style="background-color:#eee;border:solid 1px #ccc;border-radius:3px;float:right;margin:20px;padding:10px;width:300px;">
+    //Display options form
+    echo '<div style="background-color:#eee;border:solid 1px #ccc;border-radius:3px;float:right;margin:20px;padding:10px;width:300px;">
             <div style="background-color:#fff;border:solid 1px #ccc;float:right;">
                 <img src="http://www.smartredfox.com/wp-content/uploads/2012/02/All_styles-150x150.png" style="margin:5px;" />
@@ -265 +282 @@
             <div class="wrap">'.$message.
         '<div id="icon-options-general" class="icon32"><br /></div>  
-        <h2>prettylist Settings</h2>  
+        <h2>Pretty file list Settings</h2>  
       
         <form method="post" action="">  
@@ -278 +295 @@
       {
         echo '<option value="' . basename($style) .'"' . (basename($style) == $options['stylesheet_to_use'] ? 'selected="selected"' : '')  . '>' . basename($style) . '</option>';
+      }
+      foreach($altStyles as $style)
+      {
+        echo '<option value="' . basename($style) .'#"' . (basename($style) == $options['stylesheet_to_use'] ? 'selected="selected"' : '')  . '>' . basename($style) . ' (Custom)</option>';
       }
       
@@ -301 +322 @@
       return $post;
     }
+    
+    /*********************
+    ADD SHORTCODE BUTTON
+    **********************/ 
+    
+    function add_button() {  
+       if ( current_user_can('edit_posts') &&  current_user_can('edit_pages') )  
+       {  
+         add_filter('mce_external_plugins', array($this,'add_plugin'));
+         add_filter('mce_buttons', array($this,'register_button'));
+       }  
+    }  
+    
+    function register_button($buttons) {  
+       array_push($buttons, "prettylist");  
+       return $buttons;  
+    }  
+    
+    function add_plugin($plugin_array) {  
+       $plugin_array['prettylist'] = PRETTY_FILE_LIST_URL.'js/prettygen.js';  
+       return $plugin_array;  
+    } 
+    
+    /*************************
+    UPGRADE FUNCTIONALITY TO SAVE STYLE PACK
+    **************************/
+    function hpt_copyr($source, $dest) 
+    {
+        // Check for symlinks
+        if (is_link($source)) { 
+            return symlink(readlink($source), $dest); 
+        }
+ 
+        // Simple copy for a file 
+        if (is_file($source)) {
+            return copy($source, $dest); 
+        } 
+
+        // Make destination directory
+        if (!is_dir($dest)) {
+            mkdir($dest);   
+        }
+ 
+        // Loop through the folder
+        $dir = dir($source);
+        while (false !== $entry = $dir->read()) {
+            // Skip pointers
+            if ($entry == '.' || $entry == '..') {
+                continue;
+            }
+
+            // Deep copy directories
+            $this->hpt_copyr("$source/$entry", "$dest/$entry");
+        }
+
+        // Clean up
+        $dir->close();
+        return true;
+    }
+    
+    function hpt_backup()
+    {
+            $from = PRETTY_FILE_LIST_PATH."styles/";
+            $to = WP_CONTENT_DIR."/uploads/prettystyles/"; 
+            $this->hpt_copyr($from, $to);
+    }
+    function hpt_recover()
+    {       
+            $from = WP_CONTENT_DIR."/uploads/prettystyles/";
+            $to = PRETTY_FILE_LIST_PATH."styles/";          
+            $this->hpt_copyr($from, $to);
+            if (is_dir($from)) {
+                rmdir($from);
+            }
+    }   
 }  
   

pretty-file-lister/trunk/js/style_previewer.js

@@ -4 +4 @@
     {   
         jQuery.get(prettylistScriptParams.pluginUrl + '/styles/prettylist.css', updateImageUrls);
-        
     }
     else
     {
-        jQuery.get(prettylistScriptParams.pluginUrl + '/styles/' + jQuery('#show_pages').attr('value'), updateImageUrls);
+        //If it contains a hash it's an alt style
+        if((jQuery('#show_pages').attr('value')).indexOf('#') > 0){
+            jQuery.get(prettylistScriptParams.altPluginUrl + jQuery('#show_pages').attr('value'), updateImageUrls);
+        }
+        else{
+            jQuery.get(prettylistScriptParams.pluginUrl + '/styles/' + jQuery('#show_pages').attr('value'), updateImageUrls);
+        }
     }
     
-    /*After selecting a stylesheet*/    
+    /*After selecting a stylesheet*/
     jQuery('#show_pages').change(function(){
+            //If it contains a hash it's an alt style
+        if((jQuery('#show_pages').attr('value')).indexOf('#') > 0){
+            jQuery.get(prettylistScriptParams.altPluginUrl + jQuery('#show_pages').attr('value'), updateImageUrls);
+        }
+        else{
+            jQuery.get(prettylistScriptParams.pluginUrl + '/styles/' + jQuery('#show_pages').attr('value'), updateImageUrls);
+        }
+    
         //Load styles
-        jQuery.get(prettylistScriptParams.pluginUrl + '/styles/' + jQuery(this).attr('value'), updateImageUrls);
+        //jQuery.get(prettylistScriptParams.pluginUrl + '/styles/' + jQuery(this).attr('value'), updateImageUrls);
     });
     
-    function updateImageUrls(data) {
-        //Make image paths work with a greedy regex
-        newData = data.replace( new RegExp( "../images/", "g" ), prettylistScriptParams.pluginUrl + '/images/' );
+    //Make image paths work in the previewer
+    function updateImageUrls(data) {        
+        //If it contains a hash it's an alt style
+        if((jQuery('#show_pages').attr('value')).indexOf('#') > 0){
+            //Make image paths work with a greedy regex
+            //Uses "../i because we can't be sure if it will be images or img. 
+            //Also uses ../../../ to fix style pack icons
+            //Also looks for a bracket or quote to stop ../../ etc from matching
+            //This will not always work.
+            newData = data.replace( new RegExp( '"../i', 'g' ), '"' + prettylistScriptParams.altPluginUrl + 'i' );      
+            newData = data.replace( new RegExp( '\\(../i', 'g' ),'(' +  prettylistScriptParams.altPluginUrl + 'i' );        
+            newData = data.replace( new RegExp( '.../../../plugins/pretty-file-lister/', 'g' ),'(' +  prettylistScriptParams.pluginUrl + '' );  
+        }
+        else{
+            //Make image paths work with a greedy regex
+            newData = data.replace( new RegExp( '../images/', 'g' ), prettylistScriptParams.pluginUrl + 'images/' );
+        }
+        
         //Empty and refill styles section
         jQuery('#Previewer').empty().append(newData);

pretty-file-lister/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.0
 Tested up to: 3.3.1
-Stable tag: 0.1
+Stable tag: 0.2
 
 The Pretty file list plugin lists files attached to a post, displays them, and pages them in an attractive format without you having to do any work. It’s designed to be very easy to use, and even comes with built in styles for different set ups.
@@ -26 +26 @@
 3. An example of the split Pretty File List style.
 
-
 == Changelog ==
 
 = 0.1 =
 * Initial release
+
+= 0.2 =
+* Fixed initial style not set (BUG)
+* Added editor button to insert shortcode (FEATURE)
+* Added shortcode wizard to insert shortcode (FEATURE)
+* Now reads custom css files from a folder in your theme directory (stops files getting wiped after upgrade).
+
+== Upgrade Notice ==
+
+= 0.2 =
+If you are using the Style Pack you will need to [redownload it (Style Pack v0.3)](http://www.smartredfox.com/style-pack-download/) and install it into your theme directory.