From 5d1d0d1a9f84bf9ab8aa48473ab193a60e8ba4d5 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 18:59:08 +0000 Subject: [PATCH 1/7] Remove empty help spans from templates. The empty spans from the templates mess up the layout sometimes, and are useless weight anyway. Lets get rid of them. --- view/templates/field_checkbox.tpl | 4 +++- view/templates/field_combobox.tpl | 4 +++- view/templates/field_custom.tpl | 4 +++- view/templates/field_input.tpl | 2 ++ view/templates/field_intcheckbox.tpl | 2 ++ view/templates/field_openid.tpl | 4 +++- view/templates/field_password.tpl | 2 ++ view/templates/field_radio.tpl | 2 ++ view/templates/field_richtext.tpl | 4 +++- view/templates/field_select.tpl | 4 +++- view/templates/field_select_raw.tpl | 4 +++- view/templates/field_textarea.tpl | 4 +++- view/templates/field_themeselect.tpl | 4 +++- view/templates/field_yesno.tpl | 4 +++- 14 files changed, 38 insertions(+), 10 deletions(-) diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl index b66cced87..8275d4595 100644 --- a/view/templates/field_checkbox.tpl +++ b/view/templates/field_checkbox.tpl @@ -1,6 +1,8 @@
- + + {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl index 458655016..876e607cd 100644 --- a/view/templates/field_combobox.tpl +++ b/view/templates/field_combobox.tpl @@ -13,6 +13,8 @@ {{foreach $field.4 as $opt=>$val}}{{/foreach}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl index 0b0928402..6649b0ff9 100644 --- a/view/templates/field_custom.tpl +++ b/view/templates/field_custom.tpl @@ -3,5 +3,7 @@
{{$field.2}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl index 495493f2f..850656bb8 100644 --- a/view/templates/field_input.tpl +++ b/view/templates/field_input.tpl @@ -2,5 +2,7 @@
+ {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl index 73bdf6041..9c5f04e79 100644 --- a/view/templates/field_intcheckbox.tpl +++ b/view/templates/field_intcheckbox.tpl @@ -3,5 +3,7 @@
+ {{if $field.4}} {{$field.4}} + {{/if}}
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl index 062ac6ac6..9a18bbc13 100644 --- a/view/templates/field_openid.tpl +++ b/view/templates/field_openid.tpl @@ -2,5 +2,7 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl index 333ce67c3..4b4d4f2b2 100644 --- a/view/templates/field_password.tpl +++ b/view/templates/field_password.tpl @@ -2,5 +2,7 @@
+ {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl index 6b880ed99..1e1d8e0b1 100644 --- a/view/templates/field_radio.tpl +++ b/view/templates/field_radio.tpl @@ -1,5 +1,7 @@
+ {{if $field.3}} {{$field.3}} + {{/if}}
diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl index 67553bb95..bc346ddb0 100644 --- a/view/templates/field_richtext.tpl +++ b/view/templates/field_richtext.tpl @@ -3,5 +3,7 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl index 2d037439d..87a2ab9ff 100644 --- a/view/templates/field_select.tpl +++ b/view/templates/field_select.tpl @@ -5,5 +5,7 @@ - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl index 4c826a042..147c028ef 100644 --- a/view/templates/field_select_raw.tpl +++ b/view/templates/field_select_raw.tpl @@ -5,5 +5,7 @@ - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl index c37537d6e..60594a266 100644 --- a/view/templates/field_textarea.tpl +++ b/view/templates/field_textarea.tpl @@ -3,5 +3,7 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl index 51f6057ae..5f56c187e 100644 --- a/view/templates/field_themeselect.tpl +++ b/view/templates/field_themeselect.tpl @@ -5,6 +5,8 @@ - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} {{if $field.5}}
{{/if}} diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl index 155d0488b..7e7c3cc4e 100644 --- a/view/templates/field_yesno.tpl +++ b/view/templates/field_yesno.tpl @@ -10,5 +10,7 @@ {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}} From 2d8a4a923f0ff02fff2aa74ac2a2aea4d860fe41 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:00:47 +0000 Subject: [PATCH 2/7] Fix login dialog layout. Rearrange login dialog distinguish better between logging und registering. --- view/templates/login.tpl | 18 ++++++++------ view/theme/vier/mobile.css | 7 ++++++ view/theme/vier/style.css | 50 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/view/templates/login.tpl b/view/templates/login.tpl index e1e8c5f3a..c2dac46f6 100644 --- a/view/templates/login.tpl +++ b/view/templates/login.tpl @@ -4,11 +4,14 @@
-
{{$login}}
+

{{$login}}

{{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} +
{{if $openid}} @@ -17,16 +20,11 @@
{{/if}} - {{include file="field_checkbox.tpl" field=$lremember}} - - -
+ + {{include file="field_checkbox.tpl" field=$lremember}} {{foreach $hiddens as $k=>$v}} @@ -35,5 +33,9 @@ + diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css index 66721a1b8..b528ca4bd 100644 --- a/view/theme/vier/mobile.css +++ b/view/theme/vier/mobile.css @@ -91,6 +91,13 @@ nav ul { width: 100% !important; height: 110px !important; } + #login-extra-links, #login-form { + /* width: 341px; */ + width: 100%; + } + #id_remember_label { + width: unset; + } } @media screen and (max-width: 480px) { diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 710c76f6a..aad5d4384 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2422,10 +2422,60 @@ aside #div_id_remember label { float: inherit; } +#login-group { + overflow: hidden; +} + +#login-head { + position: unset; + width: unset; + height: unset; + margin-bottom: 10px; +} + +div #wrapper_username { + padding: 0px; +} + +div #wrapper_password { + padding: 0px; + margin-bottom: 0px; +} + +#div_id_remember { + float: left; + width: unset; +} + +#remember_tip { + display: none; +} + +#login-submit-wrapper { + float: right; +} + +#login-form { + margin-top: 20px; +} + +#login-extra-links, #login-form { + /* width: 341px; */ + width: 341px; + clear: both; + border-top: 3px solid white; + padding-top: 20px; +} + aside div #login-submit-button { margin-left:0px; } +#login-lost-password-link { + margin-bottom: 10px; + float: right; +} + aside #register-link, aside #lost-password-link { display: block; } From fe74a3d697bbff697a05b34381f43ce8a04319f7 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:15:54 +0000 Subject: [PATCH 3/7] Remove empty help spans from templates. The empty spans from the templates mess up the layout sometimes, and are useless weight anyway. Lets get rid of them. --- view/theme/frio/templates/field_checkbox.tpl | 4 +++- view/theme/frio/templates/field_colorinput.tpl | 4 +++- view/theme/frio/templates/field_custom.tpl | 4 +++- view/theme/frio/templates/field_fileinput.tpl | 4 +++- view/theme/frio/templates/field_input.tpl | 4 +++- view/theme/frio/templates/field_intcheckbox.tpl | 4 +++- view/theme/frio/templates/field_openid.tpl | 4 +++- view/theme/frio/templates/field_password.tpl | 4 +++- view/theme/frio/templates/field_radio.tpl | 4 +++- view/theme/frio/templates/field_select.tpl | 6 ++++-- view/theme/frio/templates/field_select_raw.tpl | 6 ++++-- view/theme/frio/templates/field_textarea.tpl | 4 +++- view/theme/frio/templates/field_themeselect.tpl | 4 +++- view/theme/frio/templates/field_yesno.tpl | 2 ++ 14 files changed, 43 insertions(+), 15 deletions(-) diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl index 787a82ebd..1fde3634a 100644 --- a/view/theme/frio/templates/field_checkbox.tpl +++ b/view/theme/frio/templates/field_checkbox.tpl @@ -4,6 +4,8 @@ - \ No newline at end of file + diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl index 886d647e9..704db346d 100644 --- a/view/theme/frio/templates/field_colorinput.tpl +++ b/view/theme/frio/templates/field_colorinput.tpl @@ -6,6 +6,8 @@ {{if $field.4}}{{$field.4}}{{/if}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_custom.tpl b/view/theme/frio/templates/field_custom.tpl index 20f529278..158073a64 100644 --- a/view/theme/frio/templates/field_custom.tpl +++ b/view/theme/frio/templates/field_custom.tpl @@ -2,5 +2,7 @@
{{$field.2}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl index 721a6535f..c5f8ac86d 100644 --- a/view/theme/frio/templates/field_fileinput.tpl +++ b/view/theme/frio/templates/field_fileinput.tpl @@ -6,6 +6,8 @@ {{if $field.4}}{{$field.4}}{{/if}} - {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl index bbd7535e5..62a7d72e8 100644 --- a/view/theme/frio/templates/field_input.tpl +++ b/view/theme/frio/templates/field_input.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl index 8863d14c4..f898c87fa 100644 --- a/view/theme/frio/templates/field_intcheckbox.tpl +++ b/view/theme/frio/templates/field_intcheckbox.tpl @@ -2,6 +2,8 @@
- {{$field.4}} + {{if $field.4}} + {{$field.4}} + {{/if}}
diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl index 8081f9cf1..66f8c9e80 100644 --- a/view/theme/frio/templates/field_openid.tpl +++ b/view/theme/frio/templates/field_openid.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl index 31defaf33..7bef420a1 100644 --- a/view/theme/frio/templates/field_password.tpl +++ b/view/theme/frio/templates/field_password.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_radio.tpl b/view/theme/frio/templates/field_radio.tpl index 42c145e3a..725e1c96a 100644 --- a/view/theme/frio/templates/field_radio.tpl +++ b/view/theme/frio/templates/field_radio.tpl @@ -4,7 +4,9 @@ - \ No newline at end of file + diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl index 9c0315121..594b91002 100644 --- a/view/theme/frio/templates/field_select.tpl +++ b/view/theme/frio/templates/field_select.tpl @@ -4,5 +4,7 @@ - {{$field.3}} - \ No newline at end of file + {{if $field.3}} + {{$field.3}} + {{/if}} + diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl index d4f476860..52b63079c 100644 --- a/view/theme/frio/templates/field_select_raw.tpl +++ b/view/theme/frio/templates/field_select_raw.tpl @@ -4,5 +4,7 @@ - {{$field.3}} - \ No newline at end of file + {{if $field.3}} + {{$field.3}} + {{/if}} + diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl index 8ef56babb..1aea484de 100644 --- a/view/theme/frio/templates/field_textarea.tpl +++ b/view/theme/frio/templates/field_textarea.tpl @@ -2,6 +2,8 @@
- {{$field.3}} + {{if $field.3}} + {{$field.3}} + {{/if}}
diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl index 3b2cb780c..fc1f7243a 100644 --- a/view/theme/frio/templates/field_themeselect.tpl +++ b/view/theme/frio/templates/field_themeselect.tpl @@ -5,6 +5,8 @@ + {{if $field.3}} {{$field.3}} + {{/if}} {{if $field.5=="preview"}}
{{/if}} - \ No newline at end of file + diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl index 85096c70e..47649fe67 100644 --- a/view/theme/frio/templates/field_yesno.tpl +++ b/view/theme/frio/templates/field_yesno.tpl @@ -14,6 +14,8 @@ + {{if $field.3}} {{$field.3}} + {{/if}}
From e5ed2fdede23fc9368ab214a2acdda10fc4e0f1d Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 19:57:04 +0000 Subject: [PATCH 4/7] Remove complete section when registering disabled. Move out the check so that the complete div containing the register-link is removed. --- view/templates/login.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/templates/login.tpl b/view/templates/login.tpl index c2dac46f6..029ebb034 100644 --- a/view/templates/login.tpl +++ b/view/templates/login.tpl @@ -33,9 +33,11 @@ +{{if $register}} +{{/if}} From 6a1ce9c9c0960850401dde26b474d36f70944f54 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Mon, 23 Apr 2018 20:03:29 +0000 Subject: [PATCH 5/7] Fix login dialog layout for frio. Rearrange login dialog distinguish better between logging und registering. --- view/theme/frio/css/style.css | 37 +++++++++++++++++++++++++---- view/theme/frio/templates/login.tpl | 13 +++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 1614547b8..55ccff4d7 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3136,12 +3136,25 @@ section .profile-match-wrapper { * Login page */ #login-submit-wrapper { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; + float: right; } #lost-password-link { flex-grow: 2; } +#login-lost-password-link { + margin-bottom: 10px; + float: right; +} +#div_id_remember { + float: left; +} +#id_password_wrapper { + margin-bottom: unset; +} +#login_openid { + clear: both; +} +#register-link { + width: 100%; +} .mod-home.is-not-singleuser, .mod-login { @@ -3166,12 +3179,21 @@ section .profile-match-wrapper { margin-top: 2.5%; } +.mod-home.is-not-singleuser .login-form > #login-form, +.mod-home.is-not-singleuser .login-form > #login-extra-links, +.mod-login #content #login-form { + overflow: hidden; +} +.mod-home.is-not-singleuser .login-form > #login-extra-links { + margin-top: 4em; + margin-bottom: 1em; +} + .mod-home.is-not-singleuser .login-form > #login-form label, .mod-login #content #login-form label { color: #eee; } - .mod-home.is-not-singleuser .login-panel-content, .mod-login .login-panel-content { background-color: rgba(255,255,255,.85); @@ -3185,12 +3207,17 @@ section .profile-match-wrapper { } .mod-home.is-not-singleuser .login-form > #login-form, + .mod-home.is-not-singleuser .login-form > #login-extra-links, .mod-login #content #login-form { background-color: #fff; padding: 1em; position: relative; margin-top: 4em; } + .mod-home.is-not-singleuser .login-form > #login-extra-links { + margin-top: unset; + background-color: #8ad0a1; + } .mod-home.is-not-singleuser .login-form > #login-form label, .mod-login #content #login-form label { diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl index aaa42d24b..332ac70df 100644 --- a/view/theme/frio/templates/login.tpl +++ b/view/theme/frio/templates/login.tpl @@ -8,6 +8,9 @@
{{include file="field_input.tpl" field=$lname}} {{include file="field_password.tpl" field=$lpassword}} +
{{if $openid}} @@ -19,10 +22,7 @@ {{include file="field_checkbox.tpl" field=$lremember}}
- {{$lostlink}} -
- {{if $register}}{{$register.desc}}{{/if}}
@@ -35,4 +35,11 @@ +{{if $register}} + +{{/if}} + From 1a69265da49f02985d0afd7d57c704c9e75335e1 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Tue, 24 Apr 2018 21:16:15 +0000 Subject: [PATCH 6/7] Fix missing background tiles. --- view/theme/frio/css/style.css | 8 +++----- view/theme/frio/templates/login.tpl | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 55ccff4d7..c4d64973e 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3155,6 +3155,9 @@ section .profile-match-wrapper { #register-link { width: 100%; } +#login-end { + clear: both; +} .mod-home.is-not-singleuser, .mod-login { @@ -3179,11 +3182,6 @@ section .profile-match-wrapper { margin-top: 2.5%; } -.mod-home.is-not-singleuser .login-form > #login-form, -.mod-home.is-not-singleuser .login-form > #login-extra-links, -.mod-login #content #login-form { - overflow: hidden; -} .mod-home.is-not-singleuser .login-form > #login-extra-links { margin-top: 4em; margin-bottom: 1em; diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl index 332ac70df..57bb86c15 100644 --- a/view/theme/frio/templates/login.tpl +++ b/view/theme/frio/templates/login.tpl @@ -32,6 +32,7 @@ {{/foreach}} +
From d06a174f0cc4fc14267fcd606a0855592c4d1448 Mon Sep 17 00:00:00 2001 From: Andreas Neustifter Date: Tue, 24 Apr 2018 21:18:31 +0000 Subject: [PATCH 7/7] Make register-link less obtrusive. --- view/theme/frio/css/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index c4d64973e..9c5431605 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3153,6 +3153,8 @@ section .profile-match-wrapper { clear: both; } #register-link { + color: white; + background: #8ad0a1; width: 100%; } #login-end { @@ -3214,7 +3216,7 @@ section .profile-match-wrapper { } .mod-home.is-not-singleuser .login-form > #login-extra-links { margin-top: unset; - background-color: #8ad0a1; + background-color: white; } .mod-home.is-not-singleuser .login-form > #login-form label,