From f9d1d79929e8414789245c79369ceadf1af67ab4 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 30 Jul 2013 14:43:48 +0200 Subject: [PATCH 1/7] reduce z-index of settings popup, fix #4212 --- core/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 0dd66fb5b7c..9c6d39030e9 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -596,7 +596,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;} #category_addinput { width:10em; } /* ---- APP SETTINGS ---- */ -.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; } +.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:100; } .popup.topright { top:7em; right:1em; } .popup.bottomleft { bottom:1em; left:33em; } .popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; } From 31afbb3434b98aaa839d20d035a449b842b9d97a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 30 Jul 2013 14:47:05 +0200 Subject: [PATCH 2/7] remove ugly inset shadow from header --- core/css/styles.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 9c6d39030e9..e7dcdf67d64 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -19,7 +19,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari #body-user #header, #body-settings #header { position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; background:#1d2d44 url('../img/noise.png') repeat; - -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } + -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5); + -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5); + box-shadow:0 0 10px rgba(0, 0, 0, .5); +} #body-login { text-align: center; From 0a5be39446e01f6e4a25c11370b2b133198a92b7 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 31 Jul 2013 09:58:57 +0200 Subject: [PATCH 3/7] remove unused and never to be used pagination --- core/templates/part.pagenavi.php | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 core/templates/part.pagenavi.php diff --git a/core/templates/part.pagenavi.php b/core/templates/part.pagenavi.php deleted file mode 100644 index 2f5c2183765..00000000000 --- a/core/templates/part.pagenavi.php +++ /dev/null @@ -1,22 +0,0 @@ -
    - 0):?> -
  1. t( 'prev' )); ?>
    2. - - 0):?> - … - - - -
    3. - -
    4. - - - - … - - - -
  4. t( 'next' )); ?>
    5. - -
From 8eaa0e73366cc7bd4685394480f0498bc2e45e8b Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 31 Jul 2013 10:04:02 +0200 Subject: [PATCH 4/7] remove table layout for background jobs --- settings/templates/admin.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 2b14c1460d6..e54586b80df 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -90,38 +90,30 @@ if (!$_['internetconnectionworking']) {
t('Cron'));?> - - - - - - - - - - -
+

>
t("Execute one task with each page loaded")); ?> -

+

+

>
t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?> -

+

+

>
t("Use systems cron service to call the cron.php file once a minute.")); ?> -

+

From ded02e771e90227d7e7d204a8c24ced53f1ac3b0 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 31 Jul 2013 18:08:29 +0200 Subject: [PATCH 5/7] wrap code output in error messages, fix #4231 --- core/css/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index e7dcdf67d64..742a3d1bf1a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -381,6 +381,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } color: #dd3b3b !important; font-weight: bold; } +.error pre { + white-space: pre-wrap; + text-align: left; +} /* Fixes for log in page, TODO should be removed some time */ #body-login .update, #body-login .error { From 5a77b671479003f1181f47beabed13c87450ffab Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 4 Aug 2013 16:27:17 +0200 Subject: [PATCH 6/7] change long couldn't be determined string to question mark again --- lib/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/helper.php b/lib/helper.php index ca508e1d933..31f0f1698d5 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -232,7 +232,7 @@ class OC_Helper { public static function humanFileSize( $bytes ) { if( $bytes < 0 ) { $l = OC_L10N::get('lib'); - return $l->t("couldn't be determined"); + return "?"; } if( $bytes < 1024 ) { return "$bytes B"; From 0aa7dc9b893ffa5ac8a1f3a3959ad3de2ce6178c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 16 Aug 2013 00:56:09 +0200 Subject: [PATCH 7/7] tixing width and position of wider error messages --- core/css/styles.css | 5 +++++ core/templates/error.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 48ef026fba8..7369f8d5251 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -385,6 +385,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } white-space: pre-wrap; text-align: left; } + +.error-wide { + width: 800px; +} + /* Fixes for log in page, TODO should be removed some time */ #body-login .update, #body-login .error { diff --git a/core/templates/error.php b/core/templates/error.php index ac91357b350..e8b7a49264f 100644 --- a/core/templates/error.php +++ b/core/templates/error.php @@ -1,4 +1,4 @@ -
    +