mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5528 from frisco82/changeUpadateNotification 

Changed update message to be more instructive
This commit is contained in:
Thomas Müller 2013-10-24 10:28:17 -07:00
parent 54e9d8c306 3a81c8e3af
commit 3917d18980
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/css/styles.css
View File

@ -445,6 +445,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
cursor: default;
}
#body-login .update {
text-align: center;
color: #ccc;
}
#body-user .warning, #body-settings .warning {
margin-top: 8px;
padding: 5px;

0
core/templates/update.php → core/templates/update.admin.php
View File

8
core/templates/update.user.php Normal file
View File

@ -0,0 +1,8 @@
<ul>
<li class='update'>
<?php p($l->t('This ownCloud instance is currently being updated, which may take a while.')) ?><br/><br/>
<?php p($l->t('Please reload this page after a short time to continue using ownCloud.')) ?><br/><br/>
<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?><br/><br/>
<?php p($l->t('Thank you for your patience.')); ?><br/><br/>
</li>
</ul>

6
lib/base.php
View File

@ -224,7 +224,9 @@ class OC {
header('Retry-After: 120');
// render error page
OC_Template::printErrorPage('ownCloud is in maintenance mode');
$tmpl = new OC_Template('', 'update.user', 'guest');
$tmpl->printPage();
die();
}
}
@ -240,7 +242,7 @@ class OC {
$minimizerJS = new OC_Minimizer_JS();
$minimizerJS->clearCache();
OC_Util::addscript('update');
$tmpl = new OC_Template('', 'update', 'guest');
$tmpl = new OC_Template('', 'update.admin', 'guest');
$tmpl->assign('version', OC_Util::getVersionString());
$tmpl->printPage();
exit();