From 50f9ed78d3404baa63ec078f740ef14bcc9e6fd2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2015 11:09:15 +0200 Subject: [PATCH 1/3] code style fixes --- core/css/styles.css | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index b1df8d1a8a..5d4a5a7eee 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -409,7 +409,9 @@ input[type="submit"].enabled { padding: 5px; } -#body-login div.buttons { text-align:center; } +#body-login div.buttons { + text-align: center; +} #body-login p.info { width: 22em; margin: 0 auto; @@ -420,14 +422,22 @@ input[type="submit"].enabled { padding: 13px; margin: -13px; } -#body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ - -#body-login form { width:22em; margin:2em auto 2em; padding:0; } +/* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ +#body-login #submit.login { + margin-right: 7px; +} +#body-login form { + width: 22em; + margin: 2em auto 2em; + padding: 0; +} #body-login form fieldset { margin-bottom: 20px; text-align: left; } -#body-login form #adminaccount { margin-bottom:15px; } +#body-login form #adminaccount { + margin-bottom: 15px; +} #body-login form fieldset legend, #datadirContent label { width: 100%; } @@ -618,7 +628,9 @@ label.infield { /* Warnings and errors are the same */ -#body-login .warning, #body-login .update, #body-login .error { +#body-login .warning, +#body-login .update, +#body-login .error { display: block; padding: 10px; background-color: rgba(0,0,0,.3); From f3efd7a51e377b5e789bf057228f95da28caa9c8 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2015 11:10:41 +0200 Subject: [PATCH 2/3] fix position of SQLite warning --- core/css/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index 5d4a5a7eee..66f241eaee 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -435,6 +435,10 @@ input[type="submit"].enabled { margin-bottom: 20px; text-align: left; } +#body-login form #sqliteInformation { + margin-top: -20px; + margin-bottom: 20px; +} #body-login form #adminaccount { margin-bottom: 15px; } From dd7e519cda569b5f0f175799975a836425446987 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 9 Apr 2015 11:27:24 +0200 Subject: [PATCH 3/3] add link to installation documentation to setup page --- core/css/icons.css | 3 +++ core/css/styles.css | 3 +++ core/img/actions/info-white.png | Bin 0 -> 324 bytes core/img/actions/info-white.svg | 5 +++++ core/templates/installation.php | 10 ++++++++-- 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 core/img/actions/info-white.png create mode 100644 core/img/actions/info-white.svg diff --git a/core/css/icons.css b/core/css/icons.css index ecf6b17995..0f60251588 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -79,6 +79,9 @@ .icon-info { background-image: url('../img/actions/info.svg'); } +.icon-info-white { + background-image: url('../img/actions/info-white.svg'); +} .icon-logout { background-image: url('../img/actions/logout.svg'); diff --git a/core/css/styles.css b/core/css/styles.css index 66f241eaee..3df2abd49d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -459,6 +459,9 @@ input[type="submit"].enabled { vertical-align: bottom; /* adjust position of Advanced dropdown arrow */ margin-left: -4px; } +#body-login .icon-info-white { + padding: 10px; +} /* strengthify wrapper */ #body-login .strengthify-wrapper { diff --git a/core/img/actions/info-white.png b/core/img/actions/info-white.png new file mode 100644 index 0000000000000000000000000000000000000000..670d7309c4eec4e6c8e462309db6511d66d4c8af GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}MSxF;>;C})sYXI4fNoGP3GxeO zVB;1Pm6Vp%w(<2335$$N&8w?#>FDa4IA`6)O}h`AyKwROi}#=YGAwG-0BQ;Gba4!+ zxK(??Rj9#%hxOtEo_Fh-|NOo`K{WIv)4g@G<7V=CMoc_CF~sceW|^BGEkBt2mNu4O zyMKY=LkE>xtTu*B8A4t?MLrrKr;hinHv93y%vD~_eJRWI0KJFoK=T + + + + diff --git a/core/templates/installation.php b/core/templates/installation.php index 96e6119cad..911bc05069 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -28,7 +28,7 @@ script('core', [
- t('Security Warning'));?> + t('Security warning'));?>

t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?>
t( 'For information how to properly configure your server, please see the documentation.', @@ -150,7 +150,7 @@ script('core', [ 0): ?>

- t('Performance Warning'));?> + t('Performance warning'));?>

t('SQLite will be used as database.'));?>

t('For larger installations we recommend to choose a different database backend.'));?>

t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?>

@@ -158,4 +158,10 @@ script('core', [
+ +

+ + t('Need help?'));?> + t('See the documentation'));?> ↗ +