yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1197 from Psy-Virus/patch-13

Browse source 
FIX for #1195 & New position for update notification
This commit is contained in:
Afterster 2016-04-09 08:24:51 +02:00
commit b1c7cf9ef6
3 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/class/autoupdate.class.php
View file

@ -226,7 +226,7 @@ class AutoUpdate
*/ */
public static function show_new_version() public static function show_new_version()
{ {
echo '<div>'; echo '<div id="autoupdate">';
echo '<font color="#ff0000">' . T_('Update available') . '</font>'; echo '<font color="#ff0000">' . T_('Update available') . '</font>';
echo ' (' . self::get_latest_version() . ').<br />'; echo ' (' . self::get_latest_version() . ').<br />';

54
templates/header.inc.php
View file

@ -408,16 +408,7 @@ $_SESSION['login'] = false;
</span> </span>
<?php <?php
} ?> } ?>
<span id="updateInfo">
<?php
if (AmpConfig::get('autoupdate') && Access::check('interface','100')) {
if (AutoUpdate::is_update_available()) {
AutoUpdate::show_new_version();
}
}
$count_temp_playlist = count($GLOBALS['user']->playlist->get_items());
?>
</span>
<?php UI::show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
</div> <!-- End headerbox --> </div> <!-- End headerbox -->
</div><!-- End header --> </div><!-- End header -->
@ -434,7 +425,7 @@ $_SESSION['login'] = false;
</div> </div>
<div id="topmenu_item"> <div id="topmenu_item">
<a href="<?php echo $web_path ?>/browse.php?action=artist"> <a href="<?php echo $web_path ?>/browse.php?action=artist">
<img src="<?php echo $web_path ?>/images/topmenu-music.png" /> <img src="<?php echo $web_path ?>/images/topmenu-artist.png" />
<span><?php echo T_('Artists') ?></span> <span><?php echo T_('Artists') ?></span>
</a> </a>
</div> </div>
@ -527,20 +518,35 @@ $_SESSION['login'] = false;
<div id="ajax-loading">Loading . . .</div> <div id="ajax-loading">Loading . . .</div>
<div id="util_div" style="display:none;"></div> <div id="util_div" style="display:none;"></div>
<iframe name="util_iframe" id="util_iframe" style="display:none;" src="<?php echo $web_path; ?>/util.php"></iframe> <iframe name="util_iframe" id="util_iframe" style="display:none;" src="<?php echo $web_path; ?>/util.php"></iframe>
<div id="content" class="content-<?php echo AmpConfig::get('ui_fixed') ? (AmpConfig::get('topmenu') ? 'fixed-topmenu' : 'fixed') : 'float'; ?> <?php echo (($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'content-right-wild'); echo $isCollapsed ? ' content-left-wild' : ''; ?>"> <div id="content" class="content-<?php echo AmpConfig::get('ui_fixed') ? (AmpConfig::get('topmenu') ? 'fixed-topmenu' : 'fixed') : 'float'; ?> <?php echo (($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'content-right-wild'); echo $isCollapsed ? ' content-left-wild' : ''; ?>">
<?php if (AmpConfig::get('int_config_version') != AmpConfig::get('config_version') and $GLOBALS['user']->has_access(100)) {
?>
<div class="fatalerror">
<?php echo T_('Error Config File Out of Date');
?>
<a rel="nohtml" href="<?php echo $web_path;
?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config');
?></a> |
<a rel="nohtml" href="<?php echo $web_path;
?>/admin/system.php?action=write_config"><?php echo T_('Write New Config');
?></a>
</div>
<?php <?php
} ?> if (Access::check('interface','100')) {
echo '<div id=update_notify>';
if (AmpConfig::get('autoupdate') && AutoUpdate::is_update_available()) {
AutoUpdate::show_new_version();
echo '<br />';
}
$count_temp_playlist = count($GLOBALS['user']->playlist->get_items());
if (AmpConfig::get('int_config_version') != AmpConfig::get('config_version')) {
?>
<div class="fatalerror">
<?php echo T_('Error: Your config file is out of date!');
?>
<br />
<a rel="nohtml" href="<?php echo $web_path;
?>/admin/system.php?action=generate_config"><?php echo T_('Generate and download new config file');
?></a> |
<a rel="nohtml" href="<?php echo $web_path;
?>/admin/system.php?action=write_config"><?php echo T_('Write new config file to disk');
?></a>
</div>
<?php
}
echo '</div>';
}
?>
<div id="guts"> <div id="guts">

4
themes/reborn/templates/default.css
View file

@ -248,10 +248,6 @@ input[type=button]:focus:active, input[type=submit]:focus:active {
top: 20px; top: 20px;
} }
#updateInfo {
float: left;
}
#sb_Subsearch input[type=submit] { #sb_Subsearch input[type=submit] {
min-width: 100px; min-width: 100px;
font-size: 15px; font-size: 15px;