From 8892b3daa1bcd15284944b28e85ca210133ca3fb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 10:44:36 -0500 Subject: [PATCH 1/4] Remove obsolete CSS styles related to the old ACL selector --- view/theme/duepuntozero/deriv/darkzero.css | 7 +- view/theme/duepuntozero/style.css | 83 ------------------ view/theme/frio/css/style.css | 76 ----------------- view/theme/quattro/dark/style.css | 91 -------------------- view/theme/quattro/green/style.css | 91 -------------------- view/theme/quattro/lilac/style.css | 91 -------------------- view/theme/quattro/quattro.less | 82 ------------------ view/theme/smoothly/style.css | 97 ---------------------- view/theme/vier/dark.css | 9 -- view/theme/vier/mobile.css | 24 ------ view/theme/vier/style.css | 91 -------------------- 11 files changed, 1 insertion(+), 741 deletions(-) diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css index 60e2d9c45..dc021a619 100644 --- a/view/theme/duepuntozero/deriv/darkzero.css +++ b/view/theme/duepuntozero/deriv/darkzero.css @@ -126,18 +126,13 @@ input#dfrn-url { border: 1px solid #cccccc; } -.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net { +#profile-jot-email-label, div#jot-preview-content, div.profile-jot-net { color: #eec; } #fancybox-content{ background:#444; } -input#acl-search { - background-color: #aaa; -} - - .notify-seen { background:#111; } diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index bb5a25490..eceaed124 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1821,97 +1821,14 @@ blockquote.shared_content { margin-bottom: 15px; } - #acl-wrapper { width: 690px; float:left; } -#acl-search { - float:right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right:20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; - color: #999999; -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} - -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -#acl-list-content { - -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img{ - width:22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} #acl-wrapper a:hover { text-decoration: none; color:#000000; } -.acl-button-show { background-image: url("../../../images/show_off.png"); } -.acl-button-hide { background-image: url("../../../images/hide_off.png"); } - -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { border-color: #9ade00; } -.acl-list-item.grouphide { border-color: #ff4141; } /** /acl **/ diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index b0458d513..630a92fb2 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1457,82 +1457,6 @@ textarea.comment-edit-text:focus + .comment-edit-form .preview { overflow-y: overlay; } /* ACL */ -/*#jot-modal-body { - height: auto; - max-height: calc(100vh - 130px); - overflow-y: hidden; -}*/ -#acl-search { - /*margin-top: 20px;*/ - /*padding: 8px;*/ - /*border: 1px solid #ccc;*/ - width: 100%; -} -#acl-list { - display: block; - border: 1px solid #ccc; - clear: both; - min-height: 62px; - margin-top: 20px; - padding: 10px 10px 0px 0px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - overflow-y: auto; -} -#acl-list-content { - overflow-y: hidden; - height: auto !important; -} -.acl-list-item { - width: 48%; - width: calc(50% - 10px); - border: 1px solid #ccc; - margin: 0px 0px 10px 10px; - padding: 5px; - float: left; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.acl-list-item img { - width: 40px; - height: 40px; - float: left; - margin-right: 5px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.acl-list-item p { - margin: 0px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} -.acl-list-item.groupshow { - background-color: #8DB255 -} -.acl-list-item.grouphide { - background-color: #E68364; -} -.acl-button-show, .acl-button-hide { - float: right; - margin-left: 5px; -} -#acl-showall.selected { - background-color: #4CAF50; - color: #fff; -} -.acl-button-show.selected { - background-color: #4CAF50; - color: #fff; -} -.acl-button-hide.selected { - background-color: #F44336; - color: #fff; -} - .fa.lock:before { font-family: ForkAwesome; content: "\f023"; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 6b4d2b880..0ce009cdb 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1848,101 +1848,10 @@ h2 > .actionbutton { width: 690px; float: left; } -#acl-search { - float: right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0 30px; - color: #999999; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img { - width: 22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { - height: 12px; - font-size: 10px; - margin: 0; - padding: 2px 0 1px; - overflow: hidden; -} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} #acl-wrapper a:hover { text-decoration: none; color: #000000; } -.acl-button-show { - background-image: url("../../../images/show_off.png"); -} -.acl-button-hide { - background-image: url("../../../images/hide_off.png"); -} -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { - border-color: #9ade00; -} -.acl-list-item.grouphide { - border-color: #ff4141; -} /** /acl **/ /** tab buttons **/ ul.tabs { diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 326a2fbfd..c0a1befad 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1848,101 +1848,10 @@ h2 > .actionbutton { width: 690px; float: left; } -#acl-search { - float: right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0 30px; - color: #999999; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img { - width: 22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { - height: 12px; - font-size: 10px; - margin: 0; - padding: 2px 0 1px; - overflow: hidden; -} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} #acl-wrapper a:hover { text-decoration: none; color: #000000; } -.acl-button-show { - background-image: url("../../../images/show_off.png"); -} -.acl-button-hide { - background-image: url("../../../images/hide_off.png"); -} -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { - border-color: #9ade00; -} -.acl-list-item.grouphide { - border-color: #ff4141; -} /** /acl **/ /** tab buttons **/ ul.tabs { diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 064b60ba6..05cb05b18 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -1848,101 +1848,10 @@ h2 > .actionbutton { width: 690px; float: left; } -#acl-search { - float: right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0 30px; - color: #999999; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img { - width: 22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { - height: 12px; - font-size: 10px; - margin: 0; - padding: 2px 0 1px; - overflow: hidden; -} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} #acl-wrapper a:hover { text-decoration: none; color: #000000; } -.acl-button-show { - background-image: url("../../../images/show_off.png"); -} -.acl-button-hide { - background-image: url("../../../images/hide_off.png"); -} -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { - border-color: #9ade00; -} -.acl-list-item.grouphide { - border-color: #ff4141; -} /** /acl **/ /** tab buttons **/ ul.tabs { diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 0c1c21a7b..2406fea53 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1134,96 +1134,14 @@ h2 > .actionbutton { float: right; } display:block!important; } - - #acl-wrapper { width: 690px; float:left; } -#acl-search { - float:right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right:20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0 30px; - color: #999999; - .rounded(5px); -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} - -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -#acl-list-content { - -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img{ - width:22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { height: 12px; font-size: 10px; margin: 0; padding: 2px 0 1px; overflow: hidden;} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} #acl-wrapper a:hover { text-decoration: none; color:#000000; } -.acl-button-show { background-image: url("../../../images/show_off.png"); } -.acl-button-hide { background-image: url("../../../images/hide_off.png"); } - -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { border-color: #9ade00; } -.acl-list-item.grouphide { border-color: #ff4141; } /** /acl **/ /** tab buttons **/ diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ea84f0166..7e276f459 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -4138,108 +4138,11 @@ tools { width: 690px; float:left; } -#acl-search { - float:right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; -} - -#acl-showall { - float: left; - display: block; - font-size: 1em; - font-style: bold; - text-align: center; - padding: 3px; - margin-bottom: 5px; - background-color: #cccccc; - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 5px; - border-radius: 5px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - color: #999999; -} - -#acl-showall.selected { - color: #ffffff; - background-color: #1873a2; -} - -#acl-list { - height: 400px; - border: 1px solid #cccccc; - background-color: #efefef; - clear: both; - margin-top: 30px; - overflow: auto; -} - -#acl-list-content { -} - -.acl-list-item { - display: block; - width: 155px; - height: 50px; - border: 1px solid #cccccc; - background-color: #fff; - margin: 5px; - float: left; - box-shadow: 2px 2px 3px #c1c1c1; - -moz-box-shadow: 2px 2px 3px #c1c1c1; - -webkit-box-shadow: 2px 2px 3px #c1c1c1; -} -.acl-list-item img { - width: 30px; - height: 30px; - float: left; - margin: 5px; -} - -.acl-list-item p { - color: #999999; - height: 12px; - font-size: 0.7em; - margin: 0px; - padding: 2px 0px 1px; - overflow: hidden; -} - -.acl-list-item a { - font-size: 10px; - display: block; - float: left; - color: #efefef; - background-color: #898989; - background-position: 3px 3px; - background-repeat: no-repeat; - margin: 10px 0 0 5px; - border-radius: 2px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - padding: 3px; -} - #acl-wrapper a:hover { text-decoration: none; background-color:#1873a2; } -.acl-button-show.selected { - color: #efefef; - background-color: #1873a2; -} - -.acl-button-hide .selected { - color: #efefef; - background-color: #a2a2a2; -} - -.acl-list-item.groupshow { border-color: #1873a2; } -.acl-list-item.grouphide { border-color: #a2a2a2; } - /* ========================= */ /* = Global Directory Link = */ /* ========================= */ diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css index 9fbe4d347..f18076b50 100644 --- a/view/theme/vier/dark.css +++ b/view/theme/vier/dark.css @@ -88,15 +88,6 @@ table.smiley-preview{ background-color: #252C33 !important; } -/* ACL permission popup */ - .acl-list-item.groupshow { - border-color: #9ade00 !important; -} - -.acl-list-item.grouphide { - border-color: #ff4141 !important; -} - /* Notifications */ li.notify-unseen { background-color: #252C33; diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css index 7ad071756..caadf66ba 100644 --- a/view/theme/vier/mobile.css +++ b/view/theme/vier/mobile.css @@ -226,24 +226,6 @@ aside.show { /* ACL window */ #profile-jot-acl-wrapper, #profile-jot-acl-wrapper * { box-sizing: border-box; } #acl-wrapper { width: 100%; float: none; } -#acl-search { width: 100%; float: none; padding-right: 0px; margin-bottom: 1em; } -#acl-showall { width: 100%; height: 48px; margin-bottom: 1em; } -.acl-list-item { width: auto; float: none; height: auto; overflow: hidden; position: relative;} -.acl-list-item img { width: 48px; height: 48px; } -.acl-list-item p { height: auto; font-size: inherit; } -.acl-list-item a { - float: none; - position: absolute; - top: 5px; - right: 5px; - height: 48px; - padding: 10px 2px 2px 2px; - font-size: 12px; - width: 20%; - text-align: center; - background-position: center 5px; -} -.acl-list-item a.acl-button-hide { right: 25%; } /* flexbox for ACL window */ #cboxLoadedContent, #cboxLoadedContent > div, @@ -266,12 +248,6 @@ aside.show { -ms-flex: 1 100%; flex: 1 100%; } -#acl-list { - -webkit-flex: 1 1 auto; - -moz-flex: 1 1 auto; - -ms-flex: 1 1 auto; - flex: 1 1 auto; -} /** input elements **/ input, diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 7596ff5ca..3c507de36 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2123,101 +2123,10 @@ table.smiley-preview { width: 690px; float: left; } -#acl-search { - float: right; - background: #ffffff url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; -} -#acl-showall { - float: left; - display: block; - width: auto; - height: 18px; - background-color: #cccccc; - background-image: url("../../../images/show_all_off.png"); - background-position: 7px 7px; - background-repeat: no-repeat; - padding: 7px 5px 0px 30px; - color: #999999; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; -} -#acl-showall.selected { - color: #000000; - background-color: #ff9900; - background-image: url("../../../images/show_all_on.png"); -} -#acl-list { - height: 210px; - border: 1px solid #cccccc; - clear: both; - margin-top: 30px; - overflow: auto; -} -.acl-list-item { - display: block; - width: 150px; - height: 30px; - border: 1px solid #cccccc; - margin: 5px; - float: left; -} -.acl-list-item img { - width: 22px; - height: 22px; - float: left; - margin: 4px; -} -.acl-list-item p { - height: 12px; - font-size: 10px; - margin: 0px; - padding: 2px 0px 1px; - overflow: hidden; -} -.acl-list-item a { - font-size: 8px; - display: block; - width: 40px; - height: 10px; - float: left; - color: #999999; - background-color: #cccccc; - background-position: 3px 3px; - background-repeat: no-repeat; - margin-right: 5px; - -webkit-border-radius: 2px ; - -moz-border-radius: 2px; - border-radius: 2px; - padding-left: 15px; -} #acl-wrapper a:hover { text-decoration: none; color: #000000; } -.acl-button-show { - background-image: url("../../../images/show_off.png"); -} -.acl-button-hide { - background-image: url("../../../images/hide_off.png"); -} -.acl-button-show.selected { - color: #000000; - background-color: #9ade00; - background-image: url("../../../images/show_on.png"); -} -.acl-button-hide.selected { - color: #000000; - background-color: #ff4141; - background-image: url("../../../images/hide_on.png"); -} -.acl-list-item.groupshow { - border-color: #9ade00; -} -.acl-list-item.grouphide { - border-color: #ff4141; -} /** /acl **/ /** tab buttons **/ div.pager, ul.tabs { From 461f7f4bb0f30df216a87ecb908c128552d19dbe Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 10:45:47 -0500 Subject: [PATCH 2/4] Assume hidewall key may be missing in ACL::getFullSelectorHTML - Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-559974588 --- src/Core/ACL.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/ACL.php b/src/Core/ACL.php index 3f163216e..53e6c1969 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -410,7 +410,7 @@ class ACL extends BaseObject '$group_deny' => implode(',', $default_permissions['deny_gid']), '$for_federation' => $for_federation, '$jotnets_fields' => $jotnets_fields, - '$user_hidewall' => $default_permissions['hidewall'], + '$user_hidewall' => $default_permissions['hidewall'] ?? false, ]); return $o; From 77abf65b62e77746848c8ee3b75666490eafffdd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 10:47:25 -0500 Subject: [PATCH 3/4] [frio] Make whole ACL panel heading clickable to change visibility panel - Addresses https://libranet.de/display/0b6b25a8-155d-e27f-6cc4-2e4568491578 --- view/templates/acl_selector.tpl | 20 ++++++++------------ view/theme/frio/css/style.css | 6 ++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 21b28d5d7..4da7862bb 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -1,12 +1,10 @@
-
- -
+

{{$public_desc}}

@@ -41,12 +39,10 @@
-
- -
+
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 630a92fb2..5926b3b53 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1466,6 +1466,12 @@ textarea.comment-edit-text:focus + .comment-edit-form .preview { content: "\f09c"; } +#acl-wrapper label.panel-heading { + display: block; + margin-bottom: 0; + cursor: pointer; +} + /* Filebrowser */ .fbrowser .breadcrumb { margin-bottom: 0px; From 5aebdec0bfd5bc4c6c737e24a640ef27f4bd574d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 10:48:23 -0500 Subject: [PATCH 4/4] [frio] Fix file browser staying displayed even after switching jot tab - Addresses https://libranet.de/display/0b6b25a8-445d-e188-54e9-c05224132808 - Include file browser tab in the jot form - Remove input elements from the file browser to avoid interference with jot form --- view/theme/frio/js/modal.js | 17 ++++++++--------- view/theme/frio/templates/filebrowser.tpl | 7 ++----- view/theme/frio/templates/jot.tpl | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js index 04184a651..c13b0682b 100644 --- a/view/theme/frio/js/modal.js +++ b/view/theme/frio/js/modal.js @@ -159,20 +159,19 @@ Dialog.showJot = function() { // Init the filebrowser after page load. Dialog._load = function(url) { // Get nickname & filebrowser type from the modal content. - var nickname = $("#fb-nickname").attr("value"); - var type = $("#fb-type").attr("value"); + let filebrowser = document.getElementById('filebrowser'); // Try to fetch the hash form the url. - var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); - if (match===null) return; //not fbrowser - var hash = match[1]; + let match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); + if (!filebrowser || match === null) { + return; //not fbrowser + } // Initialize the filebrowser. - var jsbrowser = function() { - FileBrowser.init(nickname, type, hash); - }; loadScript("view/js/ajaxupload.js"); - loadScript("view/theme/frio/js/filebrowser.js", jsbrowser); + loadScript("view/theme/frio/js/filebrowser.js", function() { + FileBrowser.init(filebrowser.dataset.nickname, filebrowser.dataset.type, match[1]); + }); }; /** diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl index 48b9a63cb..6d1e092d0 100644 --- a/view/theme/frio/templates/filebrowser.tpl +++ b/view/theme/frio/templates/filebrowser.tpl @@ -1,13 +1,10 @@ -
+
- - - {{* The breadcrumb navigation *}} diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index 71d598e23..d4a430ecc 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -128,9 +128,9 @@
- + - + {{if $content}}{{/if}}