From cdd2e9cd953394adfd6331c946466f3165606e29 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 3 Mar 2014 20:05:23 -0800 Subject: layout export to file --- view/js/icon_translate.js | 1 + 1 file changed, 1 insertion(+) (limited to 'view/js') diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js index 45deef05b..930d3b265 100644 --- a/view/js/icon_translate.js +++ b/view/js/icon_translate.js @@ -53,4 +53,5 @@ $(document).ready(function() { $('.icon-circle').addClass(''); $('.icon-bookmark').addClass(''); $('.icon-fullscreen').addClass(''); + $('.icon-share').addClass(''); }); \ No newline at end of file -- cgit v1.2.3 From 3b0b59dfad2c69539e018e43b9ee946a9d9993bc Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Mar 2014 20:15:54 -0800 Subject: When approving a connection automatically select Full Sharing. --- view/js/mod_connedit.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view/js') diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 7a33952dc..a641029f3 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -1,4 +1,10 @@ +$(document).ready(function() { + $('#id_pending').click(function() { + connectFullShare(); + }); +}); + function connectFullShare() { $('.abook-edit-me').each(function() { if(! $(this).is(':disabled')) -- cgit v1.2.3 From ab0eab49e866e29b1c1b5ef58897c6a446d24864 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Mar 2014 20:28:04 -0800 Subject: start new connections out with even more sane defaults than before by pre-filling the connedit form page. This still lets them change things before any damage has been done or before any privacy has leaked, but should reduce the number of new connections that can't comment. --- view/js/mod_connedit.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/js') diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index a641029f3..80a56f854 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -1,5 +1,8 @@ $(document).ready(function() { + if(typeof(after_following) !== 'undefined' && after_following) + connectFullShare(); + $('#id_pending').click(function() { connectFullShare(); }); -- cgit v1.2.3 From 5ec38459dc474700ec89304786228ba06bfbed53 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Mar 2014 21:55:52 -0800 Subject: notify when permissions change and haven't been saved. --- view/js/mod_connedit.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'view/js') diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 80a56f854..8f06aeee9 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -27,6 +27,8 @@ function connectFullShare() { $('#me_id_perms_view_storage').attr('checked','checked'); $('#me_id_perms_republish').attr('checked','checked'); + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); } function connectCautiousShare() { @@ -43,6 +45,9 @@ function connectCautiousShare() { $('#me_id_perms_send_stream').attr('checked','checked'); $('#me_id_perms_post_comments').attr('checked','checked'); $('#me_id_perms_post_mail').attr('checked','checked'); + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); + } function connectForum() { @@ -63,6 +68,8 @@ function connectForum() { $('#me_id_perms_post_mail').attr('checked','checked'); $('#me_id_perms_tag_deliver').attr('checked','checked'); $('#me_id_perms_republish').attr('checked','checked'); + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); } @@ -78,6 +85,8 @@ function connectSoapBox() { $('#me_id_perms_view_contacts').attr('checked','checked'); $('#me_id_perms_view_storage').attr('checked','checked'); $('#me_id_perms_view_pages').attr('checked','checked'); + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); } @@ -88,5 +97,8 @@ function connectFollowOnly() { }); $('#me_id_perms_send_stream').attr('checked','checked'); + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); + } -- cgit v1.2.3 From d83ebcdab5239ab82054cbb93d05b343777f5f56 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 7 Mar 2014 22:00:23 -0800 Subject: showwarning when manually changing also --- view/js/mod_connedit.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/js') diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 8f06aeee9..64240abb8 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -6,6 +6,13 @@ $(document).ready(function() { $('#id_pending').click(function() { connectFullShare(); }); + + $('.abook-edit-me').click(function() { + $('.abook-permschange').show(); + $('.abook-permschange').html(aStr['permschange']); + }); + + }); function connectFullShare() { -- cgit v1.2.3 From c903ff7aab3f7d094d0ae0c37f9fe46887cf2363 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Mar 2014 17:09:02 -0700 Subject: get rid of fancybox for photos upload, not just photo edit --- view/js/mod_photos.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/js') diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index c9d13f742..f0a0de253 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -3,6 +3,11 @@ var ispublic = aStr['everybody']; $(document).ready(function() { + $("a#photos-upload-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); + $("a#settings-default-perms-menu").colorbox({ 'inline' : true, 'transition' : 'elastic' -- cgit v1.2.3 From d7dcf463ed887951930a1fb5b0360406542dedd7 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Mar 2014 20:17:14 -0700 Subject: update acl internal list whenever there is a change - the submit handler seems to be unreliable or is getting into a race condition. --- view/js/acl.js | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'view/js') diff --git a/view/js/acl.js b/view/js/acl.js index 84b080de2..6c3d9b462 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -20,16 +20,23 @@ function ACL(backend_url, preset){ if (preset.length==0) that.showall.addClass("selected"); /*events*/ - that.showall.click(that.on_showall); - $(document).on('click','.acl-button-show',that.on_button_show); - $(document).on('click','.acl-button-hide',that.on_button_hide); - $("#acl-search").keypress(that.on_search); - $("#acl-wrapper").parents("form").submit(that.on_submit); - - /* startup! */ - that.get(0,100); + + $(document).ready(function() { + that.showall.click(that.on_showall); + $(document).on('click','.acl-button-show',that.on_button_show); + $(document).on('click','.acl-button-hide',that.on_button_hide); + $("#acl-search").keypress(that.on_search); +// $("#acl-wrapper").parents("form").submit(that.on_submit); + + /* startup! */ + that.get(0,100); + that.on_submit(); + }); + } +// no longer called on submit - call to update whenever a change occurs to the acl list. + ACL.prototype.on_submit = function(){ aclfileds = $("#acl-fields").html(""); $(that.allow_gid).each(function(i,v){ @@ -44,6 +51,8 @@ ACL.prototype.on_submit = function(){ $(that.deny_cid).each(function(i,v){ aclfileds.append(""); }); +// alert(aclfileds); + } ACL.prototype.search = function(){ @@ -72,6 +81,7 @@ ACL.prototype.on_showall = function(event){ that.deny_gid = []; that.update_view(); + that.on_submit(); return false; } @@ -86,7 +96,7 @@ ACL.prototype.on_button_show = function(event){ $(this).toggleClass("selected");*/ that.set_allow($(this).parent().attr('id')); - + that.on_submit(); return false; } ACL.prototype.on_button_hide = function(event){ @@ -99,7 +109,7 @@ ACL.prototype.on_button_hide = function(event){ $(this).toggleClass("selected");*/ that.set_deny($(this).parent().attr('id')); - + that.on_submit(); return false; } -- cgit v1.2.3 From 3f337dad2c783e62338a88887d1ef3d7754da410 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 11 Mar 2014 21:45:20 -0700 Subject: file had wrong extension --- view/js/mod_filestorage.js | 16 ++++++++++++++++ view/js/mod_filestorage.php | 16 ---------------- view/js/mod_photos.js | 14 +++++++------- 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 view/js/mod_filestorage.js delete mode 100644 view/js/mod_filestorage.php (limited to 'view/js') diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js new file mode 100644 index 000000000..82957ae44 --- /dev/null +++ b/view/js/mod_filestorage.js @@ -0,0 +1,16 @@ +$(document).ready(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(); + $('#jot-perms-icon').removeClass('unlock').addClass('lock'); + $('#jot-public').hide(); + }); + if(selstr == null) { + $('#jot-perms-icon').removeClass('lock').addClass('unlock'); + $('#jot-public').show(); + } + + }).trigger('change'); +}); diff --git a/view/js/mod_filestorage.php b/view/js/mod_filestorage.php deleted file mode 100644 index 82957ae44..000000000 --- a/view/js/mod_filestorage.php +++ /dev/null @@ -1,16 +0,0 @@ -$(document).ready(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(); - $('#jot-perms-icon').removeClass('unlock').addClass('lock'); - $('#jot-public').hide(); - }); - if(selstr == null) { - $('#jot-perms-icon').removeClass('lock').addClass('unlock'); - $('#jot-public').show(); - } - - }).trigger('change'); -}); diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index f0a0de253..d9497af1e 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -4,14 +4,14 @@ var ispublic = aStr['everybody']; $(document).ready(function() { $("a#photos-upload-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); + 'inline' : true, + 'transition' : 'elastic' + }); - $("a#settings-default-perms-menu").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); + $("a#settings-default-perms-menu").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; -- cgit v1.2.3