[geeklog-hg] geeklog: Added message block to page navigation template so we c...

[geeklog-cvs at lists.geeklog.net]

changeset 9342:d3198251df58
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d3198251df58
user: Tom <websitemaster at cogeco.net>
date: Sun Nov 24 15:24:50 2013 -0500
description:
Added message block to page navigation template so we can add some extra html around the message (needed to make multi page articles look better)

diffstat:

 public_html/layout/denim/pagenavigation.thtml            |  5 ++++-
 public_html/layout/modern_curve/pagenavigation.thtml     |  5 ++++-
 public_html/layout/professional/pagenavigation.thtml     |  5 ++++-
 public_html/layout/professional_css/pagenavigation.thtml |  5 ++++-
 public_html/lib-common.php                               |  7 +++++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diffs (108 lines):

diff -r 180c8869dd61 -r d3198251df58 public_html/layout/denim/pagenavigation.thtml
--- a/public_html/layout/denim/pagenavigation.thtml	Sat Nov 23 15:08:49 2013 -0500
+++ b/public_html/layout/denim/pagenavigation.thtml	Sun Nov 24 15:24:50 2013 -0500
@@ -4,6 +4,10 @@
 {message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
 <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
 {pages}
+</div>
+<!-- BEGIN message -->
+<p>{message_text}</p>
+<!-- END message -->
 <!-- BEGIN page -->
 {page_number}
 <!-- END page -->
@@ -17,6 +21,5 @@
 <!-- BEGIN nav-open-ended -->
 | {open_ended}
 <!-- END nav-open-ended -->
-</div>
 
 {# end {templatelocation} #}
diff -r 180c8869dd61 -r d3198251df58 public_html/layout/modern_curve/pagenavigation.thtml
--- a/public_html/layout/modern_curve/pagenavigation.thtml	Sat Nov 23 15:08:49 2013 -0500
+++ b/public_html/layout/modern_curve/pagenavigation.thtml	Sun Nov 24 15:24:50 2013 -0500
@@ -4,6 +4,10 @@
 {message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
 <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
 {pages}
+</div>
+<!-- BEGIN message -->
+<p>{message_text}</p>
+<!-- END message -->
 <!-- BEGIN page -->
 {page_number}
 <!-- END page -->
@@ -17,6 +21,5 @@
 <!-- BEGIN nav-open-ended -->
 | {open_ended}
 <!-- END nav-open-ended -->
-</div>
 
 {# end {templatelocation} #}
diff -r 180c8869dd61 -r d3198251df58 public_html/layout/professional/pagenavigation.thtml
--- a/public_html/layout/professional/pagenavigation.thtml	Sat Nov 23 15:08:49 2013 -0500
+++ b/public_html/layout/professional/pagenavigation.thtml	Sun Nov 24 15:24:50 2013 -0500
@@ -4,6 +4,10 @@
 {message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
 <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
 {pages}
+</div>
+<!-- BEGIN message -->
+<p>{message_text}</p>
+<!-- END message -->
 <!-- BEGIN page -->
 {page_number}
 <!-- END page -->
@@ -17,6 +21,5 @@
 <!-- BEGIN nav-open-ended -->
 | {open_ended}
 <!-- END nav-open-ended -->
-</div>
 
 {# end {templatelocation} #}
diff -r 180c8869dd61 -r d3198251df58 public_html/layout/professional_css/pagenavigation.thtml
--- a/public_html/layout/professional_css/pagenavigation.thtml	Sat Nov 23 15:08:49 2013 -0500
+++ b/public_html/layout/professional_css/pagenavigation.thtml	Sun Nov 24 15:24:50 2013 -0500
@@ -4,6 +4,10 @@
 {message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
 <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
 {pages}
+</div>
+<!-- BEGIN message -->
+<p>{message_text}</p>
+<!-- END message -->
 <!-- BEGIN page -->
 {page_number}
 <!-- END page -->
@@ -17,6 +21,5 @@
 <!-- BEGIN nav-open-ended -->
 | {open_ended}
 <!-- END nav-open-ended -->
-</div>
 
 {# end {templatelocation} #}
diff -r 180c8869dd61 -r d3198251df58 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Nov 23 15:08:49 2013 -0500
+++ b/public_html/lib-common.php	Sun Nov 24 15:24:50 2013 -0500
@@ -5682,7 +5682,7 @@
 
     $page_navigation = COM_newTemplate($_CONF['path_layout']);
     $page_navigation->set_file('page_navigation', 'pagenavigation.thtml');
-    $blocks = array('page', 'page-current', 'nav-end', 'nav-open-ended');
+    $blocks = array('page', 'page-current', 'nav-end', 'nav-open-ended', 'message');
     foreach ($blocks as $block) {
         $page_navigation->set_block('page_navigation', $block);
     }    
@@ -5762,7 +5762,10 @@
     }
 
     if (!empty($msg)) {
-        $page_navigation->set_var('message', $msg . ' ');
+        $page_navigation->set_var('message_text', $msg . ' ');
+        $page_navigation->parse('message', 'message');
+    } else {
+        $page_navigation->parse('message', '');
     }
 
     return $page_navigation->finish($page_navigation->parse('output', 'page_navigation'));