diff options
| -rw-r--r-- | images/icon_add_tag.png | bin | 0 -> 613 bytes | |||
| -rw-r--r-- | lib/class/browse.class.php | 3 | ||||
| -rw-r--r-- | server/tag.ajax.php | 15 | ||||
| -rw-r--r-- | templates/show_album_row.inc.php | 3 |
4 files changed, 13 insertions, 8 deletions
diff --git a/images/icon_add_tag.png b/images/icon_add_tag.png Binary files differnew file mode 100644 index 00000000..83ec984b --- /dev/null +++ b/images/icon_add_tag.png diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index ff830826..cd424ec1 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -418,7 +418,6 @@ class Browse { private static function get_base_sql() { // Get our base SQL must always return ID -/* $includetags = (is_array($_SESSION['browse']['filter']['tag']) && sizeof($_SESSION['browse']['filter']['tag'])); $megajoin = ''; @@ -432,7 +431,7 @@ class Browse { if ($includetags) $megajoin .= ' tag_map.tag_id = tags.id AND '; $w = " WHERE 1=1 AND "; -*/ + switch ($_SESSION['browse']['type']) { case 'album': $sql = "SELECT DISTINCT `album`.`id` " diff --git a/server/tag.ajax.php b/server/tag.ajax.php index ca28e4f2..2f1fa297 100644 --- a/server/tag.ajax.php +++ b/server/tag.ajax.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -25,10 +25,15 @@ if (AJAX_INCLUDE != '1') { exit; } switch ($_REQUEST['action']) { -case 'add': - TagCloud::add_tag($_REQUEST['type'], $_REQUEST['id'], $_REQUEST['val']); - break; - + case 'show_add_tag': + + break; + case 'add_tag': + + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 56a08091..734bacb1 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -44,6 +44,7 @@ <?php echo get_user_icon('comment',_('Post Shout')); ?> </a> <?php } ?> + <?php echo Ajax::button('?page=tag&action=show_add_tag&type=album&id=' . $album->id,'add_tag',_('Add Tag'),'add_album_tag_' . $album->id); ?> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&id=<?php echo $album->id; ?>"> <?php echo get_user_icon('batch_download',_('Batch Download')); ?> |
