modules/tags/pages/admin/edit_tags.twig
@@ -18,7 +18,7 @@
</fieldset>
</form>
<br />
- <h2>${ "Last 25 Pages" | translate }</h2>
+ <h2>{% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Pages" | translate }{% endif %}</h2>
<table border="0" cellspacing="0" cellpadding="0" class="wide">
<thead>
<tr class="head">
admin/layout/pages/manage_pages.twig
@@ -29,7 +29,7 @@
</fieldset>
</form>
<br />
- <h2>${ "Last 25 Posts" | translate }</h2>
+ <h2>{% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Posts" | translate }{% endif %}</h2>
<table border="0" cellspacing="0" cellpadding="0" class="wide">
<thead>
<tr class="head">
admin/layout/pages/manage_posts.twig
@@ -208,6 +208,12 @@ a:visited {
font-size: .8em;
color: #bcbcbc;
}
+#content h1.sub,
+#content h2.sub,
+#content h3.sub,
+#content h4.sub {
+ color: #bcbcbc;
+}
/* @end */
/* @group Extend */
@@ -534,8 +540,7 @@ table thead tr th {
}
table thead tr th input {
position: relative;
- top: -2px;
- right: -2px;
+ top: -.15em;
}
table thead tr th.header {
cursor: pointer;
@@ -561,7 +566,8 @@ table tbody tr td.main {
background: #f9f9f9;
font-weight: bold;
}
-table tbody tr td.center {
+table tbody tr td.center,
+table tbody tr th.center {
text-align: center;
vertical-align: middle;
}
@@ -953,4 +959,7 @@ br#after_options {
img.smiley {
margin: 0 0 -.3em;
}
+.inline {
+ display: inline;
+}
/* @end */
admin/style.css
@@ -27,6 +27,9 @@ $(function(){
return false
})
+ // Auto-expand input fields
+ $(".expand").expand()
+
// Checkbox toggling.
togglers()
@@ -68,14 +71,19 @@ function togglers() {
$(document.createElement("label")).attr("for", "toggle").text("<?php echo __("Toggle All"); ?>").appendTo("#toggler")
$(document.createElement("input")).attr({
- "class": "checkbox",
type: "checkbox",
name: "toggle",
id: "toggle"
- }).appendTo("#toggler, .toggler").click(function(){
+ }).prependTo("#toggler, .toggler")
+
+ $("#toggle").click(function(){
$("form#new_group, form#group_edit, table").find(":checkbox").not("#toggle").each(function(){
this.checked = document.getElementById("toggle").checked
})
+
+ $(this).parent().parent().find(":checkbox").not("#toggle").each(function(){
+ this.checked = document.getElementById("toggle").checked
+ })
})
// Some checkboxes are already checked when the page is loaded
@@ -84,7 +92,7 @@ function togglers() {
all_checked = this.checked
})
- $(":checkbox").click(function(){
+ $(":checkbox:not(#toggle)").click(function(){
var action_all_checked = true
$("form#new_group, form#group_edit, table").find(":checkbox").not("#toggle").each(function(){
@@ -92,6 +100,11 @@ function togglers() {
action_all_checked = this.checked
})
+ $("#toggle").parent().parent().find(":checkbox").not("#toggle").each(function(){
+ if (!action_all_checked) return
+ action_all_checked = this.checked
+ })
+
document.getElementById("toggle").checked = action_all_checked
})
includes/admin.js.php
@@ -5,7 +5,7 @@
switch($_POST['action']) {
case "edit_post":
if (!isset($_POST['id']))
- error(__("Unspecified ID"), __("Please specify an ID of the post you would like to edit."));
+ error(__("No ID Specified"), __("Please specify an ID of the post you would like to edit."));
$post = new Post($_POST['id'], array("filter" => false, "drafts" => true));
includes/ajax.php
@@ -228,7 +228,7 @@ function twig_urlencode_filter($url, $raw=false)
return urlencode($url);
}
-function twig_join_filter($value, $glue=', ')
+function twig_join_filter($value, $glue='')
{
return implode($glue, $value);
}
includes/class/Twig/runtime.php
@@ -48,6 +48,9 @@
global $posts;
+ if (empty($_GET['query']))
+ return Flash::warning(__("Please enter a search term."));
+
list($where, $params) = keywords(urldecode($_GET['query']), "xml LIKE :query");
$posts = new Paginator(Post::find(array("placeholders" => true,
includes/controller/Main.php
@@ -238,7 +238,7 @@ msgid "Title"
msgstr ""
#: includes/ajax.php:8
-msgid "Unspecified ID"
+msgid "No ID Specified"
msgstr ""
#: admin/layout/pages/import.twig:118
includes/locale/en_US.pot
@@ -149,6 +149,7 @@
if (!Visitor::current()->group()->can("edit_comment", "delete_comment", true))
show_403(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments"));
+ fallback($_GET['query'], "");
list($where, $params) = keywords(urldecode($_GET['query']), "body LIKE :query");
$where[] = "status = 'spam'";
@@ -310,6 +311,7 @@
if (!Comment::any_editable() and !Comment::any_deletable())
show_403(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments"));
+ fallback($_GET['query'], "");
list($where, $params) = keywords(urldecode($_GET['query']), "body LIKE :query");
$where[] = "status != 'spam'";
modules/comments/comments.php
@@ -38,7 +38,7 @@
</button>
</div>
{% endif %}
- <h2>${ "Last 25 Comments" | translate("comments") }</h2>
+ <h2>{% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Comments" | translate("comments") }{% endif %}</h2>
<table border="0" cellspacing="0" cellpadding="0" class="wide">
<thead>
<tr class="head">
modules/comments/pages/admin/manage_comments.twig
@@ -34,7 +34,7 @@
<img src="images/icons/delete.png" alt="delete" /> ${ "delete" | translate("comments") }
</button>
</div>
- <h2>${ "Last 25 Spam" | translate("comments") }</h2>
+ <h2>{% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Spam" | translate("comments") }{% endif %}</h2>
<table border="0" cellspacing="0" cellpadding="0" class="wide">
<thead>
<tr class="head">
modules/comments/pages/admin/manage_spam.twig
@@ -23,10 +23,12 @@
.tag_cloud {
text-align: center;
}
-.tag_cloud span {
+.tag_cloud span,
+.post_tags a.tag {
display: inline-block;
}
-.tag_cloud span a.tag {
+.tag_cloud span a.tag,
+.post_tags a.tag {
display: block;
line-height: 2.5em;
padding: 0 .75em;
@@ -34,6 +36,7 @@
text-decoration: none;
font-weight: bold;
color: #777;
+ text-align: center;
}
.tag_cloud span .controls {
opacity: 0;
@@ -42,4 +45,41 @@
background: #f9f9f9;
-webkit-border-bottom-right-radius: .5em;
-webkit-border-bottom-left-radius: .5em;
+}
+
+.post_tags {
+ list-style: none;
+}
+.post_tags li {
+ display: block;
+ margin-bottom: .5em;
+ padding: .75em;
+}
+.post_tags input,
+.post_tags h3 {
+ margin: 0 .5em 0 .25em;
+}
+.post_tags li.odd {
+ background: #fafafa;
+}
+.post_tags li a.tag,
+.post_tags li a.edit_tag {
+ margin: -.85em 0;
+}
+.post_tags li a.tag {
+ display: inline-block;
+ padding: 0 .75em;
+ background: #e5e5e5;
+ -webkit-border-radius: .5em;
+}
+.post_tags li a.edit_tag {
+ display: inline-block;
+ position: relative;
+ bottom: -.2em;
+ padding: .5em .75em .4em;
+ background: #f0f0f0;
+ -webkit-border-radius: .5em;
+}
+.post_tags li a.edit_tag:hover {
+ background: #f5f5f5;
}
\ No newline at end of file
modules/tags/admin.css
@@ -3,14 +3,15 @@
{% block title %}${ "Manage Tags" | translate("tags") }{% endblock %}
{% block content %}
- <h1>${ "Manage Tags" | translate("tags") } <span class="sub right">${ "(hover for controls)" | translate }</span></h1>
+ <h1>${ "Manage Tags" | translate("tags") }</h1>
+ <h2>${ "All Tags" | translate("tags") } <span class="sub right">${ "(hover for controls)" | translate }</span></h2>
<div class="tag_cloud">
{% for tag in tag_cloud %}
<span class="tag_wrap">
<a class="tag" href="$tag.url" style="font-size: $tag.size%" title="$tag.title">$tag.name</a>
<div class="controls">
<a class="edit_tag" href="{% admin "rename_tag&name="~ tag.clean %}"><img src="images/icons/edit.png" alt="edit" /></a>
- <a class="delete_tag" href="{% admin "delete_tag&name="~ tag.clean %}"><img src="images/icons/delete.png" alt="edit" /></a>
+ <a class="delete_tag" href="{% admin "delete_tag&name="~ (tag.name | urlencode) ~"&clean="~ tag.clean %}"><img src="images/icons/delete.png" alt="edit" /></a>
</div>
</span>
{% else %}
@@ -18,4 +19,55 @@
<br />
{% endfor %}
</div>
+ <hr />
+ <br />
+ <h2>${ "Post Tags" | translate("tags") }</h2>
+ <br />
+ <div class="left pad margin-right">
+ <form class="detail" action="index.php" method="get" accept-charset="utf-8">
+ <fieldset>
+ <input type="hidden" name="action" value="manage_tags" />
+ <h3>
+ ${ "Search…" | translate }
+ <a href="{% admin "help&id=filtering_results" %}" class="help emblem"><img src="images/icons/help.png" alt="help" /></a>
+ </h3>
+ <input class="text" type="text" name="query" value="${ GET.query | escape }" id="query" /> <button type="submit" class="inline">${ "Search →" | translate }</button>
+ </fieldset>
+ </form>
+ </div>
+ <form class="detail" action="{% admin "bulk_tag" %}" method="post" accept-charset="utf-8">
+ <fieldset>
+ <div class="left pad">
+ <h3>${ "Tag Selected:" | translate("tags") }</h3>
+ <input type="text" name="name" value="" id="name" />
+ <button type="submit" class="inline">${ "Tag →" | translate("tags") }</button>
+ <input type="hidden" name="hash" value="$site.secure_hashkey" id="hash" />
+ </div>
+ <div class="clear"></div>
+ <br />
+ <h2>{% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Posts" | translate }{% endif %}</h2>
+ <ul class="post_tags">
+ <li class="odd js_enabled toggler">
+ <h3 class="inline sub">${ "Toggle All" | translate }</h3>
+ </li>
+ {% for post in posts.paginated %}
+ <li class="{% if loop.index | odd %}even{% else %}odd{% endif %}">
+ <input type="checkbox" name="post[$loop.index0]" value="$post.id" id="post_checkbox_$post.id" />
+ <h3 class="inline"><a href="$post.url">${ post.title | truncate | fallback((post.feather | capitalize) ~ " #" ~ post.id) }</a></h3>
+ {% for tag in post.tags.info %}
+ <a class="tag" href="$tag.url">$tag.name</a>
+ {% endfor %}
+ <a class="edit_tag" href="{% admin "edit_tags&id="~ post.id %}"><img src="images/icons/edit.png" alt="edit" /></a>
+ </li>
+ {% else %}
+ <li>
+ <span class="sub">${ "(none)" | translate }</span>
+ </li>
+ {% endfor %}
+ </ul>
+ </fieldset>
+ </form>
+ <br />
+ $posts.next_link
+ $posts.prev_link
{% endblock %}
\ No newline at end of file
modules/tags/pages/admin/manage_tags.twig
@@ -149,13 +149,13 @@
return $navs;
$navs["manage_tags"] = array("title" => __("Tags", "tags"),
- "selected" => array("bulk_tags", "rename_tag", "delete_tag"));
+ "selected" => array("rename_tag", "delete_tag", "edit_tags"));
return $navs;
}
static function manage_nav_pages($pages) {
- array_push($pages, "manage_tags", "bulk_tags", "rename_tag", "delete_tag");
+ array_push($pages, "manage_tags", "rename_tag", "delete_tag", "edit_tags");
return $pages;
}
@@ -200,6 +200,23 @@
"url" => url("tag/".$tag2clean[$tag]."/"));
$admin->context["tag_cloud"] = $context;
+
+ if (!Post::any_editable() and !Post::any_deletable())
+ return;
+
+ fallback($_GET['query'], "");
+ list($where, $params) = keywords(urldecode($_GET['query']), "xml LIKE :query");
+
+ $visitor = Visitor::current();
+ if (!$visitor->group()->can("view_draft", "edit_draft", "edit_post", "delete_draft", "delete_post")) {
+ $where[] = "user_id = :visitor_id";
+ $params[':visitor_id'] = $visitor->id;
+ }
+
+ $admin->context["posts"] = new Paginator(Post::find(array("placeholders" => true,
+ "drafts" => true,
+ "where" => $where,
+ "params" => $params)), 25);
}
public function admin_rename_tag($admin) {
@@ -229,7 +246,33 @@
return $admin->context["tag"] = array("name" => $tag, "clean" => $tag2clean[$tag]);
}
+ public function admin_edit_tags($admin) {
+ $sql = SQL::current();
+
+ if (!isset($_GET['id']))
+ error(__("No ID Specified"), __("Please specify the ID of the post whose tags you would like to edit.", "tags"));
+
+ $admin->context["post"] = new Post($_GET['id']);
+ }
+
+ public function admin_update_tags($admin) {
+ $sql = SQL::current();
+
+ if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
+ show_403(__("Access Denied"), __("Invalid security key."));
+
+ if (!isset($_POST['id']))
+ error(__("No ID Specified"), __("Please specify the ID of the post whose tags you would like to edit.", "tags"));
+
+ $this->update_post(new Post($_POST['id']));
+
+ Flash::notice(__("Tags updated.", "tags"), "/admin/?action=manage_tags");
+ }
+
public function admin_update_tag($admin) {
+ if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
+ show_403(__("Access Denied"), __("Invalid security key."));
+
$sql = SQL::current();
$tags = array();
@@ -256,24 +299,51 @@
public function admin_delete_tag($admin) {
$sql = SQL::current();
- $tags = array();
- $clean = array();
foreach($sql->select("tags",
"*",
"clean LIKE :tag",
null,
- array(":tag" => "%{{".$_GET['name']."}}%"))->fetchAll() as $tag)
+ array(":tag" => "%{{".$_GET['name']."}}%"))->fetchAll() as $tag) {
+ $names = array();
+ foreach (explode("}},{{", substr(substr($tag["tags"], 0, -2), 2)) as $name)
+ if ($name != $_GET['name'])
+ $names[] = "{{".$name."}}";
+
+ $cleans = array();
+ foreach (explode("}},{{", substr(substr($tag["clean"], 0, -2), 2)) as $clean)
+ if ($clean != $_GET['clean'])
+ $cleans[] = "{{".$clean."}}";
+
$sql->update("tags",
"id = :id",
array("tags" => ":tags",
"clean" => ":clean"),
array(":id" => $tag["id"],
- ":tags" => preg_replace("/\{\{{$_GET['name']}\}\},?/", "", $tag["tags"]),
- ":clean" => preg_replace("/\{\{{$_GET['name']}\}\},?/", "", $tag["clean"])));
+ ":tags" => join(",", $names),
+ ":clean" => join(",", $cleans)));
+ }
Flash::notice(__("Tag deleted.", "tags"), "/admin/?action=manage_tags");
}
+ public function admin_bulk_tag($admin) {
+ if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
+ show_403(__("Access Denied"), __("Invalid security key."));
+
+ if (empty($_POST['name']) or empty($_POST['post']))
+ redirect("/admin/?action=manage_tags");
+
+ $sql = SQL::current();
+
+ foreach ($_POST['post'] as $post_id) {
+ $post = new Post($post_id);
+ $_POST['tags'] = join(", ", $post->tags["unlinked"]).", ".$_POST['name'];
+ $this->update_post($post);
+ }
+
+ Flash::notice(__("Posts tagged.", "tags"), "/admin/?action=manage_tags");
+ }
+
public function check_route_tag() {
global $posts;
@@ -430,11 +500,22 @@
}
public function filter_post($post) {
- if (!isset($post->unclean_tags))
- $post->tags = array("unlinked" => array(), "linked" => array());
- else
- $post->tags = array("unlinked" => self::unlinked_tags($post->unclean_tags),
- "linked" => self::linked_tags($post->unclean_tags, $post->clean_tags));
+ if (empty($post->unclean_tags)) {
+ $post->tags = array("info" => array(), "unlinked" => array(), "linked" => array());
+ return;
+ }
+
+ list($tags, $clean, $tag2clean) = $this->parseTags(array($post->unclean_tags), array($post->clean_tags));
+
+ $post->tags = array();
+
+ foreach ($tags as $tag => $count)
+ $post->tags["info"][] = array("name" => $tag,
+ "clean" => $tag2clean[$tag],
+ "url" => url("tag/".$tag2clean[$tag]."/"));
+
+ $post->tags["unlinked"] = self::unlinked_tags($post->unclean_tags);
+ $post->tags["linked"] = self::linked_tags($post->unclean_tags, $post->clean_tags);
}
public function sort_tags_name_asc($a, $b) {
modules/tags/tags.php
@@ -27,7 +27,7 @@
{% endif %}
{% if post.tags.linked | length > 0 %}
|
- ${ "Tags" | translate }: ${ post.tags.linked | join }
+ ${ "Tags" | translate }: ${ post.tags.linked | join(", ") }
{% endif %}
</span>
{% if visitor.group.can("edit_post", "delete_post") %}
themes/stardust/content/post.twig
0e91f8164067b11245d1cc918aab3325352f9ea2
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/4e3143b9f0a2f79b46f8610c0b76a55b25c1291f
4e3143b9f0a2f79b46f8610c0b76a55b25c1291f
2008-08-29T22:14:49-07:00
2008-08-29T22:14:49-07:00
Added bulk tag managing and bulk post tagging. [#125 state:resolved]
ae7ef3e7cd5e79e6fa4a6fcb18e4b8ef5837b572
Alex Suraci
i.am@toogeneric.com