[geeklog-hg] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Sep 17 18:09:10 EDT 2012
changeset 8821:d83d1a709356
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d83d1a709356
user: dengen
date: Tue Sep 18 07:04:17 2012 +0900
description:
Merged with upstream
diffstat:
public_html/layout/denim/page_navigation.thtml | 23 ++++++++++
public_html/layout/denim/page_navigation/page.thtml | 4 -
public_html/layout/denim/page_navigation/page_current.thtml | 4 -
public_html/layout/denim/page_navigation/page_navigation.thtml | 3 -
public_html/layout/denim/page_navigation/page_navigation_end.thtml | 3 -
public_html/layout/denim/page_navigation/page_navigation_open_ended.thtml | 3 -
public_html/layout/denim/page_navigation/page_navigation_start.thtml | 3 -
public_html/layout/modern_curve/page_navigation.thtml | 23 ++++++++++
public_html/layout/modern_curve/page_navigation/page.thtml | 4 -
public_html/layout/modern_curve/page_navigation/page_current.thtml | 4 -
public_html/layout/modern_curve/page_navigation/page_navigation.thtml | 3 -
public_html/layout/modern_curve/page_navigation/page_navigation_end.thtml | 3 -
public_html/layout/modern_curve/page_navigation/page_navigation_open_ended.thtml | 3 -
public_html/layout/modern_curve/page_navigation/page_navigation_start.thtml | 3 -
public_html/layout/professional/page_navigation.thtml | 18 +++++++
public_html/layout/professional/page_navigation/page.thtml | 4 -
public_html/layout/professional/page_navigation/page_current.thtml | 4 -
public_html/layout/professional/page_navigation/page_navigation.thtml | 3 -
public_html/layout/professional/page_navigation/page_navigation_end.thtml | 3 -
public_html/layout/professional/page_navigation/page_navigation_open_ended.thtml | 3 -
public_html/layout/professional/page_navigation/page_navigation_start.thtml | 3 -
public_html/layout/professional_css/page_navigation.thtml | 23 ++++++++++
public_html/layout/professional_css/page_navigation/page.thtml | 4 -
public_html/layout/professional_css/page_navigation/page_current.thtml | 4 -
public_html/layout/professional_css/page_navigation/page_navigation.thtml | 3 -
public_html/layout/professional_css/page_navigation/page_navigation_end.thtml | 3 -
public_html/layout/professional_css/page_navigation/page_navigation_open_ended.thtml | 3 -
public_html/layout/professional_css/page_navigation/page_navigation_start.thtml | 3 -
public_html/lib-common.php | 23 ++++-----
29 files changed, 98 insertions(+), 92 deletions(-)
diffs (truncated from 350 to 300 lines):
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/denim/page_navigation.thtml Tue Sep 18 07:04:17 2012 +0900
@@ -0,0 +1,23 @@
+
+<!-- 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 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation/page.thtml
--- a/public_html/layout/denim/page_navigation/page.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page -->
-{page_number}
-<!-- End of Page -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation/page_current.thtml
--- a/public_html/layout/denim/page_navigation/page_current.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page Current -->
-<b>{page_number}</b>
-<!-- End of Page Current -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation/page_navigation.thtml
--- a/public_html/layout/denim/page_navigation/page_navigation.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation -->
-<div class="gl-pagenav">{message}{page_navigation_start}{pages}{page_navigation_end}</div>
-<!-- End of Page Navigation -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation/page_navigation_end.thtml
--- a/public_html/layout/denim/page_navigation/page_navigation_end.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation End -->
- |<span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span> | <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- End of Page Navigation End -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation/page_navigation_open_ended.thtml
--- a/public_html/layout/denim/page_navigation/page_navigation_open_ended.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Open Ended -->
- | {open_ended}
-<!-- End of Page Navigation Open Ended -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/denim/page_navigation/page_navigation_start.thtml
--- a/public_html/layout/denim/page_navigation/page_navigation_start.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Start -->
-<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> | <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-<!-- End of Page Navigation Start -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/modern_curve/page_navigation.thtml Tue Sep 18 07:04:17 2012 +0900
@@ -0,0 +1,23 @@
+
+<!-- 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 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation/page.thtml
--- a/public_html/layout/modern_curve/page_navigation/page.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page -->
-{page_number}
-<!-- End of Page -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation/page_current.thtml
--- a/public_html/layout/modern_curve/page_navigation/page_current.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page Current -->
-<b>{page_number}</b>
-<!-- End of Page Current -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation/page_navigation.thtml
--- a/public_html/layout/modern_curve/page_navigation/page_navigation.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation -->
-<div class="gl-pagenav">{message}{page_navigation_start}{pages}{page_navigation_end}</div>
-<!-- End of Page Navigation -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation/page_navigation_end.thtml
--- a/public_html/layout/modern_curve/page_navigation/page_navigation_end.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation End -->
- |<span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span> | <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- End of Page Navigation End -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation/page_navigation_open_ended.thtml
--- a/public_html/layout/modern_curve/page_navigation/page_navigation_open_ended.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Open Ended -->
- | {open_ended}
-<!-- End of Page Navigation Open Ended -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/modern_curve/page_navigation/page_navigation_start.thtml
--- a/public_html/layout/modern_curve/page_navigation/page_navigation_start.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Start -->
-<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> | <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-<!-- End of Page Navigation Start -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/page_navigation.thtml Tue Sep 18 07:04:17 2012 +0900
@@ -0,0 +1,18 @@
+<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 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation/page.thtml
--- a/public_html/layout/professional/page_navigation/page.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page -->
-{page_number}
-<!-- End of Page -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation/page_current.thtml
--- a/public_html/layout/professional/page_navigation/page_current.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page Current -->
-<b>{page_number}</b>
-<!-- End of Page Current -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation/page_navigation.thtml
--- a/public_html/layout/professional/page_navigation/page_navigation.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation -->
-<div class="gl-pagenav">{message}{page_navigation_start}{pages}{page_navigation_end}</div>
-<!-- End of Page Navigation -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation/page_navigation_end.thtml
--- a/public_html/layout/professional/page_navigation/page_navigation_end.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation End -->
- |<span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span> | <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- End of Page Navigation End -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation/page_navigation_open_ended.thtml
--- a/public_html/layout/professional/page_navigation/page_navigation_open_ended.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Open Ended -->
- | {open_ended}
-<!-- End of Page Navigation Open Ended -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional/page_navigation/page_navigation_start.thtml
--- a/public_html/layout/professional/page_navigation/page_navigation_start.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Start -->
-<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> | <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-<!-- End of Page Navigation Start -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional_css/page_navigation.thtml Tue Sep 18 07:04:17 2012 +0900
@@ -0,0 +1,23 @@
+
+<!-- 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 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation/page.thtml
--- a/public_html/layout/professional_css/page_navigation/page.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page -->
-{page_number}
-<!-- End of Page -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation/page_current.thtml
--- a/public_html/layout/professional_css/page_navigation/page_current.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<!-- Start of Page Current -->
-<b>{page_number}</b>
-<!-- End of Page Current -->
-
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation/page_navigation.thtml
--- a/public_html/layout/professional_css/page_navigation/page_navigation.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation -->
-<div class="gl-pagenav">{message}{page_navigation_start}{pages}{page_navigation_end}</div>
-<!-- End of Page Navigation -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation/page_navigation_end.thtml
--- a/public_html/layout/professional_css/page_navigation/page_navigation_end.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation End -->
- |<span>{start_next_anchortag}{lang_next}{end_next_anchortag}</span> | <span>{start_last_anchortag}{lang_last}{end_last_anchortag}</span>
-<!-- End of Page Navigation End -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation/page_navigation_open_ended.thtml
--- a/public_html/layout/professional_css/page_navigation/page_navigation_open_ended.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Open Ended -->
- | {open_ended}
-<!-- End of Page Navigation Open Ended -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/layout/professional_css/page_navigation/page_navigation_start.thtml
--- a/public_html/layout/professional_css/page_navigation/page_navigation_start.thtml Mon Sep 17 09:57:08 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<!-- Start of Page Navigation Start -->
-<span>{start_first_anchortag}{lang_first}{end_first_anchortag}</span> | <span>{start_previous_anchortag}{lang_previous}{end_previous_anchortag}</span> |
-<!-- End of Page Navigation Start -->
diff -r 4bbdff15a011 -r d83d1a709356 public_html/lib-common.php
--- a/public_html/lib-common.php Mon Sep 17 09:57:08 2012 -0400
+++ b/public_html/lib-common.php Tue Sep 18 07:04:17 2012 +0900
@@ -5469,7 +5469,6 @@
$first_url = '';
$last_url = '';
-
if (is_array($base_url)) {
$first_url = current($base_url);
$last_url = end($base_url);
@@ -5484,13 +5483,12 @@
$page_str = '';
}
- $page_navigation = COM_newTemplate($_CONF['path_layout'] . 'page_navigation');
- $page_navigation->set_file(array('page_navigation' => 'page_navigation.thtml',
- 'page_navigation_start' => 'page_navigation_start.thtml',
- 'page_navigation_end' => 'page_navigation_end.thtml',
- 'page' => 'page.thtml',
- 'page_current' => 'page_current.thtml',
More information about the geeklog-cvs
mailing list