diff --git a/ext/comment.ext.php b/ext/comment.ext.php index 8e352d24..b1fb0771 100644 --- a/ext/comment.ext.php +++ b/ext/comment.ext.php @@ -232,7 +232,7 @@ class CommentList extends Extension { ORDER BY comments.id DESC LIMIT ? ", array($config->get_int('comment_count')), true); - $html .= "
Full List >>>"; + $html .= "
Full List";
return $html;
}
diff --git a/ext/tag_list.ext.php b/ext/tag_list.ext.php
index feeeda35..7a5b7d96 100644
--- a/ext/tag_list.ext.php
+++ b/ext/tag_list.ext.php
@@ -170,7 +170,6 @@ class TagList extends Extension {
$n = 0;
$html = "";
$result = $database->db->Execute($query, $args);
- $show_count = $config->get_bool('tag_list_numbers');
while(!$result->EOF) {
$row = $result->fields;
$tag = $row['tag'];
@@ -179,18 +178,13 @@ class TagList extends Extension {
$count = $row['count'];
if($n++) $html .= "
";
$link = $this->tag_link($row['tag']);
- $html .= "$h_tag_no_underscores\n";
+ $html .= "$h_tag_no_underscores\n";
if(!is_null($callback)) {
- $html .= $this->$callback($tag, $cbdata);
+ $html .= $this->$callback($tag, $count, $cbdata);
}
- else {
- if($show_count) {
- $html .= " ($count)";
- }
- if(!is_null($config->get_string('info_link'))) {
- $link = str_replace('$tag', $tag, $config->get_string('info_link'));
- $html .= " ?\n";
- }
+ if(!is_null($config->get_string('info_link'))) {
+ $link = str_replace('$tag', $tag, $config->get_string('info_link'));
+ $html .= " ?\n";
}
$result->MoveNext();
}
@@ -239,11 +233,20 @@ class TagList extends Extension {
";
$args = array($config->get_int('tag_list_length'));
- $html = $this->build_tag_list_html($query, $args);
- $html .= "
Full List >>>\n"; + global $config; + if($config->get_bool('tag_list_numbers')) { + $html = $this->build_tag_list_html($query, $args, "add_count"); + } + else { + $html = $this->build_tag_list_html($query, $args); + } + $html .= "
Full List\n"; return $html; } + private function add_count($tag, $count, $data) { + return " ($count)"; + } // }}} // get refine {{{ private function get_refiner_tags($search) { @@ -271,13 +274,13 @@ class TagList extends Extension { return $this->build_tag_list_html($query, $args, "ars", $tags); } - private function ars($tag, $tags) { + private function ars($tag, $count, $tags) { $html = ""; - $html .= " ("; + $html .= " ("; $html .= $this->get_add_link($tags, $tag); $html .= $this->get_remove_link($tags, $tag); $html .= $this->get_subtract_link($tags, $tag); - $html .= ")"; + $html .= ")"; return $html; } diff --git a/themes/default/style.css b/themes/default/style.css index 9049b1f6..94204dc2 100644 --- a/themes/default/style.css +++ b/themes/default/style.css @@ -94,6 +94,10 @@ A:hover {text-decoration: underline;} overflow: hidden; } +.more:after { + content: " >>>"; +} + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * the main part of each page *