aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/acl_selector.tpl24
-rw-r--r--view/head.tpl2
-rw-r--r--view/jot-header.tpl5
-rw-r--r--view/theme/duepuntozero/style.css157
-rw-r--r--view/theme/loozah/style.css129
5 files changed, 203 insertions, 114 deletions
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl
new file mode 100644
index 000000000..3379f5764
--- /dev/null
+++ b/view/acl_selector.tpl
@@ -0,0 +1,24 @@
+<div id="acl-wrapper">
+ <input id="acl-search">
+ <a href="#" id="acl-showall">$showall</a>
+ <div id="acl-list">
+ <div id="acl-list-content">
+ </div>
+ </div>
+ <span id="acl-fields"></span>
+</div>
+
+<div class="acl-list-item" rel="acl-template" style="display:none">
+ <img src="{0}"><p>{1}</p>
+ <a href="#" class='acl-button-show'>$show</a>
+ <a href="#" class='acl-button-hide'>$hide</a>
+</div>
+
+<script>
+$(function(){
+ acl = new ACL(
+ baseurl+"/acl",
+ [$allowcid,$allowgid,$denycid,$denygid]
+ );
+});
+</script>
diff --git a/view/head.tpl b/view/head.tpl
index ff66997e7..f26e41b51 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -12,6 +12,8 @@
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="$baseurl/include/acl.js" ></script>
<script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index b03c1b4f5..7d215bd46 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -1,5 +1,4 @@
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
var editor;
@@ -91,7 +90,7 @@ tinyMCE.init({
}
);
- $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+ /*$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
@@ -105,7 +104,7 @@ tinyMCE.init({
$('.profile-jot-net input').attr('disabled', false);
}
- }).trigger('change');
+ }).trigger('change');*/
});
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 5ee3761ef..fbeab2321 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1483,89 +1483,122 @@ input#dfrn-url {
width: 180px;
}
-.comment-edit-text-empty {
- color: gray;
- height: 30px;
- width: 175px;
- overflow: auto;
- margin-bottom: 10px;
+/** acl **/
+#profile-jot-acl-wrapper{
+ overflow:hidden;
+ height: 100%;
}
-.comment-edit-text-full {
- color: black;
- height: 150px;
- width: 350px;
- overflow: auto;
+#acl-wrapper {
+ width: 690px;
+ float:left;
}
-
-#group-new-submit-wrapper {
- margin-top: 30px;
+#acl-search {
+ float:right;
+ background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+ padding-right:20px;
}
-
-#acl-allow-group-label,
-#acl-allow-contact-label,
-#acl-deny-group-label,
-#acl-deny-contact-label {
+#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-permit-text {
- margin-top: 10px;
+#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-deny-text {
- margin-top: 10px;
+.acl-list-item img{
+ width:22px;
+ height: 22px;
+ float: left;
+ margin: 4px;
}
-
-#jot-public {
+.acl-list-item p { font-size: 10px; margin: 0px; padding: 2px 0px 1px; }
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
float: left;
- margin-top: 10px;
- margin-left: 15px;
- color: #FF0000;
+ 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-permit-text-end {
- clear: both;
+#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-allow-group-label,
-#acl-allow-contact-label,
-#acl-deny-group-label,
-#acl-deny-contact-label {
- margin-top: 5px;
- margin-bottom: 5px;
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
}
-
-
-#group_allow_wrapper,
-#group_deny_wrapper {
- float: left;
- width: 100px;
- margin-right: 10px;
+.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 **/
-#contact_allow_wrapper,
-#contact_deny_wrapper {
- float: left;
- width: 150px;
- margin-right: 10px;
-}
-#acl-allow-end,
-#acl-deny-end {
- clear: both;
+.comment-edit-text-empty {
+ color: gray;
+ height: 30px;
+ width: 175px;
+ overflow: auto;
+ margin-bottom: 10px;
}
-#acl-permit-outer-wrapper,
-#acl-deny-outer-wrapper {
- padding: 10px;
- margin-top: 10px;
- border: 2px solid #BBBBBB;
- float: left;
+
+.comment-edit-text-full {
+ color: black;
+ height: 150px;
+ width: 350px;
+ overflow: auto;
}
-#acl-wrapper-end {
- clear: both;
+#group-new-submit-wrapper {
+ margin-top: 30px;
}
#group-edit-name-label {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 11ccab8ff..2bd72ddbf 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1561,74 +1561,105 @@ padding: 5px 10px 0px;
overflow: auto;
}
-#group-new-submit-wrapper {
- margin-top: 30px;
+/** acl **/
+#profile-jot-acl-wrapper{
+ overflow:hidden;
+ height: 100%;
}
-#acl-allow-group-label,
-#acl-allow-contact-label,
-#acl-deny-group-label,
-#acl-deny-contact-label {
+#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: 20px;
+ background-color: #cccccc;
+ background-image: url("../../../images/show_all_off.png");
+ background-position: 7px 7px;
+ background-repeat: no-repeat;
+ padding: 5px 5px 0px 30px;
+ -webkit-border-radius: 5px ;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ color: #999999;
}
-
-#acl-permit-text {
- margin-top: 10px;
- float: left;
+#acl-showall.selected {
+ color: #000000;
+ background-color: #ff9900;
+ background-image: url("../../../images/show_all_on.png");
}
-#acl-deny-text {
- margin-top: 10px;
-}
-#jot-public {
- float: left;
- margin-top: 10px;
- margin-left: 15px;
- color: #FF0000;
+#acl-list {
+ height: 210px;
+ border: 1px solid #cccccc;
+ clear: both;
+ margin-top: 30px;
+ overflow: auto;
}
+#acl-list-content {
-#acl-permit-text-end {
- clear: both;
}
-
-#acl-allow-group-label,
-#acl-allow-contact-label,
-#acl-deny-group-label,
-#acl-deny-contact-label {
- margin-top: 5px;
- margin-bottom: 5px;
+.acl-list-item {
+ display: block;
+ width: 150px;
+ height: 30px;
+ border: 1px solid #cccccc;
+ margin: 5px;
+ float: left;
}
-
-
-#group_allow_wrapper,
-#group_deny_wrapper {
+.acl-list-item img{
+ width:22px;
+ height: 22px;
float: left;
- width: 100px;
- margin-right: 10px;
+ margin: 4px;
}
-
-#contact_allow_wrapper,
-#contact_deny_wrapper {
+.acl-list-item p { font-size: 10px; margin: 0px; padding: 2px 0px 1px; }
+.acl-list-item a {
+ font-size: 8px;
+ display: block;
+ width: 40px;
+ height: 10px;
float: left;
- width: 150px;
- margin-right: 10px;
+ color: #999999;
+ background-color: #cccccc;
+ 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-allow-end,
-#acl-deny-end {
- clear: both;
+.acl-button-show.selected {
+ color: #000000;
+ background-color: #9ade00;
+ background-image: url("../../../images/show_on.png");
}
-#acl-permit-outer-wrapper,
-#acl-deny-outer-wrapper {
- padding: 10px;
- margin-top: 10px;
- border: 2px solid #BBBBBB;
- float: left;
+.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-wrapper-end {
- clear: both;
+#group-new-submit-wrapper {
+ margin-top: 30px;
}
#group-edit-name-label {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 20:57:45 +0000