yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 11:59:56 +02:00
Code Issues Releases Wiki Activity

Fix hard-coded values before Kaivo work merge

Browse source
This commit is contained in:
Afterster 2014-06-01 10:08:27 +02:00
parent 9610a1e6c4
commit 3a539f7ceb
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/show_html5_player.inc.php
View file

@ -118,7 +118,7 @@ function ShowEqualizer()
function SavePlaylist() function SavePlaylist()
{ {
var url = "http://ampache.test/server/ajax.server.php?page=playlist&action=append_item&item_type=song&item_id="; var url = "<?php echo AmpConfig::get('ajax_url'); ?>?page=playlist&action=append_item&item_type=song&item_id=";
for (var i = 0; i < jplaylist['playlist'].length; i++) { for (var i = 0; i < jplaylist['playlist'].length; i++) {
url += "," + jplaylist['playlist'][i]["song_id"]; url += "," + jplaylist['playlist'][i]["song_id"];
} }

10
templates/sidebar_admin.inc.php
View file

@ -21,26 +21,26 @@
*/ */
?> ?>
<ul class="sb2" id="sb_admin"> <ul class="sb2" id="sb_admin">
<li><h4 class="header"><?php echo T_('Catalogs'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('Catalogs'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_admin_catalogs"> <ul class="sb3" id="sb_admin_catalogs">
<li id="sb_admin_catalogs_Add"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo T_('Add a Catalog'); ?></a></li> <li id="sb_admin_catalogs_Add"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo T_('Add a Catalog'); ?></a></li>
<li id="sb_admin_catalogs_Show"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo T_('Show Catalogs'); ?></a></li> <li id="sb_admin_catalogs_Show"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo T_('Show Catalogs'); ?></a></li>
</ul> </ul>
</li> </li>
<li><h4 class="header"><?php echo T_('User Tools'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('User Tools'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_admin_ut"> <ul class="sb3" id="sb_admin_ut">
<li id="sb_admin_ut_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo T_('Add User'); ?></a></li> <li id="sb_admin_ut_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo T_('Add User'); ?></a></li>
<li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo T_('Browse Users'); ?></a></li> <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo T_('Browse Users'); ?></a></li>
</ul> </ul>
</li> </li>
<li><h4 class="header"><?php echo T_('Access Control'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('Access Control'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_admin_acl"> <ul class="sb3" id="sb_admin_acl">
<li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_advanced"><?php echo T_('Add ACL'); ?></a></li> <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_advanced"><?php echo T_('Add ACL'); ?></a></li>
<li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo T_('Show ACL(s)'); ?></a></li> <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo T_('Show ACL(s)'); ?></a></li>
</ul> </ul>
</li> </li>
<li><h4 class="header"><?php echo T_('Other Tools'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('Other Tools'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_admin_ot"> <ul class="sb3" id="sb_admin_ot">
<li id="sb_admin_ot_Debug"><a href="<?php echo $web_path; ?>/admin/system.php?action=show_debug"><?php echo T_('Ampache Debug'); ?></a></li> <li id="sb_admin_ot_Debug"><a href="<?php echo $web_path; ?>/admin/system.php?action=show_debug"><?php echo T_('Ampache Debug'); ?></a></li>
<li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a></li> <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a></li>
@ -51,7 +51,7 @@
</ul> </ul>
</li> </li>
<?php if (Access::check('interface','100')) { ?> <?php if (Access::check('interface','100')) { ?>
<li><h4 class="header"><?php echo T_('Server Config'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('Server Config'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_preferences_sc"> <ul class="sb3" id="sb_preferences_sc">
<?php <?php
$catagories = Preference::get_catagories(); $catagories = Preference::get_catagories();

10
templates/sidebar_home.inc.php
View file

@ -21,7 +21,7 @@
*/ */
?> ?>
<ul class="sb2" id="sb_home"> <ul class="sb2" id="sb_home">
<li><h4 class="header"><?php echo T_('Browse'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <li><h4 class="header"><?php echo T_('Browse'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<?php <?php
if (isset($_REQUEST['action'])) { if (isset($_REQUEST['action'])) {
$text = scrub_in($_REQUEST['action']) . '_ac'; $text = scrub_in($_REQUEST['action']) . '_ac';
@ -46,7 +46,7 @@
<?php Ajax::start_container('browse_filters'); ?> <?php Ajax::start_container('browse_filters'); ?>
<?php Ajax::end_container(); ?> <?php Ajax::end_container(); ?>
<li> <li>
<h4 class="header"><?php echo T_('Playlist'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <h4 class="header"><?php echo T_('Playlist'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_home_info"> <ul class="sb3" id="sb_home_info">
<li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo AmpConfig::get('web_path') . ((AmpConfig::get('iframes')) ? '/?framed=1' : ''); ?>"><?php echo T_('Currently Playing'); ?></a></li> <li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo AmpConfig::get('web_path') . ((AmpConfig::get('iframes')) ? '/?framed=1' : ''); ?>"><?php echo T_('Currently Playing'); ?></a></li>
<?php if (AmpConfig::get('allow_democratic_playback')) { ?> <?php if (AmpConfig::get('allow_democratic_playback')) { ?>
@ -65,7 +65,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<h4 class="header"><?php echo T_('Random'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <h4 class="header"><?php echo T_('Random'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_home_random"> <ul class="sb3" id="sb_home_random">
<li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=song', T_('Song'),'home_random_song'); ?></li> <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=song', T_('Song'),'home_random_song'); ?></li>
<li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'),'home_random_album'); ?></li> <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'),'home_random_album'); ?></li>
@ -75,7 +75,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<h4 class="header"><?php echo T_('Information'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <h4 class="header"><?php echo T_('Information'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_home_info"> <ul class="sb3" id="sb_home_info">
<li id="sb_home_info_Recent"><a href="<?php echo $web_path; ?>/stats.php?action=recent"><?php echo T_('Recent'); ?></a></li> <li id="sb_home_info_Recent"><a href="<?php echo $web_path; ?>/stats.php?action=recent"><?php echo T_('Recent'); ?></a></li>
<li id="sb_home_info_Newest"><a href="<?php echo $web_path; ?>/stats.php?action=newest"><?php echo T_('Newest'); ?></a></li> <li id="sb_home_info_Newest"><a href="<?php echo $web_path; ?>/stats.php?action=newest"><?php echo T_('Newest'); ?></a></li>
@ -96,7 +96,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<h4 class="header"><?php echo T_('Search'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <h4 class="header"><?php echo T_('Search'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_home_search"> <ul class="sb3" id="sb_home_search">
<li id="sb_home_search_song"><a href="<?php echo $web_path; ?>/search.php?type=song"><?php echo T_('Songs'); ?></a></li> <li id="sb_home_search_song"><a href="<?php echo $web_path; ?>/search.php?type=song"><?php echo T_('Songs'); ?></a></li>
<li id="sb_home_search_album"><a href="<?php echo $web_path; ?>/search.php?type=album"><?php echo T_('Albums'); ?></a></li> <li id="sb_home_search_album"><a href="<?php echo $web_path; ?>/search.php?type=album"><?php echo T_('Albums'); ?></a></li>

6
templates/sidebar_localplay.inc.php
View file

@ -35,7 +35,7 @@ if ($server_allow && $controller && $access_check) {
$class = $current_instance ? '' : ' class="active_instance"'; $class = $current_instance ? '' : ' class="active_instance"';
?> ?>
<?php if (Access::check('localplay','25')) { ?> <?php if (Access::check('localplay','25')) { ?>
<li><h4 class="header"><?php echo T_('Localplay'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('Localplay'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_localplay_info"> <ul class="sb3" id="sb_localplay_info">
<?php if (Access::check('localplay','75')) { ?> <?php if (Access::check('localplay','75')) { ?>
<li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo T_('Add Instance'); ?></a></li> <li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo T_('Add Instance'); ?></a></li>
@ -45,7 +45,7 @@ if ($server_allow && $controller && $access_check) {
</ul> </ul>
</li> </li>
<?php } ?> <?php } ?>
<li><h4 class="header"><?php echo T_('Active Instance'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4> <li><h4 class="header"><?php echo T_('Active Instance'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4>
<ul class="sb3" id="sb_localplay_instances"> <ul class="sb3" id="sb_localplay_instances">
<li id="sb_localplay_instances_none"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'),'localplay_instance_none'); ?></li> <li id="sb_localplay_instances_none"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'),'localplay_instance_none'); ?></li>
<?php <?php
@ -63,7 +63,7 @@ if ($server_allow && $controller && $access_check) {
</ul> </ul>
</li> </li>
<?php } else { ?> <?php } else { ?>
<li><h4 class="header"><?php echo T_('Localplay Disabled'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></h4></li> <li><h4 class="header"><?php echo T_('Localplay Disabled'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></h4></li>
<?php if (!$server_allow) { ?> <?php if (!$server_allow) { ?>
<li><?php echo T_('Allow Localplay set to False'); ?></li> <li><?php echo T_('Allow Localplay set to False'); ?></li>
<?php } elseif (!$controller) { ?> <?php } elseif (!$controller) { ?>

4
templates/sidebar_modules.inc.php
View file

@ -21,14 +21,14 @@
*/ */
?> ?>
<ul class="sb2" id="sb_modules"> <ul class="sb2" id="sb_modules">
<li><h4 class="header"><?php echo T_('Modules'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <li><h4 class="header"><?php echo T_('Modules'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_Modules"> <ul class="sb3" id="sb_Modules">
<li id="sb_preferences_mo_localplay"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_localplay"><?php echo T_('Localplay Modules'); ?></a></li> <li id="sb_preferences_mo_localplay"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_localplay"><?php echo T_('Localplay Modules'); ?></a></li>
<li id="sb_preferences_mo_catalog_types"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_catalog_types"><?php echo T_('Catalog Modules'); ?></a></li> <li id="sb_preferences_mo_catalog_types"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_catalog_types"><?php echo T_('Catalog Modules'); ?></a></li>
<li id="sb_preferences_mo_plugins"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_plugins"><?php echo T_('Available Plugins'); ?></a></li> <li id="sb_preferences_mo_plugins"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_plugins"><?php echo T_('Available Plugins'); ?></a></li>
</ul> </ul>
</li> </li>
<li><h4 class="header"><?php echo T_('Other Tools'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <li><h4 class="header"><?php echo T_('Other Tools'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_admin_ot"> <ul class="sb3" id="sb_admin_ot">
<li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Find Duplicates'); ?></a></li> <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Find Duplicates'); ?></a></li>
<li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo T_('Mail Users'); ?></a></li> <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo T_('Mail Users'); ?></a></li>

2
templates/sidebar_preferences.inc.php
View file

@ -27,7 +27,7 @@
$catagories = Preference::get_catagories(); $catagories = Preference::get_catagories();
?> ?>
<ul class="sb2" id="sb_preferences"> <ul class="sb2" id="sb_preferences">
<li><h4 class="header"><?php echo T_('Preferences'); ?><span class="sprite sprite-icon_all expanded" alt="Expand/Collapse" title="Expand/Collapse"></span></h4> <li><h4 class="header"><?php echo T_('Preferences'); ?><span class="sprite sprite-icon_all expanded" alt="<?php echo T_('Expand/Collapse'); ?>" title="<?php echo T_('Expand/Collapse'); ?>"></span></h4>
<ul class="sb3" id="sb_preferences_sections"> <ul class="sb3" id="sb_preferences_sections">
<?php <?php
foreach ($catagories as $name) { foreach ($catagories as $name) {