diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/acl_selector.tpl | 12 | ||||
| -rw-r--r-- | view/head.tpl | 2 | ||||
| -rw-r--r-- | view/jot-header.tpl | 28 | ||||
| -rw-r--r-- | view/jot.tpl | 19 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 4 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 4 |
6 files changed, 34 insertions, 35 deletions
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl index 3379f5764..3f8a9e7d2 100644 --- a/view/acl_selector.tpl +++ b/view/acl_selector.tpl @@ -15,10 +15,12 @@ </div> <script> -$(function(){ - acl = new ACL( - baseurl+"/acl", - [$allowcid,$allowgid,$denycid,$denygid] - ); +$(document).ready(function() { + if(typeof acl=="undefined"){ + acl = new ACL( + baseurl+"/acl", + [$allowcid,$allowgid,$denycid,$denygid] + ); + } }); </script> diff --git a/view/head.tpl b/view/head.tpl index f26e41b51..9d73269e1 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -2,6 +2,7 @@ <base href="$baseurl/" /> <meta name="generator" content="$generator" /> <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> +<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" /> <link rel="search" href="$baseurl/opensearch" @@ -12,6 +13,7 @@ <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/fancybox/jquery.fancybox-1.3.4.pack.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> diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 5e598e05e..29ba38538 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -4,6 +4,7 @@ var editor; var textlen = 0; + tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -26,7 +27,7 @@ tinyMCE.init({ content_css: "$baseurl/view/custom_tinymce.css", theme_advanced_path : false, setup : function(ed) { - //Character count + //Character count ed.onKeyUp.add(function(ed, e) { var txt = tinyMCE.activeEditor.getContent(); textlen = txt.length; @@ -53,7 +54,7 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(textlen); - }); + }); ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; @@ -62,11 +63,19 @@ tinyMCE.init({ } }); + </script> <script type="text/javascript" src="include/ajaxupload.js" ></script> <script> var ispublic = '$ispublic'; $(document).ready(function() { + + $("#profile-jot-acl-wrapper").hide(); + $("a#jot-perms-icon").fancybox({ + 'transitionIn' : 'none', + 'transitionOut' : 'none' + }); + var uploader = new window.AjaxUpload( 'wall-image-upload', { action: 'wall_upload/$nickname', @@ -90,21 +99,6 @@ tinyMCE.init({ } ); - /*$('#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(); - $('.profile-jot-net input').attr('disabled', 'disabled'); - }); - if(selstr == null) { - $('#jot-perms-icon').removeClass('lock').addClass('unlock'); - $('#jot-public').show(); - $('.profile-jot-net input').attr('disabled', false); - } - - }).trigger('change');*/ }); diff --git a/view/jot.tpl b/view/jot.tpl index 15fc460e1..43c20b90e 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -57,19 +57,20 @@ <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> </div> <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > - <a id="jot-perms-icon" class="icon $lockstate" title="$permset" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');return false;"></a>$bang + <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang </div> <div id="profile-jot-perms-end"></div> - <div id="profile-jot-email-wrapper" style="display: none;" > - <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> - <div id="profile-jot-email-end"></div> - </div> - <div id="profile-jot-networks" style="display: none;" > - $jotnets + <div style="display: none;"> + <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> + $acl + <hr style="clear:both"/> + <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> + <div id="profile-jot-email-end"></div> + $jotnets + </div> </div> - <div id="profile-jot-networks-end"></div> - <div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div> + </div> <div id="profile-jot-end"></div> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ca258617d..4d83cbb7a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1484,9 +1484,9 @@ input#dfrn-url { } /** acl **/ + #profile-jot-acl-wrapper{ - overflow:hidden; - height: 100%; + display:block!important; } #acl-wrapper { diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 2bd72ddbf..698f30803 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -1563,10 +1563,10 @@ padding: 5px 10px 0px; /** acl **/ #profile-jot-acl-wrapper{ - overflow:hidden; - height: 100%; + display:block!important; } + #acl-wrapper { width: 690px; float:left; |