diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 09:28:48 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-18 09:28:48 -0700 |
| commit | 090c4d016baec6376d6d26c347c3e1ca11a929d5 (patch) | |
| tree | ddab7b8e10cf635b7f45c0c18bdf809c848334a3 /modules/tag/views | |
| parent | c9a030dd08711f89a985504ce26378a315d7ff1f (diff) | |
| parent | 4949a2ce0b5daca7afe86a261be447440fce7eff (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
lib/gallery.common.css
themes/admin_wind/views/admin.html.php
themes/night_wind/views/sidebar.html.php
themes/wind/views/sidebar.html.php
Diffstat (limited to 'modules/tag/views')
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 27813a91..edc466bb 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -3,8 +3,8 @@ var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>; $("document").ready(function() { // using JS for adding link titles to avoid running t() for each tag - $("#g-tag-admin .tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>); - $("#g-tag-admin .delete-link").attr("title", $(".delete-link:first span").html()); + $("#g-tag-admin .g-tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>); + $("#g-tag-admin .g-delete-link").attr("title", $(".g-delete-link:first span").html()); // In-place editing for tag admin $(".g-editable").bind("click", editInPlace); @@ -47,10 +47,10 @@ <? endif ?> <li> - <span id="g-tag-<?= $tag->id ?>" class="g-editable tag-name"><?= html::clean($tag->name) ?></span> + <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span> <span class="g-understate">(<?= $tag->count ?>)</span> <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" - class="g-dialog-link delete-link g-button"> + class="g-dialog-link g-delete-link g-button"> <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> </li> |