diff options
| -rw-r--r-- | core/css/styles.css | 17 | ||||
| -rw-r--r-- | core/templates/error.php | 2 | ||||
| -rw-r--r-- | core/templates/part.pagenavi.php | 22 | ||||
| -rw-r--r-- | lib/helper.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 20 |
5 files changed, 21 insertions, 42 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 3d3b79c6a14..2f08b58c04f 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -19,9 +19,9 @@ 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 { @@ -381,6 +381,15 @@ 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; +} + +.error-wide { + width: 800px; +} + /* Fixes for log in page, TODO should be removed some time */ #body-login .update, #body-login .error { @@ -635,7 +644,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; } 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 @@ -<ul> +<ul class="error-wide"> <?php foreach($_["errors"] as $error):?> <li class='error'> <?php p($error['error']) ?><br/> 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 @@ -<ol class="pager"> - <?php if($_['page']>0):?> - <li class="pagerbutton1"><a href="<?php print_unescaped($_['url'].($_['page']-1));?>"><?php p($l->t( 'prev' )); ?></a></li> - <?php endif; ?> - <?php if ($_['pagestart']>0):?> - … - <?php endif;?> - <?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?> - <?php if ($_['page']!=$i):?> - <li><a href="<?php print_unescaped($_['url'].$i);?>"><?php p($i+1);?></a></li> - <?php else:?> - <li><?php p($i+1);?></li> - <?php endif?> - <?php endfor;?> - <?php if ($_['pagestop']<$_['pagecount']):?> - … - <?php endif;?> - - <?php if(($_['page']+1)<$_['pagecount']):?> - <li class="pagerbutton2"><a href="<?php print_unescaped($_['url'].($_['page']+1));?>"><?php p($l->t( 'next' )); ?></a></li> - <?php endif; ?> -</ol> 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"; 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']) { <fieldset class="personalblock" id="backgroundjobs"> <legend><strong><?php p($l->t('Cron'));?></strong></legend> - <table class="nostyle"> - <tr> - <td> + <p> <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_ajax">AJAX</label><br/> <em><?php p($l->t("Execute one task with each page loaded")); ?></em> - </td> - </tr> - <tr> - <td> + </p> + <p> <input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_webcron">Webcron</label><br/> <em><?php p($l->t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?></em> - </td> - </tr> - <tr> - <td> + </p> + <p> <input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_cron">Cron</label><br/> <em><?php p($l->t("Use systems cron service to call the cron.php file once a minute.")); ?></em> - </td> - </tr> - </table> + </p> </fieldset> <fieldset class="personalblock" id="shareAPI"> |