diff options
| author | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-04-16 20:16:44 -0700 |
| commit | f72d3512242d13fbba69b77a739319a9cd58627c (patch) | |
| tree | d59c8904fda78b04ee19e42343d8c7ca56c67a5f /view/tpl/smarty3/jot-header.tpl | |
| parent | 3e7e0a3c43ddb742a6518a3b38b89e3d9675eae5 (diff) | |
| parent | 23f897b8aedac8a99aa81ac7799ec67ca196d407 (diff) | |
| download | volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.gz volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.tar.bz2 volse-hubzilla-f72d3512242d13fbba69b77a739319a9cd58627c.zip | |
Merge branch 'master' into photothread
Diffstat (limited to 'view/tpl/smarty3/jot-header.tpl')
| -rw-r--r-- | view/tpl/smarty3/jot-header.tpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl index cce83e30b..c1b6d62e2 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -18,7 +18,7 @@ function initEditor(cb){ $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; - $("a#jot-perms-icon").fancybox({ + $("a#jot-perms-icon").prettyPhoto({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -93,7 +93,7 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").fancybox({ + $("a#jot-perms-icon").prettyPhoyo({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); @@ -257,7 +257,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.fancybox(data); + $.prettyPhoto(data); $("#id_term").keypress(function(){ $(this).css("border-color",bordercolor); }) @@ -275,7 +275,7 @@ function enableOnUser(){ // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.fancybox.close(); + $.prettyPhoto.close(); } else { $("#id_term").css("border-color","#FF0000"); } |