Changeset 908 for plugins/pageless

Timestamp:

09/11/08 19:43:23 (4 months ago)

Author:

bcse

Message:

1. Add locales
2. Change license to Apache License 2.0

Location:

plugins/pageless/trunk

Files:

• locale (added)
• locale/en-us (added)
• locale/en-us/LC_MESSAGES (added)
• locale/en-us/LC_MESSAGES/pageless.mo (added)
• locale/en-us/LC_MESSAGES/pageless.po (added)
• locale/zh-tw (added)
• locale/zh-tw/LC_MESSAGES (added)
• locale/zh-tw/LC_MESSAGES/pageless.mo (added)
• locale/zh-tw/LC_MESSAGES/pageless.po (added)
• pageless.php (modified) (2 diffs)
• pageless.plugin.php (modified) (15 diffs)
• pagelesshandler.php (modified) (3 diffs)
• spinnersmalldark.png (modified) (previous)

plugins/pageless/trunk/pageless.php

@@ -1 @@
-<?php foreach ( $posts as $post ) { ?>
+<?php foreach ($posts as $post) { ?>
         <div id="entry-<?php echo $post->slug; ?>" class="hentry entry <?php echo $post->statusname , ' ' , $post->tags_class; ?>">
             <div class="entry-head">
@@ -6 +6 @@
                     <li class="entry-date"><abbr class="published" title="<?php echo $post->pubdate_iso; ?>"><?php echo $post->pubdate_out; ?></abbr></li>
                     <li class="entry-time"><abbr class="published" title="<?php echo $post->pubdate_iso; ?>"><?php echo $post->pubdate_time; ?></abbr></li>
-                    <li class="comments-link"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post') ?>"><?php printf( _n('%1$d Comment', '%1$d Comments', $post->comments->approved->count), $post->comments->approved->count ); ?></a></li>
-<?php if ( is_array( $post->tags ) ) { ?>
+                    <li class="comments-link"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post', $this->class_name) ?>"><?php printf(_n('%1$d Comment', '%1$d Comments', $post->comments->approved->count, $this->class_name), $post->comments->approved->count); ?></a></li>
+<?php if (is_array($post->tags)) { ?>
                     <li class="entry-tags"><?php echo $post->tags_out; ?></li>
 <?php } ?>
-<?php if ( isset($user) && $user ) { ?>
-                    <li class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post') ?>"><?php _e('Edit') ?></a></li>
+<?php if (isset($user) && $user) { ?>
+                    <li class="entry-edit"><a href="<?php URL::out('admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post', $this->class_name) ?>"><?php _e('Edit', $this->class_name) ?></a></li>
 <?php } ?>
                 </ul>

plugins/pageless/trunk/pageless.plugin.php

@@ -1 +1 @@
 <?php
 /**
- * Pageless Plugin: Make your blog pageless
- *
- * To use this plugin, your HTML structure must like this:
- *
- *   <div id="entry-post1" class="entry">
- *       blah blah...
- *   </div>
- *   <div id="entry-post2" class="entry">
- *       blah blah...
- *   </div>
- *   <div id="pager">
- *       blah blah...
- *   </div>
- *
- * 1. Every post¡Šs container must have an ID named ¡§entry-{$slug}¡š.
- *    If you are sure you won't write any post which slug is begin with
- *    ¡§entry-¡š or ¡§page-¡š, then you can simply named it ¡§{$slug}¡š.
- * 2. Every post must have an identical CSS class, e.g. ¡§entry¡š, and
- *    this CSS class must not appear elsewhere. You have to put this
- *    in ¡§Class name of posts¡š.
- * 3. The page selector¡Šs container must have an ID, e.g. ¡§pager¡š.
- *    You have to put this in ¡§ID of page selector¡š.
- * 4. You can put custom ¡¥pageless.php¡Š in the activated theme directory.
- *    The plugin will use this template instead of the default one.
+ * Pageless Plugin: Give your blog the ability of Infinite scrolling, instead of breaking content into ‘pages.’
  */
 
@@ -48 +25 @@
         return array(
             'name' => 'Pageless',
-            'version' => '0.1',
+            'version' => '0.2',
             'url' => 'http://blog.bcse.info/pageless-plugin-for-habari',
             'author' => 'Joel Lee',
             'authorurl' => 'http://blog.bcse.info/',
-            'license' => 'MIT License',
-            'description' => 'Make your blog pageless',
+            'license' => 'Apache License 2.0',
+            'description' => 'Give your blog the ability of Infinite scrolling, instead of breaking content into ‘pages.’',
             'copyright' => '2008'
         );
@@ -63 +40 @@
     public function action_update_check()
     {
-        Update::add( 'Pageless', '9b146781-0ee5-406a-aed5-90d661f76ade', $this->info->version );
+        Update::add('Pageless', '9b146781-0ee5-406a-aed5-90d661f76ade', $this->info->version);
     }
 
@@ -72 +49 @@
      * @return array The array of actions to attach to the specified $plugin_id
      **/
-    public function filter_plugin_config( $actions, $plugin_id )
-    {
-        if ( $plugin_id === $this->plugin_id() ) {
-            $actions[] = _t( 'Configure' );
+    public function filter_plugin_config($actions, $plugin_id)
+    {
+        if ($plugin_id === $this->plugin_id()) {
+            $actions[] = _t('Configure', $this->class_name);
         }
 
@@ -86 +63 @@
      * @param string $action The action string supplied via the filter_plugin_config hook
      **/
-    public function action_plugin_ui( $plugin_id, $action )
-    {
-        if ( $plugin_id === $this->plugin_id() ) {
-            switch ( $action ) {
-                case _t( 'Configure' ):
-                    $ui = new FormUI( $this->class_name );
-
-                    $num_item = $ui->append( 'text', 'num_item', 'option:' . $this->class_name . '__num_item', _t( 'How many posts to load each time?' ) );
-                    $num_item->add_validator( 'validate_uint' );
-                    $num_item->add_validator( 'validate_required' );
-
-                    $post_class = $ui->append( 'text', 'post_class', 'option:' . $this->class_name . '__post_class', _t( 'Class name of posts:' ) );
-                    $post_class->add_validator( 'validate_required' );
-
-                    $pager_id = $ui->append( 'text', 'pager_id', 'option:' . $this->class_name . '__pager_id', _t( 'ID of page selector:' ) );
-                    $pager_id->add_validator( 'validate_required' );
+    public function action_plugin_ui($plugin_id, $action)
+    {
+        if ($plugin_id === $this->plugin_id()) {
+            switch ($action) {
+                case _t('Configure', $this->class_name):
+                    $ui = new FormUI($this->class_name);
+
+                    $num_item = $ui->append('text', 'num_item', 'option:' . $this->class_name . '__num_item', _t('How many posts to load each time?', $this->class_name));
+                    $num_item->add_validator('validate_uint');
+                    $num_item->add_validator('validate_required');
+
+                    $post_class = $ui->append('text', 'post_class', 'option:' . $this->class_name . '__post_class', _t('CSS Class Name of Posts', $this->class_name));
+                    $post_class->add_validator('validate_required');
+
+                    $pager_id = $ui->append('text', 'pager_id', 'option:' . $this->class_name . '__pager_id', _t('ID of Page Selector', $this->class_name));
+                    $pager_id->add_validator('validate_required');
 
                     // When the form is successfully completed, call $this->updated_config()
-                    $ui->append( 'submit', 'save', _t( 'Save' ));
-                    $ui->set_option( 'success_message', _t( 'Options saved' ) );
+                    $ui->append('submit', 'save', _t('Save', $this->class_name));
+                    $ui->set_option('success_message', _t('Options saved', $this->class_name));
                     $ui->out();
                     break;
@@ -112 +89 @@
     }
 
-    public function validate_uint( $value )
-    {
-        if ( ! ctype_digit($value) || ! strstr($value, '.') || $value < 0 ) {
-            return array( _t( 'This field must be positive integer.' ) );
+    public function validate_uint($value)
+    {
+        if (!ctype_digit($value) || strstr($value, '.') || $value < 0) {
+            return array(_t('This field must be positive integer.', $this->class_name));
         }
         return array();
@@ -124 +101 @@
      * @return bool True if options should be stored
      **/
-    public function updated_config( $ui )
+    public function updated_config($ui)
     {
         return true;
@@ -132 +109 @@
      * On plugin activation, set the default options
      */
-    public function action_plugin_activation( $file )
-    {
-        if ( realpath( $file ) === __FILE__ ) {
-            $this->class_name = strtolower( get_class( $this ) );
-            foreach ( $this->default_options as $name => $value ) {
-                $current_value = Options::get( $this->class_name . '__' . $name );
-                if ( is_null($current_value) ) {
-                    Options::set( $this->class_name . '__' . $name, $value );
+    public function action_plugin_activation($file)
+    {
+        if (realpath($file) === __FILE__) {
+            $this->class_name = strtolower(get_class($this));
+            foreach ($this->default_options as $name => $value) {
+                $current_value = Options::get($this->class_name . '__' . $name);
+                if (is_null($current_value)) {
+                    Options::set($this->class_name . '__' . $name, $value);
                 }
             }
@@ -150 +127 @@
     public function action_init()
     {
-        $this->class_name = strtolower( get_class( $this ) );
-        foreach ( $this->default_options as $name => $value ) {
-            $this->config[$name] = Options::get( $this->class_name . '__' . $name );
-        }
-        $this->add_template( 'pageless', dirname(__FILE__) . '/pageless.php' );
-    }
-
-    public function filter_rewrite_rules( $rules )
+        $this->class_name = strtolower(get_class($this));
+        foreach ($this->default_options as $name => $value) {
+            $this->config[$name] = Options::get($this->class_name . '__' . $name);
+        }
+        $this->load_text_domain($this->class_name);
+        $this->add_template('pageless', dirname(__FILE__) . '/pageless.php');
+    }
+
+    public function filter_rewrite_rules($rules)
     {
         $rules[] = new RewriteRule(array(
@@ -169 +147 @@
             'description' => 'display_pageless'
         ));
+        $rules[] = new RewriteRule(array(
+            'name' => 'display_pageless_js',
+            'parse_regex' => '%^scripts/jquery.pageless_(?P<config>[0-9a-f]{32}).js$%i',
+            'build_str' =>  'scripts/jquery.pageless_{$config}.js',
+            'handler' => 'UserThemeHandler',
+            'action' => 'display_pageless_js',
+            'rule_class' => RewriteRule::RULE_PLUGIN,
+            'is_active' => 1,
+            'description' => 'display_pageless_js'
+        ));
         return $rules;
     }
 
-    public function theme_footer()
-    {
-        if ( count(self::$handler_vars) === 0 )
-            self::$handler_vars = Controller::get_handler_vars();
-
+    public function action_handler_display_pageless_js($handler_vars)
+    {
         // If 'slug' exists, then it must be single, don't do anything
-        if ( ! array_key_exists('slug', self::$handler_vars) ) {
+        if (!isset($handler_vars['slug'])) {
             // Determine act_display
             $filter_type = '';
             $filter_param = '';
-            if ( array_key_exists('tag', self::$handler_vars) ) {
+            if (isset($handler_vars['tag'])) {
                 $filter_type = 'tag';
-                $filter_param = self::$handler_vars['tag'];
+                $filter_param = $handler_vars['tag'];
             } else
-            if ( array_key_exists('year', self::$handler_vars) ) {
+            if (isset($handler_vars['year'])) {
                 $filter_type = 'date';
-                $filter_param = self::$handler_vars['year'];
-                if ( array_key_exists('month', self::$handler_vars) ) {
-                    $filter_param .= '/' . self::$handler_vars['month'];
+                $filter_param = $handler_vars['year'];
+                if (isset($handler_vars['month'])) {
+                    $filter_param .= '/' . $handler_vars['month'];
                 }
-                if ( array_key_exists('day', self::$handler_vars) ) {
-                    $filter_param .= '/' . self::$handler_vars['day'];
+                if (isset($handler_vars['day'])) {
+                    $filter_param .= '/' . $handler_vars['day'];
                 }
             } else
-            if ( array_key_exists('criteria', self::$handler_vars) ) {
+            if (isset($handler_vars['criteria'])) {
                 $filter_type = 'search';
-                $filter_param = self::$handler_vars['criteria'];
-            }
-
-            echo '<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>';
-            echo '<script type="text/javascript" src="' . Site::get_url('scripts') . '/jquery.spinner.js"></script>';
-            echo '<script type="text/javascript">
-(function($){
-    $(document).ready(function() {
+                $filter_param = $handler_vars['criteria'];
+            }
+
+            $out = '(function($){
+    $(function() {
         $("#' . $this->config['pager_id'] . '").hide();
 
@@ -223 +205 @@
 
         function appendEntries() {
-            if ( $(window).scrollTop() >= $(document).height() - ( $(window).height() * 2 ) ) {
+            if ($(window).scrollTop() >= $(document).height() - ($(window).height() * 2)) {
                 var slug = $(".' . $this->config['post_class'] . ':last").attr("id").replace(/^(?:entry|page)-/, "");
                 $.ajax({
-                    url: "' . URL::get( 'display_pageless', array( 'type' => $filter_type, 'param' => $filter_param ) ) . '".replace("{$slug}", slug),
+                    url: "' . URL::get('display_pageless', array('type' => $filter_type, 'param' => $filter_param)) . '".replace("{$slug}", slug),
                     beforeSend: function() {
                         spinner.start();
@@ -232 +214 @@
                     },
                     success: function(response) {
-                        if ( response.length > 100 ) {
+                        if (response.length > 100) {
                             $(".' . $this->config['post_class'] . ':last").after(response);
                         } else {
@@ -240 +222 @@
                     complete: function() {
                         spinner.stop();
-                        if ( ! the_end && activated ) {
+                        if (!the_end && activated) {
                             $(window).bind("scroll", appendEntries);
                         }
@@ -253 +235 @@
         function toggleScroll() {
             activated = !activated;
-            if ( ! the_end && activated ) {
+            if (!the_end && activated) {
                 $(window).bind("scroll", appendEntries);
                 $("#' . $this->config['pager_id'] . '").hide();
@@ -264 +246 @@
         $(document).bind("dblclick", toggleScroll);
     });
-})(jQuery);
-</script>';
+})(jQuery);';
+
+            ob_clean();
+            header('Content-type: text/javascript');
+            header('ETag: ' . md5($out));
+            header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 315360000) . ' GMT');
+            header('Cache-Control: max-age=315360000');
+            echo $out;
+        }
+
+        exit;
+    }
+
+    public function theme_footer()
+    {
+        if (count(self::$handler_vars) === 0)
+            self::$handler_vars = Controller::get_handler_vars();
+
+        // If 'slug' exists, then it must be single, don't do anything
+        if (!isset(self::$handler_vars['slug'])) {
+            Stack::add('template_footer_javascript', 'http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js', 'jquery');
+            Stack::add('template_footer_javascript', Site::get_url('scripts') . '/jquery.spinner.js', 'jquery.spinner');
+            Stack::add('template_footer_javascript', URL::get('display_pageless_js', array('config' => md5(serialize(array_merge($this->config, self::$handler_vars))))), 'jquery.pageless');
         }
     }

plugins/pageless/trunk/pagelesshandler.php

@@ -20 +20 @@
     {
         $this->handler_vars = array_merge($this->default_fields, $this->handler_vars);
-        $post = Post::get( array( 'slug' => $this->handler_vars['slug'] ) );
-        if ( $post instanceof Post ) {
+        $post = Post::get(array('slug' => $this->handler_vars['slug']));
+        if ($post instanceof Post) {
             // Default params
             $params = array(
                 'before' => $post->pubdate,
                 'content_type' => $post->content_type,
-                'limit' => Options::get( 'pageless__num_item' ),
+                'limit' => Options::get('pageless__num_item'),
                 'orderby' => 'pubdate DESC'
                 );
 
             // Additional filters, in other word, handling act_display
-            if ( array_key_exists('type', $this->handler_vars) ) {
-                if ( $this->handler_vars['type'] === 'tag' ) {
+            if (isset($this->handler_vars['type'])) {
+                if ($this->handler_vars['type'] === 'tag') {
                     $params['tag_slug'] = $this->handler_vars['param'];
                 } else
-                if ( $this->handler_vars['type'] === 'date' ) {
+                if ($this->handler_vars['type'] === 'date') {
                     $date = explode('/', $this->handler_vars['param']);
                     $params_count = count($date);
-                    switch ( $params_count ) {
+                    switch ($params_count) {
                         case 3:
                             $params['day'] = $date[2];
@@ -49 +49 @@
                     }
                 } else
-                if ( $this->handler_vars['type'] === 'search' ) {
+                if ($this->handler_vars['type'] === 'search') {
                     $params['criteria'] = $this->handler_vars['param'];
                 }
@@ -55 +55 @@
 
             // Get $posts -> Assign $posts to theme -> Display template
-            $posts = Posts::get( $params );
-            $this->theme->assign( 'posts', $posts );
-            $this->theme->display( 'pageless' );
+            $posts = Posts::get($params);
+            $this->theme->assign('posts', $posts);
+            $this->theme->display('pageless');
         }
     }