]> git.mxchange.org Git - friendica.git/commitdiff
Update Frost-mobile to v0.3
authorZach Prezkuta <fermion@gmx.com>
Sun, 10 Feb 2013 17:21:52 +0000 (10:21 -0700)
committerZach Prezkuta <fermion@gmx.com>
Sun, 10 Feb 2013 17:21:52 +0000 (10:21 -0700)
44 files changed:
view/theme/frost-mobile/contact_edit.tpl
view/theme/frost-mobile/conversation.tpl
view/theme/frost-mobile/default.php
view/theme/frost-mobile/end.tpl
view/theme/frost-mobile/generic_links_widget.tpl
view/theme/frost-mobile/head.tpl
view/theme/frost-mobile/jot-header.tpl
view/theme/frost-mobile/jot.tpl
view/theme/frost-mobile/js/acl.js
view/theme/frost-mobile/js/acl.min.js
view/theme/frost-mobile/js/main.js
view/theme/frost-mobile/js/main.min.js
view/theme/frost-mobile/js/theme.js
view/theme/frost-mobile/js/theme.min.js
view/theme/frost-mobile/login-style.css
view/theme/frost-mobile/login_head.tpl
view/theme/frost-mobile/mail_conv.tpl
view/theme/frost-mobile/msg-header.tpl
view/theme/frost-mobile/nav.tpl
view/theme/frost-mobile/photo_edit.tpl
view/theme/frost-mobile/settings.tpl
view/theme/frost-mobile/smarty3/contact_edit.tpl
view/theme/frost-mobile/smarty3/conversation.tpl
view/theme/frost-mobile/smarty3/end.tpl
view/theme/frost-mobile/smarty3/generic_links_widget.tpl
view/theme/frost-mobile/smarty3/head.tpl
view/theme/frost-mobile/smarty3/jot-header.tpl
view/theme/frost-mobile/smarty3/jot.tpl
view/theme/frost-mobile/smarty3/login_head.tpl
view/theme/frost-mobile/smarty3/mail_conv.tpl
view/theme/frost-mobile/smarty3/msg-header.tpl
view/theme/frost-mobile/smarty3/nav.tpl
view/theme/frost-mobile/smarty3/photo_edit.tpl
view/theme/frost-mobile/smarty3/settings.tpl
view/theme/frost-mobile/smarty3/threaded_conversation.tpl
view/theme/frost-mobile/smarty3/wall_thread.tpl
view/theme/frost-mobile/smarty3/wallmsg-end.tpl
view/theme/frost-mobile/smarty3/wallmsg-header.tpl
view/theme/frost-mobile/style.css
view/theme/frost-mobile/theme.php
view/theme/frost-mobile/threaded_conversation.tpl
view/theme/frost-mobile/wall_thread.tpl
view/theme/frost-mobile/wallmsg-end.tpl
view/theme/frost-mobile/wallmsg-header.tpl

index d4bd41d74b59117bcfb9101fa6cbcee038685167..e5f12950c74077ef50874cd179bd6a4e003e53ea 100644 (file)
@@ -6,7 +6,7 @@
        $tab_str
 
        <div id="contact-edit-drop-link" >
-               <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+               <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
        </div>
 
        <div id="contact-edit-drop-link-end"></div>
@@ -74,7 +74,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
-       <textarea id="contact-edit-info" rows="8" cols="35" name="info">$info</textarea>
+       <textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
        <input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 </div>
 <div id="contact-edit-info-end"></div>
index 54ddafbb1d52d276f986fb04a7a4094550fbc79f..d39976f39f31c1f50c534878ddff95e4a646afae 100644 (file)
@@ -20,10 +20,10 @@ $live_update
 
 <div id="conversation-end"></div>
 
-<!--{{ if $dropping }}
+{#<!--{{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >$dropping</div>
 </div>
-<div id="item-delete-selected-end"></div>-->
-{{ endif }}
+<div id="item-delete-selected-end"></div>
+{{ endif }}-->#}
index 7a8a0494de9e0adaa2ee3512d87148f3c1bf7b5b..ad464760f74156ed93df0dcb311582e914612088 100644 (file)
@@ -27,7 +27,7 @@
        <div class='main-container'>\r
 <!--           <div class='main-content-container'>-->\r
                <div class='section-wrapper'>\r
-               <?php if( ($a->module === 'settings') && x($page,'aside')) echo $page['aside']; ?>\r
+               <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>\r
                <section><?php if(x($page,'content')) echo $page['content']; ?>\r
                        <div id="page-footer"></div>\r
                </section>\r
index d2679935c9197c4657c22ecb65f97b583e6269e3..8bc088421a8b3a9b763f0b016abac9ed0bc93d7c 100644 (file)
@@ -1,18 +1,22 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
 <script type="text/javascript">
   tinyMCE.init({ mode : "none"});
-</script>-->
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
+</script>-->#}
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.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/colorbox/jquery.colorbox-min.js"></script>-->
-<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.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/colorbox/jquery.colorbox-min.js"></script>-->#}
+{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.min.js"></script>
 
index 3783467215df571daf52e71c04ae2f759afedc59..a976d4573c532ea30cd023309498d1008655bff9 100644 (file)
@@ -1,11 +1,12 @@
 <div class="widget{{ if $class }} $class{{ endif }}">
-<!--   {{if $title}}<h3>$title</h3>{{endif}}-->
+{#<!-- {{if $title}}<h3>$title</h3>{{endif}}-->#}
        {{if $desc}}<div class="desc">$desc</div>{{endif}}
        
-       <ul class="tabs">
+       <ul class="tabs links-widget">
                {{ for $items as $item }}
                        <li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
                {{ endfor }}
+               <div id="tabs-end"></div>
        </ul>
        
 </div>
index edfa5e4bbf1b5c19ca973e912c89fa1288d0e766..a79b2916ddae6d0d6ede34adde9180fdf11d29ef 100644 (file)
@@ -1,15 +1,15 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+{#<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->
+<meta content='320' name='MobileOptimized'>-->#}
 <meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->
+{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
 
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->#}
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
@@ -28,7 +28,4 @@
        var updateInterval = $update_interval;
        var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 </script>
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 
index b7aafc5ed94ff64b91053ef1a9adf3ebac49a6ec..5d8cfa4548b88b65bcdbf2fab022909be2a2e1b7 100644 (file)
@@ -11,7 +11,8 @@
        window.term = "$term";
        window.baseURL = "$baseurl";
        window.geoTag = function () { $geotag }
-       window.ajaxType = 'jot-header';
+       window.jotId = "#profile-jot-text";
+       window.imageUploadButton = 'wall-image-upload';
 </script>
 
 
index d28cf57e48978dbb8350c00954ec411ce13cf350..b34515279236b2065b27a5e6926ba70c85863eb2 100644 (file)
@@ -21,7 +21,7 @@
                <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
                {{ endif }}
                <div id="jot-text-wrap">
-               <!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->
+               {#<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->#}
                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
                </div>
 
                <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
        </div> 
 
-       <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-               <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+       {#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+               <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->#}
+       <div id="profile-link-wrapper" style="display: $visitor;" >
+               <a id="profile-link" class="icon link" title="$weblink" onclick="jotGetLink(); return false;"></a>
        </div> 
        <div id="profile-video-wrapper" style="display: $visitor;" >
                <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
@@ -73,7 +75,7 @@
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper">
                        $acl
-                       <hr style="clear:both"/>
+                       <hr/>
                        <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
                        $jotnets
                        <div id="profile-jot-networks-end"></div>
index d54df12a35eb57f50787b52a86599115939a06b9..241e0c2370b35b7001dc3bf78b9a4f7bc1c87d01 100644 (file)
@@ -160,7 +160,7 @@ ACL.prototype.update_view = function(){
                                $j('#jot-public').show();
                                $j('.profile-jot-net input').attr('disabled', false);                   
                                if(typeof editor != 'undefined' && editor != false) {
-                                       $j('#profile-jot-desc').html(ispublic);
+                                       $j('#profile-jot-desc').html(window.isPublic);
                                }
                        
        } else {
index b543cbdd72ff2e3958bb0d946446d926c4faf959..3a5d07298b119c5b27241992df3f012926e64f41 100644 (file)
@@ -1 +1 @@
-function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(ispublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
+function ACL(backend_url,preset){that=this;that.url=backend_url;that.kp_timer=null;if(preset==undefined)preset=[];that.allow_cid=preset[0]||[];that.allow_gid=preset[1]||[];that.deny_cid=preset[2]||[];that.deny_gid=preset[3]||[];that.group_uids=[];that.nw=2;that.list_content=$j("#acl-list-content");that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html());that.showall=$j("#acl-showall");if(preset.length==0)that.showall.addClass("selected");that.showall.click(that.on_showall);$j(".acl-button-show").live("click",that.on_button_show);$j(".acl-button-hide").live("click",that.on_button_hide);$j("#acl-search").keypress(that.on_search);$j("#acl-wrapper").parents("form").submit(that.on_submit);that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html("");$j(that.allow_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>")});$j(that.allow_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>")});$j(that.deny_gid).each(function(i,v){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>")});$j(that.deny_cid).each(function(i,v){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>")})};ACL.prototype.search=function(){var srcstr=$j("#acl-search").val();that.list_content.html("");that.get(0,100,srcstr)};ACL.prototype.on_search=function(event){if(that.kp_timer)clearTimeout(that.kp_timer);that.kp_timer=setTimeout(that.search,1e3)};ACL.prototype.on_showall=function(event){event.preventDefault();event.stopPropagation();if(that.showall.hasClass("selected")){return false}that.showall.addClass("selected");that.allow_cid=[];that.allow_gid=[];that.deny_cid=[];that.deny_gid=[];that.update_view();return false};ACL.prototype.on_button_show=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_allow($j(this).parent().attr("id"));return false};ACL.prototype.on_button_hide=function(event){event.preventDefault();event.stopImmediatePropagation();event.stopPropagation();that.set_deny($j(this).parent().attr("id"));return false};ACL.prototype.set_allow=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.allow_gid.indexOf(id)<0){that.allow_gid.push(id)}else{that.allow_gid.remove(id)}if(that.deny_gid.indexOf(id)>=0)that.deny_gid.remove(id);break;case"c":if(that.allow_cid.indexOf(id)<0){that.allow_cid.push(id)}else{that.allow_cid.remove(id)}if(that.deny_cid.indexOf(id)>=0)that.deny_cid.remove(id);break}that.update_view()};ACL.prototype.set_deny=function(itemid){type=itemid[0];id=parseInt(itemid.substr(1));switch(type){case"g":if(that.deny_gid.indexOf(id)<0){that.deny_gid.push(id)}else{that.deny_gid.remove(id)}if(that.allow_gid.indexOf(id)>=0)that.allow_gid.remove(id);break;case"c":if(that.deny_cid.indexOf(id)<0){that.deny_cid.push(id)}else{that.deny_cid.remove(id)}if(that.allow_cid.indexOf(id)>=0)that.allow_cid.remove(id);break}that.update_view()};ACL.prototype.update_view=function(){if(that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0){that.showall.addClass("selected");$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show();$j(".profile-jot-net input").attr("disabled",false);if(typeof editor!="undefined"&&editor!=false){$j("#profile-jot-desc").html(window.isPublic)}}else{that.showall.removeClass("selected");$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide();$j(".profile-jot-net input").attr("disabled","disabled");$j("#profile-jot-desc").html("&nbsp;")}$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")});$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id");type=itemid[0];id=parseInt(itemid.substr(1));btshow=$j(this).children(".acl-button-show").removeClass("selected");bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var uclass="";if(that.allow_gid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected");uclass="groupshow"}if(that.deny_gid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected");uclass="grouphide"}$j(that.group_uids[id]).each(function(i,v){if(uclass=="grouphide")$j("#c"+v).removeClass("groupshow");if(uclass!=""){var cls=$j("#c"+v).attr("class");if(cls==undefined)return true;var hiding=cls.indexOf("grouphide");if(hiding==-1)$j("#c"+v).addClass(uclass)}});break;case"c":if(that.allow_cid.indexOf(id)>=0){btshow.addClass("selected");bthide.removeClass("selected")}if(that.deny_cid.indexOf(id)>=0){btshow.removeClass("selected");bthide.addClass("selected")}}})};ACL.prototype.get=function(start,count,search){var postdata={start:start,count:count,search:search};$j.ajax({type:"POST",url:that.url,data:postdata,dataType:"json",success:that.populate})};ACL.prototype.populate=function(data){$j(data.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link);if(this.uids!=undefined)that.group_uids[this.id]=this.uids;that.list_content.append(html)});$j(".acl-list-item img[data-src]",that.list_content).each(function(i,el){$j(el).attr("src",$j(el).data("src"))});that.update_view()};
\ No newline at end of file
index 4ea2f7cdade534830fb698203840a26a4a028e90..de89ba919f5b3548bcb1827ab368d4e4f0e2a34d 100644 (file)
        }
 
        function liveUpdate() {
-               if((src == null) || (stopped) || (! profile_uid)) { $j('.like-rotator').hide(); return; }
+               if((src == null) || (stopped) || (typeof profile_uid == 'undefined') || (! profile_uid)) { $j('.like-rotator').hide(); return; }
                if(($j('.comment-edit-text-full').length) || (in_progress)) {
                        if(livetime) {
                                clearTimeout(livetime);
                });
        }
 
-       function imgbright(node) {
+/*     function imgbright(node) {
                $j(node).removeClass("drophide").addClass("drop");
        }
 
        function imgdull(node) {
                $j(node).removeClass("drop").addClass("drophide");
-       }
+       }*/
 
        // Since our ajax calls are asynchronous, we will give a few 
        // seconds for the first ajax call (setting like/dislike), then 
 
        function getPosition(e) {
                var cursor = {x:0, y:0};
-               if ( e.touches[0].pageX || e.touches[0].pageY  ) {
-                       cursor.x = e.touches[0].pageX;
-                       cursor.y = e.touches[0].pageY;
+               if ( e.pageX || e.pageY  ) {
+                       cursor.x = e.pageX;
+                       cursor.y = e.pageY;
                }
                else {
-                       if( e.touches[0].clientX || e.touches[0].clientY ) {
-                               cursor.x = e.touches[0].clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
-                               cursor.y = e.touches[0].clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
+                       if( e.clientX || e.clientY ) {
+                               cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
+                               cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
                        }
                        else {
-                               if( e.touches[0].x || e.touches[0].y ) {
-                                       cursor.touches[0].x = e.touches[0].x;
-                                       cursor.touches[0].y = e.touches[0].y;
+                               if( e.x || e.y ) {
+                                       cursor.x = e.x;
+                                       cursor.y = e.y;
                                }
                        }
                }
                        lockvisible = true;
                        $j.get('lockview/' + id, function(data) {
                                $j('#panel').html(data);
-                               $j('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
+                               $j('#panel').css({ 'left': 10 , 'top': cursor.y + 20});
                                $j('#panel').show();
                        });
                }
index aa4ce442757b3cc9619a832fc1bbfee814c8e3fb..3f6100e44200624bfd46e1f2dfcf4a2f5215c2a0 100644 (file)
@@ -1 +1 @@
-function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
+function openClose(listID){listID="#"+listID.replace(/:/g,"\\:");listID=listID.replace(/\./g,"\\.");listID=listID.replace(/@/g,"\\@");if($j(listID).is(":visible")){$j(listID).hide();$j(listID+"-wrapper").show();alert($j(listID+"-wrapper").attr("id"))}else{$j(listID).show();$j(listID+"-wrapper").hide()}}function openMenu(theID){document.getElementById(theID).style.display="block"}function closeMenu(theID){document.getElementById(theID).style.display="none"}var src=null;var prev=null;var livetime=null;var msie=false;var stopped=false;var totStopped=false;var timer=null;var pr=0;var liking=0;var in_progress=false;var langSelect=false;var commentBusy=false;var last_popup_menu=null;var last_popup_button=null;$j(function(){$j.ajaxSetup({cache:false});msie=$j.browser.msie;collapseHeight();$j(".onoff input").each(function(){val=$j(this).val();id=$j(this).attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")});$j(".onoff > a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("<div>").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("<div>").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format("<span class='contactname'>"+e.attr("name")+"</span>");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)});$j("img[data-src]",nnm).each(function(i,el){$j(el).attr("src",$j(el).data("src"))})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||typeof profile_uid=="undefined"||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:10,top:cursor.y+20});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i<f;i++){a[i]=s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1")}return a.join("")}function groupChangeMember(gid,cid,sec_token){$j("body .fakelink").css("cursor","wait");$j.get("group/"+gid+"/"+cid+"?t="+sec_token,function(data){$j("#group-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function profChangeMember(gid,cid){$j("body .fakelink").css("cursor","wait");$j.get("profperm/"+gid+"/"+cid,function(data){$j("#prof-update-wrapper").html(data);$j("body .fakelink").css("cursor","auto")})}function contactgroupChangeMember(gid,cid){$j("body").css("cursor","wait");$j.get("contactgroup/"+gid+"/"+cid,function(data){$j("body").css("cursor","auto")})}function checkboxhighlight(box){if($j(box).is(":checked")){$j(box).addClass("checkeditem")}else{$j(box).removeClass("checkeditem")}}function notifyMarkAll(){$j.get("notify/mark/all",function(data){if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,1e3)})}function fcFileBrowser(field_name,url,type,win){var cmsURL=baseurl+"/fbrowser/"+type+"/";tinyMCE.activeEditor.windowManager.open({file:cmsURL,title:"File Browser",width:420,height:400,resizable:"yes",inline:"yes",close_previous:"no"},{window:win,input:field_name});return false}function setupFieldRichtext(){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:"fieldRichtext",plugins:"bbcode,paste, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"})}String.prototype.format=function(){var formatted=this;for(var i=0;i<arguments.length;i++){var regexp=new RegExp("\\{"+i+"\\}","gi");formatted=formatted.replace(regexp,arguments[i])}return formatted};Array.prototype.remove=function(item){to=undefined;from=this.indexOf(item);var rest=this.slice((to||from)+1||this.length);this.length=from<0?this.length+from:from;return this.push.apply(this,rest)};function previewTheme(elm){theme=$j(elm).val();$j.getJSON("pretheme?f=&theme="+theme,function(data){$j("#theme-preview").html('<div id="theme-desc">'+data.desc+'</div><div id="theme-version">'+data.version+'</div><div id="theme-credits">'+data.credits+"</div>")})}
\ No newline at end of file
index 178202ce5c794e1aec948a169d2a58b1a809e37a..bb0d9dcccdd216b50835a051ac9f748793f00cc5 100644 (file)
@@ -4,58 +4,6 @@ $j(document).ready(function() {
        $j("#profile-jot-text").focus(enableOnUser);
        $j("#profile-jot-text").click(enableOnUser);
 
-       if(typeof window.AjaxUpload != "undefined") {
-               switch(window.ajaxType) {
-                       case 'jot-header':
-                               var uploader = new window.AjaxUpload(
-                                       'wall-image-upload',
-                                       { action: 'wall_upload/'+window.nickname+'?nomce=1',
-                                               name: 'userfile',
-                                               onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-                                               onComplete: function(file,response) {
-                                                       addeditortext(response);
-                                                       $j('#profile-rotator').hide();
-                                               }                                
-                                       }
-                               );
-
-                               var file_uploader = new window.AjaxUpload(
-                                       'wall-file-upload',
-                                       { action: 'wall_attach/'+window.nickname+'?nomce=1',
-                                               name: 'userfile',
-                                               onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-                                               onComplete: function(file,response) {
-                                                       addeditortext(response);
-                                                       $j('#profile-rotator').hide();
-                                               }                                
-                                       }
-                               );
-                               break;
-                       case 'msg-header':
-                               var uploader = new window.AjaxUpload(
-                                       'prvmail-upload',
-                                       { action: 'wall_upload/'+window.nickname+'?nomce=1',
-                                               name: 'userfile',
-                                               onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
-                                               onComplete: function(file,response) {
-                                                       tinyMCE.execCommand('mceInsertRawHTML',false,response);
-                                                       $j('#profile-rotator').hide();
-                                               }                                
-                                       }
-                               );
-                               break;
-                       default:
-                               break;
-               }
-       }
-
-       if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
-               acl = new ACL(
-                       baseurl+"/acl",
-                       [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
-               );
-       }
-
 /*$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
 
        /*$j('.group-edit-icon').hover(
@@ -93,11 +41,115 @@ $j(document).ready(function() {
                        $j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
        );*/
 
-       if(window.autoCompleteType == "display-head") {
+
+       $j('#event-share-checkbox').change(function() {
+
+               if ($j('#event-share-checkbox').is(':checked')) { 
+                       $j('#acl-wrapper').show();
+               }
+               else {
+                       $j('#acl-wrapper').hide();
+               }
+       }).trigger('change');
+
+
+       $j(".popupbox").click(function () {
+               var parent = $j( $j(this).attr('href') ).parent();
+               if (parent.css('display') == 'none') {
+                       parent.show();
+               } else {
+                       parent.hide();
+               }
+               return false;
+       });
+
+
+
+       if(typeof window.AjaxUpload != "undefined") {
+               var uploader = new window.AjaxUpload(
+                       window.imageUploadButton,
+                       { action: 'wall_upload/'+window.nickname+'?nomce=1',
+                               name: 'userfile',
+                               onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+                               onComplete: function(file,response) {
+                                       addeditortext(window.jotId, response);
+                                       $j('#profile-rotator').hide();
+                               }                                
+                       }
+               );
+
+               if($j('#wall-file-upload').length) {
+                       var file_uploader = new window.AjaxUpload(
+                               'wall-file-upload',
+                               { action: 'wall_attach/'+window.nickname+'?nomce=1',
+                                       name: 'userfile',
+                                       onSubmit: function(file,ext) { $j('#profile-rotator').show(); },
+                                       onComplete: function(file,response) {
+                                               addeditortext(window.jotId, response);
+                                               $j('#profile-rotator').hide();
+                                       }                                
+                               }
+                       );
+               }
+       }
+
+
+       if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
+               acl = new ACL(
+                       baseurl+"/acl",
+                       [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
+               );
+       }
+
+       switch(window.autocompleteType) {
+               case 'msg-header':
+                       var a = $j("#recip").autocomplete({ 
+                               serviceUrl: baseurl + '/acl',
+                               minChars: 2,
+                               width: 350,
+                               onSelect: function(value,data) {
+                                       $j("#recip-complete").val(data);
+                               }                       
+                       });
+                       break;
+               case 'contacts-head':
+                       var a = $j("#contacts-search").autocomplete({ 
+                               serviceUrl: baseurl + '/acl',
+                               minChars: 2,
+                               width: 350,
+                       });
+                       a.setOptions({ params: { type: 'a' }});
+                       break;
+               case 'display-head':
+                       $j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+                       break;
+               default:
+                       break;
+       }
+
+
+/*     if(window.autoCompleteType == "display-head") {
                //$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
                // make auto-complete work in more places
                //$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
                $j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+       }*/
+
+
+       if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
+               $j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+                       var selstr;
+                       $j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+                               selstr = $j(this).text();
+                               $j('#jot-perms-icon').removeClass('unlock').addClass('lock');
+                               $j('#jot-public').hide();
+                       });
+                       if(selstr == null) { 
+                               $j('#jot-perms-icon').removeClass('lock').addClass('unlock');
+                               $j('#jot-public').show();
+                       }
+
+               }).trigger('change');
        }
 
        if(window.aclType == "event_head") {
@@ -159,67 +211,6 @@ $j(document).ready(function() {
                if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
        }       
 
-       if(window.aclType == "settings-head" || window.aclType == "photos_head" || window.aclType == "event_head") {
-               $j('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-                       var selstr;
-                       $j('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-                               selstr = $j(this).text();
-                               $j('#jot-perms-icon').removeClass('unlock').addClass('lock');
-                               $j('#jot-public').hide();
-                       });
-                       if(selstr == null) { 
-                               $j('#jot-perms-icon').removeClass('lock').addClass('unlock');
-                               $j('#jot-public').show();
-                       }
-
-               }).trigger('change');
-       }
-
-       switch(window.autocompleteType) {
-               case 'msg-header':
-                       var a = $j("#recip").autocomplete({ 
-                               serviceUrl: baseurl + '/acl',
-                               minChars: 2,
-                               width: 350,
-                               onSelect: function(value,data) {
-                                       $j("#recip-complete").val(data);
-                               }                       
-                       });
-                       break;
-               case 'contacts-head':
-                       var a = $j("#contacts-search").autocomplete({ 
-                               serviceUrl: baseurl + '/acl',
-                               minChars: 2,
-                               width: 350,
-                       });
-                       a.setOptions({ params: { type: 'a' }});
-                       break;
-               default:
-                       break;
-       }
-
-
-       $j('#event-share-checkbox').change(function() {
-
-               if ($j('#event-share-checkbox').is(':checked')) { 
-                       $j('#acl-wrapper').show();
-               }
-               else {
-                       $j('#acl-wrapper').hide();
-               }
-       }).trigger('change');
-
-
-       $j(".popupbox").click(function () {
-               var parent = $j( $j(this).attr('href') ).parent();
-               if (parent.css('display') == 'none') {
-                       parent.show();
-               } else {
-                       parent.hide();
-               }
-               return false;
-       });
-
 });
 
 // update pending count //
@@ -242,50 +233,52 @@ function homeRedirect() {
 }
 
 
-function insertFormatting(comment,BBcode,id) {
-       
-       var tmpStr = $j("#comment-edit-text-" + id).val();
-       if(tmpStr == comment) {
-               tmpStr = "";
-               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-               openMenu("comment-edit-submit-wrapper-" + id);
-               $j("#comment-edit-text-" + id).val(tmpStr);
+function initCrop() {
+       function onEndCrop( coords, dimensions ) {
+               $( 'x1' ).value = coords.x1;
+               $( 'y1' ).value = coords.y1;
+               $( 'x2' ).value = coords.x2;
+               $( 'y2' ).value = coords.y2;
+               $( 'width' ).value = dimensions.width;
+               $( 'height' ).value = dimensions.height;
        }
 
-       textarea = document.getElementById("comment-edit-text-" +id);
-       if (document.selection) {
-               textarea.focus();
-               selected = document.selection.createRange();
-               if (BBcode == "url"){
-                       selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
-                       } else                  
-               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
-               var start = textarea.selectionStart;
-               var end = textarea.selectionEnd;
-               if (BBcode == "url"){
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-                       } else
-               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-       }
-       return true;
+       Event.observe( window, 'load', function() {
+               new Cropper.ImgWithPreview(
+               'croppa',
+               {
+                       previewWrap: 'previewWrap',
+                       minWidth: 175,
+                       minHeight: 175,
+                       maxWidth: 640,
+                       maxHeight: 640,
+                       ratioDim: { x: 100, y:100 },
+                       displayOnInit: true,
+                       onEndCrop: onEndCrop
+               });
+       });
 }
 
-function cmtBbOpen(id) {
-       $j(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-       $j(".comment-edit-bb-" + id).hide();
+
+function showEvent(eventid) {
+/*     $j.get(
+               baseurl + '/events/?id='+eventid,
+               function(data){
+                       $j.colorbox({html:data});
+               }
+       );*/                    
 }
 
 
 
+/*
+ * TinyMCE/Editor
+ */
 
 var editor=false;
 var textlen = 0;
 var plaintext = 'none';//window.editSelect;
-       var ispublic = window.isPublic;
+//var ispublic = window.isPublic;
 
 function initEditor(cb){
        if (editor==false){
@@ -412,7 +405,7 @@ function enableOnUser(){
        initEditor();
 }
 
-function wallInitEditor() {
+/*function wallInitEditor() {
        var plaintext = window.editSelect;
 
        if(plaintext != 'none') {
@@ -454,131 +447,34 @@ function wallInitEditor() {
        }
        else
                $j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-}
-
-
-
-
-function initCrop() {
-       function onEndCrop( coords, dimensions ) {
-               $( 'x1' ).value = coords.x1;
-               $( 'y1' ).value = coords.y1;
-               $( 'x2' ).value = coords.x2;
-               $( 'y2' ).value = coords.y2;
-               $( 'width' ).value = dimensions.width;
-               $( 'height' ).value = dimensions.height;
-       }
-
-       Event.observe( window, 'load', function() {
-               new Cropper.ImgWithPreview(
-               'croppa',
-               {
-                       previewWrap: 'previewWrap',
-                       minWidth: 175,
-                       minHeight: 175,
-                       maxWidth: 640,
-                       maxHeight: 640,
-                       ratioDim: { x: 100, y:100 },
-                       displayOnInit: true,
-                       onEndCrop: onEndCrop
-               });
-       });
-}
+}*/
 
 
-function confirmDelete() { return confirm(window.delItem); }
-function commentOpen(obj,id) {
-       if(obj.value == window.commentEmptyText) {
-               obj.value = "";
-               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-               $j("#mod-cmnt-wrap-" + id).show();
-               openMenu("comment-edit-submit-wrapper-" + id);
-       }
-}
-function commentClose(obj,id) {
-       if(obj.value == "") {
-               obj.value = window.commentEmptyText;
-               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-               $j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-               $j("#mod-cmnt-wrap-" + id).hide();
-               closeMenu("comment-edit-submit-wrapper-" + id);
-       }
-}
 
+/*
+ * Jot
+ */
 
-function commentInsert(obj,id) {
-       var tmpStr = $j("#comment-edit-text-" + id).val();
-       if(tmpStr == window.commentEmptyText) {
-               tmpStr = "";
-               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-               openMenu("comment-edit-submit-wrapper-" + id);
-       }
-       var ins = $j(obj).html();
-       ins = ins.replace("&lt;","<");
-       ins = ins.replace("&gt;",">");
-       ins = ins.replace("&amp;","&");
-       ins = ins.replace("&quot;",'"');
-       $j("#comment-edit-text-" + id).val(tmpStr + ins);
-}
-
-function qCommentInsert(obj,id) {
-       var tmpStr = $j("#comment-edit-text-" + id).val();
-       if(tmpStr == window.commentEmptyText) {
-               tmpStr = "";
-               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-               openMenu("comment-edit-submit-wrapper-" + id);
+function addeditortext(textElem, data) {
+       if(window.editSelect == 'none') {
+               var currentText = $j(textElem).val();
+               $j(textElem).val(currentText + data);
        }
-       var ins = $j(obj).val();
-       ins = ins.replace("&lt;","<");
-       ins = ins.replace("&gt;",">");
-       ins = ins.replace("&amp;","&");
-       ins = ins.replace("&quot;",'"');
-       $j("#comment-edit-text-" + id).val(tmpStr + ins);
-       $j(obj).val("");
+/*     else
+               tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
 }
 
-/*function showHideCommentBox(id) {
-       if( $j('#comment-edit-form-' + id).is(':visible')) {
-               $j('#comment-edit-form-' + id).hide();
-       }
-       else {
-               $j('#comment-edit-form-' + id).show();
-       }
-}*/
-
-
-/*function deleteCheckedItems() {
-       var checkedstr = '';
-
-       $j('.item-select').each( function() {
-               if($j(this).is(':checked')) {
-                       if(checkedstr.length != 0) {
-                               checkedstr = checkedstr + ',' + $j(this).val();
-                       }
-                       else {
-                               checkedstr = $j(this).val();
-                       }
-               }       
-       });
-       $j.post('item', { dropitems: checkedstr }, function(data) {
-               window.location.reload();
-       });
-}*/
-
 function jotVideoURL() {
        reply = prompt(window.vidURL);
        if(reply && reply.length) {
-               addeditortext('[video]' + reply + '[/video]');
+               addeditortext("#profile-jot-text", '[video]' + reply + '[/video]');
        }
 }
 
 function jotAudioURL() {
        reply = prompt(window.audURL);
        if(reply && reply.length) {
-               addeditortext('[audio]' + reply + '[/audio]');
+               addeditortext("#profile-jot-text", '[audio]' + reply + '[/audio]');
        }
 }
 
@@ -597,7 +493,7 @@ function jotShare(id) {
        $j.get('share/' + id, function(data) {
                if (!editor) $j("#profile-jot-text").val("");
                initEditor(function(){
-                       addeditortext(data);
+                       addeditortext("#profile-jot-text", data);
                        $j('#like-rotator-' + id).hide();
                        $j(window).scrollTop(0);
                });
@@ -605,84 +501,73 @@ function jotShare(id) {
        });
 }
 
-function linkdropper(event) {
+function jotGetLink() {
+       reply = prompt(window.linkURL);
+       if(reply && reply.length) {
+               reply = bin2hex(reply);
+               $j('#profile-rotator').show();
+               $j.get('parse_url?binurl=' + reply, function(data) {
+                       addeditortext(window.jotId, data);
+                       $j('#profile-rotator').hide();
+               });
+       }
+}
+
+/*function linkdropper(event) {
        var linkFound = event.dataTransfer.types.contains("text/uri-list");
        if(linkFound)
                event.preventDefault();
 }
 
-switch(window.ajaxType) {
-       case 'jot-header':
-               function jotGetLink() {
-                       reply = prompt(window.linkURL);
-                       if(reply && reply.length) {
-                               reply = bin2hex(reply);
-                               $j('#profile-rotator').show();
-                               $j.get('parse_url?binurl=' + reply, function(data) {
-                                       addeditortext(data);
-                                       $j('#profile-rotator').hide();
-                               });
-                       }
-               }
+function linkdrop(event) {
+       var reply = event.dataTransfer.getData("text/uri-list");
+       event.target.textContent = reply;
+       event.preventDefault();
+       if(reply && reply.length) {
+               reply = bin2hex(reply);
+               $j('#profile-rotator').show();
+               $j.get('parse_url?binurl=' + reply, function(data) {
+                       //if (!editor) $j("#profile-jot-text").val("");
+                       //initEditor(function(){
+                       addeditortext(window.jotId, data);
+                       $j('#profile-rotator').hide();
+                       //});
+               });
+       }
+}*/
 
-               function linkdrop(event) {
-                       var reply = event.dataTransfer.getData("text/uri-list");
-                       event.target.textContent = reply;
-                       event.preventDefault();
-                       if(reply && reply.length) {
-                               reply = bin2hex(reply);
-                               $j('#profile-rotator').show();
-                               $j.get('parse_url?binurl=' + reply, function(data) {
-                                       if (!editor) $j("#profile-jot-text").val("");
-                                       initEditor(function(){
-                                               addeditortext(data);
-                                               $j('#profile-rotator').hide();
-                                       });
-                               });
-                       }
-               }
-               break;
-       case 'msg-header':
-       case 'wallmsg-header':
-// TINYMCE -- BAD
-               function jotGetLink() {
-                       reply = prompt(window.linkURL);
-                       if(reply && reply.length) {
-                               $j('#profile-rotator').show();
-                               $j.get('parse_url?url=' + reply, function(data) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,data);
-                                       $j('#profile-rotator').hide();
-                               });
-                       }
-               }
+function jotClearLocation() {
+       $j('#jot-coord').val('');
+       $j('#profile-nolocation-wrapper').hide();
+}
 
-               function linkdrop(event) {
-                       var reply = event.dataTransfer.getData("text/uri-list");
-                       event.target.textContent = reply;
-                       event.preventDefault();
-                       if(reply && reply.length) {
-                               $j('#profile-rotator').show();
-                               $j.get('parse_url?url=' + reply, function(data) {
-                                       tinyMCE.execCommand('mceInsertRawHTML',false,data);
-                                       $j('#profile-rotator').hide();
-                               });
-                       }
-               }
+if(typeof window.geoTag === 'function') window.geoTag();
 
-               break;
-       default:
-               break;
-}
 
-function showEvent(eventid) {
-/*     $j.get(
-               baseurl + '/events/?id='+eventid,
-               function(data){
-                       $j.colorbox({html:data});
-               }
-       );*/                    
-}
 
+/*
+ * Items
+ */
+
+function confirmDelete() { return confirm(window.delItem); }
+
+/*function deleteCheckedItems() {
+       var checkedstr = '';
+
+       $j('.item-select').each( function() {
+               if($j(this).is(':checked')) {
+                       if(checkedstr.length != 0) {
+                               checkedstr = checkedstr + ',' + $j(this).val();
+                       }
+                       else {
+                               checkedstr = $j(this).val();
+                       }
+               }       
+       });
+       $j.post('item', { dropitems: checkedstr }, function(data) {
+               window.location.reload();
+       });
+}*/
 
 function itemTag(id) {
        reply = prompt(window.term);
@@ -750,20 +635,111 @@ function itemFiler(id) {
 */             
 }
 
-function jotClearLocation() {
-       $j('#jot-coord').val('');
-       $j('#profile-nolocation-wrapper').hide();
+
+
+/*
+ * Comments
+ */
+
+
+function commentOpen(obj,id) {
+       if(obj.value == window.commentEmptyText) {
+               obj.value = "";
+               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               $j("#mod-cmnt-wrap-" + id).show();
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
+}
+function commentClose(obj,id) {
+       if(obj.value == "") {
+               obj.value = window.commentEmptyText;
+               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+               $j("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+               $j("#mod-cmnt-wrap-" + id).hide();
+               closeMenu("comment-edit-submit-wrapper-" + id);
+       }
 }
 
-function addeditortext(data) {
-       if(plaintext == 'none') {
-               var currentText = $j("#profile-jot-text").val();
-               $j("#profile-jot-text").val(currentText + data);
+
+function commentInsert(obj,id) {
+       var tmpStr = $j("#comment-edit-text-" + id).val();
+       if(tmpStr == window.commentEmptyText) {
+               tmpStr = "";
+               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
        }
-       /*else
-               tinyMCE.execCommand('mceInsertRawHTML',false,data);*/
+       var ins = $j(obj).html();
+       ins = ins.replace("&lt;","<");
+       ins = ins.replace("&gt;",">");
+       ins = ins.replace("&amp;","&");
+       ins = ins.replace("&quot;",'"');
+       $j("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
-if(typeof window.geoTag === 'function') window.geoTag();
+function qCommentInsert(obj,id) {
+       var tmpStr = $j("#comment-edit-text-" + id).val();
+       if(tmpStr == window.commentEmptyText) {
+               tmpStr = "";
+               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+       }
+       var ins = $j(obj).val();
+       ins = ins.replace("&lt;","<");
+       ins = ins.replace("&gt;",">");
+       ins = ins.replace("&amp;","&");
+       ins = ins.replace("&quot;",'"');
+       $j("#comment-edit-text-" + id).val(tmpStr + ins);
+       $j(obj).val("");
+}
+
+/*function showHideCommentBox(id) {
+       if( $j('#comment-edit-form-' + id).is(':visible')) {
+               $j('#comment-edit-form-' + id).hide();
+       }
+       else {
+               $j('#comment-edit-form-' + id).show();
+       }
+}*/
+
+
+function insertFormatting(comment,BBcode,id) {
+       
+       var tmpStr = $j("#comment-edit-text-" + id).val();
+       if(tmpStr == comment) {
+               tmpStr = "";
+               $j("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $j("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               openMenu("comment-edit-submit-wrapper-" + id);
+               $j("#comment-edit-text-" + id).val(tmpStr);
+       }
+
+       textarea = document.getElementById("comment-edit-text-" +id);
+       if (document.selection) {
+               textarea.focus();
+               selected = document.selection.createRange();
+               if (BBcode == "url"){
+                       selected.text = "["+BBcode+"=http://]" +  selected.text + "[/"+BBcode+"]";
+                       } else                  
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+       } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+               var start = textarea.selectionStart;
+               var end = textarea.selectionEnd;
+               if (BBcode == "url"){
+                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"=http://]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+                       } else
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+       }
+       return true;
+}
+
+function cmtBbOpen(id) {
+       $j(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+       $j(".comment-edit-bb-" + id).hide();
+}
 
 
index a7562d5e99ec16f40c21e1aea79da12111c129a0..47b0bb9b8779fa6abc2b853381c68924838a9c70 100644 (file)
@@ -1 +1 @@
-$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false})});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}var editor=false;var textlen=0;var plaintext="none";var ispublic=window.isPublic;function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$j("#profile-rotator").hide()}});if($j("#wall-file-upload").length){var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(window.jotId,response);$j("#profile-rotator").hide()}})}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;case"display-head":$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");break;default:break}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showEvent(eventid){}var editor=false;var textlen=0;var plaintext="none";function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function addeditortext(textElem,data){if(window.editSelect=="none"){var currentText=$j(textElem).val();$j(textElem).val(currentText+data)}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("#profile-jot-text","[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext("#profile-jot-text",data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(window.jotId,data);$j("#profile-rotator").hide()})}}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}if(typeof window.geoTag==="function")window.geoTag();function confirmDelete(){return confirm(window.delItem)}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("&lt;","<");ins=ins.replace("&gt;",">");ins=ins.replace("&amp;","&");ins=ins.replace("&quot;",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}
\ No newline at end of file
index bbb60ebabb855d24544bc211ef1bdcc6b5464478..4c853307165b12086901a677bd0362022e5a9e1e 100644 (file)
@@ -99,7 +99,7 @@ div.section-wrapper {
        margin-top: 50px;
 }
 
-#login_openid input {
+#login_openid input, input.openid {
        background: url(login-bg.gif) no-repeat;
        background-position: 0 50%;
        width: 182px;
index 47651ad8ad4ec543833962f3018da749d0bd6aa2..14734821ce118cfe042cfc1af55a486e006c5d05 100644 (file)
@@ -1,2 +1,2 @@
-<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->
+{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
 
index 3529fcffa616eac04af0c73b6cf4da23984b2104..ed32dac5a9f3b5e8d980f22c5dd2188436ee7fed 100644 (file)
@@ -12,7 +12,7 @@
 <div class="mail-conv-outside-wrapper-end"></div>
 
 
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a></div>
 <div class="mail-conv-delete-end"></div>
 
 <hr class="mail-conv-break" />
index 5215092e454caecee78d682d331c8476b173d3c5..fb6e0684b7e434b8f394a4448530a99861c686fa 100644 (file)
@@ -3,7 +3,8 @@
        window.nickname = "$nickname";
        window.linkURL = "$linkurl";
        var plaintext = "none";
-       window.ajaxType = 'msg-header';
+       window.jotId = "#prvmail-text";
+       window.imageUploadButton = 'prvmail-upload';
        window.autocompleteType = 'msg-header';
 </script>
 
index 01aafabf0d8c27286e3b79f790f6231f747f9696..c03ea05d90bfefeed0591a39bb0e8d950136c25e 100644 (file)
@@ -1,15 +1,15 @@
 <nav>
-<!--   $langselector -->
+{#<!-- $langselector -->#}
 
-<!--   <div id="site-location">$sitelocation</div> -->
+{#<!-- <div id="site-location">$sitelocation</div> -->#}
 
        <span id="nav-link-wrapper" >
 
-<!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
+{#<!-- <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
        <div class="nav-button-container">
-<!--   <a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->
+{#<!-- <a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
        <img rel="#system-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/menu.png">
-<!--   </a>-->
+{#<!-- </a>-->#}
        <ul id="system-menu-list" class="nav-menu-list">
                {{ if $nav.login }}
                <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
        </div>
 
        {{ if $nav.notifications }}
-<!--   <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->
+{#<!-- <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
        <div class="nav-button-container">
-<!--   <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->
+{#<!-- <a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
        <img rel="#nav-notifications-menu" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/notifications.png">
-<!--   </a>-->
+{#<!-- </a>-->#}
        <span id="notify-update" class="nav-ajax-left"></span>
        <ul id="nav-notifications-menu" class="notifications-menu-popup">
                <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
        </div>
        {{ endif }}             
 
-<!--   <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
+{#<!-- <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
        <div class="nav-button-container">
-<!--   <a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->
+{#<!-- <a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
        <img rel="#contacts-menu-list"  class="nav-link" src="$baseurl/view/theme/frost-mobile/images/contacts.png">
-       <!--</a>-->
+       {#<!--</a>-->#}
        {{ if $nav.introductions }}
        <span id="intro-update" class="nav-ajax-left"></span>
        {{ endif }}
@@ -92,7 +92,7 @@
        </div>
 
        {{ if $nav.messages }}
-<!--   <a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->
+{#<!-- <a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
        <div class="nav-button-container">
        <a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
        <img src="$baseurl/view/theme/frost-mobile/images/message.png" class="nav-link">
        </div>
        {{ endif }}
 
-<!--   <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
+{#<!-- <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
        <div class="nav-button-container">
-<!--   <a class="network-menu-link nav-link" href="#network-menu" title="Network">-->
+{#<!-- <a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
        <img rel="#network-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/network.png">
-<!--   </a>-->
+{#<!-- </a>-->#}
        {{ if $nav.network }}
        <span id="net-update" class="nav-ajax-left"></span>
        {{ endif }}
                <li>
                <a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
                </li>
-               <!--<span id="net-update" class="nav-ajax-left"></span>-->
+               {#<!--<span id="net-update" class="nav-ajax-left"></span>-->#}
                {{ endif }}
 
                {{ if $nav.network }}
 
                {{ if $nav.home }}
                <li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-               <!--<span id="home-update" class="nav-ajax-left"></span>-->
+               {#<!--<span id="home-update" class="nav-ajax-left"></span>-->#}
                {{ endif }}
 
                {{ if $nav.community }}
        </div>
 
        </span>
-       <!--<span id="nav-end"></span>-->
+       {#<!--<span id="nav-end"></span>-->#}
        <span id="banner">$banner</span>
 </nav>
 
index 5631b2eba8be1169d3ee10165cbdea981bcde0f9..4265f8c98c9fa609e2fea70dd166e95e606f2f05 100644 (file)
@@ -3,30 +3,35 @@
 
        <input type="hidden" name="item_id" value="$item_id" />
 
+       <div class="photo-edit-input-text">
        <label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
        <input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
+       </div>
 
        <div id="photo-edit-albumname-end"></div>
 
+       <div class="photo-edit-input-text">
        <label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
        <input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
+       </div>
 
        <div id="photo-edit-caption-end"></div>
 
+       <div class="photo-edit-input-text">
        <label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
        <input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
+       </div>
 
        <div id="photo-edit-tags-end"></div>
-       <div id="photo-edit-rotate-wrapper">
-               <div class="photo-edit-rotate-label">
-                       $rotatecw
-               </div>
-               <input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
 
-               <div class="photo-edit-rotate-label">
-                       $rotateccw
-               </div>
-               <input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+       <div class="photo-edit-rotate-choice">
+       <label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
+       <input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+       </div>
+
+       <div class="photo-edit-rotate-choice">
+       <label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
+       <input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
        </div>
        <div id="photo-edit-rotate-end"></div>
 
index 5a40b96bca5c114a1a5fdc4454990bd6b7ca7ab8..3e8b33d7f0efd604549875783d399837722c4609 100644 (file)
@@ -81,7 +81,7 @@ $unkmail
        <a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
        <div id="settings-default-perms-menu-end"></div>
 
-<!--   <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->
+{#<!-- <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
        
        <div style="display: none;">
                <div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
@@ -89,7 +89,7 @@ $unkmail
                </div>
        </div>
 
-<!--   </div>-->
+{#<!-- </div>-->#}
 </div>
 <br/>
 <div id="settings-default-perms-end"></div>
index b18fff6b4a40cc6c2e8b7e70e9e4b9095149d760..924acb0c1a01024cf121c7b7e4f1b95ac07d17ba 100644 (file)
@@ -11,7 +11,7 @@
        {{$tab_str}}
 
        <div id="contact-edit-drop-link" >
-               <a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+               <a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
        </div>
 
        <div id="contact-edit-drop-link-end"></div>
@@ -79,7 +79,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>{{$lbl_info1}}</h4>
-       <textarea id="contact-edit-info" rows="8" cols="35" name="info">{{$info}}</textarea>
+       <textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
        <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
 </div>
 <div id="contact-edit-info-end"></div>
index 31cfb54d2087dd1948d104d63c9b3024dd9a09b9..f6810bb100084a5a3a3ad3e0c69e873021a81c9c 100644 (file)
 
 <div id="conversation-end"></div>
 
-<!--{{if $dropping}}
+{{*<!--{{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >{{$dropping}}</div>
 </div>
-<div id="item-delete-selected-end"></div>-->
-{{/if}}
+<div id="item-delete-selected-end"></div>
+{{/if}}-->*}}
index c51bc4167ff183fad1790073cba6d98e9c185f22..435c190fb920a2784b5dc2d1d0cf73d442f2deb1 100644 (file)
@@ -6,18 +6,22 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
 <script type="text/javascript">
   tinyMCE.init({ mode : "none"});
-</script>-->
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
+</script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.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/colorbox/jquery.colorbox-min.js"></script>-->
-<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.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/colorbox/jquery.colorbox-min.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.min.js"></script>
 
index 6c9700764a7ae9918a50c2440fcb59e9e92d0138..705ddb57cbac895d3d0a5da434c504b01b9b7fb0 100644 (file)
@@ -4,13 +4,14 @@
  *
  *}}
 <div class="widget{{if $class}} {{$class}}{{/if}}">
-<!--   {{if $title}}<h3>{{$title}}</h3>{{/if}}-->
+{{*<!--        {{if $title}}<h3>{{$title}}</h3>{{/if}}-->*}}
        {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
        
-       <ul class="tabs">
+       <ul class="tabs links-widget">
                {{foreach $items as $item}}
                        <li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
                {{/foreach}}
+               <div id="tabs-end"></div>
        </ul>
        
 </div>
index 1799a74942fe65877aa3fd6ad78788c1b0c0a6d5..d11d072f2649d6f7cf5de5e47f9a589527851edc 100644 (file)
@@ -4,17 +4,17 @@
  *
  *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
 <meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->
+<meta content='320' name='MobileOptimized'>-->*}}
 <meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
 
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
-<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
+<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
@@ -33,7 +33,4 @@
        var updateInterval = {{$update_interval}};
        var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
 </script>
-<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 
index d792ec1a18c2bc94d607e0d344c21bf756ab3cd0..bfaf3d5e062f6a21389dcc97aa184b5774b12b12 100644 (file)
@@ -16,7 +16,8 @@
        window.term = "{{$term}}";
        window.baseURL = "{{$baseurl}}";
        window.geoTag = function () { {{$geotag}} }
-       window.ajaxType = 'jot-header';
+       window.jotId = "#profile-jot-text";
+       window.imageUploadButton = 'wall-image-upload';
 </script>
 
 
index 40c410717435dbdcf2ec7651f5bf4ea32fff98d9..1dcfc0b21cbf172715e9603f2e8632c65e6a62ae 100644 (file)
@@ -26,7 +26,7 @@
                <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
                {{/if}}
                <div id="jot-text-wrap">
-               <!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->
+               {{*<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />-->*}}
                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
                </div>
 
                <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
        </div> 
 
-       <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-               <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+       {{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+               <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
+       <div id="profile-link-wrapper" style="display: {{$visitor}};" >
+               <a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
        </div> 
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
                <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
@@ -78,7 +80,7 @@
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper">
                        {{$acl}}
-                       <hr style="clear:both"/>
+                       <hr/>
                        <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
                        {{$jotnets}}
                        <div id="profile-jot-networks-end"></div>
index 86805c61f9a74d80d5c9ed532c380ece6c4fa9c3..c2d9504ad3cf9edd236339c4022df1d7ae3a2331 100644 (file)
@@ -3,5 +3,5 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->*}}
 
index 0e58de8f743722e8caa9eb1650489cb8803ec98e..c6d9aa03afe65bdfb4688a0d3f544b103933c136 100644 (file)
@@ -17,7 +17,7 @@
 <div class="mail-conv-outside-wrapper-end"></div>
 
 
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div>
 <div class="mail-conv-delete-end"></div>
 
 <hr class="mail-conv-break" />
index 977f571d15f6b09c8c2cc578b8780303f7172e9a..b0a0f7945736a7d7227eeb50380a04ab58bfbe58 100644 (file)
@@ -8,7 +8,8 @@
        window.nickname = "{{$nickname}}";
        window.linkURL = "{{$linkurl}}";
        var plaintext = "none";
-       window.ajaxType = 'msg-header';
+       window.jotId = "#prvmail-text";
+       window.imageUploadButton = 'prvmail-upload';
        window.autocompleteType = 'msg-header';
 </script>
 
index d570c9f265d65b6c10c94be64a98bc02ea3280bc..2c9f29d503ce435473f6c1a2c49480ccf03c1b3a 100644 (file)
@@ -4,17 +4,17 @@
  *
  *}}
 <nav>
-<!--   {{$langselector}} -->
+{{*<!--        {{$langselector}} -->*}}
 
-<!--   <div id="site-location">{{$sitelocation}}</div> -->
+{{*<!--        <div id="site-location">{{$sitelocation}}</div> -->*}}
 
        <span id="nav-link-wrapper" >
 
-<!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
+{{*<!--        <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
        <div class="nav-button-container">
-<!--   <a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->
+{{*<!--        <a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
        <img rel="#system-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/menu.png">
-<!--   </a>-->
+{{*<!--        </a>-->*}}
        <ul id="system-menu-list" class="nav-menu-list">
                {{if $nav.login}}
                <a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
        </div>
 
        {{if $nav.notifications}}
-<!--   <a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->
+{{*<!--        <a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
        <div class="nav-button-container">
-<!--   <a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->
+{{*<!--        <a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
        <img rel="#nav-notifications-menu" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/notifications.png">
-<!--   </a>-->
+{{*<!--        </a>-->*}}
        <span id="notify-update" class="nav-ajax-left"></span>
        <ul id="nav-notifications-menu" class="notifications-menu-popup">
                <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
        </div>
        {{/if}}         
 
-<!--   <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
+{{*<!--        <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
        <div class="nav-button-container">
-<!--   <a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->
+{{*<!--        <a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
        <img rel="#contacts-menu-list"  class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/contacts.png">
-       <!--</a>-->
+       {{*<!--</a>-->*}}
        {{if $nav.introductions}}
        <span id="intro-update" class="nav-ajax-left"></span>
        {{/if}}
@@ -97,7 +97,7 @@
        </div>
 
        {{if $nav.messages}}
-<!--   <a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->
+{{*<!--        <a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
        <div class="nav-button-container">
        <a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
        <img src="{{$baseurl}}/view/theme/frost-mobile/images/message.png" class="nav-link">
        </div>
        {{/if}}
 
-<!--   <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
+{{*<!--        <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
        <div class="nav-button-container">
-<!--   <a class="network-menu-link nav-link" href="#network-menu" title="Network">-->
+{{*<!--        <a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
        <img rel="#network-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/network.png">
-<!--   </a>-->
+{{*<!--        </a>-->*}}
        {{if $nav.network}}
        <span id="net-update" class="nav-ajax-left"></span>
        {{/if}}
                <li>
                <a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
                </li>
-               <!--<span id="net-update" class="nav-ajax-left"></span>-->
+               {{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
                {{/if}}
 
                {{if $nav.network}}
 
                {{if $nav.home}}
                <li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
-               <!--<span id="home-update" class="nav-ajax-left"></span>-->
+               {{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
                {{/if}}
 
                {{if $nav.community}}
        </div>
 
        </span>
-       <!--<span id="nav-end"></span>-->
+       {{*<!--<span id="nav-end"></span>-->*}}
        <span id="banner">{{$banner}}</span>
 </nav>
 
index a6668c9f11c0e996a0b10993956056d9e66695bc..87df97b4bf55cd19afa2829a6daab632bee9f6ab 100644 (file)
@@ -8,30 +8,35 @@
 
        <input type="hidden" name="item_id" value="{{$item_id}}" />
 
+       <div class="photo-edit-input-text">
        <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
        <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+       </div>
 
        <div id="photo-edit-albumname-end"></div>
 
+       <div class="photo-edit-input-text">
        <label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
        <input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+       </div>
 
        <div id="photo-edit-caption-end"></div>
 
+       <div class="photo-edit-input-text">
        <label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
        <input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+       </div>
 
        <div id="photo-edit-tags-end"></div>
-       <div id="photo-edit-rotate-wrapper">
-               <div class="photo-edit-rotate-label">
-                       {{$rotatecw}}
-               </div>
-               <input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
 
-               <div class="photo-edit-rotate-label">
-                       {{$rotateccw}}
-               </div>
-               <input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+       <div class="photo-edit-rotate-choice">
+       <label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+       <input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+       </div>
+
+       <div class="photo-edit-rotate-choice">
+       <label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+       <input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
        </div>
        <div id="photo-edit-rotate-end"></div>
 
index 8724a12443749d0e0c98ce2c24fd1c9331ccbd7b..73732e453c7e419fb0d6d05c73e1c71b99f353d0 100644 (file)
@@ -86,7 +86,7 @@
        <a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
        <div id="settings-default-perms-menu-end"></div>
 
-<!--   <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->
+{{*<!--        <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->*}}
        
        <div style="display: none;">
                <div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
@@ -94,7 +94,7 @@
                </div>
        </div>
 
-<!--   </div>-->
+{{*<!--        </div>-->*}}
 </div>
 <br/>
 <div id="settings-default-perms-end"></div>
index 801d3e179e328ec38dac37827560acc2e020b25a..bf6eab47af8f075c3bb4959c9b2069bb68a32a4d 100644 (file)
 
 <div id="conversation-end"></div>
 
-<!--{{if $dropping}}
+{{*<!--{{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >{{$dropping}}</div>
 </div>
 <div id="item-delete-selected-end"></div>
-{{/if}}-->
+{{/if}}-->*}}
index 1bbaf4420ed360ec9865c57f165d779529844d95..18246114da2f819898b66a7d1e50e743d100abca 100644 (file)
@@ -11,7 +11,7 @@
 {{/if}}
 <div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
 <a name="{{$item.id}}" ></a>
-<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
        <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
                <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
                        {{if $item.owner_url}}
                        </div>
                        <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
-                       <!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+                       {{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->
-                       <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+                       {{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
                                <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
                                <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
                                </a>
-                               <!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                               {{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                         {{$item.item_photo_menu}}
                     </ul>
-                </div>-->
+                </div>-->*}}
 
-                       </div>
-                       <!--<div class="wall-item-photo-end"></div>-->
+                       {{*<!--</div>-->*}}
+                       {{*<!--<div class="wall-item-photo-end"></div>-->*}}
                        <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-                               {{if $item.lock}}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /><!--</div>-->
+                               {{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
                                {{else}}<div class="wall-item-lock"></div>{{/if}}       
                                <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
                        </div>
                </div>
-               <!--<div class="wall-item-author">-->
+               {{*<!--<div class="wall-item-author">-->*}}
                                <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>                         
-               <!--</div>-->
+               {{*<!--</div>-->*}}
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
                        <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-                       <!--<div class="wall-item-title-end"></div>-->
+                       {{*<!--<div class="wall-item-title-end"></div>-->*}}
                        <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-                                       <!--<div class="body-tag">-->
+                                       {{*<!--<div class="body-tag">-->*}}
                                                {{foreach $item.tags as $tag}}
                                                        <span class='body-tag tag'>{{$tag}}</span>
                                                {{/foreach}}
-                                       <!--</div>-->
+                                       {{*<!--</div>-->*}}
                        {{if $item.has_cats}}
                        <div class="categorytags">{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                        </div>
@@ -80,7 +80,7 @@
                        </div>
                        {{/if}}
                        {{if $item.plink}}
-                               <!--<div class="wall-item-links-wrapper">--><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a><!--</div>-->
+                               {{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
                        {{/if}}
                        {{if $item.edpost}}
                                <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                        <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
                        {{/if}}                 
                        
-                       <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->
-                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-                       <!--</div>-->
+                       {{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
+                       {{*<!--</div>-->*}}
                                {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-                       <!--<div class="wall-item-delete-end"></div>-->
+                       {{*<!--<div class="wall-item-delete-end"></div>-->*}}
                </div>
        </div>  
-       <!--<div class="wall-item-wrapper-end"></div>-->
+       {{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
        <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
        <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
 
        {{if $item.threaded}}
        {{if $item.comment}}
-       <!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->
+       {{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
                {{$item.comment}}
-       <!--</div>-->
+       {{*<!--</div>-->*}}
        {{/if}}
        {{/if}}
 
-<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->
-<!--</div>-->
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
 {{foreach $item.children as $child}}
        {{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 
 {{if $item.flatten}}
-<!--<div class="wall-item-comment-wrapper" >-->
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
        {{$item.comment}}
-<!--</div>-->
+{{*<!--</div>-->*}}
 {{/if}}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
index a0da3e095b978c1cf95bfc6876422e75a2b1fc90..594f3f79b9505bc9b2387177c5ea6ead3c626f70 100644 (file)
@@ -3,8 +3,5 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-
-<script language="javascript" type="text/javascript">
-wallInitEditor();
-</script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
index 1d6cb69a1d82f30a224f108fa3c17cd0fe3a324b..5f65cc00149827593f83bb04fe95d71868d86601 100644 (file)
@@ -6,6 +6,7 @@
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "none";
-window.ajaxType = "wallmsg-header";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
 </script>
 
index 1082c40d76b593d82c96e9b98dfd9e563d7876cf..8c61a9f8b312e54885e6e028a4339eef999e4a79 100644 (file)
@@ -42,7 +42,7 @@ a:hover {text-decoration: underline; }
 \r
 input {\r
        border: 1px solid #666666;\r
-/*     -moz-border-radius: 3px;*/\r
+       -moz-border-radius: 3px;\r
        -webkit-border-radius: 3px;\r
        border-radius: 3px;     \r
        padding: 3px;\r
@@ -120,12 +120,17 @@ blockquote {
 }\r
 \r
 #panel {\r
-       background-color: ivory;\r
        position: absolute;\r
-/*     z-index: 2;*/\r
-       width: 30%;\r
+       z-index: 2;\r
        padding: 25px;\r
-       border: 1px solid #444;\r
+       margin-right: 10px;\r
+\r
+       /*background-color: ivory;\r
+       border: 1px solid #444;*/\r
+\r
+       border-radius: 7px;\r
+       background-color: #222;\r
+       color: #eee;\r
 }\r
 \r
 .heart {\r
@@ -201,7 +206,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
        border-bottom: 0px;\r
        background-color: #aec0d3;\r
        color: #565854;         \r
-/*     -moz-border-radius: 3px 3px 0px 0px;*/\r
+       -moz-border-radius: 3px 3px 0px 0px;\r
        -webkit-border-radius: 3px 3px 0px 0px;\r
        border-radius: 3px 3px 0px 0px; \r
 }\r
@@ -222,7 +227,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
        right: 2px;\r
        padding: 1px 2px;\r
        border-radius: 4px;\r
-/*     -moz-border-radius: 4px;*/\r
+       -moz-border-radius: 4px;\r
        -webkit-border-radius: 4px;\r
        background-color: gold !important;\r
 }\r
@@ -270,7 +275,7 @@ nav .nav-link {
 /*     right: -33px;*/\r
        padding: 1em 0px;\r
 \r
-/*     -moz-box-shadow: 3px 3px 5px #555;*/\r
+       -moz-box-shadow: 3px 3px 5px #555;\r
        -webkit-box-shadow: 3px 3px 5px #555;\r
        box-shadow: 3px 3px 5px #555;\r
 \r
@@ -323,7 +328,7 @@ div.main-container {
        display: block;\r
        color: #FFFFFF;\r
        -webkit-border-radius: 5px ;\r
-/*     -moz-border-radius: 5px;*/\r
+       -moz-border-radius: 5px;\r
        border-radius: 5px;\r
        padding: 5px;\r
        font-weight: bold;\r
@@ -333,7 +338,7 @@ div.main-container {
        display: block;\r
        color: #FFFFFF;\r
        -webkit-border-radius: 5px ;\r
-/*     -moz-border-radius: 5px;*/\r
+       -moz-border-radius: 5px;\r
        border-radius: 5px;\r
        padding: 5px;\r
        font-weight: bold;\r
@@ -383,23 +388,26 @@ section {
        border-bottom: 1px solid #babdb6;\r
        padding:0px;\r
 }\r
+.tabs.links-widget {\r
+       border: none;\r
+}\r
 .tabs li { margin: 0px 0px 20px 0px; padding-left: 1em; list-style: none; }\r
 .tabs a {\r
        padding: 0.4em 2em;\r
        border: 1px solid #aaa;\r
        border-radius: 8px;\r
-/*     -moz-border-radius: 8px;*/\r
+       -moz-border-radius: 8px;\r
        -webkit-border-radius: 8px;\r
 }\r
 .tab {\r
        /*display:block;*/\r
-       /*float:left;*/\r
+       float:left;\r
        padding-left: 1em;\r
        padding-right: 0.4em;\r
        padding-top: 0.4em;\r
        padding-bottom: 0.4em;\r
-       /*margin-right: 1em;*/\r
-       margin-right: 3px ;\r
+       margin-right: 0.5em;\r
+       margin-bottom: 0.4em;\r
 }\r
 .tab.active {\r
        font-weight: bold;\r
@@ -408,6 +416,10 @@ section {
 #events-tab {\r
        display: none;\r
 }\r
+#tabs-end {\r
+       padding-top: 0.3em;\r
+       clear: both;\r
+}\r
 \r
 \r
 /* footer */\r
@@ -468,9 +480,9 @@ footer {
        border: 1px solid #ffffff;\r
 }\r
 \r
-#jot-title::-webkit-input-placeholder{font-weight: normal;}\r
+/*#jot-title::-webkit-input-placeholder{font-weight: normal;}\r
 #jot-category::-webkit-input-placeholder{font-weight: normal;}\r
-/*#jot-title:-moz-placeholder{font-weight: normal;}\r
+#jot-title:-moz-placeholder{font-weight: normal;}\r
 #jot-category:-moz-placeholder{font-weight: normal;}*/\r
                \r
        \r
@@ -501,7 +513,7 @@ footer {
 \r
 .group-selected, .nets-selected, .fileas-selected, .categories-selected {\r
        padding: 3px;\r
-/*     -moz-border-radius: 3px;*/\r
+       -moz-border-radius: 3px;\r
        -webkit-border-radius: 3px;\r
        border-radius: 3px;     \r
        border: 1px solid #CCCCCC;\r
@@ -616,6 +628,7 @@ input#dfrn-url {
        background-color: #FFFFFF;\r
        color: #000000;\r
        margin-bottom: 20px;\r
+       max-width: 90%;\r
 }\r
 \r
 #dfrn-url-label {\r
@@ -649,9 +662,16 @@ input#dfrn-url {
 #dfrn-request-message-wrapper {\r
        margin-bottom: 50px;\r
 }\r
+#dfrn-request-message-wrapper textarea {\r
+       max-width: 90%;\r
+}\r
 #dfrn-request-submit-wrapper {\r
        clear: both;\r
-       margin-left: 50px;\r
+       /*margin-left: 50px;*/\r
+}\r
+#dfrn-request-submit-wrapper input {\r
+       font-size: 18px;\r
+       padding: 5px 10px;\r
 }\r
 \r
 #dfrn-request-info-wrapper {\r
@@ -755,6 +775,9 @@ input#dfrn-url {
 \r
 #profile-extra-links li {\r
        margin-top: 5px;\r
+       max-width: 300px;\r
+       margin-left: auto;\r
+       margin-right: auto;\r
 }\r
 \r
 #profile-edit-links ul {\r
@@ -944,6 +967,8 @@ input#dfrn-url {
        margin-bottom: 20px;\r
 }\r
 \r
+\r
+\r
 #profile-publish-yes-reg,\r
 #profile-publish-no-reg {\r
        float: left;\r
@@ -1165,20 +1190,26 @@ input#dfrn-url {
 \r
 .wall-item-content-wrapper {\r
        padding-top: 1em;\r
+/*     padding-left: 0.25em;\r
+       padding-right: 0.25em;*/\r
+\r
        border-top: 2px solid #AAAAAA;\r
        position: relative;\r
-\r
 }\r
 \r
 .wall-item-content-wrapper.comment {\r
        margin-top: 15px;\r
-       padding-top: 0px;\r
        margin-left: 5px;\r
        margin-right: 5px;\r
+\r
+       padding-top: 0px;\r
+/*     padding-left: 0.5em\r
+       padding-right: 0.5em;*/\r
+\r
        border: 2px solid #AAAAAA;\r
        border-radius: 10px;\r
        -webkit-border-radius: 10px;\r
-/*     -moz-border-radius: 10px;*/\r
+       -moz-border-radius: 10px;\r
 /*     background: #EEEEEE;*/\r
 }\r
 \r
@@ -1195,17 +1226,14 @@ input#dfrn-url {
 .wall-item-info {\r
        display: block;\r
        float: left;\r
-       width:110px;\r
+       width:126px;\r
        margin-right:10px;\r
+       margin-bottom:10px;\r
 }\r
 .comment .wall-item-info {\r
-       width: 70px;\r
+       width: 86px;\r
 }\r
 \r
-.wall-item-photo-wrapper {\r
-       margin-bottom: 10px;\r
-       width: 100px;\r
-}\r
 .wall-item-photo-menu-button {\r
        display: block;\r
        position: absolute;\r
@@ -1242,7 +1270,7 @@ input#dfrn-url {
     left: 50px;\r
     margin: 0;\r
     position: absolute;\r
-    top: 80px;\r
+    top: 67px;\r
     width: 30px\r
 }\r
 .wallwall .wwto img {\r
@@ -1257,14 +1285,15 @@ input#dfrn-url {
 .wall-item-arrowphoto-wrapper {\r
     position: absolute;\r
     left: 75px;\r
-    top: 80px;\r
+    top: 67px;\r
 /*    z-index: 100;*/\r
 }\r
 .wall-item-lock {\r
        margin-top: 1em;\r
        left: 105px;\r
        position: absolute;\r
-       top: 1px;       \r
+       top: 1px;\r
+       width: 32px;\r
 }\r
 .comment .wall-item-lock {\r
        margin-top: 0px;\r
@@ -1362,75 +1391,72 @@ input#dfrn-url {
        height: 50px !important;\r
 }\r
 .wall-item-content {\r
-       float: left;\r
-       margin-left: 3px;\r
+/*     float: left;\r
+       max-width: 100%*/\r
 /*     padding-right: 1em;\r
        max-height: 500px;\r
        overflow: auto;*/\r
+       padding-left:0.25em;\r
+       padding-right:0.25em;\r
+       clear: left; /* I hate this, but it's the only way to keep the text from bunching to the right on the Android browser */\r
+}\r
+.comment .wall-item-content {\r
+       padding-left:0.5em;\r
+       padding-right:0.5em;\r
 }\r
 \r
-.wall-item-content img {\r
-       display: block;\r
+.wall-item-title {\r
+       /*float: left;*/\r
+       font-weight: bold;\r
+       font-size: 1.6em; \r
+       /*width: 450px;*/\r
+}\r
+\r
+/*.wall-item-title-end {\r
+       clear: both;\r
+}*/\r
+\r
+.wall-item-body {\r
+       text-align: justify;\r
+       float: left;\r
+       max-width: 100%;\r
+       overflow: hidden;\r
        margin-top: 10px;\r
+       line-height: 23px;\r
+}\r
+\r
+.wall-item-body img {\r
+       display: block;\r
+       margin-top: 2px;\r
        margin-right: auto;\r
        margin-left: auto;\r
-       max-width: 290px;\r
+       /*max-width: 290px;*/\r
+       max-width: 100%;\r
        border-radius: 7px;\r
-/*     -moz-border-radius: 7px;*/\r
+       -moz-border-radius: 7px;\r
        -webkit-border-radius: 7px;\r
 }\r
 \r
-.wall-item-content img.smiley {\r
+/*.comment .wall-item-body img {\r
+       max-width: 100%;\r
+}*/\r
+\r
+.wall-item-body img.smiley {\r
        display: inline;\r
        margin: auto;\r
        border-radius: 0;\r
        -webkit-border-radius: 0;\r
 }\r
 \r
-.wall-item-content blockquote {\r
+.wall-item-body blockquote {\r
        margin-left: 0px;\r
        margin-right: 0px;\r
 }\r
 \r
-.comment .wall-item-content img {\r
-       max-width: 280px;\r
-}\r
-\r
-.comment .wall-item-content ul {\r
+.comment .wall-item-body ul {\r
        padding-left: 1.5em;\r
 }\r
 \r
-.divgrow-showmore {\r
-       display: block;\r
-       clear: both;\r
-       text-align: center;\r
-       outline: 0;\r
-       border-top: 1px dotted #888;\r
-}\r
-\r
-\r
-.wall-item-title {\r
-       float: left;\r
-       font-weight: bold;\r
-       font-size: 1.6em; \r
-       /*width: 450px;*/\r
-}\r
-\r
-/*.wall-item-title-end {\r
-       clear: both;\r
-}*/\r
-\r
-.wall-item-body {\r
-       text-align: justify;\r
-       float: left;\r
-       clear: left;\r
-/*     width: 300px;*/\r
-       overflow: hidden;\r
-       margin-top: 10px;\r
-       padding-right: 1em;\r
-       line-height: 23px;\r
-}\r
-\r
 .wall-item-body iframe {\r
        display: block;\r
        clear: both;\r
@@ -1442,10 +1468,12 @@ input#dfrn-url {
        overflow: hidden;\r
 }\r
 \r
-.comment .wall-item-body {\r
-       margin-left: 5px;\r
-       padding-right: 0.5em;\r
-/*     width: 280px;*/\r
+.divgrow-showmore {\r
+       display: block;\r
+       clear: both;\r
+       text-align: center;\r
+       outline: 0;\r
+       border-top: 1px dotted #888;\r
 }\r
 \r
 .wall-item-tools {\r
@@ -1484,6 +1512,8 @@ input#dfrn-url {
        background: #f3f3f3;\r
        margin-left: 10px;\r
        margin-right: 10px;\r
+\r
+       max-width: 90%;\r
 }\r
 \r
 .comment-wwedit-wrapper.comment {\r
@@ -1493,10 +1523,15 @@ input#dfrn-url {
 }\r
 \r
 \r
+.comment-edit-form {\r
+       padding-left: 1em;\r
+       padding-right: 1.5em;\r
+}\r
+\r
 .comment-edit-photo {\r
        margin-top: 15px;\r
-       margin-left: 10px;\r
-       margin-bottom: 10px;\r
+       /*margin-left: 10px;\r
+       margin-bottom: 10px;*/\r
        width: 25px;\r
        float: left;\r
 }\r
@@ -1505,7 +1540,7 @@ input#dfrn-url {
 }\r
 .comment-edit-text-empty, .comment-edit-text-full {\r
 /*     float: left;*/\r
-/*     -moz-border-radius: 3px;*/\r
+       -moz-border-radius: 3px;\r
        -webkit-border-radius: 3px;\r
        border-radius: 3px;     \r
        border: 1px solid #cccccc;\r
@@ -1526,10 +1561,12 @@ input#dfrn-url {
        color: black;\r
        height: 150px;\r
 /*     width: 350px;\r
-       overflow: auto;*/\r
+       overflow: auto;\r
        width: 250px;\r
        margin-top: 15px;\r
-       margin-left: 20px;\r
+       margin-left: 20px;*/\r
+       width: 100%;\r
+       margin-top: 1.5em;\r
 }\r
 \r
 .comment .comment-edit-text-empty {\r
@@ -1548,11 +1585,33 @@ input#dfrn-url {
 .comment-edit-submit {\r
        font-size: 18px;\r
        padding: 5px 10px;\r
-       margin: 10px 0px 10px 110px;\r
+       margin: 10px 0px 10px 0px;\r
 }\r
 \r
 #profile-jot-wrapper {\r
-       padding-left: 10px;\r
+       padding-left: 1em;\r
+       padding-right: 1em;\r
+}\r
+\r
+.shared_header {\r
+       border-top: 1px solid #aaa;\r
+       color: #999;\r
+\r
+       height: 42px; /* 32 px for the image plus 10 px for the margin around the image */\r
+       padding-top: 0.5em;\r
+       margin-top: 1em;\r
+       margin-bottom: 1em;\r
+       \r
+}\r
+.shared_header img {\r
+       float: left;\r
+\r
+       margin: auto 1em auto auto;\r
+       padding: 0;\r
+\r
+       box-shadow: none;\r
+       -moz-box-shadow: none;\r
+       -webkit-box-shadow: none;\r
 }\r
 \r
 #profile-jot-plugin-wrapper,\r
@@ -1773,7 +1832,7 @@ input#profile-jot-email {
        padding: 0.2em 1em;\r
        border: 1px solid #aaa;\r
        border-radius: 10px;\r
-/*     -moz-border-radius: 10px;*/\r
+       -moz-border-radius: 10px;\r
        -webkit-border-radius: 10px;\r
 }\r
 \r
@@ -1833,7 +1892,7 @@ input#profile-jot-email {
        padding: 0.2em 1em;\r
        border: 1px solid #aaa;\r
        border-radius: 10px;\r
-/*     -moz-border-radius: 10px;*/\r
+       -moz-border-radius: 10px;\r
        -webkit-border-radius: 10px;\r
 }\r
 \r
@@ -1842,7 +1901,7 @@ input#profile-jot-email {
        float: left;\r
        border: 1px solid black;\r
        border-radius: 7px;\r
-/*     -moz-border-radius: 7px;*/\r
+       -moz-border-radius: 7px;\r
        -webkit-border-radius: 7px;\r
        background: #FFCCCC;\r
        font-size: 1.25em;\r
@@ -1857,6 +1916,7 @@ input#profile-jot-email {
 #advanced-profile-gender-wrapper,\r
 #advanced-profile-dob-wrapper,\r
 #advanced-profile-age-wrapper,\r
+\r
 #advanced-profile-marital-wrapper,\r
 #advanced-profile-sexual-wrapper,\r
 #advanced-profile-homepage-wrapper,\r
@@ -2031,6 +2091,10 @@ input#profile-jot-email {
        margin-top: 30px;\r
 }\r
 \r
+#contact-edit-info-wrapper, #contact-edit-info {\r
+       width: 90%;\r
+}\r
+\r
 #contact-edit-end {\r
        clear: both;\r
        margin-top: 15px;\r
@@ -2042,7 +2106,11 @@ input#profile-jot-email {
 }\r
 \r
 .contact-edit-submit {\r
-       margin-top: 20px;\r
+       clear: left;\r
+       display: block;\r
+\r
+       margin-top: 10px;\r
+       margin-bottom: 45px;\r
        padding: 0.2em 0.5em;\r
        font-size: 18px;\r
 }\r
@@ -2070,7 +2138,7 @@ input#profile-jot-email {
        left: -30px; top: 80px;\r
        display: none;\r
        z-index: 101;\r
-/*     -moz-box-shadow: 3px 3px 5px #555;*/\r
+       -moz-box-shadow: 3px 3px 5px #555;\r
        -webkit-box-shadow: 3px 3px 5px #555;\r
        box-shadow: 3px 3px 5px #555;\r
 }\r
@@ -2103,12 +2171,12 @@ input#profile-jot-email {
 }\r
 \r
 #profile-jot-text {\r
-       width: 90%;\r
+       width: 100%;\r
        height: 20px;\r
        color:#cccccc;\r
        border: 1px solid #cccccc;\r
        padding: 3px 0px 0px 5px;\r
-/*     -moz-border-radius: 3px;*/\r
+       -moz-border-radius: 3px;\r
        -webkit-border-radius: 3px;\r
        border-radius: 3px;     \r
 }\r
@@ -2118,23 +2186,34 @@ input#profile-jot-email {
 #photo-edit-perms-select,\r
 #photos-upload-permissions-wrapper,\r
 #profile-jot-acl-wrapper{\r
-       display:block!important;\r
+       /*display:block!important;*/\r
 }\r
 \r
 #photos-usage-message {\r
        margin-bottom: 15px;\r
 }\r
 \r
-#profile-jot-acl-wrapper{\r
+#profile-jot-acl-wrapper {\r
        /*width:270px;*/\r
-       padding-left:10px;\r
-       height:auto;\r
-       overflow:visible;\r
+       height: auto;\r
+       overflow: visible;\r
+       margin-top: 1em;\r
+       display: inline-block;\r
+}\r
+\r
+#profile-jot-acl-wrapper,\r
+#photos-upload-permissions-wrapper,\r
+#photo-edit-perms-select {\r
+       padding: 0.7em;\r
+       border: 1px solid #888;\r
+       border-radius: 10px;\r
 }\r
 \r
 #acl-wrapper {\r
-       /*width: 270px;*/\r
-       float:left;\r
+       /*width: 270px;\r
+       float:left;*/\r
+       text-align: left;\r
+       clear: both;\r
 }\r
 #acl-search {\r
        display: none;\r
@@ -2151,11 +2230,12 @@ input#profile-jot-email {
        background-image: url("../../../images/show_all_off.png");\r
        background-position: 7px 7px;\r
        background-repeat: no-repeat;\r
-       padding: 7px 5px 0px 30px;\r
+       padding: 7px 15px 7px 30px;\r
        -webkit-border-radius: 5px ;\r
-/*     -moz-border-radius: 5px;*/\r
+       -moz-border-radius: 5px;\r
        border-radius: 5px;\r
        color: #999999;\r
+       margin-bottom: 0.3em;\r
 }\r
 #acl-showall.selected {\r
        color: #000000;\r
@@ -2174,11 +2254,11 @@ input#profile-jot-email {
        \r
 }\r
 .acl-list-item {\r
-       display: block;\r
-       width: 120px;\r
+       display: inline-block;\r
+       width: 190px;\r
        height: 30px;\r
        border: 1px solid #cccccc;\r
-/*     -moz-border-radius: 4px;*/\r
+       -moz-border-radius: 4px;\r
        -webkit-border-radius: 4px;\r
        border-radius: 4px;\r
        margin-top: 5px;\r
@@ -2186,10 +2266,9 @@ input#profile-jot-email {
        margin-right: 2px;\r
        margin-left: 2px;\r
        padding-left: 5px;\r
-       float: left;\r
+       /*float: left;*/\r
 }\r
 .acl-list-item img{\r
-       display: none;\r
        width:22px;\r
        height: 22px;\r
        float: left;\r
@@ -2197,20 +2276,22 @@ input#profile-jot-email {
 }\r
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}\r
 .acl-list-item a { \r
-       font-size: 8px;\r
+       font-size: 10px;\r
        display: block;\r
-       width: 40px;\r
+       width: 55px;\r
        height: 10px;\r
        float: left;\r
-       color: #999999;\r
-       background-color: #cccccc;\r
+       color: rgb(153, 153, 153);\r
+       background-color: rgb(204, 204, 204);\r
        background-position: 3px 3px;\r
        background-repeat: no-repeat;\r
        margin-right: 5px;\r
+\r
        -webkit-border-radius: 2px ;\r
-/*     -moz-border-radius: 2px;*/\r
-       border-radius: 2px;\r
-       padding-left: 15px;\r
+       -moz-border-radius: 2px;\r
+       border-radius: 2px 2px 2px 2px;\r
+\r
+       padding: 0px 5px 3px 15px;\r
 }\r
 #acl-wrapper a:hover {\r
        text-decoration: none;\r
@@ -2255,6 +2336,7 @@ input#profile-jot-email {
 #group-edit-name-wrapper {\r
 \r
 \r
+\r
 }\r
 \r
 \r
@@ -2277,6 +2359,10 @@ input#profile-jot-email {
        clear: both;\r
 }\r
 \r
+#message-new {\r
+       font-size: 24px;\r
+}\r
+\r
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {\r
        margin-bottom: 10px;\r
        margin-top: 20px;\r
@@ -2329,6 +2415,7 @@ a.mail-list-link {
 \r
 .mail-list-outside-wrapper-end {\r
        clear: both;\r
+\r
 }\r
 \r
 .mail-list-outside-wrapper {\r
@@ -2442,6 +2529,8 @@ a.mail-list-link {
 }\r
 \r
 #search-save {\r
+       font-size: 18px;\r
+       padding: 5px 10px;\r
        margin-left: 5px;\r
 }\r
 .groupsideedit {\r
@@ -2483,11 +2572,14 @@ aside input[type='text'] {
        border: 1px solid #DDDDDD;\r
        padding: 18px;\r
        margin-top: 5px;\r
-/*     -moz-border-radius:5px;*/\r
+       -moz-border-radius:5px;\r
        -webkit-border-radius:5px;\r
        border-radius:5px;\r
-\r
 }\r
+.widget.settings-widget {\r
+       padding: 0;\r
+}\r
+\r
 \r
 \r
 /*.photos {\r
@@ -2529,8 +2621,10 @@ aside input[type='text'] {
 }\r
 \r
 .photo-top-image-wrapper {\r
-/*     position: relative; */\r
-       float: left;\r
+/*     position: relative; \r
+       float: left;*/\r
+       display: inline-block;\r
+       vertical-align: top;\r
        margin-top: 15px;\r
        margin-right: 15px;\r
        margin-left: 15px;\r
@@ -2541,7 +2635,7 @@ aside input[type='text'] {
 .photo-top-image-wrapper img {\r
        max-width: 290px;\r
        border-radius: 10px;\r
-/*     -moz-border-radius: 10px;*/\r
+       -moz-border-radius: 10px;\r
        -webkit-border-radius: 10px;\r
 }\r
 .photo-top-album-name {\r
@@ -2562,25 +2656,37 @@ aside input[type='text'] {
        margin-left: 30px;\r
 }\r
 \r
-#photos-upload-newalbum-div {\r
-       float: left;\r
+#photos-upload-form {\r
+       text-align: center;\r
+}\r
+\r
+#photos-upload-newalbum-div, #photos-upload-existing-album-text {\r
+       /*float: left;*/\r
+       display: inline-block;\r
        width: 175px;\r
+       text-align: left;\r
 }\r
 \r
 #photos-upload-noshare {\r
        margin-bottom: 10px;\r
 }\r
-#photos-upload-existing-album-text {\r
-       float: left;\r
-       width: 175px;\r
+#photos-upload-noshare-div {\r
+       margin-top: 2em;\r
+       margin-bottom: 15px;\r
 }\r
+\r
+#photos-upload-noshare-label {\r
+       margin-left: 25px;\r
+}\r
+\r
 #photos-upload-newalbum {\r
-       float: left;\r
+       width: 15em;\r
 }\r
 #photos-upload-album-select {\r
-       float: left;\r
+       width: 15.7em;\r
 }\r
 \r
+\r
 #photos-upload-spacer {\r
        margin-top: 25px;\r
 }\r
@@ -2590,9 +2696,6 @@ aside input[type='text'] {
 #photos-upload-exist-end {\r
        margin-bottom: 15px;\r
 }\r
-#photos-upload-submit {\r
-       margin-top: 15px;\r
-}\r
 \r
 #photos_upload_applet_wrapper {\r
        margin-bottom: 15px;\r
@@ -2647,26 +2750,23 @@ aside input[type='text'] {
        margin-bottom: 15px;\r
 }\r
 \r
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {\r
-       float: left;\r
-       width: 150px;\r
-}\r
-\r
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {\r
-       font-weight: 700;\r
+.photo-edit-input-text {\r
+       display: inline-block;\r
+       text-align: left;\r
 }\r
 \r
-#photos-upload-noshare-div {\r
-       margin-top: 140px;\r
-       margin-bottom: 15px;\r
+#photo_edit_form {\r
+       text-align: center;\r
 }\r
 \r
-#photos-upload-noshare-label {\r
-       margin-left: 25px;\r
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, .photo-edit-rotate-label {\r
+       /*float: left;*/\r
+       display: inline-block;\r
+       width: 150px;\r
 }\r
 \r
-#photos-upload-noshare {\r
-       float: left;\r
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {\r
+       font-weight: 700;\r
 }\r
 \r
 .photo-perms-icon {\r
@@ -2675,6 +2775,11 @@ aside input[type='text'] {
 \r
 #photo-edit-perms-menu, #photos-upload-perms-menu, #settings-default-perms-menu {\r
        text-decoration: none;\r
+       display: inline-block;\r
+}\r
+\r
+#photos-upload-perms-menu #jot-perms-icon {\r
+       margin-right: 1em;\r
 }\r
 \r
 .photo-jot-perms-text {\r
@@ -2684,6 +2789,7 @@ aside input[type='text'] {
 \r
 #photo-edit-perms, #photos-upload-perms, #settings-default-perms {\r
        margin-top: 30px;\r
+       display: inline-block;\r
 }\r
 #photos-upload-perms {\r
        margin-top: 15px;\r
@@ -2700,7 +2806,7 @@ aside input[type='text'] {
        margin-top: 15px;\r
        border: 1px solid #aaa;\r
        border-radius: 10px;\r
-/*     -moz-border-radius: 10px;*/\r
+       -moz-border-radius: 10px;\r
        -webkit-border-radius: 10px;\r
 }\r
 \r
@@ -2709,13 +2815,18 @@ aside input[type='text'] {
 }\r
 \r
 #photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {\r
-       float: left;\r
+       /*float: left;*/\r
        margin-bottom: 25px;\r
 }\r
 \r
+.photo-edit-rotate-choice {\r
+       display: inline-block;\r
+}\r
+\r
 .photo-edit-rotate {\r
        float: left;\r
        margin-left: 20px;\r
+\r
 }\r
 #photo-edit-link-wrap {\r
        margin-bottom: 15px;\r
@@ -2745,13 +2856,13 @@ aside input[type='text'] {
        margin-left: 45px;\r
 }\r
 #photos-upload-choose {\r
-       position: absolute;\r
+/*     position: absolute;\r
        top: 460px;\r
-       left: 5px;\r
+       left: 5px;*/\r
+       margin-top: 1em;\r
 }\r
 #photos-upload-submit {\r
-       margin-top: 30px;\r
-       margin-left: 100px;\r
+       margin-top: 0px;\r
        margin-bottom: 20px;\r
 }\r
 .settings-submit, .profile-edit-submit-button, .settings-features-submit {\r
@@ -2780,13 +2891,28 @@ aside input[type='text'] {
        margin-bottom: 20px;\r
 }\r
 \r
+#photo-album-edit-form {\r
+       max-width: 100%;\r
+       padding-left: 0.5em;\r
+       padding-right: 0.5em;\r
+}\r
+#photo-album-edit-form input {\r
+       max-width: 100%;\r
+}\r
+#photo-album-edit-name-label {\r
+       display: block;\r
+}\r
+\r
 #photo-album-edit-submit, #photo-album-edit-drop {\r
        margin-top: 15px;\r
        margin-bottom: 15px;\r
+\r
+       padding: 0.25em 0.5em;\r
+       font-size: 18px;\r
 }\r
 \r
 #photo-album-edit-drop {\r
-       margin-left: 200px;\r
+       margin-left: 2em;\r
 }\r
 \r
 .group-delete-wrapper {\r
@@ -2888,6 +3014,8 @@ aside input[type='text'] {
 }\r
 \r
 #search-submit {\r
+       font-size: 18px;\r
+       padding: 5px 10px;\r
        margin-left: 15px;\r
 }\r
 \r
@@ -2935,7 +3063,7 @@ aside input[type='text'] {
        \r
 \r
 .fn {\r
-       padding: 0px 0px 5px 12px;\r
+       padding: 1em 0px 5px 12px;\r
        font-size: 120%;\r
        font-weight: bold;\r
 }\r
@@ -3132,8 +3260,15 @@ aside input[type='text'] {
        float: left;\r
 }*/\r
 \r
+#photo-photo {\r
+       display: block;\r
+       margin-left: auto;\r
+       margin-right: auto;\r
+       text-align: center;\r
+}\r
+\r
 #photo-photo img {\r
-       max-width: 310px;\r
+       max-width: 100%;\r
 }\r
 \r
 #photo-photo-end {\r
@@ -3164,15 +3299,23 @@ aside input[type='text'] {
 }\r
 \r
 .profile-match-wrapper {\r
-       float: left;\r
+       display: inline-block;\r
        padding: 10px;\r
-       width: 120px;\r
-       height: 120px;\r
+       /*width: 120px;\r
+       height: 120px;*/\r
        scroll: auto;\r
+       margin-bottom: 2em;\r
+       vertical-align: top;\r
+}\r
+.profile-match-wrapper .icon.drophide {\r
+       margin-left: auto;\r
+       margin-right: auto;\r
+       margin-top: 1em;\r
 }\r
 #profile-match-wrapper-end {\r
        clear: both;\r
 }\r
+\r
 .side-link {\r
        margin-bottom: 15px;\r
 }\r
@@ -3394,6 +3537,7 @@ aside input[type='text'] {
 }\r
  \r
 \r
+\r
 /**\r
  * Form fields\r
  */\r
@@ -3766,8 +3910,8 @@ aside input[type='text'] {
 [class^="comment-edit-bb"] {\r
        list-style: none;\r
        display: none;\r
-       margin: 0px 0 -5px 20px;\r
-       width: 75%;\r
+       margin: 0px 0 -5px 0px;\r
+/*     width: 75%;*/\r
 }\r
 [class^="comment-edit-bb"] > li {\r
        display: inline-block;\r
@@ -3847,21 +3991,66 @@ aside input[type='text'] {
 }\r
 \r
 .attachtype {\r
-       display: block; width: 20px; height: 23px;\r
+       display: block;\r
        float: left;\r
-       background-image: url('../../../images/content-types.png');\r
-       background-position: -80px 0px;\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+       background-image: url('images/oxygen/unknown.png');\r
 }\r
 \r
 .body-attach {\r
        margin-top: 10px;\r
 }\r
 \r
-.type-video { background-position: 0px 0px; }\r
+/*.type-video { background-position: 0px 0px; }\r
 .type-image { background-position: -20px 0px; }\r
 .type-audio { background-position: -40px 0px; }\r
 .type-text  { background-position: -60px 0px; }\r
-.type-unkn  { background-position: -80px 0px; }\r
+.type-unkn  { background-position: -80px 0px; }*/\r
+.type-video {\r
+       background-image: url('images/oxygen/video-x-generic.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}\r
+.type-image {\r
+       background-image: url('images/oxygen/image-x-generic.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}\r
+.type-audio {  background-image: url('images/oxygen/audio-x-generic.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}\r
+\r
+.type-text  {\r
+       background-image: url('images/oxygen/text-x-generic-2.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}\r
+.subtype-msword, .subtype-vnd-openxmlformats-officedocument-wordprocessingml-document  {\r
+       background-image: url('images/oxygen/application-msword.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}\r
+.subtype-pdf  {\r
+       background-image: url('images/oxygen/application-pdf.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}\r
+/*.type-unkn  {\r
+       background-image: url('images/oxygen/unknown.png');\r
+       background-size: 100% 100%;\r
+       width: 48px;\r
+       height: 48px;\r
+}*/\r
+\r
 \r
 \r
 /* autocomplete popup */\r
@@ -3958,11 +4147,11 @@ ul.notifications-menu-popup {
        height: auto;\r
 /*     overflow-y: scroll;overflow-style:scrollbar;*/\r
        background-color:#FFFFFF;\r
-/*     -moz-border-radius: 5px;*/\r
+       -moz-border-radius: 5px;\r
        -webkit-border-radius: 5px;\r
        border-radius:5px;\r
        border: 1px solid #AAA;\r
-/*     -moz-box-shadow: 3px 3px 5px #555;*/\r
+       -moz-box-shadow: 3px 3px 5px #555;\r
        -webkit-box-shadow: 3px 3px 5px #555;\r
        box-shadow: 3px 3px 5px #555;\r
 /*     z-index: 103;*/\r
index 00a9184dc58d447035046619a8888306a42989a9..dd97045a6894ab8966a8a18254c80c1aff03f22b 100644 (file)
@@ -4,7 +4,7 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.17
+ * Version: Version 0.3
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
index 25cfe662146663a38f48a4de9eb0f8585551ba63..9d7f5c325c2fb18c88325cecd58f49e267dea3b2 100644 (file)
@@ -6,10 +6,10 @@ $live_update
 
 <div id="conversation-end"></div>
 
-<!--{{ if $dropping }}
+{#<!--{{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
   <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
   <div id="item-delete-selected-desc" >$dropping</div>
 </div>
 <div id="item-delete-selected-end"></div>
-{{ endif }}-->
+{{ endif }}-->#}
index 901ed76c168059622c1ffe648b3d56d98a159d0e..6d34602a79e1e3f3192f10e9f20505cf1406ed7e 100644 (file)
@@ -6,7 +6,7 @@
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
-<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
+{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->#}
        <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
                        {{ if $item.owner_url }}
                        </div>
                        <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
                        {{ endif }}
-                       <!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+                       {#<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
                                onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->
-                       <div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
+                       {#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">-->#}
                                <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
                                <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
                                </a>
-                               <!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                               {#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                         $item.item_photo_menu
                     </ul>
-                </div>-->
+                </div>-->#}
 
-                       </div>
-                       <!--<div class="wall-item-photo-end"></div>-->
+                       {#<!--</div>-->#}
+                       {#<!--<div class="wall-item-photo-end"></div>-->#}
                        <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-                               {{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
+                               {{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
                                {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
                                <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
                        </div>
                </div>
-               <!--<div class="wall-item-author">-->
+               {#<!--<div class="wall-item-author">-->#}
                                <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>                         
-               <!--</div>-->
+               {#<!--</div>-->#}
                <div class="wall-item-content" id="wall-item-content-$item.id" >
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-                       <!--<div class="wall-item-title-end"></div>-->
+                       {#<!--<div class="wall-item-title-end"></div>-->#}
                        <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-                                       <!--<div class="body-tag">-->
+                                       {#<!--<div class="body-tag">-->#}
                                                {{ for $item.tags as $tag }}
                                                        <span class='body-tag tag'>$tag</span>
                                                {{ endfor }}
-                                       <!--</div>-->
+                                       {#<!--</div>-->#}
                        {{ if $item.has_cats }}
                        <div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
                        </div>
@@ -75,7 +75,7 @@
                        </div>
                        {{ endif }}
                        {{ if $item.plink }}
-                               <!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
+                               {#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
                        {{ endif }}
                        {{ if $item.edpost }}
                                <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                        <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
                        {{ endif }}                     
                        
-                       <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
-                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       <!--</div>-->
+                       {#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>{{ endif }}
+                       {#<!--</div>-->#}
                                {{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-                       <!--<div class="wall-item-delete-end"></div>-->
+                       {#<!--<div class="wall-item-delete-end"></div>-->#}
                </div>
        </div>  
-       <!--<div class="wall-item-wrapper-end"></div>-->
+       {#<!--<div class="wall-item-wrapper-end"></div>-->#}
        <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
        <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
 
        {{ if $item.threaded }}
        {{ if $item.comment }}
-       <!--<div class="wall-item-comment-wrapper $item.indent" >-->
+       {#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
                $item.comment
-       <!--</div>-->
+       {#<!--</div>-->#}
        {{ endif }}
        {{ endif }}
 
-<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->
-<!--</div>-->
+{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
+{#<!--</div>-->#}
 {{ for $item.children as $child }}
        {{ inc $child.template with $item=$child }}{{ endinc }}
 {{ endfor }}
 
 {{ if $item.flatten }}
-<!--<div class="wall-item-comment-wrapper" >-->
+{#<!--<div class="wall-item-comment-wrapper" >-->#}
        $item.comment
-<!--</div>-->
+{#<!--</div>-->#}
 {{ endif }}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
index d9e34d6fba98e65144e9e3a4b2e285fe8ac21e2b..60741337981366aa980489ae3cda0173e4cc537d 100644 (file)
@@ -1,5 +1,2 @@
-
-<script language="javascript" type="text/javascript">
-wallInitEditor();
-</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
 
index fc95f4d6c81987d8a85bbe7ed054b0c55d05bd9e..8ed5ea130de1f67eaa0c623dba6d4a41381a48d1 100644 (file)
@@ -1,6 +1,7 @@
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "none";
-window.ajaxType = "wallmsg-header";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
 </script>