From 07affc574b4942df989c6ef963f8b02366f5bb5f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 4 May 2021 13:16:01 +0200 Subject: [PATCH 1/5] fix layout, show icon on buttons only on small devices --- views/bootstrap/class.GroupMgr.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php index 539ad3e2f..e9a4946b1 100644 --- a/views/bootstrap/class.GroupMgr.php +++ b/views/bootstrap/class.GroupMgr.php @@ -187,6 +187,7 @@ $(document).ready( function() { contentContainerStart(); $this->formField( getMLText("name"), array( @@ -207,14 +208,15 @@ $(document).ready( function() { 'value'=>($group ? htmlspecialchars($group->getComment()) : '') ) ); + $this->contentContainerEnd(); $this->formSubmit(" ".getMLText('save')); ?> contentSubHeading(getMLText("group_members")); + $this->contentHeading(getMLText("group_members")); ?> - +
getUsers(); if (count($members) == 0) @@ -228,9 +230,9 @@ $(document).ready( function() { print ""; print ""; print ""; } } @@ -238,7 +240,7 @@ $(document).ready( function() {
" . htmlspecialchars($member->getFullName()) . "" . ($group->isMember($member,true)?getMLText("manager"):" ") . ""; - print "
getID()."\" />getID()."\" />".createHiddenFieldWithKey('rmmember')."
"; + print "
getID()."\" />getID()."\" />".createHiddenFieldWithKey('rmmember')."
"; print " "; - print "
getID()."\" />getID()."\" />".createHiddenFieldWithKey('tmanager')."
"; + print "
getID()."\" />getID()."\" />".createHiddenFieldWithKey('tmanager')."
"; print "
contentSubHeading(getMLText("add_member")); + $this->contentHeading(getMLText("add_member")); ?>
@@ -246,6 +248,7 @@ $(document).ready( function() { contentContainerStart(); $options = array(); $allUsers = $dms->getAllUsers($sortusersinlist); foreach ($allUsers as $currUser) { @@ -271,6 +274,7 @@ $(document).ready( function() { 'value'=>1 ) ); + $this->contentContainerEnd(); $this->formSubmit(" ".getMLText('add')); ?>
@@ -326,11 +330,9 @@ $(document).ready( function() { columnEnd(); $this->columnStart(8); - $this->contentContainerStart(); ?>
getID()."\"" : "") ?>>
contentContainerEnd(); $this->columnEnd(); $this->rowEnd(); $this->contentEnd(); From 4cb9ed294ef136e98b13eab5e4b1d46d0930dc5b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 4 May 2021 13:16:35 +0200 Subject: [PATCH 2/5] place submit button outside of contentContainer --- views/bootstrap/class.UsrMgr.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 3cb9763b7..4cf8b1ad4 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -227,6 +227,7 @@ $(document).ready( function() { contentContainerStart(); $this->formField( getMLText("user_login"), array( @@ -501,6 +502,7 @@ $(document).ready( function() { ); } } + $this->contentContainerEnd(); $this->formSubmit(" ".getMLText($currUser ? "save" : "add_user")); ?> @@ -555,12 +557,10 @@ $(document).ready( function() { columnEnd(); $this->columnStart(4); - $this->contentContainerStart(); ?>
getID()."\"" : "") ?>>
contentContainerEnd(); $this->columnEnd(); $this->rowEnd(); $this->contentEnd(); From d3958e73f94bf98bbf3d2d984cf35430860a1977 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 4 May 2021 13:17:07 +0200 Subject: [PATCH 3/5] add border botton to contentHeading --- views/bootstrap4/class.Bootstrap4.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index dfd1a4918..16bfaa4ee 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -1005,9 +1005,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);; function contentHeading($heading, $noescape=false) { /* {{{ */ if($noescape) - echo "".$heading."\n"; + echo "".$heading."\n"; else - echo "".htmlspecialchars($heading)."\n"; + echo "".htmlspecialchars($heading)."\n"; return; } /* }}} */ From 5fe8ab1615598734174907d9a7da15fc93e5f041 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 4 May 2021 13:40:05 +0200 Subject: [PATCH 4/5] set width of pwd strength bar to 100% --- views/bootstrap/class.UsrMgr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 4cf8b1ad4..67d1193ca 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -245,7 +245,7 @@ $(document).ready( function() { if($passwordstrength > 0) { $this->formField( getMLText("password_strength"), - '
' + '
' ); } $this->formField( From 1c6c36eb52fc1c764f99652f37166deaf7468e58 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 4 May 2021 13:40:49 +0200 Subject: [PATCH 5/5] fix update of pwd strength bar --- views/bootstrap4/styles/application.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js index a94495658..4f129e2a3 100644 --- a/views/bootstrap4/styles/application.js +++ b/views/bootstrap4/styles/application.js @@ -521,11 +521,11 @@ $(document).ready( function() { pwsp = 100*data.score; $('#'+target+' div.bar').width(pwsp+'%'); if(data.ok) { - $('#'+target+' div.bar').removeClass('bar-danger'); - $('#'+target+' div.bar').addClass('bar-success'); + $('#'+target+' div.bar').removeClass('bg-danger'); + $('#'+target+' div.bar').addClass('bg-success'); } else { - $('#'+target+' div.bar').removeClass('bar-success'); - $('#'+target+' div.bar').addClass('bar-danger'); + $('#'+target+' div.bar').removeClass('bg-success'); + $('#'+target+' div.bar').addClass('bg-danger'); } } }); /* }}} */ @@ -588,11 +588,11 @@ $(document).ready( function() { pwsp = 100*data.score; $('#'+target+' div.bar').width(pwsp+'%'); if(data.ok) { - $('#'+target+' div.bar').removeClass('bar-danger'); - $('#'+target+' div.bar').addClass('bar-success'); + $('#'+target+' div.bar').removeClass('bg-danger'); + $('#'+target+' div.bar').addClass('bg-success'); } else { - $('#'+target+' div.bar').removeClass('bar-success'); - $('#'+target+' div.bar').addClass('bar-danger'); + $('#'+target+' div.bar').removeClass('bg-success'); + $('#'+target+' div.bar').addClass('bg-danger'); } } }); /* }}} */ @@ -804,7 +804,7 @@ function onAddClipboard(ev) { /* {{{ */ this.statusbar = $("
"); this.filename = $("
").appendTo(this.statusbar); this.size = $("
").appendTo(this.statusbar); - this.progressBar = $("
").appendTo(this.statusbar); + this.progressBar = $("
").appendTo(this.statusbar); this.abort = $("
" + abortBtnLabel + "
").appendTo(this.statusbar); // $('.statusbar').empty(); obj.after(this.statusbar);