diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-26 04:32:08 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-26 04:32:08 +0000 |
commit | 97c78343ae899e59226ecbeb88dc4805b5ddc751 (patch) | |
tree | 500c4e90ddfe0c245cb7b30050d59fa1de6488e8 /templates | |
parent | 00417ad9658bd68f347f45e1ef8c5327fed95648 (diff) | |
download | ampache-97c78343ae899e59226ecbeb88dc4805b5ddc751.tar.gz ampache-97c78343ae899e59226ecbeb88dc4805b5ddc751.tar.bz2 ampache-97c78343ae899e59226ecbeb88dc4805b5ddc751.zip |
two file pattern fixes and some more work on the flagged stuff as well as some minor cleanup on the album art links
Diffstat (limited to 'templates')
-rw-r--r-- | templates/show_album.inc.php | 2 | ||||
-rw-r--r-- | templates/show_big_art.inc.php | 2 | ||||
-rw-r--r-- | templates/show_flagged.inc.php | 18 |
3 files changed, 11 insertions, 11 deletions
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index 4bfd05e7..45cb95bc 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -31,7 +31,7 @@ $title = scrub_out($album->name) . ' (' . $album->year . ') -- ' if ($album_name != _('Unknown (Orphaned)')) { $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); echo "<a target=\"_blank\" href=\"$aa_url\" onclick=\"popup_art('$aa_url'); return false;\">"; - echo "<img src=\"" . $web_path . "/image.php?id=" . $album->id . "&thumb=2&sid=" . session_id() . "\" alt=\"Album Art\" height=\"128\" />"; + echo "<img src=\"" . $web_path . "/image.php?id=" . $album->id . "&thumb=2\" alt=\"Album Art\" height=\"128\" width=\"128\" />"; echo "</a>\n"; } ?> diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php index e1cbdcaf..4121fff3 100644 --- a/templates/show_big_art.inc.php +++ b/templates/show_big_art.inc.php @@ -31,7 +31,7 @@ $htmllang = str_replace("_","-",Config::get('lang')); <body onLoad="self.resizeTo(document.images[0].width+30, document.images[0].height+70)"> <?php echo "<a href=\"javascript:window.close()\" title=\"" . _('Click to close window') . "\">"; -echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&sid=" . session_id() . "\" />"; +echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&sid=" . session_id() . "\" border=\"0\" alt=\"\" />"; echo "</a>"; ?> </body> diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index 218226a2..82c5d138 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -39,22 +39,22 @@ $web_path = Config::get('web_path'); <th class="cel_status"><?php echo _('Status'); ?></th> <th class="cel_action"><?php echo _('Action'); ?></th> </tr> -<?php foreach ($object_ids as $flag_id) { $flag = new Flag($flag_id); ?> +<?php +foreach ($object_ids as $flag_id) { + $flag = new Flag($flag_id); + $flag->format(); +?> <tr class="<?php echo flip_class(); ?>"> - <td class="cel_object"><a href="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=show_edit_song&song=<?php echo $flag->object_id; ?>"><?php $flag->print_name(); ?></a></td> - <td class="cel_username"><?php echo scrub_out($flag->f_user_username); ?></td> + <td class="cel_object"><?php echo $flag->f_name; ?></td> + <td class="cel_username"><?php echo $flag->f_user; ?></td> <td class="cel_flag"><?php $flag->print_flag(); ?></td> <td class="cel_comment"><?php echo scrub_out($flag->comment); ?></td> <td class="cel_status"><?php $flag->print_status(); ?></td> <td class="cel_action"> <?php if ($flag->approved) { ?> - <a href="<?php echo $web_path; ?>/admin/flag.php?action=reject_flag&flag_id=<?php echo $flag->id; ?>"> - <?php echo get_user_icon('disable'); ?> - </a> + <?php echo Ajax::button('?page=flag&action=reject&flag_id=' . $flag->id,'disable',_('Reject'),'reject_flag_' . $flag->id); ?> <?php } else { ?> - <a href="<?php echo $web_path; ?>/admin/flag.php?action=approve_flag&flag_id=<?php echo $flag->id; ?>"> - <?php echo get_user_icon('enable'); ?> - </a> + <?php echo Ajax::button('?page=flag&action=accept&flag_id=' . $flag->id,'enable',_('Enable'),'enable_flag_' . $flag->id); ?> <?php } ?> </td> </tr> |