From bf77c580c1e20400dbeb3bdbb7e3ddcd87880409 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 27 Mar 2014 16:06:37 +0100 Subject: [PATCH 1/6] general styles for the content area --- core/css/apps.css | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/core/css/apps.css b/core/css/apps.css index 0e6a080c9cd..8eb3bdd683e 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -151,9 +151,6 @@ transition: padding-bottom 500ms ease 0s; padding-bottom: 40px; } -#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */ - padding: 10px 0; margin: 0; -} #app-navigation .error { color: #dd1144; } @@ -242,3 +239,22 @@ button.loading { padding-right: 30px; } + +/* general styles for the content area */ +.section { + display: block; + padding: 30px; + color: #555; + border-top: 1px solid #ddd; +} +.section h2 { + font-size: 20px; + font-weight: normal; + margin-bottom: 7px; +} +/* slight position correction of checkboxes and radio buttons */ +.section input[type="checkbox"], +.section input[type="radio"] { + vertical-align: -2px; + margin-right: 4px; +} From 69be5bdbd8fb9fc04d0c05179fa183a4e4fd35a3 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 27 Mar 2014 16:28:05 +0100 Subject: [PATCH 2/6] replace personalblock fieldset with section div in admin and personal settings --- settings/templates/admin.php | 61 ++++++----- settings/templates/personal.php | 175 +++++++++++++++----------------- 2 files changed, 112 insertions(+), 124 deletions(-) diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 9092d2833fd..10f19b8891e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -43,35 +43,35 @@ if ($_['mail_smtpmode'] == 'qmail') { // is ssl working ? if (!$_['isConnectedViaHTTPS']) { ?> -
+

t('Security Warning'));?>

t('You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.', $theme->getTitle())); ?> -
+ -
+

t('Security Warning'));?>

t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?> -
+ -
+

t('Setup Warning'));?>

@@ -79,42 +79,42 @@ if (!$_['isWebDavWorking']) { t('Please double check the installation guides.', link_to_docs('admin-install'))); ?> -
+ -
+

t('Module \'fileinfo\' missing'));?>

t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?> -
+ -
+

t('Your PHP version is outdated'));?>

t('Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.')); ?> -
+ -
+

t('Locale not working'));?>

@@ -132,21 +132,21 @@ if (!$_['isLocaleWorking']) { ?> -
+ -
+

t('Internet connection not working'));?>

t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?> -
+ @@ -156,7 +156,7 @@ if (!$_['internetconnectionworking']) { } ;?> -
+

t('Cron'));?>

@@ -199,9 +199,9 @@ if (!$_['internetconnectionworking']) {
t("Use systems cron service to call the cron.php file every 15 minutes.")); ?>

-
+ -
+

t('Sharing'));?>

@@ -255,9 +255,9 @@ if (!$_['internetconnectionworking']) {
-
+ -
+

t('Security'));?>

@@ -288,9 +288,9 @@ if (!$_['internetconnectionworking']) {
-
+ -
+

t('Email Server'));?>

t('This is used for sending out notifications.')); ?>

@@ -370,9 +370,9 @@ if (!$_['internetconnectionworking']) { t( 'Test email settings' )); ?> -
+ -
+

t('Log'));?>

t('Log level'));?> - - - -
-
-
+
+

t('Password'));?>

+
t('Your password was changed');?>
+
t('Unable to change your password');?>
+ + + + +
+
-
-
-

t('Full Name');?>

- - - -
+ +

t('Full Name');?>

+ + +
-
-
-

t('Email'));?>

- -
- t('Fill in an email address to enable password recovery and receive notifications'));?> -
+ +

t('Email'));?>

+ +
+ t('Fill in an email address to enable password recovery and receive notifications'));?>
-
-
-

t('Profile picture')); ?>

-
-

- - -
t('Upload new')); ?>
- -
t('Select new from Files')); ?>
-
t('Remove image')); ?>

- t('Either png or jpg. Ideally square but you will be able to crop it.')); ?> - - t('Your avatar is provided by your original account.')); ?> - -
- -
+ +

t('Profile picture')); ?>

+
+

+ + +
t('Upload new')); ?>
+ +
t('Select new from Files')); ?>
+
t('Remove image')); ?>

+ t('Either png or jpg. Ideally square but you will be able to crop it.')); ?> + + t('Your avatar is provided by your original account.')); ?> + +
+
-
-
-

t('Language'));?>

- + + + - - - - - - - - - - - t('Help translate'));?> - - -
+ + + + + + + + + t('Help translate'));?> + +
-
+

t('WebDAV'));?>


t('Use this address to access your Files via WebDAV', array(link_to_docs('user-webdav'))));?> -
+ -
+

t( 'Encryption' ) ); ?>

@@ -174,18 +164,17 @@ if($_['passwordChangeSupported']) {


-
+ -
+

t('Version'));?>

getName()); ?>
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> -
-
-

- getShortFooter()); ?> -

-
+ + +
+

getShortFooter()); ?>

+
From 6de572c6e6387ae2b60c97b655083a0412bfa643 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 27 Mar 2014 16:35:34 +0100 Subject: [PATCH 3/6] replace personalblock fieldset with section class in files apps --- apps/files/templates/admin.php | 42 ++- .../templates/settings-admin.php | 113 ++++---- .../templates/settings-personal.php | 119 ++++---- apps/files_external/templates/settings.php | 262 +++++++++--------- 4 files changed, 263 insertions(+), 273 deletions(-) diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index a5afd55fbc3..5f7d3261d6c 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -1,28 +1,26 @@ -
-
-

t('File handling')); ?>

- - - '/> - - (t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) - -
+ +

t('File handling')); ?>

+ + + '/> + + (t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) - checked="checked" /> -
+
+ + checked="checked" /> +
- ' - title="t( '0 is unlimited' )); ?>" - disabled="disabled" />
- t( 'Maximum input size for ZIP files' )); ?>
+ ' + title="t( '0 is unlimited' )); ?>" + disabled="disabled" />
+ t( 'Maximum input size for ZIP files' )); ?>
- - -
+ +
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php index 231a68b6a58..cf676c445ce 100644 --- a/apps/files_encryption/templates/settings-admin.php +++ b/apps/files_encryption/templates/settings-admin.php @@ -1,63 +1,60 @@ -
-
+ +

t('Encryption')); ?>

-

t('Encryption')); ?>

+

+ t("Enable recovery key (allow to recover users files in case of password loss):")); ?> +
+
+ + +
+ + +
+ /> + t("Enabled")); ?> +
-

- t("Enable recovery key (allow to recover users files in case of password loss):")); ?> -
-
- - -
- - -
- /> - t("Enabled")); ?> -
+ /> + t("Disabled")); ?> +

+

- /> - t("Disabled")); ?> -

+

> + t("Change recovery key password:")); ?>

- -

> - t("Change recovery key password:")); ?> -

- t("Old Recovery key password")); ?> -
-
- t("New Recovery key password")); ?> -
- t("Repeat New Recovery key password")); ?> -
- - -

-
+ t("Old Recovery key password")); ?> +
+
+ t("New Recovery key password")); ?> +
+ t("Repeat New Recovery key password")); ?> +
+ + +

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php index 1b4239d82cd..8139ece1950 100644 --- a/apps/files_encryption/templates/settings-personal.php +++ b/apps/files_encryption/templates/settings-personal.php @@ -1,66 +1,63 @@ -
-
-

t( 'Encryption' ) ); ?>

+ +

t( 'Encryption' ) ); ?>

- -

- - -
- t( "Set your old private key password to your current log-in password." ) ); ?> - t( " If you don't remember your old password you can ask your administrator to recover your files." ) ); - endif; ?> - -
- - -
- - -
- - -

- - - + +

+ +
-

- -
- t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?> -
- /> - t( "Enabled" ) ); ?> -
+ t( "Set your old private key password to your current log-in password." ) ); ?> + t( " If you don't remember your old password you can ask your administrator to recover your files." ) ); + endif; ?> + +
+ + +
+ + +
+ + +

+ - /> - t( "Disabled" ) ); ?> -
t( 'File recovery settings updated' ) ); ?>
-
t( 'Could not update file recovery' ) ); ?>
-

- + +
+

+ +
+ t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?> +
+ /> + t( "Enabled" ) ); ?> +
-

+ /> + t( "Disabled" ) ); ?> +
t( 'File recovery settings updated' ) ); ?>
+
t( 'Could not update file recovery' ) ); ?>
+

+ diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 5e84fa8a252..e7be16bede1 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -1,141 +1,139 @@ -
-
+

t('External Storage')); ?>

- '')) print_unescaped(''.$_['dependencies'].''); ?> - '> - - - - - - - - '.$l->t('Applicable').''); ?> - - - - - array())); ?> - - > - - - - - - - - + + + + + + + +
t('Folder name')); ?>t('External storage')); ?>t('Configuration')); ?> 
- - - - - - - - $value): ?> - - - - - - - - - - - - - - + '')) print_unescaped(''.$_['dependencies'].''); ?> + '> + + + + + + + + '.$l->t('Applicable').''); ?> + + + + + array())); ?> + + > + + + + - - + + + + - - - -
t('Folder name')); ?>t('External storage')); ?>t('Configuration')); ?> 
+ + + + + ' - data-applicable-users=''> - - + + $value): ?> + + + + + + + + + + + + + + + + + + - class="remove" - style="visibility:hidden;" - ><?php p($l->t('Delete')); ?>
+ 		' + data-applicable-users=''> + + class="remove" + style="visibility:hidden;" + ><?php p($l->t('Delete')); ?>
+
+ +
+ /> + - -
- /> - - -

class="hidden"> - t('Allow users to mount the following external storage')); ?>
- $backend): ?> - /> -
- - -

- -
+

class="hidden"> + t('Allow users to mount the following external storage')); ?>
+ $backend): ?> + /> +
+ + +

+
From 25326b89dad234ecbb91b778e6d1adf3600f09c6 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 27 Mar 2014 16:41:16 +0100 Subject: [PATCH 4/6] replace personalblock fieldset with section class in core user_ apps --- apps/user_ldap/templates/settings.php | 2 +- apps/user_webdavauth/templates/settings.php | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 79c4ae224c3..ee4a7df3cb8 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -1,5 +1,5 @@
-
+
    $title) { ?>
    • diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php index ad1701add8c..4596fdf3c78 100755 --- a/apps/user_webdavauth/templates/settings.php +++ b/apps/user_webdavauth/templates/settings.php @@ -1,9 +1,7 @@ - -
    -

    t('WebDAV Authentication'));?>

    -

    - - -
    t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?> -

    + +

    t('WebDAV Authentication'));?>

    +

    + + +
    t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>

    From 5b2abb32a64de2c315148893d2774a84315a5ac2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 27 Mar 2014 16:42:08 +0100 Subject: [PATCH 5/6] remove CSS rules for personalblock, remove it from core --- core/css/styles.css | 16 ++++------------ settings/css/settings.css | 5 ----- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index bd8111ebc72..4420633e34e 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -790,20 +790,12 @@ tr .action { width:16px; height:16px; } tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } tbody tr:hover, tr:active { background-color:#f8f8f8; } -#body-settings h2 { - font-size: 20px; - font-weight: normal; - margin-bottom: 7px; -} -#body-settings .personalblock, #body-settings .helpblock { - padding: 30px; - color: #555; - border-top: 1px solid #ddd; -} -#body-settings .personalblock#quota { position:relative; padding:0; } -#body-settings #controls+.helpblock { position:relative; margin-top:3em; } code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; } +#quota { + position: relative; + padding: 0; +} #quota div { padding: 0; background-color: rgb(220,220,220); diff --git a/settings/css/settings.css b/settings/css/settings.css index 280d022af4e..19678e687e1 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -12,11 +12,6 @@ input#openid, input#webdav { width:20em; } display: block; } -.personalblock input[type="checkbox"] { - position: relative; - top: 2px; -} - /* Sync clients */ .clientsbox { margin:12px; } .clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; } From 6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 31 Mar 2014 13:00:46 +0200 Subject: [PATCH 6/6] replace last personalblock fieldset within files_external --- apps/files_external/templates/settings.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index e7be16bede1..8b01b7677e5 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -137,11 +137,10 @@ -
    -

    t('SSL root certificates'));?>

    '> @@ -161,6 +160,5 @@ -