1
1
Fork 0

Merge pull request #7883 from MrPetovan/bug/acl-fixes

Various ACL/jot fixes
This commit is contained in:
Tobias Diekershoff 2019-11-30 20:50:06 +01:00 committed by GitHub
commit 8e3428764b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 28 additions and 770 deletions

View file

@ -410,7 +410,7 @@ class ACL extends BaseObject
'$group_deny' => implode(',', $default_permissions['deny_gid']), '$group_deny' => implode(',', $default_permissions['deny_gid']),
'$for_federation' => $for_federation, '$for_federation' => $for_federation,
'$jotnets_fields' => $jotnets_fields, '$jotnets_fields' => $jotnets_fields,
'$user_hidewall' => $default_permissions['hidewall'], '$user_hidewall' => $default_permissions['hidewall'] ?? false,
]); ]);
return $o; return $o;

View file

@ -1,12 +1,10 @@
<div id="acl-wrapper"> <div id="acl-wrapper">
<div class="panel-group" id="visibility-accordion" role="tablist" aria-multiselectable="true"> <div class="panel-group" id="visibility-accordion" role="tablist" aria-multiselectable="true">
<div class="panel panel-success"> <div class="panel panel-success">
<div class="panel-heading{{if $visibility != 'public'}} collapsed{{/if}}" id="visibility-public-heading" aria-expanded="{{if $visibility == 'public'}}true{{else}}false{{/if}}"> <label class="panel-heading{{if $visibility != 'public'}} collapsed{{/if}}" id="visibility-public-heading" aria-expanded="{{if $visibility == 'public'}}true{{else}}false{{/if}}">
<label> <input type="radio" name="visibility" id="visibility-public" value="public" tabindex="14" {{if $visibility == 'public'}}checked{{/if}}>
<input type="radio" name="visibility" id="visibility-public" value="public" tabindex="14" {{if $visibility == 'public'}}checked{{/if}}> <i class="fa fa-globe"></i> {{$public_title}}
<i class="fa fa-globe"></i> {{$public_title}} </label>
</label>
</div>
<fieldset id="visibility-public-panel" class="panel-collapse collapse{{if $visibility == 'public'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-public-heading" {{if $visibility != 'public'}}disabled{{/if}}> <fieldset id="visibility-public-panel" class="panel-collapse collapse{{if $visibility == 'public'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-public-heading" {{if $visibility != 'public'}}disabled{{/if}}>
<div class="panel-body"> <div class="panel-body">
<p>{{$public_desc}}</p> <p>{{$public_desc}}</p>
@ -41,12 +39,10 @@
</fieldset> </fieldset>
</div> </div>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading{{if $visibility != 'custom'}} collapsed{{/if}}" id="visibility-custom-heading" aria-expanded="{{if $visibility == 'custom'}}true{{else}}false{{/if}}"> <label class="panel-heading{{if $visibility != 'custom'}} collapsed{{/if}}" id="visibility-custom-heading" aria-expanded="{{if $visibility == 'custom'}}true{{else}}false{{/if}}">
<label> <input type="radio" name="visibility" id="visibility-custom" value="custom" tabindex="15" {{if $visibility == 'custom'}}checked{{/if}}>
<input type="radio" name="visibility" id="visibility-custom" value="custom" tabindex="15" {{if $visibility == 'custom'}}checked{{/if}}> <i class="fa fa-lock"></i> {{$custom_title}}
<i class="fa fa-lock"></i> {{$custom_title}} </label>
</label>
</div>
<fieldset id="visibility-custom-panel" class="panel-collapse collapse{{if $visibility == 'custom'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-custom-heading" {{if $visibility != 'custom'}}disabled{{/if}}> <fieldset id="visibility-custom-panel" class="panel-collapse collapse{{if $visibility == 'custom'}} in{{/if}}" role="tabpanel" aria-labelledby="visibility-custom-heading" {{if $visibility != 'custom'}}disabled{{/if}}>
<input type="hidden" name="group_allow" value="{{$group_allow}}"/> <input type="hidden" name="group_allow" value="{{$group_allow}}"/>
<input type="hidden" name="contact_allow" value="{{$contact_allow}}"/> <input type="hidden" name="contact_allow" value="{{$contact_allow}}"/>

View file

@ -126,18 +126,13 @@ input#dfrn-url {
border: 1px solid #cccccc; 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; color: #eec;
} }
#fancybox-content{ #fancybox-content{
background:#444; background:#444;
} }
input#acl-search {
background-color: #aaa;
}
.notify-seen { .notify-seen {
background:#111; background:#111;
} }

View file

@ -1821,97 +1821,14 @@ blockquote.shared_content {
margin-bottom: 15px; margin-bottom: 15px;
} }
#acl-wrapper { #acl-wrapper {
width: 690px; width: 690px;
float:left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
color:#000000; 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 **/ /** /acl **/

View file

@ -1457,82 +1457,6 @@ textarea.comment-edit-text:focus + .comment-edit-form .preview {
overflow-y: overlay; overflow-y: overlay;
} }
/* ACL */ /* 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 { .fa.lock:before {
font-family: ForkAwesome; font-family: ForkAwesome;
content: "\f023"; content: "\f023";
@ -1542,6 +1466,12 @@ textarea.comment-edit-text:focus + .comment-edit-form .preview {
content: "\f09c"; content: "\f09c";
} }
#acl-wrapper label.panel-heading {
display: block;
margin-bottom: 0;
cursor: pointer;
}
/* Filebrowser */ /* Filebrowser */
.fbrowser .breadcrumb { .fbrowser .breadcrumb {
margin-bottom: 0px; margin-bottom: 0px;

View file

@ -159,20 +159,19 @@ Dialog.showJot = function() {
// Init the filebrowser after page load. // Init the filebrowser after page load.
Dialog._load = function(url) { Dialog._load = function(url) {
// Get nickname & filebrowser type from the modal content. // Get nickname & filebrowser type from the modal content.
var nickname = $("#fb-nickname").attr("value"); let filebrowser = document.getElementById('filebrowser');
var type = $("#fb-type").attr("value");
// Try to fetch the hash form the url. // Try to fetch the hash form the url.
var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); let match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/);
if (match===null) return; //not fbrowser if (!filebrowser || match === null) {
var hash = match[1]; return; //not fbrowser
}
// Initialize the filebrowser. // Initialize the filebrowser.
var jsbrowser = function() {
FileBrowser.init(nickname, type, hash);
};
loadScript("view/js/ajaxupload.js"); 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]);
});
}; };
/** /**

View file

@ -1,13 +1,10 @@
<!-- <!--
This is the template used by mod/fbrowser.php This is the template used by mod/fbrowser.php
--> -->
<div class="fbrowser {{$type}}"> <div id="filebrowser" class="fbrowser {{$type}}" data-nickname="{{$nickname}}" data-type="{{$type}}">
<div class="fbrowser-content"> <div class="fbrowser-content">
<input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
<input id="fb-type" type="hidden" name="type" value="{{$type}}" />
<div class="error hidden"> <div class="error hidden">
<span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</a> <span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</button>
</div> </div>
{{* The breadcrumb navigation *}} {{* The breadcrumb navigation *}}

View file

@ -128,9 +128,9 @@
</ul> </ul>
</div> </div>
</form> <div id="jot-fbrowser-wrapper" class="minimize" aria-labelledby="jot-browser-link" role="tabpanel" aria-hidden="true"></div>
<div id="jot-fbrowser-wrapper" class="minimize" aria-labelledby="jot-browser-link" role="tabpanel" aria-hidden="true"></div> </form>
{{if $content}}<script type="text/javascript">initEditor();</script>{{/if}} {{if $content}}<script type="text/javascript">initEditor();</script>{{/if}}
</div> </div>

View file

@ -1848,101 +1848,10 @@ h2 > .actionbutton {
width: 690px; width: 690px;
float: left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
color: #000000; 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 **/ /** /acl **/
/** tab buttons **/ /** tab buttons **/
ul.tabs { ul.tabs {

View file

@ -1848,101 +1848,10 @@ h2 > .actionbutton {
width: 690px; width: 690px;
float: left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
color: #000000; 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 **/ /** /acl **/
/** tab buttons **/ /** tab buttons **/
ul.tabs { ul.tabs {

View file

@ -1848,101 +1848,10 @@ h2 > .actionbutton {
width: 690px; width: 690px;
float: left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
color: #000000; 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 **/ /** /acl **/
/** tab buttons **/ /** tab buttons **/
ul.tabs { ul.tabs {

View file

@ -1134,96 +1134,14 @@ h2 > .actionbutton { float: right; }
display:block!important; display:block!important;
} }
#acl-wrapper { #acl-wrapper {
width: 690px; width: 690px;
float:left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
color:#000000; 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 **/ /** /acl **/
/** tab buttons **/ /** tab buttons **/

View file

@ -4138,108 +4138,11 @@ tools {
width: 690px; width: 690px;
float:left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
background-color:#1873a2; 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 = */ /* = Global Directory Link = */
/* ========================= */ /* ========================= */

View file

@ -88,15 +88,6 @@ table.smiley-preview{
background-color: #252C33 !important; background-color: #252C33 !important;
} }
/* ACL permission popup */
.acl-list-item.groupshow {
border-color: #9ade00 !important;
}
.acl-list-item.grouphide {
border-color: #ff4141 !important;
}
/* Notifications */ /* Notifications */
li.notify-unseen { li.notify-unseen {
background-color: #252C33; background-color: #252C33;

View file

@ -226,24 +226,6 @@ aside.show {
/* ACL window */ /* ACL window */
#profile-jot-acl-wrapper, #profile-jot-acl-wrapper * { box-sizing: border-box; } #profile-jot-acl-wrapper, #profile-jot-acl-wrapper * { box-sizing: border-box; }
#acl-wrapper { width: 100%; float: none; } #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 */ /* flexbox for ACL window */
#cboxLoadedContent, #cboxLoadedContent,
#cboxLoadedContent > div, #cboxLoadedContent > div,
@ -266,12 +248,6 @@ aside.show {
-ms-flex: 1 100%; -ms-flex: 1 100%;
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 elements **/
input, input,

View file

@ -2123,101 +2123,10 @@ table.smiley-preview {
width: 690px; width: 690px;
float: left; 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 { #acl-wrapper a:hover {
text-decoration: none; text-decoration: none;
color: #000000; 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 **/ /** /acl **/
/** tab buttons **/ /** tab buttons **/
div.pager, ul.tabs { div.pager, ul.tabs {