[geeklog-hg] geeklog: Renamed page_navigation to pagenavigation.thtml and fix...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Jun 13 18:38:12 EDT 2013
changeset 9092:4a70366d2aac
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/4a70366d2aac
user: Tom <websitemaster at cogeco.net>
date: Thu Jun 13 18:34:47 2013 -0400
description:
Renamed page_navigation to pagenavigation.thtml and fixed Next and Last page links not displaying. Combined menu templates into one file called menunavigation.thtml
diffstat:
public_html/docs/english/theme.html | 4 +-
public_html/layout/denim/menuitem.thtml | 1 -
public_html/layout/denim/menuitem_last.thtml | 1 -
public_html/layout/denim/menuitem_none.thtml | 1 -
public_html/layout/denim/menunavigation.thtml | 11 +++
public_html/layout/denim/page_navigation.thtml | 23 -------
public_html/layout/denim/pagenavigation.thtml | 22 ++++++
public_html/layout/denim/topicnavigation.thtml | 4 +-
public_html/layout/modern_curve/menuitem.thtml | 6 -
public_html/layout/modern_curve/menuitem_last.thtml | 6 -
public_html/layout/modern_curve/menuitem_none.thtml | 5 -
public_html/layout/modern_curve/menunavigation.thtml | 11 +++
public_html/layout/modern_curve/page_navigation.thtml | 23 -------
public_html/layout/modern_curve/pagenavigation.thtml | 22 ++++++
public_html/layout/modern_curve/topicnavigation.thtml | 4 +-
public_html/layout/professional/menuitem.thtml | 1 -
public_html/layout/professional/menuitem_last.thtml | 1 -
public_html/layout/professional/menuitem_none.thtml | 1 -
public_html/layout/professional/menunavigation.thtml | 11 +++
public_html/layout/professional/page_navigation.thtml | 18 -----
public_html/layout/professional/pagenavigation.thtml | 22 ++++++
public_html/layout/professional/topicnavigation.thtml | 4 +-
public_html/layout/professional_css/menuitem.thtml | 6 -
public_html/layout/professional_css/menuitem_last.thtml | 6 -
public_html/layout/professional_css/menuitem_none.thtml | 5 -
public_html/layout/professional_css/menunavigation.thtml | 11 +++
public_html/layout/professional_css/page_navigation.thtml | 23 -------
public_html/layout/professional_css/pagenavigation.thtml | 22 ++++++
public_html/layout/professional_css/topicnavigation.thtml | 4 +-
public_html/lib-common.php | 48 ++++++--------
30 files changed, 160 insertions(+), 167 deletions(-)
diffs (truncated from 528 to 300 lines):
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html Thu Jun 13 15:17:54 2013 -0400
+++ b/public_html/docs/english/theme.html Thu Jun 13 18:34:47 2013 -0400
@@ -203,11 +203,13 @@
<h2><a name="changes">Theme changes in Geeklog 2.0.1</a></h2>
<ul>
-<li>Added the template varialbe {related_topics} to <tt>featuredstorytext.thtml</tt> and <tt>storytext.thtml</tt></li>li>
+<li>Added the template variable {related_topics} to <tt>featuredstorytext.thtml</tt> and <tt>storytext.thtml</tt></li>li>
<li>Removed <tt>topicoption.thtml</tt> and <tt>topicoption_off.thtml</tt>.
Added <tt>topicnavigation.thtml</tt> which uses blocks to reduce the number of template files.</li>
<li>Renamed <tt>page_navigation.thtml</tt> to <tt>pagenavigation.thtml</tt>
to be consistent.</li>
+<li>Removed <tt>menuitem.thtml</tt>, <tt>menuitem_last.thtml</tt> and <tt>menuitem_none.thtml</tt>.
+ Added <tt>menunavigation.thtml</tt> which uses blocks to reduce the number of template files.</li>
</ul>
<h2><a name="changes">Theme changes in Geeklog 2.0.0</a></h2>
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/menuitem.thtml
--- a/public_html/layout/denim/menuitem.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="menuitem"><a href="{menuitem_url}">{menuitem_text}</a></li>
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/menuitem_last.thtml
--- a/public_html/layout/denim/menuitem_last.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="menuitem last-child"><a href="{menuitem_url}">{menuitem_text}</a></li>
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/menuitem_none.thtml
--- a/public_html/layout/denim/menuitem_none.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/menunavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/denim/menunavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -0,0 +1,11 @@
+{# {templatelocation} - The Menu Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN menuitem -->
+<li class="menuitem"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<!-- END menuitem -->
+<!-- BEGIN menuitem_last -->
+<li class="menuitem last-child"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<!-- END menuitem_last -->
+<!-- BEGIN menuitem_none -->
+
+<!-- END menuitem_none -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/page_navigation.thtml
--- a/public_html/layout/denim/page_navigation.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-<!-- page_navigation.thtml { -->
-
-<div class="gl-pagenav">
-{message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
-<span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-{pages}
-<!-- BEGIN page -->
-{page_number}
-<!-- END page -->
-<!-- BEGIN page-current -->
-<b>{page_number}</b>
-<!-- END page-current -->
-<!-- BEGIN nav-end -->
-| <span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span>
-| <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- END nav-end -->
-<!-- BEGIN nav-open-ended -->
-| {open_ended}
-<!-- END nav-open-ended -->
-</div>
-
-<!-- } page_navigation.thtml -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/pagenavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/denim/pagenavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -0,0 +1,22 @@
+{# begin {templatelocation} #}
+
+<div class="gl-pagenav">
+{message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
+<span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
+{pages}
+<!-- BEGIN page -->
+{page_number}
+<!-- END page -->
+<!-- BEGIN page-current -->
+<b>{page_number}</b>
+<!-- END page-current -->
+<!-- BEGIN nav-end -->
+| <span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span>
+| <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
+<!-- END nav-end -->
+<!-- BEGIN nav-open-ended -->
+| {open_ended}
+<!-- END nav-open-ended -->
+</div>
+
+{# end {templatelocation} #}
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/denim/topicnavigation.thtml
--- a/public_html/layout/denim/topicnavigation.thtml Thu Jun 13 15:17:54 2013 -0400
+++ b/public_html/layout/denim/topicnavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -1,4 +1,4 @@
-{# begin {templatelocation} #}
+{# {templatelocation} - The Topic Navigation uses template blocks which is built into this file #}
<!-- BEGIN option -->
<li class="topicoption sideoption branch_level{branch_level}"><a href="{option_url}">{option_label}<span>{option_count}</span></a></li>
@@ -9,5 +9,3 @@
<!-- BEGIN option-off -->
<li class="topicoption_off sideoption_off branch_level{branch_level}">{option_label} {option_count}</li>
<!-- END option-off -->
-
-{# end {templatelocation} #}
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/menuitem.thtml
--- a/public_html/layout/modern_curve/menuitem.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- menuitem.thtml { -->
-
- <li class="menuitem"><a href="{menuitem_url}">{menuitem_text}</a></li>
-
-<!-- } menuitem.thtml -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/menuitem_last.thtml
--- a/public_html/layout/modern_curve/menuitem_last.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- menuitem_last.thtml { -->
-
- <li class="menuitem last-child"><a href="{menuitem_url}">{menuitem_text}</a></li>
-
-<!-- } menuitem_last.thtml -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/menuitem_none.thtml
--- a/public_html/layout/modern_curve/menuitem_none.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-
-<!-- menuitem_none.thtml { -->
-
-
-<!-- } menuitem_none.thtml -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/menunavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/modern_curve/menunavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -0,0 +1,11 @@
+{# {templatelocation} - The Menu Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN menuitem -->
+<li class="menuitem"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<!-- END menuitem -->
+<!-- BEGIN menuitem_last -->
+<li class="menuitem last-child"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<!-- END menuitem_last -->
+<!-- BEGIN menuitem_none -->
+
+<!-- END menuitem_none -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/page_navigation.thtml
--- a/public_html/layout/modern_curve/page_navigation.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-<!-- page_navigation.thtml { -->
-
-<div class="gl-pagenav">
-{message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
-<span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-{pages}
-<!-- BEGIN page -->
-{page_number}
-<!-- END page -->
-<!-- BEGIN page-current -->
-<b>{page_number}</b>
-<!-- END page-current -->
-<!-- BEGIN nav-end -->
-| <span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span>
-| <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- END nav-end -->
-<!-- BEGIN nav-open-ended -->
-| {open_ended}
-<!-- END nav-open-ended -->
-</div>
-
-<!-- } page_navigation.thtml -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/pagenavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/modern_curve/pagenavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -0,0 +1,22 @@
+{# begin {templatelocation} #}
+
+<div class="gl-pagenav">
+{message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
+<span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
+{pages}
+<!-- BEGIN page -->
+{page_number}
+<!-- END page -->
+<!-- BEGIN page-current -->
+<b>{page_number}</b>
+<!-- END page-current -->
+<!-- BEGIN nav-end -->
+| <span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span>
+| <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
+<!-- END nav-end -->
+<!-- BEGIN nav-open-ended -->
+| {open_ended}
+<!-- END nav-open-ended -->
+</div>
+
+{# end {templatelocation} #}
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/modern_curve/topicnavigation.thtml
--- a/public_html/layout/modern_curve/topicnavigation.thtml Thu Jun 13 15:17:54 2013 -0400
+++ b/public_html/layout/modern_curve/topicnavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -1,4 +1,4 @@
-{# begin {templatelocation} #}
+{# {templatelocation} - The Topic Navigation uses template blocks which is built into this file #}
<!-- BEGIN option -->
<li class="topicoption">{branch_spaces}<a href="{option_url}">{option_label}</a> {option_count}</li>
@@ -9,5 +9,3 @@
<!-- BEGIN option-off -->
<li class="topicoption_off">{branch_spaces}{option_label} {option_count}</li>
<!-- END option-off -->
-
-{# end {templatelocation} #}
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/professional/menuitem.thtml
--- a/public_html/layout/professional/menuitem.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<li><a href="{menuitem_url}">{menuitem_text}</a></li>
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/professional/menuitem_last.thtml
--- a/public_html/layout/professional/menuitem_last.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<li class="last"><a href="{menuitem_url}">{menuitem_text}</a></li>
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/professional/menuitem_none.thtml
--- a/public_html/layout/professional/menuitem_none.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/professional/menunavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/menunavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -0,0 +1,11 @@
+{# {templatelocation} - The Menu Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN menuitem -->
+<li><a href="{menuitem_url}">{menuitem_text}</a></li>
+<!-- END menuitem -->
+<!-- BEGIN menuitem_last -->
+<li class="last"><a href="{menuitem_url}">{menuitem_text}</a></li>
+<!-- END menuitem_last -->
+<!-- BEGIN menuitem_none -->
+
+<!-- END menuitem_none -->
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/professional/page_navigation.thtml
--- a/public_html/layout/professional/page_navigation.thtml Thu Jun 13 15:17:54 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<div class="gl-pagenav">
-{message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
-<span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-{pages}
-<!-- BEGIN page -->
-{page_number}
-<!-- END page -->
-<!-- BEGIN page-current -->
-<b>{page_number}</b>
-<!-- END page-current -->
-<!-- BEGIN nav-end -->
-| <span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span>
-| <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- END nav-end -->
-<!-- BEGIN nav-open-ended -->
-| {open_ended}
-<!-- END nav-open-ended -->
-</div>
diff -r ef58539f9cb8 -r 4a70366d2aac public_html/layout/professional/pagenavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/pagenavigation.thtml Thu Jun 13 18:34:47 2013 -0400
@@ -0,0 +1,22 @@
+{# begin {templatelocation} #}
+
+<div class="gl-pagenav">
+{message}<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> |
+<span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
+{pages}
+<!-- BEGIN page -->
+{page_number}
+<!-- END page -->
+<!-- BEGIN page-current -->
+<b>{page_number}</b>
+<!-- END page-current -->
+<!-- BEGIN nav-end -->
+| <span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span>
+| <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
+<!-- END nav-end -->
More information about the geeklog-cvs
mailing list