Changeset 168

Timestamp:

04/28/08 09:53:09 (9 months ago)

Author:

dmondark

Message:

theme:charcoal Swticed to using the new navigation links.

Location:

themes/charcoal

Files:

• home.php (modified) (2 diffs)
• multiple.php (modified) (1 diff)
• search.php (modified) (1 diff)
• tag.php (modified) (1 diff)
• theme.php (modified) (1 diff)

themes/charcoal/home.php

@@ -21 +21 @@
                             <a href="<?php echo $post->permalink.'#comment-form'; ?>" title="Comments on this post"><?php $theme->post_comments_link( $post, 'No Comments', '%s Comment', '%s Comments' ); ?></a>
                         </span>
-                        <br class="clear"></span>
+                        <br class="clear">
                     </div>
                     <div class="post-entry">
@@ -62 +62 @@
             <?php endwhile; ?>
             </div>
-            <?php $theme->prevnext($page, Utils::archive_pages($posts->count_all())); ?>
+            <div id="prev-posts-footer">
+                <span class="nav-next"><?php $theme->prev_page_link('Newer Posts'); ?></span>
+                <span class="nav-prev"><?php $theme->next_page_link('Older Posts'); ?></span>
+                <br class="clear">
+            </div>
+            <?php //$theme->prevnext($page, Utils::archive_pages($posts->count_all())); ?>
             <?php $theme->display_archives() ;?>
             

themes/charcoal/multiple.php

@@ -37 +37 @@
     <div id="wrapper-bottom">
         <div id="bottom-primary">
-            <?php $theme->prevnext($page, Utils::archive_pages($posts->count_all())); ?>
+            <div id="prev-posts-footer">
+                <span class="nav-next"><?php $theme->prev_page_link('Newer Posts'); ?></span>
+                <span class="nav-prev"><?php $theme->next_page_link('Older Posts'); ?></span>
+                <br class="clear">
+            </div>
             <?php $theme->display_archives() ;?>
 

themes/charcoal/search.php

@@ -41 +41 @@
     <div id="wrapper-bottom">
         <div id="bottom-primary">
-            <?php $theme->prevnext($page, Utils::archive_pages($posts->count_all())); ?>
+            <div id="prev-posts-footer">
+                <span class="nav-next"><?php $theme->prev_page_link('Newer Posts'); ?></span>
+                <span class="nav-prev"><?php $theme->next_page_link('Older Posts'); ?></span>
+                <br class="clear">
+            </div>
             <?php $theme->display_archives() ;?>
 

themes/charcoal/tag.php

@@ -36 +36 @@
     <div id="wrapper-bottom">
         <div id="bottom-primary">
-            <?php $theme->prevnext($page, Utils::archive_pages($posts->count_all())); ?>
+            <div id="prev-posts-footer">
+                <span class="nav-next"><?php $theme->prev_page_link('Newer Posts'); ?></span>
+                <span class="nav-prev"><?php $theme->next_page_link('Older Posts'); ?></span>
+                <br class="clear">
+            </div>
             <?php $theme->display_archives() ;?>
 

themes/charcoal/theme.php

@@ -70 +70 @@
         parent::add_template_vars();
     }
-    /**
-     * returns the previous and/or next page links based on the current matched rule
-     */
-    public function theme_prevnext($theme,$currentpage, $totalpages)
-    {
-        //Retreive the current matched rule
-        $rr= URL::get_matched_rule();
-        // Retrieve arguments name the RewriteRule can use to build a URL.
-        $rr_named_args= $rr->named_args;
-        $rr_args= array_merge( $rr_named_args['required'], $rr_named_args['optional']  );
-        // For each argument, check if the handler_vars array has that argument and if it does, use it.
-        $rr_args_values= array();
-        foreach ( $rr_args as $rr_arg ) {
-            if ( !isset( $settings[$rr_arg] ) ) {
-                $rr_arg_value= Controller::get_var( $rr_arg );
-                if ( $rr_arg_value != '' ) {
-                    $settings[$rr_arg]= $rr_arg_value;
-                }
-            }
-        }
-        if ( !empty( $settings) ) {
-            $suffix= $rr->build($settings);
-            if (preg_match( "/\bpage\/\d+$/", $suffix) ) {
-                $url= Site::get_url( 'habari', true ) . preg_replace("/\bpage\/\d+$/", "page/", $suffix );
-            }
-            else {
-                $url= Site::get_url( 'habari', true ) . $suffix . '/page/';
-            }
-        }
-        else {
-            $url=Site::get_url( 'habari', true ).'page/';
-        }
-
-        if ( $currentpage > $totalpages ) {
-            $currentpage= $totalpages;
-        }
-        else if ( $currentpage < 1 ) {
-            $currentpage= 1;
-        }
-        if ( $totalpages > 1 ) {
-            $out='<div id="prev-posts-footer">'."\n";
-            if ($currentpage < $totalpages) {
-                $out.='<span class="nav-prev"><a href="' . $url .($currentpage+1).'">Older Posts</a></span>';
-            }
-            if ($currentpage > 1) {
-                $out.='<span class="nav-next"><a href="' . $url .($currentpage-1).'">Newer Posts</a></span>';
-            }
-            $out.= "\n".'<br class="clear" />'."\n</div>\n";
-            echo $out;
-        }
-    }
-    
+        
     /**
      * Convert a post's tags array into a usable list of links