@@ -78,7 +78,7 @@
foreach ((array) Config::current()->aggregates as $name => $aggregate)
$aggregates[] = array_merge(array("name" => $name), array("user" => new User($aggregate["author"])), $aggregate);
- $admin->context["aggregates"] = new Paginator($aggregates, 25, "page", false);
+ $admin->display("manage_aggregates", array("aggregates" => new Paginator($aggregates, 25, "page", false)));
}
public function manage_nav($navs) {
@@ -184,7 +184,7 @@
show_403(__("Access Denied"), __("You do not have sufficient privileges to change settings."));
if (empty($_POST))
- return;
+ return $admin->display("aggregation_settings");
if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
show_403(__("Access Denied"), __("Invalid security key."));
@@ -205,7 +205,7 @@
show_403(__("Access Denied"), __("You do not have sufficient privileges to add aggregates.", "aggregator"));
if (empty($_POST))
- return;
+ return $admin->display("new_aggregate");
if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
show_403(__("Access Denied"), __("Invalid security key."));
@@ -248,14 +248,18 @@
$aggregate = $config->aggregates[$_GET['id']];
- $admin->context["aggregate"] = array("name" => $_GET['id'],
- "url" => $aggregate["url"],
- "feather" => $aggregate["feather"],
- "author" => $aggregate["author"],
- "data" => preg_replace("/---\n/", "", YAML::dump($aggregate["data"])));
+ $admin->context["aggregate"] = ;
if (empty($_POST))
- return;
+ return $admin->display("edit_aggregate",
+ array("users" => User::find(),
+ "aggregate" => array("name" => $_GET['id'],
+ "url" => $aggregate["url"],
+ "feather" => $aggregate["feather"],
+ "author" => $aggregate["author"],
+ "data" => preg_replace("/---\n/",
+ "",
+ YAML::dump($aggregate["data"]))));
if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
show_403(__("Access Denied"), __("Invalid security key."));
@@ -289,6 +293,8 @@
$admin->context["aggregate"] = array("name" => $_GET['id'],
"url" => $aggregate["url"]);
+ $admin->display("delete_aggregate", array("aggregate" => array("name" => $_GET['id'],
+ "url" => $aggregate["url"])));
}
public function admin_destroy_aggregate($admin) {
modules/aggregator/aggregator.php
@@ -137,12 +137,12 @@
return $navs;
}
- public function admin_cache_settings() {
+ public function admin_cache_settings($admin) {
if (!Visitor::current()->group()->can("change_settings"))
show_403(__("Access Denied"), __("You do not have sufficient privileges to change settings."));
if (empty($_POST))
- return;
+ return $admin->display("cache_settings");
if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
show_403(__("Access Denied"), __("Invalid security key."));
modules/cacher/cacher.php
@@ -109,13 +109,13 @@
"/admin/?action=manage_comments");
}
- static function admin_delete_comment() {
- $admin = AdminController::current();
+ static function admin_delete_comment($admin) {
+ $comment = new Comment($_GET['id']);
- $admin->context["comment"] = new Comment($_GET['id']);
-
- if (!$admin->context["comment"]->deletable())
+ if (!$comment->deletable())
show_403(__("Access Denied"), __("You do not have sufficient privileges to delete this comment.", "comments"));
+
+ $admin->display("delete_comment", array("comments" => $comment));
}
static function admin_destroy_comment() {
@@ -145,17 +145,20 @@
redirect("/admin/?action=manage_comments");
}
- static function admin_manage_spam() {
+ static function admin_manage_spam($admin) {
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'";
+ $where["status"] = "spam";
- AdminController::current()->context["comments"] = new Paginator(Comment::find(array("placeholders" => true, "where" => $where, "params" => $params)), 25);
- }
+ $admin->display("manage_spam",
+ array("comments" => new Paginator(Comment::find(array("placeholders" => true,
+ "where" => $where,
+ "params" => $params)),
+ 25))); }
static function admin_purge_spam() {
if (!Visitor::current()->group()->can("delete_comment"))
@@ -237,7 +240,7 @@
show_403(__("Access Denied"), __("You do not have sufficient privileges to change settings."));
if (empty($_POST))
- return;
+ return $admin->display("comment_settings");
if (!isset($_POST['hash']) or $_POST['hash'] != Config::current()->secure_hashkey)
show_403(__("Access Denied"), __("Invalid security key."));
@@ -288,19 +291,19 @@
return $pages;
}
- public function admin_edit_comment() {
+ public function admin_edit_comment($admin) {
if (empty($_GET['id']))
error(__("No ID Specified"), __("An ID is required to edit a comment.", "comments"));
- $admin = AdminController::current();
+ $comment = new Comment($_GET['id'], array("filter" => false));
- $admin->context["comment"] = new Comment($_GET['id'], array("filter" => false));
-
- if (!$admin->context["comment"]->editable())
+ if (!$comment->editable())
show_403(__("Access Denied"), __("You do not have sufficient privileges to edit this comment.", "comments"));
+
+ $admin->display("edit_comment", array("comment" => $comment));
}
- static function admin_manage_comments() {
+ static function admin_manage_comments($admin) {
if (!Comment::any_editable() and !Comment::any_deletable())
show_403(__("Access Denied"), __("You do not have sufficient privileges to manage any comments.", "comments"));
@@ -313,7 +316,11 @@
if (!$visitor->group()->can("edit_comment", "delete_comment", true))
$where["user_id"] = $visitor->id;
- AdminController::current()->context["comments"] = new Paginator(Comment::find(array("placeholders" => true, "where" => $where, "params" => $params)), 25);
+ $admin->display("manage_comments",
+ array("comments" => new Paginator(Comment::find(array("placeholders" => true,
+ "where" => $where,
+ "params" => $params)),
+ 25)));
}
static function admin_bulk_comments() {
modules/comments/comments.php
@@ -176,19 +176,17 @@
$step = 75 / $spread;
- $context = array();
+ $cloud = array();
foreach ($tags as $tag => $count)
- $context[] = array("size" => (100 + (($count - $min_qty) * $step)),
- "popularity" => $count,
- "name" => $tag,
- "title" => sprintf(_p("%s post tagged with "%s"", "%s posts tagged with "%s"", $count, "tags"), $count, $tag),
- "clean" => $tag2clean[$tag],
- "url" => url("tag/".$tag2clean[$tag]));
-
- $admin->context["tag_cloud"] = $context;
+ $cloud[] = array("size" => (100 + (($count - $min_qty) * $step)),
+ "popularity" => $count,
+ "name" => $tag,
+ "title" => sprintf(_p("%s post tagged with "%s"", "%s posts tagged with "%s"", $count, "tags"), $count, $tag),
+ "clean" => $tag2clean[$tag],
+ "url" => url("tag/".$tag2clean[$tag]));
if (!Post::any_editable() and !Post::any_deletable())
- return;
+ return $admin->display("manage_tags", array("tag_cloud" => $cloud));
fallback($_GET['query'], "");
list($where, $params) = keywords(urldecode($_GET['query']), "xml LIKE :query OR url LIKE :query");
@@ -197,10 +195,12 @@
if (!$visitor->group()->can("view_draft", "edit_draft", "edit_post", "delete_draft", "delete_post"))
$where["user_id"] = $visitor->id;
- $admin->context["posts"] = new Paginator(Post::find(array("placeholders" => true,
- "drafts" => true,
- "where" => $where,
- "params" => $params)), 25);
+ $admin->display("manage_tags", array("tag_cloud" => $cloud,
+ "posts" => new Paginator(Post::find(array("placeholders" => true,
+ "drafts" => true,
+ "where" => $where,
+ "params" => $params)),
+ 25)));
}
public function admin_rename_tag($admin) {
@@ -228,22 +228,22 @@
list($tags, $clean, $tag2clean,) = self::parseTags($tags, $clean);
foreach ($tags as $tag => $count)
- if ($tag2clean[$tag] == $_GET['name'])
- return $admin->context["tag"] = array("name" => $tag, "clean" => $tag2clean[$tag]);
+ if ($tag2clean[$tag] == $_GET['name']) {
+ $tag = array("name" => $tag, "clean" => $tag2clean[$tag]);
+ continue;
+ }
+
+ $admin->display("rename_tag", array("tag" => $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']);
+ $admin->display("edit_tags", array("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."));
modules/tags/tags.php
@@ -63,6 +63,7 @@ ${ trigger.call("sidebar") }
<span class="sub">($archive.count)</span>
</li>
{% endfor %}
+ <li><a href="{% url "archive" %}">${ "All →" | translate }</a></li>
</ul>
{% endif %}
</div>
\ No newline at end of file
themes/stardust/content/sidebar.twig
@@ -14,7 +14,7 @@ ruby gettext.rb ./modules/comments/ --domain=comments > ./modules/commen
ruby gettext.rb ./modules/markdown/ --domain=markdown > ./modules/markdown/locale/en_US.pot
ruby gettext.rb ./modules/paging/ --domain=paging > ./modules/paging/locale/en_US.pot
ruby gettext.rb ./modules/read_more/ --domain=read_more > ./modules/read_more/locale/en_US.pot
-ruby gettext.rb ./modules/aggregator/ --domain=aggregator > ./modules/aggregator/locale/en_US.pot
+ruby gettext.rb ./modules/aggregator/ --domain=aggregator > ./modules/aggregator/locale/en_US.pot
ruby gettext.rb ./modules/smartypants/ --domain=smartypants > ./modules/smartypants/locale/en_US.pot
ruby gettext.rb ./modules/tags/ --domain=tags > ./modules/tags/locale/en_US.pot
ruby gettext.rb ./modules/textilize/ --domain=textilize > ./modules/textilize/locale/en_US.pot
update_gettext
1566dd3fc416b03fa43568c84ec26d7fdc310c9f
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp-site/commit/d689e3db19579f991e8130ec5992ceb9d252fb36
d689e3db19579f991e8130ec5992ceb9d252fb36
2008-09-21T11:21:12-07:00
2008-09-21T11:21:12-07:00
Fixed various module admin pages.
1829eaeae105b10c4e5ece40c78d5ead2ddeae53
Alex Suraci
i.am@toogeneric.com