[geeklog-hg] geeklog: Merged with Upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Jun 22 13:38:50 EDT 2013
changeset 9118:341b19912752
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/341b19912752
user: Tom <websitemaster at cogeco.net>
date: Sat Jun 22 13:35:58 2013 -0400
description:
Merged with Upstream
diffstat:
public_html/layout/denim/archivestorytext.thtml | 1 -
public_html/layout/denim/comment/commentbar.thtml | 3 +++
public_html/layout/denim/css_ltr/style.css | 10 ++++++++++
public_html/layout/denim/css_rtl/style.css | 10 ++++++++++
public_html/layout/modern_curve/archivestorytext.thtml | 1 -
public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml | 4 +---
public_html/layout/modern_curve/comment/commentbar.thtml | 5 +++++
public_html/layout/modern_curve/css/common.css | 7 +++++++
public_html/layout/professional/breadcrumbs/breadcrumbs.thtml | 4 +---
public_html/layout/professional/comment/commentbar.thtml | 3 +++
public_html/layout/professional/style.css | 5 +++++
public_html/layout/professional_css/archivestorytext.thtml | 1 -
public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml | 4 +---
public_html/layout/professional_css/comment/commentbar.thtml | 5 +++++
public_html/layout/professional_css/css/common.css | 6 ++++++
system/lib-comment.php | 4 +++-
16 files changed, 60 insertions(+), 13 deletions(-)
diffs (236 lines):
diff -r a519d818ee68 -r 341b19912752 public_html/layout/denim/archivestorytext.thtml
--- a/public_html/layout/denim/archivestorytext.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/denim/archivestorytext.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -1,7 +1,6 @@
{# begin {templatelocation} #}
<div class="storytext archivestorytext">
- {breadcrumb_trail}
<h2 class="story_title">{story_title_link}</h2>
<div class="story_icon">
diff -r a519d818ee68 -r 341b19912752 public_html/layout/denim/comment/commentbar.thtml
--- a/public_html/layout/denim/comment/commentbar.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/denim/comment/commentbar.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -18,6 +18,9 @@
<input type="hidden" name="{nprefix}type" value="{comment_type}"{xhtml}>
<input type="hidden" name="title" value="{comment_title}"{xhtml}>
{hidden_field_reply}
+ <div style="padding:0.3em;{show_link_to_commenteditform}">
+ <a class="button" href="#commenteditform">{lang_reply}</a>
+ </div>
</div>
</form>
diff -r a519d818ee68 -r 341b19912752 public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/denim/css_ltr/style.css Sat Jun 22 13:35:58 2013 -0400
@@ -368,6 +368,16 @@
padding: 0;
}
+a.button:link,
+a.button:visited {
+ color: #444;
+}
+
+a.button:hover {
+ color: #222;
+ text-decoration: none;
+}
+
/*--------------------------------------
professional Compatible Style
diff -r a519d818ee68 -r 341b19912752 public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/denim/css_rtl/style.css Sat Jun 22 13:35:58 2013 -0400
@@ -368,6 +368,16 @@
padding: 0;
}
+a.button:link,
+a.button:visited {
+ color: #444;
+}
+
+a.button:hover {
+ color: #222;
+ text-decoration: none;
+}
+
/*--------------------------------------
professional Compatible Style
diff -r a519d818ee68 -r 341b19912752 public_html/layout/modern_curve/archivestorytext.thtml
--- a/public_html/layout/modern_curve/archivestorytext.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/modern_curve/archivestorytext.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -1,7 +1,6 @@
{# begin {templatelocation} #}
<div class="archivestorytext">
- {breadcrumb_trail}
<h2 class="story_title">{story_title_link}</h2>
<ul class="icon">
diff -r a519d818ee68 -r 341b19912752 public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/modern_curve/breadcrumbs/breadcrumbs.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -1,9 +1,7 @@
{# begin {templatelocation} #}
-<p>
-<div{!if microdata} itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
+<div {!if microdata}itemscope itemtype="http://data-vocabulary.org/Breadcrumb" {!endif}class="bc_navigation">
{breadcrumbs_list}
</div>
-</p>
{# end {templatelocation} #}
diff -r a519d818ee68 -r 341b19912752 public_html/layout/modern_curve/comment/commentbar.thtml
--- a/public_html/layout/modern_curve/comment/commentbar.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/modern_curve/comment/commentbar.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -34,6 +34,11 @@
<input type="{reply_hidden_or_submit}" name="reply" value="{lang_reply}" class="submit"{xhtml}>
</li>
</ul>
+ <div style="{show_link_to_commenteditform}">
+ [
+ <a class="button" href="#commenteditform">{lang_reply}</a>
+ ]
+ </div>
</div>
</form>
diff -r a519d818ee68 -r 341b19912752 public_html/layout/modern_curve/css/common.css
--- a/public_html/layout/modern_curve/css/common.css Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/modern_curve/css/common.css Sat Jun 22 13:35:58 2013 -0400
@@ -463,3 +463,10 @@
background: transparent;
border: none;
}
+
+/*--------------------------------------
+ Breadcrumbs Navigation
+--------------------------------------*/
+.bc_navigation {
+ margin: 1.12em 0;
+}
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/professional/breadcrumbs/breadcrumbs.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional/breadcrumbs/breadcrumbs.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -1,7 +1,5 @@
<!-- Start of Breadcrumbs Navigation -->
-<p>
-<div{!if microdata} itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
+<div {!if microdata}itemscope itemtype="http://data-vocabulary.org/Breadcrumb" {!endif}class="bc_navigation">
{breadcrumbs_list}
</div>
-</p>
<!-- End of Breadcrumbs Navigation -->
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional/comment/commentbar.thtml
--- a/public_html/layout/professional/comment/commentbar.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional/comment/commentbar.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -12,6 +12,9 @@
<input type="hidden" name="{nprefix}type" value="{comment_type}"{xhtml}>
<input type="hidden" name="title" value="{comment_title}"{xhtml}>
<input type="{reply_hidden_or_submit}" name="reply" value="{lang_reply}"{xhtml}>
+ <div style="padding:3px;{show_link_to_commenteditform}">
+ <a class="button" href="#commenteditform">{lang_reply}</a>
+ </div>
</div>
</form>
<form action="{parent_url}" method="post" class="floatright" style="display:inline;">
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional/style.css
--- a/public_html/layout/professional/style.css Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional/style.css Sat Jun 22 13:35:58 2013 -0400
@@ -1111,6 +1111,11 @@
text-decoration: underline;
}
+/* Breadcrumbs Navigation *********************************************************************/
+.bc_navigation {
+ margin: 13px 0;
+}
+
/* Common CSS for on-hover tooltip feature *********************************************************************/
a.gl-tooltip {
border-bottom: 1px dotted #000000; color: #000000; outline: none;
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional_css/archivestorytext.thtml
--- a/public_html/layout/professional_css/archivestorytext.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional_css/archivestorytext.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -1,7 +1,6 @@
{# begin {templatelocation} #}
<div class="archivestorytext">
- {breadcrumb_trail}
<h2>{story_title_link}</h2>
<ul class="icon">
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml
--- a/public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -2,11 +2,9 @@
<!-- breadcrumbs/breadcrumbs.thtml { -->
<!-- Start of Breadcrumbs Navigation -->
-<p>
-<div{!if microdata} itemscope itemtype="http://data-vocabulary.org/Breadcrumb"{!endif}>
+<div {!if microdata}itemscope itemtype="http://data-vocabulary.org/Breadcrumb" {!endif}class="bc_navigation">
{breadcrumbs_list}
</div>
-</p>
<!-- End of Breadcrumbs Navigation -->
<!-- } breadcrumbs/breadcrumbs.thtml -->
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional_css/comment/commentbar.thtml
--- a/public_html/layout/professional_css/comment/commentbar.thtml Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional_css/comment/commentbar.thtml Sat Jun 22 13:35:58 2013 -0400
@@ -35,6 +35,11 @@
<input type="{reply_hidden_or_submit}" name="reply" value="{lang_reply}" class="submit"{xhtml}>
</li>
</ul>
+ <div style="{show_link_to_commenteditform}">
+ [
+ <a class="button" href="#commenteditform">{lang_reply}</a>
+ ]
+ </div>
</div>
</form>
diff -r a519d818ee68 -r 341b19912752 public_html/layout/professional_css/css/common.css
--- a/public_html/layout/professional_css/css/common.css Sat Jun 22 13:33:33 2013 -0400
+++ b/public_html/layout/professional_css/css/common.css Sat Jun 22 13:35:58 2013 -0400
@@ -480,3 +480,9 @@
text-decoration: underline;
}
+/*--------------------------------------
+ Breadcrumbs Navigation
+--------------------------------------*/
+.bc_navigation {
+ margin: 1.12em 0;
+}
diff -r a519d818ee68 -r 341b19912752 system/lib-comment.php
--- a/system/lib-comment.php Sat Jun 22 13:33:33 2013 -0400
+++ b/system/lib-comment.php Sat Jun 22 13:35:58 2013 -0400
@@ -90,8 +90,10 @@
if ( $ccode == 0 && !COMMENT_ON_SAME_PAGE) {
$commentbar->set_var( 'reply_hidden_or_submit', 'submit' );
+ $commentbar->set_var( 'show_link_to_commenteditform', 'display:none;' );
} else {
$commentbar->set_var( 'reply_hidden_or_submit', 'hidden' );
+ $commentbar->set_var( 'show_link_to_commenteditform', '' );
}
$commentbar->set_var( 'num_comments', COM_numberFormat( $nrows ));
$commentbar->set_var( 'comment_type', $type );
@@ -2319,7 +2321,7 @@
}
if (!empty($_REQUEST['title'])) {
- $title = COM_applyFilter($_REQUEST['title']);
+ $title = $_REQUEST['title']; // apply filters later in CMT_commentForm or CMT_saveComment
}
if (!empty($_REQUEST[CMT_UID])) {
More information about the geeklog-cvs
mailing list