summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-08-24 06:40:49 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-08-24 06:40:49 +0000
commitc65810e08cfb8ba58eda0fa134f91aea22635ef4 (patch)
treedda5060be8af1e3777d253bb08bbc138467b2fde /templates
parent591b54daac0d95c51f4f4dd986f68e3523baf9dd (diff)
downloadampache-c65810e08cfb8ba58eda0fa134f91aea22635ef4.tar.gz
ampache-c65810e08cfb8ba58eda0fa134f91aea22635ef4.tar.bz2
ampache-c65810e08cfb8ba58eda0fa134f91aea22635ef4.zip
fixed the live stream stuff, and removed references to the genre stuff, and replaced it with tag
Diffstat (limited to 'templates')
-rw-r--r--templates/show_edit_live_stream_row.inc.php6
-rw-r--r--templates/show_live_stream_row.inc.php8
-rw-r--r--templates/show_live_streams.inc.php6
3 files changed, 8 insertions, 12 deletions
diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php
index b86c401e..475a2e78 100644
--- a/templates/show_edit_live_stream_row.inc.php
+++ b/templates/show_edit_live_stream_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
@@ -28,7 +28,6 @@
<th><?php echo _('Homepage'); ?></th>
<th><?php echo _('Callsign'); ?></th>
<th><?php echo _('Frequency'); ?></th>
- <th><?php echo _('Genre'); ?></th>
<th>&nbsp;</th>
</tr>
<tr>
@@ -48,9 +47,6 @@
<input type="textbox" name="frequency" value="<?php echo scrub_out($radio->frequency); ?>" size="6" />
</td>
<td>
- <?php show_genre_select('genre',$radio->genre); ?>
-</td>
-<td>
<input type="hidden" name="id" value="<?php echo $radio->id; ?>" />
<input type="hidden" name="type" value="live_stream" />
<?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream','download',_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?>
diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php
index 23e0f9d7..170acf61 100644
--- a/templates/show_live_stream_row.inc.php
+++ b/templates/show_live_stream_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
@@ -25,12 +25,12 @@
<td class="cel_streamname"><?php echo $radio->f_name_link; ?></td>
<td class="cel_callsign"><?php echo $radio->f_callsign; ?></td>
<td class="cel_frequency"><?php echo $radio->f_frequency; ?></td>
-<td class="cel_genre"><?php echo $radio->f_genre; ?></td>
+<td class="cel_tag"><?php echo $radio->f_tag; ?></td>
<td class="cel_action">
- <?php if ($GLOBALS['user']->has_access('50')) { ?>
+ <?php if (Access::check('interface','50')) { ?>
<?php echo Ajax::button('?action=show_edit_object&type=live_stream&id=' . $radio->id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?>
<?php } ?>
- <?php if ($GLOBALS['user']->has_access('75')) { ?>
+ <?php if (Access::check('interface','75')) { ?>
<?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $radio->id,'delete',_('Delete'),'delete_radio_' . $radio->id); ?>
<?php } ?>
</td>
diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php
index 897c34dd..6cbdd72d 100644
--- a/templates/show_live_streams.inc.php
+++ b/templates/show_live_streams.inc.php
@@ -28,7 +28,7 @@ $web_path = Config::get('web_path');
<col id="col_streamname" />
<col id="col_callsign" />
<col id="col_frequency" />
- <col id="col_genre" />
+ <col id="col_tag" />
<col id="col_action" />
</colgroup>
<tr class="th-top">
@@ -36,7 +36,7 @@ $web_path = Config::get('web_path');
<th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th>
<th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th>
<th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th>
- <th class="cel_genre"><?php echo _('Genre'); ?></th>
+ <th class="cel_genre"><?php echo _('Tag'); ?></th>
<th class="cel_action"><?php echo _('Action'); ?> </th>
</tr>
<?php
@@ -58,7 +58,7 @@ foreach ($object_ids as $radio_id) {
<th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name_bottom'); ?></th>
<th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign_bottom'); ?></th>
<th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency_bottom'); ?></th>
- <th class="cel_genre"><?php echo _('Genre'); ?></th>
+ <th class="cel_genre"><?php echo _('Tag'); ?></th>
<th class="cel_action"><?php echo _('Action'); ?> </th>
</tr>
</table>