stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-15 11:27:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source
This commit is contained in:
Tim Almdal
2009-11-07 07:35:15 -08:00
parent c40735c922 e300ede3d8
commit 87f00a5ec5
12 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/tag/controllers/admin_tags.php
+9 -9
View File
@@ -70,7 +70,7 @@ class Admin_Tags_Controller extends Admin_Controller {
$tag = ORM::factory("tag", $id);
if ($tag->loaded) {
print InPlaceEdit::factory($tag->name)
->add_action("admin/tags/rename/$id")
->action("admin/tags/rename/$id")
->render();
}
}
@@ -83,15 +83,15 @@ class Admin_Tags_Controller extends Admin_Controller {
kohana::show_404();
}
$inplaceedit = InPlaceEdit::factory($tag->name)
->add_action("admin/tags/rename/$tag->id")
->add_rules(array("required", "length[1,64]"))
->add_messages(array("in_use" => t("There is already a tag with that name")))
->add_callback(array($this, "check_for_duplicate"));
$in_place_edit = InPlaceEdit::factory($tag->name)
->action("admin/tags/rename/$tag->id")
->rules(array("required", "length[1,64]"))
->messages(array("in_use" => t("There is already a tag with that name")))
->callback(array($this, "check_for_duplicate"));
if ($inplaceedit->validate()) {
if ($in_place_edit->validate()) {
$old_name = $tag->name;
$tag->name = $inplaceedit->value();
$tag->name = $in_place_edit->value();
$tag->save();
$message = t("Renamed tag %old_name to %new_name",
@@ -101,7 +101,7 @@ class Admin_Tags_Controller extends Admin_Controller {
print json_encode(array("result" => "success"));
} else {
print json_encode(array("result" => "error", "form" => $inplaceedit->render()));
print json_encode(array("result" => "error", "form" => $in_place_edit->render()));
}
}
modules/tag/css/tag.css
+2 -2
View File
@@ -91,6 +91,6 @@
padding: .1em 0 .2em 0;
}
#g-rename-tag-form ul {
#g-tag-admin form ul {
margin-bottom: 0;
}
}