diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-20 20:29:56 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-20 20:29:56 -0700 |
| commit | 97928804ad5f7b69fefe6ff2b50115af1159dbbc (patch) | |
| tree | 59e71cf7da19a23c380b07d1ee6f0e7697484d37 | |
| parent | b49b2130729fee34b61873f20bf7822f120bc163 (diff) | |
| parent | ba2d4b923b3786495eede2098906399224f4f262 (diff) | |
Merge branch 'master' into talmdal_dev
| -rw-r--r-- | modules/tag/js/tag.js | 1 | ||||
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index 4ed88e03..02985d55 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -81,4 +81,3 @@ function editInPlace(element) { }; ajaxify_editInPlaceForm(); } - diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index dc9deb1f..8647412d 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -44,6 +44,7 @@ <strong><?= html::clean($current_letter) ?></strong> <ul> <? endif ?> + <li> <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span> <span class="g-understate">(<?= $tag->count ?>)</span> @@ -51,18 +52,7 @@ class="g-dialog-link g-delete-link g-button"> <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> </li> - </ul> - <strong><?= html::clean($current_letter) ?></strong> - <ul> - <? endif ?> - <li> - <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= 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 g-delete-link g-button"> - <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a> - </li> <? $column_tag_count++ ?> <? $last_letter = $current_letter ?> <? endforeach /* $tags */ ?> |