[geeklog-hg] geeklog: Reduced template files for useroption, adminoption and ...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Jun 18 12:56:58 EDT 2013
changeset 9097:7b258be0cdd4
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7b258be0cdd4
user: Tom <websitemaster at cogeco.net>
date: Tue Jun 18 10:56:25 2013 -0400
description:
Reduced template files for useroption, adminoption and lists
diffstat:
public_html/docs/english/theme.html | 7 +
public_html/layout/denim/adminnavigation.thtml | 8 +
public_html/layout/denim/adminoption.thtml | 1 -
public_html/layout/denim/adminoption_off.thtml | 1 -
public_html/layout/denim/list.thtml | 9 +-
public_html/layout/denim/listitem.thtml | 1 -
public_html/layout/denim/usernavigation.thtml | 8 +
public_html/layout/denim/useroption.thtml | 1 -
public_html/layout/denim/useroption_off.thtml | 1 -
public_html/layout/modern_curve/adminnavigation.thtml | 8 +
public_html/layout/modern_curve/adminoption.thtml | 6 -
public_html/layout/modern_curve/adminoption_off.thtml | 6 -
public_html/layout/modern_curve/list.thtml | 8 +-
public_html/layout/modern_curve/listitem.thtml | 6 -
public_html/layout/modern_curve/usernavigation.thtml | 8 +
public_html/layout/modern_curve/useroption.thtml | 6 -
public_html/layout/modern_curve/useroption_off.thtml | 6 -
public_html/layout/professional/adminnavigation.thtml | 8 +
public_html/layout/professional/adminoption.thtml | 1 -
public_html/layout/professional/adminoption_off.thtml | 1 -
public_html/layout/professional/list.thtml | 14 ++-
public_html/layout/professional/listitem.thtml | 1 -
public_html/layout/professional/usernavigation.thtml | 8 +
public_html/layout/professional/useroption.thtml | 1 -
public_html/layout/professional/useroption_off.thtml | 1 -
public_html/layout/professional_css/adminnavigation.thtml | 8 +
public_html/layout/professional_css/adminoption.thtml | 6 -
public_html/layout/professional_css/adminoption_off.thtml | 6 -
public_html/layout/professional_css/list.thtml | 8 +-
public_html/layout/professional_css/listitem.thtml | 6 -
public_html/layout/professional_css/usernavigation.thtml | 8 +
public_html/layout/professional_css/useroption.thtml | 6 -
public_html/layout/professional_css/useroption_off.thtml | 6 -
public_html/lib-common.php | 70 ++++++++------
34 files changed, 138 insertions(+), 112 deletions(-)
diffs (truncated from 471 to 300 lines):
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html Mon Jun 17 21:14:17 2013 -0400
+++ b/public_html/docs/english/theme.html Tue Jun 18 10:56:25 2013 -0400
@@ -210,6 +210,13 @@
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>
+<li>Removed <tt>adminoption.thtml</tt> and <tt>adminoption_off.thtml</tt>.
+ Added <tt>adminavigation.thtml</tt> which uses blocks to reduce the number of template files.</li>
+<li>Removed <tt>adminoption.thtml</tt> and <tt>adminoption_off.thtml</tt>.
+ Added <tt>adminavigation.thtml</tt> which uses blocks to reduce the number of template files.</li>
+<li>Removed <tt>useroption.thtml</tt> and <tt>useroption.thtml</tt>.
+ Added <tt>usernavigation.thtml</tt> which uses blocks to reduce the number of template files.</li>
+<li>Removed <tt>listitem.thtml</tt>. <tt>list.thtml</tt> now 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 a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/adminnavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/denim/adminnavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The Admin Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li class="adminoption sideoption"><a href="{option_url}">{option_label}<span>({option_count})</span></a></li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li class="adminoption_off sideoption_off">{option_label} ({option_count})</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/adminoption.thtml
--- a/public_html/layout/denim/adminoption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="adminoption sideoption"><a href="{option_url}">{option_label}<span>({option_count})</span></a></li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/adminoption_off.thtml
--- a/public_html/layout/denim/adminoption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="adminoption_off sideoption_off">{option_label} ({option_count})</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/list.thtml
--- a/public_html/layout/denim/list.thtml Mon Jun 17 21:14:17 2013 -0400
+++ b/public_html/layout/denim/list.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -1,8 +1,11 @@
-
-<!-- list.thtml { -->
+{# begin {templatelocation} #}
<ul {list_class}>
{list_items}
</ul>
-<!-- } list.thtml -->
+{# end {templatelocation} #}
+
+<!-- BEGIN listitem -->
+<li class="listitem">{list_item}</li>
+<!-- END listitem -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/listitem.thtml
--- a/public_html/layout/denim/listitem.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="listitem">{list_item}</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/usernavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/denim/usernavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The User Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li class="useroption"><a href="{option_url}"{option_attributes}>{option_label}</a> {option_count}</li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li class="useroption_off">{option_label} {option_count}</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/useroption.thtml
--- a/public_html/layout/denim/useroption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="useroption sideoption"><a href="{option_url}"{option_attributes}>{option_label}<span>{option_count}</span></a></li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/denim/useroption_off.thtml
--- a/public_html/layout/denim/useroption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li class="useroption_off sideoption_off">{option_label} {option_count}</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/adminnavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/modern_curve/adminnavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The Admin Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li class="adminoption"><a href="{option_url}">{option_label}</a> ({option_count})</li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li class="adminoption_off">{option_label} ({option_count})</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/adminoption.thtml
--- a/public_html/layout/modern_curve/adminoption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- adminoption.thtml { -->
-
- <li class="adminoption"><a href="{option_url}">{option_label}</a> ({option_count})</li>
-
-<!-- } adminoption.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/adminoption_off.thtml
--- a/public_html/layout/modern_curve/adminoption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- adminoption_off.thtml { -->
-
- <li class="adminoption_off">{option_label} ({option_count})</li>
-
-<!-- } adminoption_off.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/list.thtml
--- a/public_html/layout/modern_curve/list.thtml Mon Jun 17 21:14:17 2013 -0400
+++ b/public_html/layout/modern_curve/list.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -1,7 +1,11 @@
-<!-- list.thtml { -->
+{# begin {templatelocation} #}
<ul {list_class}>
{list_items}
</ul>
-<!-- } list.thtml -->
+{# end {templatelocation} #}
+
+<!-- BEGIN listitem -->
+<li class="listitem">{list_item}</li>
+<!-- END listitem -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/listitem.thtml
--- a/public_html/layout/modern_curve/listitem.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- listitem.thtml { -->
-
- <li class="listitem">{list_item}</li>
-
-<!-- } listitem.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/usernavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/modern_curve/usernavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The User Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li class="useroption sideoption"><a href="{option_url}"{option_attributes}>{option_label}<span>{option_count}</span></a></li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li class="useroption_off sideoption_off">{option_label} {option_count}</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/useroption.thtml
--- a/public_html/layout/modern_curve/useroption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- useroption.thtml { -->
-
- <li class="useroption"><a href="{option_url}"{option_attributes}>{option_label}</a> {option_count}</li>
-
-<!-- } useroption.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/modern_curve/useroption_off.thtml
--- a/public_html/layout/modern_curve/useroption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- useroption_off.thtml { -->
-
- <li class="useroption_off">{option_label} {option_count}</li>
-
-<!-- } useroption_off.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/adminnavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/adminnavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The Admin Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li><a href="{option_url}">{option_label}</a> ({option_count})</li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li>{option_label} ({option_count})</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/adminoption.thtml
--- a/public_html/layout/professional/adminoption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<li><a href="{option_url}">{option_label}</a> ({option_count})</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/adminoption_off.thtml
--- a/public_html/layout/professional/adminoption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<li>{option_label} ({option_count})</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/list.thtml
--- a/public_html/layout/professional/list.thtml Mon Jun 17 21:14:17 2013 -0400
+++ b/public_html/layout/professional/list.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -1,3 +1,11 @@
-<ul {list_class}>
-{list_items}
-</ul>
+{# begin {templatelocation} #}
+
+ <ul {list_class}>
+ {list_items}
+ </ul>
+
+{# end {templatelocation} #}
+
+<!-- BEGIN listitem -->
+<li>{list_item}</li>
+<!-- END listitem -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/listitem.thtml
--- a/public_html/layout/professional/listitem.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
- <li>{list_item}</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/usernavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional/usernavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The User Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li><a href="{option_url}">{option_label}</a> {option_count}</li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li>{option_label} {option_count}</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/useroption.thtml
--- a/public_html/layout/professional/useroption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<li><a href="{option_url}">{option_label}</a> {option_count}</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional/useroption_off.thtml
--- a/public_html/layout/professional/useroption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<li>{option_label} {option_count}</li>
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional_css/adminnavigation.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/layout/professional_css/adminnavigation.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -0,0 +1,8 @@
+{# {templatelocation} - The Admin Navigation uses template blocks which is built into this file #}
+
+<!-- BEGIN option -->
+<li class="adminoption"><a href="{option_url}">{option_label}</a> ({option_count})</li>
+<!-- END option -->
+<!-- BEGIN current -->
+<li class="adminoption_off">{option_label} ({option_count})</li>
+<!-- END current -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional_css/adminoption.thtml
--- a/public_html/layout/professional_css/adminoption.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- adminoption.thtml { -->
-
- <li class="adminoption"><a href="{option_url}">{option_label}</a> ({option_count})</li>
-
-<!-- } adminoption.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional_css/adminoption_off.thtml
--- a/public_html/layout/professional_css/adminoption_off.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- adminoption_off.thtml { -->
-
- <li class="adminoption_off">{option_label} ({option_count})</li>
-
-<!-- } adminoption_off.thtml -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional_css/list.thtml
--- a/public_html/layout/professional_css/list.thtml Mon Jun 17 21:14:17 2013 -0400
+++ b/public_html/layout/professional_css/list.thtml Tue Jun 18 10:56:25 2013 -0400
@@ -1,7 +1,11 @@
-<!-- list.thtml { -->
+{# begin {templatelocation} #}
<ul {list_class}>
{list_items}
</ul>
-<!-- } list.thtml -->
+{# end {templatelocation} #}
+
+<!-- BEGIN listitem -->
+<li class="listitem">{list_item}</li>
+<!-- END listitem -->
diff -r a484d35ea8c3 -r 7b258be0cdd4 public_html/layout/professional_css/listitem.thtml
--- a/public_html/layout/professional_css/listitem.thtml Mon Jun 17 21:14:17 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-
-<!-- listitem.thtml { -->
-
- <li class="listitem">{list_item}</li>
-
More information about the geeklog-cvs
mailing list