MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Vier - mobile friendly ACL window and form fields

Browse source
This commit is contained in:
Fabrixxm 2016-02-03 14:03:00 +01:00
parent 9fcd74f470
commit 3c6ebfa5a9
5 changed files with 197 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

207
js/acl.js
View file

@ -1,49 +1,56 @@
function ACL(backend_url, preset, automention){ function ACL(backend_url, preset, automention, is_mobile){
that = this;
that.url = backend_url; this.url = backend_url;
that.automention = automention; this.automention = automention;
this.is_mobile = is_mobile;
that.kp_timer = null;
this.kp_timer = null;
if (preset==undefined) preset = []; if (preset==undefined) preset = [];
that.allow_cid = (preset[0] || []); this.allow_cid = (preset[0] || []);
that.allow_gid = (preset[1] || []); this.allow_gid = (preset[1] || []);
that.deny_cid = (preset[2] || []); this.deny_cid = (preset[2] || []);
that.deny_gid = (preset[3] || []); this.deny_gid = (preset[3] || []);
that.group_uids = []; this.group_uids = [];
that.nw = 4; //items per row. should be calulated from #acl-list.width
that.list_content = $("#acl-list-content");
that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
that.showall = $("#acl-showall");
if (preset.length==0) that.showall.addClass("selected"); if (this.is_mobile) {
this.nw = 1;
} else {
this.nw = 4;
}
this.list_content = $("#acl-list-content");
this.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
this.showall = $("#acl-showall");
if (preset.length==0) this.showall.addClass("selected");
/*events*/ /*events*/
that.showall.click(that.on_showall); this.showall.click(this.on_showall);
$(document).on("click", ".acl-button-show", that.on_button_show); $(document).on("click", ".acl-button-show", this.on_button_show.bind(this));
$(document).on("click", ".acl-button-hide", that.on_button_hide); $(document).on("click", ".acl-button-hide", this.on_button_hide.bind(this));
$("#acl-search").keypress(that.on_search); $("#acl-search").keypress(this.on_search.bind(this));
$("#acl-wrapper").parents("form").submit(that.on_submit); $("#acl-wrapper").parents("form").submit(this.on_submit.bind(this));
/* add/remove mentions */ /* add/remove mentions */
that.element = $("#profile-jot-text"); this.element = $("#profile-jot-text");
that.htmlelm = that.element.get()[0]; this.htmlelm = this.element.get()[0];
/* startup! */ /* startup! */
that.get(0,100); this.get(0,100);
} }
ACL.prototype.remove_mention = function(id) { ACL.prototype.remove_mention = function(id) {
if (!that.automention) return; if (!this.automention) return;
var nick = that.data[id].nick; var nick = this.data[id].nick;
var searchText = "@"+nick+"+"+id+" "; var searchText = "@"+nick+"+"+id+" ";
if (tinyMCE.activeEditor===null) { if (tinyMCE.activeEditor===null) {
start = that.element.val().indexOf(searchText); start = this.element.val().indexOf(searchText);
if ( start<0) return; if ( start<0) return;
end = start+searchText.length; end = start+searchText.length;
that.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false); this.element.setSelection(start,end).replaceSelectedText('').collapseSelection(false);
} else { } else {
start = tinyMCE.activeEditor.getContent({format : 'raw'}).search( searchText ); start = tinyMCE.activeEditor.getContent({format : 'raw'}).search( searchText );
if ( start<0 ) return; if ( start<0 ) return;
@ -54,12 +61,12 @@ ACL.prototype.remove_mention = function(id) {
} }
ACL.prototype.add_mention = function(id) { ACL.prototype.add_mention = function(id) {
if (!that.automention) return; if (!this.automention) return;
var nick = that.data[id].nick; var nick = this.data[id].nick;
var searchText = "@"+nick+"+"+id+" "; var searchText = "@"+nick+"+"+id+" ";
if (tinyMCE.activeEditor===null) { if (tinyMCE.activeEditor===null) {
if ( that.element.val().indexOf( searchText) >= 0 ) return; if ( this.element.val().indexOf( searchText) >= 0 ) return;
that.element.val( searchText + that.element.val() ); this.element.val( searchText + this.element.val() );
} else { } else {
if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search(searchText) >= 0 ) return; if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search(searchText) >= 0 ) return;
tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'dummy', {}, searchText); tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'dummy', {}, searchText);
@ -68,46 +75,46 @@ ACL.prototype.add_mention = function(id) {
ACL.prototype.on_submit = function(){ ACL.prototype.on_submit = function(){
aclfileds = $("#acl-fields").html(""); aclfileds = $("#acl-fields").html("");
$(that.allow_gid).each(function(i,v){ $(this.allow_gid).each(function(i,v){
aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
}); });
$(that.allow_cid).each(function(i,v){ $(this.allow_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
}); });
$(that.deny_gid).each(function(i,v){ $(this.deny_gid).each(function(i,v){
aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
}); });
$(that.deny_cid).each(function(i,v){ $(this.deny_cid).each(function(i,v){
aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>"); aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
}); });
} }
ACL.prototype.search = function(){ ACL.prototype.search = function(){
var srcstr = $("#acl-search").val(); var srcstr = $("#acl-search").val();
that.list_content.html(""); this.list_content.html("");
that.get(0,100, srcstr); this.get(0,100, srcstr);
} }
ACL.prototype.on_search = function(event){ ACL.prototype.on_search = function(event){
if (that.kp_timer) clearTimeout(that.kp_timer); if (this.kp_timer) clearTimeout(this.kp_timer);
that.kp_timer = setTimeout( that.search, 1000); this.kp_timer = setTimeout( this.search.bind(this), 1000);
} }
ACL.prototype.on_showall = function(event){ ACL.prototype.on_showall = function(event){
event.preventDefault() event.preventDefault()
event.stopPropagation(); event.stopPropagation();
if (that.showall.hasClass("selected")){ if (this.showall.hasClass("selected")){
return false; return false;
} }
that.showall.addClass("selected"); this.showall.addClass("selected");
that.allow_cid = []; this.allow_cid = [];
that.allow_gid = []; this.allow_gid = [];
that.deny_cid = []; this.deny_cid = [];
that.deny_gid = []; this.deny_gid = [];
that.update_view(); this.update_view();
return false; return false;
} }
@ -117,11 +124,11 @@ ACL.prototype.on_button_show = function(event){
event.stopImmediatePropagation() event.stopImmediatePropagation()
event.stopPropagation(); event.stopPropagation();
/*that.showall.removeClass("selected"); /*this.showall.removeClass("selected");
$(this).siblings(".acl-button-hide").removeClass("selected"); $(this).siblings(".acl-button-hide").removeClass("selected");
$(this).toggleClass("selected");*/ $(this).toggleClass("selected");*/
that.set_allow($(this).parent().attr('id')); this.set_allow($(this).parent().attr('id'));
return false; return false;
} }
@ -130,11 +137,11 @@ ACL.prototype.on_button_hide = function(event){
event.stopImmediatePropagation() event.stopImmediatePropagation()
event.stopPropagation(); event.stopPropagation();
/*that.showall.removeClass("selected"); /*this.showall.removeClass("selected");
$(this).siblings(".acl-button-show").removeClass("selected"); $(this).siblings(".acl-button-show").removeClass("selected");
$(this).toggleClass("selected");*/ $(this).toggleClass("selected");*/
that.set_deny($(this).parent().attr('id')); this.set_deny($(this).parent().attr('id'));
return false; return false;
} }
@ -145,25 +152,25 @@ ACL.prototype.set_allow = function(itemid){
switch(type){ switch(type){
case "g": case "g":
if (that.allow_gid.indexOf(id)<0){ if (this.allow_gid.indexOf(id)<0){
that.allow_gid.push(id) this.allow_gid.push(id)
}else { }else {
that.allow_gid.remove(id); this.allow_gid.remove(id);
} }
if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id); if (this.deny_gid.indexOf(id)>=0) this.deny_gid.remove(id);
break; break;
case "c": case "c":
if (that.allow_cid.indexOf(id)<0){ if (this.allow_cid.indexOf(id)<0){
that.allow_cid.push(id) this.allow_cid.push(id)
if (that.data[id].forum=="1") that.add_mention(id); if (this.data[id].forum=="1") this.add_mention(id);
} else { } else {
that.allow_cid.remove(id); this.allow_cid.remove(id);
if (that.data[id].forum=="1") that.remove_mention(id); if (this.data[id].forum=="1") this.remove_mention(id);
} }
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id); if (this.deny_cid.indexOf(id)>=0) this.deny_cid.remove(id);
break; break;
} }
that.update_view(); this.update_view();
} }
ACL.prototype.set_deny = function(itemid){ ACL.prototype.set_deny = function(itemid){
@ -172,34 +179,34 @@ ACL.prototype.set_deny = function(itemid){
switch(type){ switch(type){
case "g": case "g":
if (that.deny_gid.indexOf(id)<0){ if (this.deny_gid.indexOf(id)<0){
that.deny_gid.push(id) this.deny_gid.push(id)
} else { } else {
that.deny_gid.remove(id); this.deny_gid.remove(id);
} }
if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id); if (this.allow_gid.indexOf(id)>=0) this.allow_gid.remove(id);
break; break;
case "c": case "c":
if (that.data[id].forum=="1") that.remove_mention(id); if (this.data[id].forum=="1") this.remove_mention(id);
if (that.deny_cid.indexOf(id)<0){ if (this.deny_cid.indexOf(id)<0){
that.deny_cid.push(id) this.deny_cid.push(id)
} else { } else {
that.deny_cid.remove(id); this.deny_cid.remove(id);
} }
if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id); if (this.allow_cid.indexOf(id)>=0) this.allow_cid.remove(id);
break; break;
} }
that.update_view(); this.update_view();
} }
ACL.prototype.is_show_all = function() { ACL.prototype.is_show_all = function() {
return (that.allow_gid.length==0 && that.allow_cid.length==0 && return (this.allow_gid.length==0 && this.allow_cid.length==0 &&
that.deny_gid.length==0 && that.deny_cid.length==0); this.deny_gid.length==0 && this.deny_cid.length==0);
} }
ACL.prototype.update_view = function(){ ACL.prototype.update_view = function(){
if (this.is_show_all()){ if (this.is_show_all()){
that.showall.addClass("selected"); this.showall.addClass("selected");
/* jot acl */ /* jot acl */
$('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-perms-icon').removeClass('lock').addClass('unlock');
$('#jot-public').show(); $('#jot-public').show();
@ -209,7 +216,7 @@ ACL.prototype.update_view = function(){
} }
} else { } else {
that.showall.removeClass("selected"); this.showall.removeClass("selected");
/* jot acl */ /* jot acl */
$('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-perms-icon').removeClass('unlock').addClass('lock');
$('#jot-public').hide(); $('#jot-public').hide();
@ -220,29 +227,29 @@ ACL.prototype.update_view = function(){
$(this).removeClass("groupshow grouphide"); $(this).removeClass("groupshow grouphide");
}); });
$("#acl-list-content .acl-list-item").each(function(){ $("#acl-list-content .acl-list-item").each(function(index, element){
itemid = $(this).attr('id'); itemid = $(element).attr('id');
type = itemid[0]; type = itemid[0];
id = parseInt(itemid.substr(1)); id = parseInt(itemid.substr(1));
btshow = $(this).children(".acl-button-show").removeClass("selected"); btshow = $(element).children(".acl-button-show").removeClass("selected");
bthide = $(this).children(".acl-button-hide").removeClass("selected"); bthide = $(element).children(".acl-button-hide").removeClass("selected");
switch(type){ switch(type){
case "g": case "g":
var uclass = ""; var uclass = "";
if (that.allow_gid.indexOf(id)>=0){ if (this.allow_gid.indexOf(id)>=0){
btshow.addClass("selected"); btshow.addClass("selected");
bthide.removeClass("selected"); bthide.removeClass("selected");
uclass="groupshow"; uclass="groupshow";
} }
if (that.deny_gid.indexOf(id)>=0){ if (this.deny_gid.indexOf(id)>=0){
btshow.removeClass("selected"); btshow.removeClass("selected");
bthide.addClass("selected"); bthide.addClass("selected");
uclass="grouphide"; uclass="grouphide";
} }
$(that.group_uids[id]).each(function(i,v) { $(this.group_uids[id]).each(function(i,v) {
if(uclass == "grouphide") if(uclass == "grouphide")
$("#c"+v).removeClass("groupshow"); $("#c"+v).removeClass("groupshow");
if(uclass != "") { if(uclass != "") {
@ -257,17 +264,17 @@ ACL.prototype.update_view = function(){
break; break;
case "c": case "c":
if (that.allow_cid.indexOf(id)>=0){ if (this.allow_cid.indexOf(id)>=0){
btshow.addClass("selected"); btshow.addClass("selected");
bthide.removeClass("selected"); bthide.removeClass("selected");
} }
if (that.deny_cid.indexOf(id)>=0){ if (this.deny_cid.indexOf(id)>=0){
btshow.removeClass("selected"); btshow.removeClass("selected");
bthide.addClass("selected"); bthide.addClass("selected");
} }
} }
}); }.bind(this));
} }
@ -281,30 +288,30 @@ ACL.prototype.get = function(start,count, search){
$.ajax({ $.ajax({
type:'POST', type:'POST',
url: that.url, url: this.url,
data: postdata, data: postdata,
dataType: 'json', dataType: 'json',
success:that.populate success:this.populate.bind(this)
}); });
} }
ACL.prototype.populate = function(data){ ACL.prototype.populate = function(data){
var height = Math.ceil(data.tot / that.nw) * 42; var height = Math.ceil(data.tot / this.nw) * 42;
that.list_content.height(height); this.list_content.height(height);
that.data = {}; this.data = {};
$(data.items).each(function(){ $(data.items).each(function(index, item){
html = "<div class='acl-list-item {4} {5} type{2}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; html = "<div class='acl-list-item {4} {5} type{2}' title='{6}' id='{2}{3}'>"+this.item_tpl+"</div>";
html = html.format(this.photo, this.name, this.type, this.id, (this.forum=='1'?'forum':''), this.network, this.link); html = html.format(item.photo, item.name, item.type, item.id, (item.forum=='1'?'forum':''), item.network, item.link);
if (this.uids!=undefined) that.group_uids[this.id] = this.uids; if (item.uids!=undefined) this.group_uids[item.id] = item.uids;
//console.log(html); //console.log(html);
that.list_content.append(html); this.list_content.append(html);
that.data[this.id] = this; this.data[item.id] = item;
}); }.bind(this));
$(".acl-list-item img[data-src]", that.list_content).each(function(i, el){ $(".acl-list-item img[data-src]", this.list_content).each(function(i, el){
// Add src attribute for images with a data-src attribute // Add src attribute for images with a data-src attribute
$(el).attr('src', $(el).data("src")); $(el).attr('src', $(el).data("src"));
}); });
that.update_view(); this.update_view();
} }

2
js/main.js
View file

@ -9,7 +9,7 @@
if (h==ch) { if (h==ch) {
return; return;
} }
console.log("_resizeIframe", obj, desth, ch); //console.log("_resizeIframe", obj, desth, ch);
if (desth!=ch) { if (desth!=ch) {
setTimeout(_resizeIframe, 500, obj, ch); setTimeout(_resizeIframe, 500, obj, ch);
} else { } else {

3
view/templates/acl_selector.tpl
View file

@ -29,7 +29,8 @@ $(document).ready(function() {
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ], [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ],
{{$features.aclautomention}} {{$features.aclautomention}},
{{$APP->is_mobile}}
); );
} }
}); });

21
view/templates/jot-header.tpl
View file

@ -8,16 +8,24 @@ var plaintext = '{{$editselect}}';
function initEditor(cb){ function initEditor(cb){
if (editor==false){ if (editor==false){
var colorbox_options = {
{{if $APP->is_mobile}}
'width' : '100%',
'height' : '100%',
{{/if}}
'inline' : true,
'transition' : 'elastic'
}
$("#profile-jot-text-loading").show(); $("#profile-jot-text-loading").show();
if(plaintext == 'none') { if(plaintext == 'none') {
$("#profile-jot-text-loading").hide(); $("#profile-jot-text-loading").hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
$("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox(colorbox_options);
'inline' : true,
'transition' : 'elastic'
});
$(".jothidden").show(); $(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
return; return;
@ -107,10 +115,7 @@ function initEditor(cb){
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").colorbox({ $("a#jot-perms-icon").colorbox(colorbox_options);
'inline' : true,
'transition' : 'elastic'
});
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
} }

74
view/theme/vier/mobile.css
View file

@ -161,3 +161,77 @@ aside.show {
} }
.tabs.show::after { display: none; } .tabs.show::after { display: none; }
.tabs.show .tab { display: block; } .tabs.show .tab { display: block; }
/* 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,
#acl-wrapper {
display: -ms-Flexbox !important;
-ms-box-orient: vertival;
display: -webkit-flex !important;
display: -moz-flex !important;
display: -ms-flex !important;
display: flex !important;
-webkit-flex-flow: column;
-moz-flex-flow: column;
-ms-flex-flow: column;
flex-flow: column;
-webkit-flex: 1 100%;
-moz-flex: 1 100%;
-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,
textarea,
select {
font-size: 18px;
border: 1px solid #888;
padding: 0.2em;
}
input:focus,
textarea:focus,
select:focus {
box-shadow: 1px 1px 10px rgba(46, 151, 255, 0.62);
}
.field, .field > * { box-sizing: border-box; }
.field label { width: 100%; float: none; display: block; }
.field input, .field textarea, .field select { max-width: 100%; width: 100%; }
.field.yesno .onoff,
.field.checkbox input { width: auto; float: right; }
.field.yesno label,
.field.checkbox label { width: 70%; float: left; }
.field .field_help { margin: 0; }