Changed update message to be more instructive, changed update style to be less aggresive

Fix br tags

Improve english messages

diff --git a/core/css/styles.css b/core/css/styles.css
index 62ee0e56cae8ac93e1158433cfee873d7d7c986a..9a62fe165a62993601b808e76395f23959df7af9 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -441,6 +441,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;

diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
new file mode 100644 (file)
index 0000000..a652d5f
--- /dev/null
+++ b/core/templates/update.admin.php
@@ -0,0 +1,6 @@
+<ul>
+       <li class='update'>
+               <?php p($l->t('Updating ownCloud to version %s, this may take a while.',
+                       array($_['version']))); ?><br /><br />
+       </li>
+</ul>

diff --git a/core/templates/update.php b/core/templates/update.php
deleted file mode 100644 (file)
index a652d5f..0000000
--- a/core/templates/update.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul>
-       <li class='update'>
-               <?php p($l->t('Updating ownCloud to version %s, this may take a while.',
-                       array($_['version']))); ?><br /><br />
-       </li>
-</ul>

diff --git a/core/templates/update.user.php b/core/templates/update.user.php
new file mode 100644 (file)
index 0000000..bb93f0f
--- /dev/null
+++ b/core/templates/update.user.php
@@ -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>

diff --git a/lib/base.php b/lib/base.php
index 62427fa568c5ab2518fb7a1c814c3ebc2ca1daa2..a8ea865e6215671b660d8a359cf6b0152d0142a6 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -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();