[geeklog-hg] geeklog: Fixed an issue where meaningless space is generated in ...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Nov 2 08:55:04 EST 2014
changeset 9547:e37702d74bd0
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e37702d74bd0
user: dengen <taharaxp at gmail.com>
date: Sun Nov 02 22:54:12 2014 +0900
description:
Fixed an issue where meaningless space is generated in the article page because there are empty <UL><LI> tags
diffstat:
public_html/layout/denim/archivestorytext.thtml | 20 +-
public_html/layout/denim/featuredstorytext.thtml | 20 +-
public_html/layout/denim/storytext.thtml | 18 +-
public_html/layout/modern_curve/archivestorytext.thtml | 20 +-
public_html/layout/modern_curve/featuredstorytext.thtml | 20 +-
public_html/layout/modern_curve/storytext.thtml | 18 +-
public_html/layout/professional_css/archivestorytext.thtml | 20 +-
public_html/layout/professional_css/featuredstorytext.thtml | 20 +-
public_html/layout/professional_css/storytext.thtml | 20 +-
system/lib-story.php | 80 +++++++-----
10 files changed, 154 insertions(+), 102 deletions(-)
diffs (truncated from 483 to 300 lines):
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/denim/archivestorytext.thtml
--- a/public_html/layout/denim/archivestorytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/denim/archivestorytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -17,20 +17,24 @@
<span class="story_image">{story_anchortag_and_image_no_align}</span>
{story_text_no_br}
</div>
-
- {related_topics}
+ {related_topics}
+
+{!if navi_list}
<ul class="story_navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/denim/featuredstorytext.thtml
--- a/public_html/layout/denim/featuredstorytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/denim/featuredstorytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -17,20 +17,24 @@
<span class="story_image">{story_anchortag_and_image_no_align}</span>
{story_text_no_br}
</div>
-
- {related_topics}
+ {related_topics}
+
+{!if navi_list}
<ul class="story_navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/denim/storytext.thtml
--- a/public_html/layout/denim/storytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/denim/storytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -17,20 +17,24 @@
<span class="story_image">{story_anchortag_and_image_no_align}</span>
{story_text_no_br}
</div>
-
+
{related_topics}
+{!if navi_list}
<ul class="story_navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/modern_curve/archivestorytext.thtml
--- a/public_html/layout/modern_curve/archivestorytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/modern_curve/archivestorytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -34,20 +34,24 @@
<div class="story_introtext">
{story_text_no_br}
</div>
-
- {related_topics}
+ {related_topics}
+
+{!if navi_list}
<ul class="navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/modern_curve/featuredstorytext.thtml
--- a/public_html/layout/modern_curve/featuredstorytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/modern_curve/featuredstorytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -34,20 +34,24 @@
<div class="story_introtext">
{story_text_no_br}
</div>
-
- {related_topics}
+ {related_topics}
+
+{!if navi_list}
<ul class="navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/modern_curve/storytext.thtml
--- a/public_html/layout/modern_curve/storytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/modern_curve/storytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -34,20 +34,24 @@
<div class="story_introtext">
{story_text_no_br}
</div>
-
+
{related_topics}
+{!if navi_list}
<ul class="navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/professional_css/archivestorytext.thtml
--- a/public_html/layout/professional_css/archivestorytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/professional_css/archivestorytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -29,20 +29,24 @@
<span class="story_image">{story_anchortag_and_image}</span>
{story_text_no_br}
</div>
-
- {related_topics}
+ {related_topics}
+
+{!if navi_list}
<ul class="navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/professional_css/featuredstorytext.thtml
--- a/public_html/layout/professional_css/featuredstorytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/professional_css/featuredstorytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -29,20 +29,24 @@
<span class="story_image">{story_anchortag_and_image}</span>
{story_text_no_br}
</div>
-
+
{related_topics}
-
+
+{!if navi_list}
<ul class="navi">
- <li>{page_selector}</li>
- <li>{readmore_link}</li>
- <li>{post_comment_link}</li>
+ {!if page_selector}<li>{page_selector}</li>{!endif}
+ {!if readmore_link}<li>{readmore_link}</li>{!endif}
+ {!if post_comment_link}<li>{post_comment_link}</li>{!endif}
</ul>
+{!endif}
+{!if feedback_list}
<ul class="feedback">
- <li>{plugin_itemdisplay}</li>
- <li>{comments_with_count}</li>
- <li>{trackbacks_with_count}</li>
+ {!if plugin_itemdisplay}<li>{plugin_itemdisplay}</li>{!endif}
+ {!if comments_with_count}<li>{comments_with_count}</li>{!endif}
+ {!if trackbacks_with_count}<li>{trackbacks_with_count}</li>{!endif}
</ul>
+{!endif}
</div>
{# end {templatelocation} #}
diff -r 8de5b63c9fc9 -r e37702d74bd0 public_html/layout/professional_css/storytext.thtml
--- a/public_html/layout/professional_css/storytext.thtml Sun Nov 02 19:49:34 2014 +0900
+++ b/public_html/layout/professional_css/storytext.thtml Sun Nov 02 22:54:12 2014 +0900
@@ -29,20 +29,24 @@
<span class="story_image">{story_anchortag_and_image}</span>
{story_text_no_br}
</div>
-
+
{related_topics}
-
+
+{!if navi_list}
<ul class="navi">
More information about the geeklog-cvs
mailing list