]> git.mxchange.org Git - friendica.git/commitdiff
update to Frost v0.4
authorZach Prezkuta <fermion@gmx.com>
Sun, 10 Feb 2013 21:57:44 +0000 (14:57 -0700)
committerZach Prezkuta <fermion@gmx.com>
Sun, 10 Feb 2013 21:57:44 +0000 (14:57 -0700)
109 files changed:
view/theme/frost/contact_edit.tpl [new file with mode: 0644]
view/theme/frost/contact_end.tpl
view/theme/frost/contact_head.tpl
view/theme/frost/end.tpl
view/theme/frost/event.tpl [new file with mode: 0644]
view/theme/frost/event_end.tpl
view/theme/frost/event_form.tpl [new file with mode: 0644]
view/theme/frost/event_head.tpl
view/theme/frost/group_drop.tpl [new file with mode: 0644]
view/theme/frost/head.tpl
view/theme/frost/images/oxygen/LICENSE [new file with mode: 0644]
view/theme/frost/images/oxygen/application-msword.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-pdf.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-vnd.ms-excel.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-compressed-tar.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-deb.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-font-otf.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-font-ttf.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-java-archive.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-php.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-rar.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-rpm.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-ruby.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-shellscript.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-shockwave-flash.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-x-tar.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-xml.png [new file with mode: 0644]
view/theme/frost/images/oxygen/application-zip.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-aac.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-mp4.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-mpeg.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-x-flac.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-x-generic.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-x-mp2.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-x-ms-wma.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png [new file with mode: 0644]
view/theme/frost/images/oxygen/audio-x-wav.png [new file with mode: 0644]
view/theme/frost/images/oxygen/image-x-generic.png [new file with mode: 0644]
view/theme/frost/images/oxygen/text-css.png [new file with mode: 0644]
view/theme/frost/images/oxygen/text-html.png [new file with mode: 0644]
view/theme/frost/images/oxygen/text-x-generic-2.png [new file with mode: 0644]
view/theme/frost/images/oxygen/text-x-tex.png [new file with mode: 0644]
view/theme/frost/images/oxygen/unknown.png [new file with mode: 0644]
view/theme/frost/images/oxygen/video-x-generic.png [new file with mode: 0644]
view/theme/frost/jot-end.tpl
view/theme/frost/jot-header.tpl
view/theme/frost/jot.tpl
view/theme/frost/js/acl.js
view/theme/frost/js/acl.min.js
view/theme/frost/js/main.js
view/theme/frost/js/main.min.js
view/theme/frost/js/theme.js
view/theme/frost/js/theme.min.js
view/theme/frost/like_noshare.tpl [new file with mode: 0644]
view/theme/frost/login-style.css
view/theme/frost/login_head.tpl
view/theme/frost/mail_conv.tpl [new file with mode: 0644]
view/theme/frost/mail_list.tpl [new file with mode: 0644]
view/theme/frost/msg-end.tpl
view/theme/frost/msg-header.tpl
view/theme/frost/nav.tpl
view/theme/frost/photo_drop.tpl [new file with mode: 0644]
view/theme/frost/photo_edit.tpl
view/theme/frost/profed_end.tpl
view/theme/frost/profile_edit.tpl
view/theme/frost/search_item.tpl [new file with mode: 0644]
view/theme/frost/smarty3/contact_edit.tpl [new file with mode: 0644]
view/theme/frost/smarty3/contact_end.tpl
view/theme/frost/smarty3/contact_head.tpl
view/theme/frost/smarty3/end.tpl
view/theme/frost/smarty3/event.tpl [new file with mode: 0644]
view/theme/frost/smarty3/event_end.tpl
view/theme/frost/smarty3/event_form.tpl [new file with mode: 0644]
view/theme/frost/smarty3/event_head.tpl
view/theme/frost/smarty3/group_drop.tpl [new file with mode: 0644]
view/theme/frost/smarty3/head.tpl
view/theme/frost/smarty3/jot-end.tpl
view/theme/frost/smarty3/jot-header.tpl
view/theme/frost/smarty3/jot.tpl
view/theme/frost/smarty3/like_noshare.tpl [new file with mode: 0644]
view/theme/frost/smarty3/login_head.tpl
view/theme/frost/smarty3/mail_conv.tpl [new file with mode: 0644]
view/theme/frost/smarty3/mail_list.tpl [new file with mode: 0644]
view/theme/frost/smarty3/msg-end.tpl
view/theme/frost/smarty3/msg-header.tpl
view/theme/frost/smarty3/nav.tpl
view/theme/frost/smarty3/photo_drop.tpl [new file with mode: 0644]
view/theme/frost/smarty3/photo_edit.tpl
view/theme/frost/smarty3/profed_end.tpl
view/theme/frost/smarty3/profile_edit.tpl
view/theme/frost/smarty3/search_item.tpl [new file with mode: 0644]
view/theme/frost/smarty3/suggest_friends.tpl [new file with mode: 0644]
view/theme/frost/smarty3/threaded_conversation.tpl
view/theme/frost/smarty3/wall_thread.tpl
view/theme/frost/smarty3/wallmsg-end.tpl
view/theme/frost/smarty3/wallmsg-header.tpl
view/theme/frost/style.css
view/theme/frost/suggest_friends.tpl [new file with mode: 0644]
view/theme/frost/theme.php
view/theme/frost/threaded_conversation.tpl
view/theme/frost/wall_thread.tpl
view/theme/frost/wallmsg-end.tpl
view/theme/frost/wallmsg-header.tpl

diff --git a/view/theme/frost/contact_edit.tpl b/view/theme/frost/contact_edit.tpl
new file mode 100644 (file)
index 0000000..f571006
--- /dev/null
@@ -0,0 +1,88 @@
+
+<h2>$header</h2>
+
+<div id="contact-edit-wrapper" >
+
+       $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>
+       </div>
+
+       <div id="contact-edit-drop-link-end"></div>
+
+
+       <div id="contact-edit-nav-wrapper" >
+               <div id="contact-edit-links">
+                       <ul>
+                               <li><div id="contact-edit-rel">$relation_text</div></li>
+                               <li><div id="contact-edit-nettype">$nettype</div></li>
+                               {{ if $lost_contact }}
+                                       <li><div id="lost-contact-message">$lost_contact</div></li>
+                               {{ endif }}
+                               {{ if $insecure }}
+                                       <li><div id="insecure-message">$insecure</div></li>
+                               {{ endif }}
+                               {{ if $blocked }}
+                                       <li><div id="block-message">$blocked</div></li>
+                               {{ endif }}
+                               {{ if $ignored }}
+                                       <li><div id="ignore-message">$ignored</div></li>
+                               {{ endif }}
+                               {{ if $archived }}
+                                       <li><div id="archive-message">$archived</div></li>
+                               {{ endif }}
+
+                               <li>&nbsp;</li>
+
+                               {{ if $common_text }}
+                                       <li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
+                               {{ endif }}
+                               {{ if $all_friends }}
+                                       <li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
+                               {{ endif }}
+
+
+                               <li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+                               {{ if $lblsuggest }}
+                                       <li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
+                               {{ endif }}
+
+                       </ul>
+               </div>
+       </div>
+       <div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+       {{ if $poll_enabled }}
+               <div id="contact-edit-poll-wrapper">
+                       <div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
+                       <span id="contact-edit-poll-text">$updpub</span> $poll_interval <span id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></span>
+               </div>
+       {{ endif }}
+       <div id="contact-edit-end" ></div>
+
+       {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+
+<div id="contact-edit-info-wrapper">
+<h4>$lbl_info1</h4>
+       <textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
+       <input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2</p> 
+</div>
+$profile_select
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+</form>
+</div>
index b6bcac295fc23ba95b52dea1bb2e7326e545973c..95c78ba7daaf0ecddee292d745d4217d0e3c179e 100644 (file)
@@ -1,6 +1,2 @@
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "$editselect";
-contactInitEditor();
-</script>
+<script language="javascript" type="text/javascript">contactInitEditor();</script>
 
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7b89a20e71ff402262e6cc9fa6fc68d6405ca89b 100644 (file)
@@ -0,0 +1,4 @@
+<script language="javascript" type="text/javascript">
+window.editSelect = "$editselect";
+</script>
+
index eadf480bea4426860e34fb208d1aee8fa79e3a78..c88426bbf420da51bb517717029240debccedf7f 100644 (file)
@@ -1,20 +1,25 @@
 <!--[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">
+{#<!--<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>-->#}
+
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></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/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/js/fk.autocomplete.min.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/tiptip/jquery.tipTip.minified.js"></script>-->#}
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+
 <script type="text/javascript" src="$baseurl/view/theme/frost/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/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost/js/main.min.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost/js/theme.min.js"></script>
 
diff --git a/view/theme/frost/event.tpl b/view/theme/frost/event.tpl
new file mode 100644 (file)
index 0000000..67de85d
--- /dev/null
@@ -0,0 +1,10 @@
+{{ for $events as $event }}
+       <div class="event">
+       
+       {{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
+       $event.html
+       {{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
+       {{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link tool s22 pencil"></a>{{ endif }}
+       </div>
+       <div class="clear"></div>
+{{ endfor }}
index ee9a6f6311ef811e4e2f1f38f1b435f8e781b41a..8e8dcd33aba6f1f50e160f022b27421e6253a9f4 100644 (file)
@@ -1,7 +1,5 @@
 <script language="javascript" type="text/javascript"
           src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
 
-<script language="javascript" type="text/javascript">
-eventInitEditor();
-</script>
+<script language="javascript" type="text/javascript">eventInitEditor();</script>
 
diff --git a/view/theme/frost/event_form.tpl b/view/theme/frost/event_form.tpl
new file mode 100644 (file)
index 0000000..36a22a8
--- /dev/null
@@ -0,0 +1,50 @@
+<h3>$title</h3>
+
+<p>
+$desc
+</p>
+
+<form action="$post" method="post" >
+
+<input type="hidden" name="event_id" value="$eid" />
+<input type="hidden" name="cid" value="$cid" />
+<input type="hidden" name="uri" value="$uri" />
+
+<div id="event-start-text">$s_text</div>
+$s_dsel $s_tsel
+
+<div id="event-finish-text">$f_text</div>
+$f_dsel $f_tsel
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">$t_text</div>
+<input type="text" id="event-summary" name="summary" value="$t_orig" />
+
+
+<div id="event-desc-text">$d_text</div>
+<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">$d_orig</textarea>
+
+
+<div id="event-location-text">$l_text</div>
+<textarea id="event-location-textarea" rows="10" cols="70" name="location">$l_orig</textarea>
+<br />
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div>
+<div id="event-share-break"></div>
+
+$acl
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="$submit" />
+</form>
+
+
index c3f16d54282112f0f95ae1811be8eb56c9412133..44c6090fc146fea7426dccd0b3c96f536b478019 100644 (file)
@@ -2,5 +2,6 @@
 
 <script language="javascript" type="text/javascript">
 window.aclType = 'event_head';
+window.editSelect = "$editselect";
 </script>
 
diff --git a/view/theme/frost/group_drop.tpl b/view/theme/frost/group_drop.tpl
new file mode 100644 (file)
index 0000000..959b77b
--- /dev/null
@@ -0,0 +1,9 @@
+<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
+       <a href="group/drop/$id?t=$form_security_token" 
+               onclick="return confirmDelete();" 
+               id="group-delete-icon-$id" 
+               class="icon drophide group-delete-icon" 
+               {#onmouseover="imgbright(this);" 
+               onmouseout="imgdull(this);"#} ></a>
+</div>
+<div class="group-delete-end"></div>
index bb6e9e200b3cfcc3587470de17167ba21b4a6e18..3c25da46d0f613d23a27e3e4b9088a3ab716ad8a 100644 (file)
@@ -2,7 +2,7 @@
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 <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" />
diff --git a/view/theme/frost/images/oxygen/LICENSE b/view/theme/frost/images/oxygen/LICENSE
new file mode 100644 (file)
index 0000000..65c5ca8
--- /dev/null
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/view/theme/frost/images/oxygen/application-msword.png b/view/theme/frost/images/oxygen/application-msword.png
new file mode 100644 (file)
index 0000000..aa5aaf3
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-msword.png differ
diff --git a/view/theme/frost/images/oxygen/application-pdf.png b/view/theme/frost/images/oxygen/application-pdf.png
new file mode 100644 (file)
index 0000000..bc954ff
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-pdf.png differ
diff --git a/view/theme/frost/images/oxygen/application-vnd.ms-excel.png b/view/theme/frost/images/oxygen/application-vnd.ms-excel.png
new file mode 100644 (file)
index 0000000..aa0d995
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.ms-excel.png differ
diff --git a/view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png b/view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png
new file mode 100644 (file)
index 0000000..022b515
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.ms-powerpoint.png differ
diff --git a/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png
new file mode 100644 (file)
index 0000000..cb573b5
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.presentation.png differ
diff --git a/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png
new file mode 100644 (file)
index 0000000..6b8030e
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.spreadsheet.png differ
diff --git a/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png
new file mode 100644 (file)
index 0000000..1adb56e
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-vnd.oasis.opendocument.text.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png b/view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png
new file mode 100644 (file)
index 0000000..d7dd1d1
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-bzip-compressed-tar.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-compressed-tar.png b/view/theme/frost/images/oxygen/application-x-compressed-tar.png
new file mode 100644 (file)
index 0000000..adda685
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-compressed-tar.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-deb.png b/view/theme/frost/images/oxygen/application-x-deb.png
new file mode 100644 (file)
index 0000000..1832d3b
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-deb.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-font-otf.png b/view/theme/frost/images/oxygen/application-x-font-otf.png
new file mode 100644 (file)
index 0000000..68fb5dd
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-font-otf.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-font-ttf.png b/view/theme/frost/images/oxygen/application-x-font-ttf.png
new file mode 100644 (file)
index 0000000..93b92fb
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-font-ttf.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-java-archive.png b/view/theme/frost/images/oxygen/application-x-java-archive.png
new file mode 100644 (file)
index 0000000..4883b2d
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-java-archive.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png b/view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png
new file mode 100644 (file)
index 0000000..6092aed
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-lzma-compressed-tar.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-php.png b/view/theme/frost/images/oxygen/application-x-php.png
new file mode 100644 (file)
index 0000000..f133c87
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-php.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-rar.png b/view/theme/frost/images/oxygen/application-x-rar.png
new file mode 100644 (file)
index 0000000..a9b1b12
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-rar.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-rpm.png b/view/theme/frost/images/oxygen/application-x-rpm.png
new file mode 100644 (file)
index 0000000..43149f1
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-rpm.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-ruby.png b/view/theme/frost/images/oxygen/application-x-ruby.png
new file mode 100644 (file)
index 0000000..e640ead
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-ruby.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-shellscript.png b/view/theme/frost/images/oxygen/application-x-shellscript.png
new file mode 100644 (file)
index 0000000..11e2754
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-shellscript.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-shockwave-flash.png b/view/theme/frost/images/oxygen/application-x-shockwave-flash.png
new file mode 100644 (file)
index 0000000..ea9ca59
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-shockwave-flash.png differ
diff --git a/view/theme/frost/images/oxygen/application-x-tar.png b/view/theme/frost/images/oxygen/application-x-tar.png
new file mode 100644 (file)
index 0000000..4b7d023
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-x-tar.png differ
diff --git a/view/theme/frost/images/oxygen/application-xml.png b/view/theme/frost/images/oxygen/application-xml.png
new file mode 100644 (file)
index 0000000..58d32e4
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-xml.png differ
diff --git a/view/theme/frost/images/oxygen/application-zip.png b/view/theme/frost/images/oxygen/application-zip.png
new file mode 100644 (file)
index 0000000..9d349a8
Binary files /dev/null and b/view/theme/frost/images/oxygen/application-zip.png differ
diff --git a/view/theme/frost/images/oxygen/audio-aac.png b/view/theme/frost/images/oxygen/audio-aac.png
new file mode 100644 (file)
index 0000000..a2d5177
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-aac.png differ
diff --git a/view/theme/frost/images/oxygen/audio-mp4.png b/view/theme/frost/images/oxygen/audio-mp4.png
new file mode 100644 (file)
index 0000000..ae5fd74
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-mp4.png differ
diff --git a/view/theme/frost/images/oxygen/audio-mpeg.png b/view/theme/frost/images/oxygen/audio-mpeg.png
new file mode 100644 (file)
index 0000000..5fe3a23
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-mpeg.png differ
diff --git a/view/theme/frost/images/oxygen/audio-x-flac.png b/view/theme/frost/images/oxygen/audio-x-flac.png
new file mode 100644 (file)
index 0000000..f2f11e8
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-flac.png differ
diff --git a/view/theme/frost/images/oxygen/audio-x-generic.png b/view/theme/frost/images/oxygen/audio-x-generic.png
new file mode 100644 (file)
index 0000000..fe7b052
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-generic.png differ
diff --git a/view/theme/frost/images/oxygen/audio-x-mp2.png b/view/theme/frost/images/oxygen/audio-x-mp2.png
new file mode 100644 (file)
index 0000000..5ac7909
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-mp2.png differ
diff --git a/view/theme/frost/images/oxygen/audio-x-ms-wma.png b/view/theme/frost/images/oxygen/audio-x-ms-wma.png
new file mode 100644 (file)
index 0000000..86cb3e5
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-ms-wma.png differ
diff --git a/view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png b/view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png
new file mode 100644 (file)
index 0000000..5ac7909
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-vorbis+ogg.png differ
diff --git a/view/theme/frost/images/oxygen/audio-x-wav.png b/view/theme/frost/images/oxygen/audio-x-wav.png
new file mode 100644 (file)
index 0000000..101f8fe
Binary files /dev/null and b/view/theme/frost/images/oxygen/audio-x-wav.png differ
diff --git a/view/theme/frost/images/oxygen/image-x-generic.png b/view/theme/frost/images/oxygen/image-x-generic.png
new file mode 100644 (file)
index 0000000..d1d4e25
Binary files /dev/null and b/view/theme/frost/images/oxygen/image-x-generic.png differ
diff --git a/view/theme/frost/images/oxygen/text-css.png b/view/theme/frost/images/oxygen/text-css.png
new file mode 100644 (file)
index 0000000..119aec5
Binary files /dev/null and b/view/theme/frost/images/oxygen/text-css.png differ
diff --git a/view/theme/frost/images/oxygen/text-html.png b/view/theme/frost/images/oxygen/text-html.png
new file mode 100644 (file)
index 0000000..34768bf
Binary files /dev/null and b/view/theme/frost/images/oxygen/text-html.png differ
diff --git a/view/theme/frost/images/oxygen/text-x-generic-2.png b/view/theme/frost/images/oxygen/text-x-generic-2.png
new file mode 100644 (file)
index 0000000..70be9bf
Binary files /dev/null and b/view/theme/frost/images/oxygen/text-x-generic-2.png differ
diff --git a/view/theme/frost/images/oxygen/text-x-tex.png b/view/theme/frost/images/oxygen/text-x-tex.png
new file mode 100644 (file)
index 0000000..23d8bf7
Binary files /dev/null and b/view/theme/frost/images/oxygen/text-x-tex.png differ
diff --git a/view/theme/frost/images/oxygen/unknown.png b/view/theme/frost/images/oxygen/unknown.png
new file mode 100644 (file)
index 0000000..eb1758a
Binary files /dev/null and b/view/theme/frost/images/oxygen/unknown.png differ
diff --git a/view/theme/frost/images/oxygen/video-x-generic.png b/view/theme/frost/images/oxygen/video-x-generic.png
new file mode 100644 (file)
index 0000000..81fe23e
Binary files /dev/null and b/view/theme/frost/images/oxygen/video-x-generic.png differ
index 41f50160f190ce442af1b47830e269cb27247a71..0ed2a3af6b104fabc7dd515e7f0bd7ec257953cf 100644 (file)
@@ -1,5 +1,3 @@
-
 <script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
 
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
-
+<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
index 04169beb58b0d05f83a06015667a1eeac435aea6..529190707274457ae09761d81d84b1526a26c034 100644 (file)
@@ -1,7 +1,6 @@
 
 <script>
-       var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
-       window.editSelect = $editselect;
+       window.editSelect = "$editselect";
        window.isPublic = "$ispublic";
        window.nickname = "$nickname";
        window.linkURL = "$linkurl";
@@ -11,7 +10,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';
        window.delItems = '$delitems';
 </script>
 
index ae3ab1d3ba9d131b477511183538d881acc256e7..96abeecba74996e752529d3291d6e3269f9ebb7b 100644 (file)
@@ -38,7 +38,8 @@
                <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);" >
+       {#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->#}
+       <div id="profile-link-wrapper" style="display: $visitor;" >
                <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> 
        <div id="profile-video-wrapper" style="display: $visitor;" >
@@ -67,7 +68,7 @@
        $jotplugins
        </div>
 
-<!--   <span id="jot-display-location" style="display: none;"></span>-->
+{#<!-- <span id="jot-display-location" style="display: none;"></span>-->#}
 
        <div id="jot-preview-content" style="display:none;"></div>
 
index 511f84f784145619c7265e5f5d63d36f8a652b23..5848ae62cfcca5e42594d8992fd423cac4421204 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 e365f6fee981d09b82b6550f86137df60c7a2996..6684493e1edb028cef6e2ffd61b07445eac96778 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=3;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){var height=Math.ceil(data.tot/that.nw)*42;that.list_content.height(height);$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=3;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){var height=Math.ceil(data.tot/that.nw)*42;that.list_content.height(height);$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 78f090db9669a8f12836f5d2644cb349946b472b..5964ed348bce7715109335822f4bfea1a9410aaf 100644 (file)
@@ -84,7 +84,7 @@
                });
                
                /* setup field_richtext */
-               setupFieldRichtext();
+               //setupFieldRichtext();
 
                /* popup menus */
                function close_last_popup_menu(e) {
        }
 
        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);
                                        $j('html').height('auto');
                                        //$j(document).scrollTop(vScroll);
                                }
+
+                               // Add Colorbox for viewing Network page images
+                               $j("#" + ident + " .wall-item-body a img").each(function(){
+                                       var aElem = $j(this).parent();
+                                       var imgHref = aElem.attr("href");
+
+                                       // We need to make sure we only put a Colorbox on links to Friendica images
+                                       // We'll try to do this by looking for links of the form
+                                       // .../photo/ab803d8eg08daf85023adfec08(-0.jpg) (with nothing more following), in hopes
+                                       // that that will be unique enough
+                                       if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
+
+                                               // Add a unique class to all the images of a certain post, to allow scrolling through
+                                               var cBoxClass = $j(this).closest(".wall-item-body").attr("id") + "-lightbox";
+                                               $j(this).addClass(cBoxClass);
+
+                                               aElem.colorbox({
+                                                       maxHeight: '90%',
+                                                       photo: true,
+                                                       rel: cBoxClass
+                                               });
+                                       }
+                               });
+
                                prev = ident;
                        });
 
                });
        }
 
-       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 
                unpause();
                $j('#like-rotator-' + ident.toString()).show();
                $j.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
-//             if(timer) clearTimeout(timer);
-//             timer = setTimeout(NavUpdate,3000);
                liking = 1;
        }
 
@@ -666,7 +688,7 @@ function fcFileBrowser (field_name, url, type, win) {
     return false;
   }
 
-function setupFieldRichtext(){
+/*function setupFieldRichtext(){
        tinyMCE.init({
                theme : "advanced",
                mode : "specific_textareas",
@@ -690,7 +712,7 @@ function setupFieldRichtext(){
                theme_advanced_path : false,
                file_browser_callback : "fcFileBrowser",
        });
-}
+}*/
 
 
 /** 
index 03f9d3ac5a071c1d621b24e1aedcdb7b221fdb17..3fea1011bec6f195c70b5aa1111e78df8f6d5320 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()}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)});setupFieldRichtext();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();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[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;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").colorbox({inline:true,transition:"elastic"});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:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')}else{unpause()}}else{if(!totStopped){unpause()}}})});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});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}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()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,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.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: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><a href="'+data.img+'"><img src="'+data.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}
\ 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()}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();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[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;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").colorbox({inline:true,transition:"elastic"});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:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />')}else{unpause()}}else{if(!totStopped){unpause()}}})});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")}$j("#"+ident+" .wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}});prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}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()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,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: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}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><a href="'+data.img+'"><img src="'+data.img+'" width="320" height="240" alt="'+theme+'" /></a>')})}
\ No newline at end of file
index f46192c9be6986dbefef8fef43722e24ff2e6838..19c224aa370eb401d02e9593365fdb3cf485dd5c 100644 (file)
@@ -17,18 +17,10 @@ $j(document).ready(function() {
     });*/
 
 
-       if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
-               acl = new ACL(
-                       baseurl+"/acl",
-                       [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
-               );
-       }
-
        /* enable tinymce on focus and click */
        $j("#profile-jot-text").focus(enableOnUser);
        $j("#profile-jot-text").click(enableOnUser);
 
-
        $j('.nav-menu-list, .nav-menu-icon').hover(function() {
                showNavMenu($j(this).attr('point'));
        }, function() {
@@ -78,11 +70,81 @@ $j(document).ready(function() {
                return false;
        });*/
 
-       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");
+       $j('#event-share-checkbox').change(function() {
+
+               if ($j('#event-share-checkbox').is(':checked')) { 
+                       $j('#acl-wrapper').show();
+               }
+               else {
+                       $j('#acl-wrapper').hide();
+               }
+       }).trigger('change');
+
+// For event_end.tpl
+/*             $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-public').hide();
+                       });
+                       if(selstr == null) {
+                               $j('#jot-public').show();
+                       }
+
+               }).trigger('change');*/
+
+
+       if(typeof window.AjaxUpload != "undefined") {
+               var uploader = new window.AjaxUpload(
+                       window.imageUploadButton,
+                       { action: 'wall_upload/'+window.nickname,
+                               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,
+                                       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 ]
+               );
+       }
+
+
+       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") {
@@ -144,45 +206,6 @@ $j(document).ready(function() {
                if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
        }       
 
-       $j('#event-share-checkbox').change(function() {
-
-               if ($j('#event-share-checkbox').is(':checked')) { 
-                       $j('#acl-wrapper').show();
-               }
-               else {
-                       $j('#acl-wrapper').hide();
-               }
-       }).trigger('change');
-
-
-       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');
-       }
-// For event_end.tpl
-/*             $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-public').hide();
-                       });
-                       if(selstr == null) {
-                               $j('#jot-public').show();
-                       }
-
-               }).trigger('change');*/
-
 
        switch(window.autocompleteType) {
                case 'msg-header':
@@ -203,55 +226,54 @@ $j(document).ready(function() {
                        });
                        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(typeof window.AjaxUpload != "undefined") {
-               switch(window.ajaxType) {
-                       case 'jot-header':
-                               var uploader = new window.AjaxUpload(
-                                       'wall-image-upload',
-                                       { action: 'wall_upload/'+window.nickname,
-                                               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,
-                                               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,
-                                               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;
+       // Add Colorbox for viewing Network page images
+       //var cBoxClasses = new Array();
+       $j(".wall-item-body a img").each(function(){
+               var aElem = $j(this).parent();
+               var imgHref = aElem.attr("href");
+
+               // We need to make sure we only put a Colorbox on links to Friendica images
+               // We'll try to do this by looking for links of the form
+               // .../photo/ab803d8eg08daf85023adfec08 (with nothing more following), in hopes
+               // that that will be unique enough
+               if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)) {
+
+                       // Add a unique class to all the images of a certain post, to allow scrolling through
+                       var cBoxClass = $j(this).closest(".wall-item-body").attr("id") + "-lightbox";
+                       $j(this).addClass(cBoxClass);
+
+//                     if( $j.inArray(cBoxClass, cBoxClasses) < 0 ) {
+//                             cBoxClasses.push(cBoxClass);
+//                     }
+
+                       aElem.colorbox({
+                               maxHeight: '90%',
+                               photo: true, // Colorbox doesn't recognize a URL that don't end in .jpg, etc. as a photo
+                               rel: cBoxClass //$j(this).attr("class").match(/wall-item-body-[\d]+-lightbox/)[0]
+                       });
                }
-       }
+       });
+       /*$j.each(cBoxClasses, function(){
+               $j('.'+this).colorbox({
+                       maxHeight: '90%',
+                       photo: true,
+                       rel: this
+               });
+       });*/
 
 });
 
@@ -274,7 +296,7 @@ $j(function(){
                $.colorbox({
                        width: 800,
                        height: '90%',
-                       href: "$baseurl/admin/themes/" + $j("#id_theme :selected").val(),
+                       href: baseurl + "/admin/themes/" + $("#id_theme :selected").val(),
                        onComplete: function(){
                                $j("div#fancybox-content form").submit(function(e){
                                        var url = $j(this).attr('action');
@@ -321,74 +343,12 @@ if(typeof window.photoEdit != 'undefined') {
        });
 }
 
-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) {
        $j.get(
                baseurl + '/events/?id='+eventid,
                function(data){
                        $j.colorbox({html:data});
+                       $j.colorbox.resize();
                }
        );                      
 }
@@ -498,167 +458,68 @@ function hideNavMenu(menuID) {
 
 
 
-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();
-}
+/*
+ * TinyMCE/Editor
+ */
 
-function confirmDelete() { return confirm(window.delItem); }
+function InitMCEEditor(editorData) {
+       var tinyMCEInitConfig = {
+               theme : "advanced",
+               //mode : // SPECIFIC
+               //editor_selector: // SPECIFIC
+               //elements: // SPECIFIC
+               plugins : "bbcode,paste,autoresize,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",
+               gecko_spellcheck : true,
+               paste_text_sticky : true, // COUPLED WITH paste PLUGIN
+               entity_encoding : "raw",
+               add_unload_trigger : false,
+               remove_linebreaks : false,
+               //force_p_newlines : false,
+               //force_br_newlines : true,
+               forced_root_block : 'div',
+               //convert_urls: false, //SPECIFIC?
+               content_css: baseurl + "/view/custom_tinymce.css",
+               theme_advanced_path : false,
+               file_browser_callback : "fcFileBrowser",
+               //setup : // SPECIFIC
+       };
 
-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);
+       if(window.editSelect != 'none') {
+               $j.extend(tinyMCEInitConfig, editorData);
+               tinyMCE.init(tinyMCEInitConfig);
        }
-}
-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);
+       else if(typeof editorData.plaintextFn == 'function') {
+               (editorData.plaintextFn)();
        }
 }
 
+var editor = false;
+var textlen = 0;
 
-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 initEditor(cb){
+       if(editor==false) {
+               editor = true;
+               $j("#profile-jot-text-loading").show();
 
-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 enableOnUser(){
-       if (editor) return;
-       $j(this).val("");
-       initEditor();
-}
-
-
-var editor=false;
-var textlen = 0;
-var plaintext = window.editSelect;
-var ispublic = window.isPublic;
-
-function initEditor(cb){
-       if (editor==false){
-               $j("#profile-jot-text-loading").show();
-               if(plaintext == 'none') {
-                       $j("#profile-jot-text-loading").hide();
-                       $j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-                       $j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-                       editor = true;
-                       $j("a#jot-perms-icon").colorbox({
-                               'inline' : true,
-                               'transition' : 'elastic'
-                       });
-                       $j(".jothidden").show();
-                       if (typeof cb!="undefined") cb();
-                       return;
-               }
-               tinyMCE.init({
-                       theme : "advanced",
-                       mode : "specific_textareas",
-                       editor_selector: window.editSelect,
-                       auto_focus: "profile-jot-text",
-                       plugins : "bbcode,paste,autoresize, 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",
-                       gecko_spellcheck : true,
-                       paste_text_sticky : true,
-                       entity_encoding : "raw",
-                       add_unload_trigger : false,
-                       remove_linebreaks : false,
-                       //force_p_newlines : false,
-                       //force_br_newlines : true,
-                       forced_root_block : 'div',
-                       convert_urls: false,
-                       content_css: window.baseURL + "/view/custom_tinymce.css",
-                       theme_advanced_path : false,
-                       file_browser_callback : "fcFileBrowser",
-                       setup : function(ed) {
-                               cPopup = null;
-                               ed.onKeyDown.add(function(ed,e) {
-                                       if(cPopup !== null)
-                                               cPopup.onkey(e);
-                               });
+               var editorData = {
+                       mode : "specific_textareas",
+                       editor_selector : "profile-jot-text",
+                       auto_focus : "profile-jot-text",
+                       //plugins : "bbcode,paste,autoresize,inlinepopups",
+                       //paste_text_sticky : true,
+                       convert_urls : false,
+                       setup : function(ed) {
+                               cPopup = null;
+                               ed.onKeyDown.add(function(ed,e) {
+                                       if(cPopup !== null)
+                                               cPopup.onkey(e);
+                               });
 
                                ed.onKeyUp.add(function(ed, e) {
                                        var txt = tinyMCE.activeEditor.getContent();
@@ -676,7 +537,7 @@ function initEditor(cb){
 
                                        textlen = txt.length;
                                        if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
-                                               $j('#profile-jot-desc').html(ispublic);
+                                               $j('#profile-jot-desc').html(window.isPublic);
                                        }
                                        else {
                                                $j('#profile-jot-desc').html('&nbsp;');
@@ -709,9 +570,17 @@ function initEditor(cb){
                                        if (typeof cb!="undefined") cb();
                                });
 
+                       },
+                       plaintextFn : function() {
+                               $j("#profile-jot-text-loading").hide();
+                               $j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+                               $j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+                               $j(".jothidden").show();
+                               if (typeof cb!="undefined") cb();
                        }
-               });
-               editor = true;
+               };
+               InitMCEEditor(editorData);
+
                // setup acl popup
                $j("a#jot-perms-icon").colorbox({
                        'inline' : true,
@@ -722,213 +591,135 @@ function initEditor(cb){
        }
 }
 
+function enableOnUser(){
+       if (editor) return;
+       $j(this).val("");
+       initEditor();
+}
+
 
 function msgInitEditor() {
-       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,
-                       //force_p_newlines : false,
-                       //force_br_newlines : true,
-                       forced_root_block : 'div',
-                       convert_urls: false,
-                       content_css: baseurl + "/view/custom_tinymce.css",
-                            //Character count
-                       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);
+       var editorData = {
+               mode : "specific_textareas",
+               editor_selector : "prvmail-text",
+               //plugins : "bbcode,paste",
+               //paste_text_sticky : true,
+               convert_urls : false,
+               //theme_advanced_path : false,
+               setup : function(ed) {
+                       cPopup = null;
+                       ed.onKeyDown.add(function(ed,e) {
+                               if(cPopup !== null)
+                                       cPopup.onkey(e);
+                       });
+
+                       ed.onKeyUp.add(function(ed, e) {
+                               var txt = tinyMCE.activeEditor.getContent();
+                               match = txt.match(/@([^ \n]+)$/);
+                               if(match!==null) {
+                                       if(cPopup === null) {
+                                               cPopup = new ACPopup(this,baseurl+"/acl");
                                        }
-                               });
-                       }
-               });
-       }
-       else
-               $j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-}
+                                       if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+                                       if(! cPopup.ready) cPopup = null;
+                               }
+                               else {
+                                       if(cPopup !== null) { cPopup.close(); cPopup = null; }
+                               }
 
+                               textlen = txt.length;
+                               if(textlen != 0 && $j('#jot-perms-icon').is('.unlock')) {
+                                       $j('#profile-jot-desc').html(window.isPublic);
+                               }
+                               else {
+                                       $j('#profile-jot-desc').html('&nbsp;');
+                               }        
+                       });
 
-function profInitEditor() {
-       tinyMCE.init({
-               theme : "advanced",
-               mode : window.editSelect,
-               plugins : "bbcode,paste",
-               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",
-               gecko_spellcheck : true,
-               paste_text_sticky : true,
-               entity_encoding : "raw",
-               add_unload_trigger : false,
-               remove_linebreaks : false,
-               //force_p_newlines : false,
-               //force_br_newlines : true,
-               forced_root_block : 'div',
-               content_css: baseurl + "/view/custom_tinymce.css",
-               theme_advanced_path : false,
-               setup : function(ed) {
                        ed.onInit.add(function(ed) {
-                       ed.pasteAsPlainText = true;
-                   });
+                               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);
+                               }
+                       });
+               },
+               plaintextFn : function() {
+                       $j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
                }
+       }
+       InitMCEEditor(editorData);
+}
 
-       });
+
+function contactInitEditor() {
+       var editorData = {
+               mode : "exact",
+               elements : "contact-edit-info",
+               //plugins : "bbcode"
+       }
+       InitMCEEditor(editorData);
 }
 
+
 function eventInitEditor() {
-       tinyMCE.init({
-               theme : "advanced",
+       var editorData = {
                mode : "textareas",
-               plugins : "bbcode,paste",
-               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",
-               gecko_spellcheck : true,
-               paste_text_sticky : true,
-               entity_encoding : "raw",
-               add_unload_trigger : false,
-               remove_linebreaks : false,
-               //force_p_newlines : false,
-               //force_br_newlines : true,
-               forced_root_block : 'div',
-               content_css: baseurl + "/view/custom_tinymce.css",
-               theme_advanced_path : false,
+               //plugins : "bbcode,paste",
+               //paste_text_sticky : true,
+               //theme_advanced_path : false,
                setup : function(ed) {
                        ed.onInit.add(function(ed) {
                                ed.pasteAsPlainText = true;
                        });
                }
-
-       });
-}
-
-function contactInitEditor () {
-       tinyMCE.init({
-               theme : "advanced",
-               mode : window.editSelect,
-               elements: "contact-edit-info",
-               plugins : "bbcode",
-               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_styles : "blockquote,code",
-               gecko_spellcheck : true,
-               entity_encoding : "raw",
-               add_unload_trigger : false,
-               remove_linebreaks : false,
-               //force_p_newlines : false,
-               //force_br_newlines : true,
-               forced_root_block : 'div',
-               content_css: baseurl + "/view/custom_tinymce.css"
-
-
-       });
+       }
+       InitMCEEditor(editorData);
 }
 
-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,
-                       //force_p_newlines : false,
-                       //force_br_newlines : true,
-                       forced_root_block : 'div',
-                       convert_urls: false,
-                       content_css: baseurl + "/view/custom_tinymce.css",
-                                //Character count
-                       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);
-                                       }
-                               });
-                       }
-               });
+function profInitEditor() {
+       var editorData = {
+               mode : "textareas",
+               //plugins : "bbcode,paste",
+               //paste_text_sticky : true,
+               //theme_advanced_path : false,
+               setup : function(ed) {
+                       ed.onInit.add(function(ed) {
+                               ed.pasteAsPlainText = true;
+                       });
+               }
        }
-       else
-               $j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+       InitMCEEditor(editorData);
 }
 
-function deleteCheckedItems(delID) {
-       if(confirm(window.delItems)) {
-               var checkedstr = '';
 
-               $j(delID).hide();
-               $j(delID + '-rotator').show();
-               $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();
-               });
+/*
+ * Jot
+ */
+
+function addeditortext(textElem, data) {
+       if(window.editSelect == 'none') {
+               var currentText = $j(textElem).val();
+               $j(textElem).val(currentText + data);
        }
+       else
+               tinyMCE.execCommand('mceInsertRawHTML',false,data);
 }
 
-
 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]');
        }
 }
 
@@ -978,7 +769,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);
                });
@@ -986,12 +777,87 @@ function jotShare(id) {
        });
 }
 
+function jotClearLocation() {
+       $j('#jot-coord').val('');
+       $j('#profile-nolocation-wrapper').hide();
+}
+
+
+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();
 }
 
+
+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(window.jotId == "#profile-jot-text") {
+                               if (!editor) $j("#profile-jot-text").val("");
+                               initEditor(function(){
+                                       addeditortext(window.jotId, data);
+                                       $j('#profile-rotator').hide();
+                               });
+                       }
+                       else {*/
+                       addeditortext(window.jotId, data);
+                       $j('#profile-rotator').hide();
+//                     }
+               });
+       }
+}
+
+
+if(typeof window.geoTag === 'function') window.geoTag();
+
+
+/*
+ * Items
+ */
+
+function confirmDelete() { return confirm(window.delItem); }
+
+function deleteCheckedItems(delID) {
+       if(confirm(window.delItems)) {
+               var checkedstr = '';
+
+               $j(delID).hide();
+               $j(delID + '-rotator').show();
+               $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);
        if(reply && reply.length) {
@@ -1015,6 +881,7 @@ function itemFiler(id) {
        
        $j.get('filer/', function(data){
                $j.colorbox({html:data});
+               $j.colorbox.resize();
                $j("#id_term").keypress(function(){
                        $j(this).css("border-color",bordercolor);
                })
@@ -1042,20 +909,107 @@ function itemFiler(id) {
        
 }
 
-function jotClearLocation() {
-       $j('#jot-coord').val('');
-       $j('#profile-nolocation-wrapper').hide();
+
+/*
+ * Comments
+ */
+
+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();
 }
 
-function addeditortext(data) {
-       if(plaintext == 'none') {
-               var currentText = $j("#profile-jot-text").val();
-               $j("#profile-jot-text").val(currentText + data);
+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);
        }
-       else
-               tinyMCE.execCommand('mceInsertRawHTML',false,data);
 }
 
-if(typeof window.geoTag === 'function') window.geoTag();
 
+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 showHideCommentBox(id) {
+       if( $j('#comment-edit-form-' + id).is(':visible')) {
+               $j('#comment-edit-form-' + id).hide();
+       }
+       else {
+               $j('#comment-edit-form-' + id).show();
+       }
+}*/
 
index c1a56c8ef3f919f0735ac8ba00ac5b156cc19b80..94384c046bfb16fa63e70e93433eaa997edb57db 100644 (file)
@@ -1 +1 @@
-$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":false,"#contacts-menu-list-opening":false,"#system-menu-list-opening":false,"#network-menu-list-closing":false,"#contacts-menu-list-closing":false,"#system-menu-list-closing":false};if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j(".nav-menu-list, .nav-menu-icon").hover(function(){showNavMenu($j(this).attr("point"))},function(){hideNavMenu($j(this).attr("point"))});$j(".group-edit-icon").hover(function(){$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id");$j("#edit-"+id).addClass("icon");$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#edit-"+id).removeClass("icon");$j("#edit-"+id).addClass("iconspacer")});$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop");$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop");$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".savedsearchterm").hover(function(){id=$j(this).attr("id");$j("#drop-"+id).addClass("icon");$j("#drop-"+id).addClass("drophide");$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#drop-"+id).removeClass("icon");$j("#drop-"+id).removeClass("drophide");$j("#drop-"+id).addClass("iconspacer")});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])}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");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}if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,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,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,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}}});$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)})});$j(function(){$j("#cnftheme").click(function(){$.colorbox({width:800,height:"90%",href:"$baseurl/admin/themes/"+$j("#id_theme :selected").val(),onComplete:function(){$j("div#fancybox-content form").submit(function(e){var url=$j(this).attr("action");var data={};$j(this).find("input").each(function(){data[$j(this).attr("name")]=$j(this).val()});$j(this).find("select").each(function(){data[$j(this).attr("name")]=$j(this).children(":selected").val()});console.log(":)",url,data);$j.post(url,data,function(data){if(timer)clearTimeout(timer);NavUpdate();$j.colorbox.close()});return false})}});return false})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}if(typeof window.photoEdit!="undefined"){$j(document).keydown(function(event){if(window.prevLink!=""){if(event.ctrlKey&&event.keyCode==37){event.preventDefault();window.location.href=window.prevLink}}if(window.nextLink!=""){if(event.ctrlKey&&event.keyCode==39){event.preventDefault();window.location.href=window.nextLink}}})}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){$j.get(baseurl+"/events/?id="+eventid,function(data){$j.colorbox({html:data})})}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 showNavMenu(menuID){if(window.navMenuTimeout[menuID+"-closing"]){window.navMenuTimeout[menuID+"-closing"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-opening"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideDown("fast").show();window.navMenuTimeout[menuID+"-opening"]=false},200)}}function hideNavMenu(menuID){if(window.navMenuTimeout[menuID+"-opening"]){window.navMenuTimeout[menuID+"-opening"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-closing"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideUp("fast");window.navMenuTimeout[menuID+"-closing"]=false},500)}}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()}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 enableOnUser(){if(editor)return;$j(this).val("");initEditor()}var editor=false;var textlen=0;var plaintext=window.editSelect;var ispublic=window.isPublic;function initEditor(cb){if(editor==false){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide();$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon").colorbox({inline:true,transition:"elastic"});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, 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",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:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser",setup:function(ed){cPopup=null;ed.onKeyDown.add(function(ed,e){if(cPopup!==null)cPopup.onkey(e)});ed.onKeyUp.add(function(ed,e){var txt=tinyMCE.activeEditor.getContent();match=txt.match(/@([^ \n]+)$/);if(match!==null){if(cPopup===null){cPopup=new ACPopup(this,baseurl+"/acl")}if(cPopup.ready&&match[1]!==cPopup.searchText)cPopup.search(match[1]);if(!cPopup.ready)cPopup=null}else{if(cPopup!==null){cPopup.close();cPopup=null}}textlen=txt.length;if(textlen!=0&&$j("#jot-perms-icon").is(".unlock")){$j("#profile-jot-desc").html(ispublic)}else{$j("#profile-jot-desc").html("&nbsp;")}if(textlen<=140){$j("#character-counter").removeClass("red");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("grey")}if(textlen>140&&textlen<=420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("red");$j("#character-counter").addClass("orange")}if(textlen>420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("red")}$j("#character-counter").text(textlen)});ed.onInit.add(function(ed){ed.pasteAsPlainText=true;$j("#profile-jot-text-loading").hide();$j(".jothidden").show();if(typeof cb!="undefined")cb()})}});editor=true;$j("a#jot-perms-icon").colorbox({inline:true,transition:"elastic"})}else{if(typeof cb!="undefined")cb()}}function msgInitEditor(){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 profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",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",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",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",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",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_styles:"blockquote,code",gecko_spellcheck:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css"})}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 deleteCheckedItems(delID){if(confirm(window.delItems)){var checkedstr="";$j(delID).hide();$j(delID+"-rotator").show();$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]")}}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()}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){var bordercolor=$j("input").css("border-color");$j.get("filer/",function(data){$j.colorbox({html:data});$j("#id_term").keypress(function(){$j(this).css("border-color",bordercolor)});$j("#select_term").change(function(){$j("#id_term").css("border-color",bordercolor)});$j("#filer_save").click(function(e){e.preventDefault();reply=$j("#id_term").val();if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1;$j.colorbox.close()}else{$j("#id_term").css("border-color","#FF0000")}return false})})}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)}else tinyMCE.execCommand("mceInsertRawHTML",false,data)}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":false,"#contacts-menu-list-opening":false,"#system-menu-list-opening":false,"#network-menu-list-closing":false,"#contacts-menu-list-closing":false,"#system-menu-list-closing":false};$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j(".nav-menu-list, .nav-menu-icon").hover(function(){showNavMenu($j(this).attr("point"))},function(){hideNavMenu($j(this).attr("point"))});$j(".group-edit-icon").hover(function(){$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id");$j("#edit-"+id).addClass("icon");$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#edit-"+id).removeClass("icon");$j("#edit-"+id).addClass("iconspacer")});$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop");$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop");$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".savedsearchterm").hover(function(){id=$j(this).attr("id");$j("#drop-"+id).addClass("icon");$j("#drop-"+id).addClass("drophide");$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#drop-"+id).removeClass("icon");$j("#drop-"+id).removeClass("drophide");$j("#drop-"+id).addClass("iconspacer")});$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");if(typeof window.AjaxUpload!="undefined"){var uploader=new window.AjaxUpload(window.imageUploadButton,{action:"wall_upload/"+window.nickname,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,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])}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])}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}$j(".wall-item-body a img").each(function(){var aElem=$j(this).parent();var imgHref=aElem.attr("href");if(imgHref.match(/\/photo\/[a-fA-F0-9]+(-[0-9]\.[\w]+?)?$/)){var cBoxClass=$j(this).closest(".wall-item-body").attr("id")+"-lightbox";$j(this).addClass(cBoxClass);aElem.colorbox({maxHeight:"90%",photo:true,rel:cBoxClass})}})});$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)})});$j(function(){$j("#cnftheme").click(function(){$.colorbox({width:800,height:"90%",href:baseurl+"/admin/themes/"+$("#id_theme :selected").val(),onComplete:function(){$j("div#fancybox-content form").submit(function(e){var url=$j(this).attr("action");var data={};$j(this).find("input").each(function(){data[$j(this).attr("name")]=$j(this).val()});$j(this).find("select").each(function(){data[$j(this).attr("name")]=$j(this).children(":selected").val()});console.log(":)",url,data);$j.post(url,data,function(data){if(timer)clearTimeout(timer);NavUpdate();$j.colorbox.close()});return false})}});return false})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}if(typeof window.photoEdit!="undefined"){$j(document).keydown(function(event){if(window.prevLink!=""){if(event.ctrlKey&&event.keyCode==37){event.preventDefault();window.location.href=window.prevLink}}if(window.nextLink!=""){if(event.ctrlKey&&event.keyCode==39){event.preventDefault();window.location.href=window.nextLink}}})}function showEvent(eventid){$j.get(baseurl+"/events/?id="+eventid,function(data){$j.colorbox({html:data});$j.colorbox.resize()})}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 showNavMenu(menuID){if(window.navMenuTimeout[menuID+"-closing"]){window.navMenuTimeout[menuID+"-closing"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-opening"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideDown("fast").show();window.navMenuTimeout[menuID+"-opening"]=false},200)}}function hideNavMenu(menuID){if(window.navMenuTimeout[menuID+"-opening"]){window.navMenuTimeout[menuID+"-opening"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-closing"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideUp("fast");window.navMenuTimeout[menuID+"-closing"]=false},500)}}function InitMCEEditor(editorData){var tinyMCEInitConfig={theme:"advanced",plugins:"bbcode,paste,autoresize,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",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,forced_root_block:"div",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser"};if(window.editSelect!="none"){$j.extend(tinyMCEInitConfig,editorData);tinyMCE.init(tinyMCEInitConfig)}else if(typeof editorData.plaintextFn=="function"){editorData.plaintextFn()}}var editor=false;var textlen=0;function initEditor(cb){if(editor==false){editor=true;$j("#profile-jot-text-loading").show();var editorData={mode:"specific_textareas",editor_selector:"profile-jot-text",auto_focus:"profile-jot-text",convert_urls:false,setup:function(ed){cPopup=null;ed.onKeyDown.add(function(ed,e){if(cPopup!==null)cPopup.onkey(e)});ed.onKeyUp.add(function(ed,e){var txt=tinyMCE.activeEditor.getContent();match=txt.match(/@([^ \n]+)$/);if(match!==null){if(cPopup===null){cPopup=new ACPopup(this,baseurl+"/acl")}if(cPopup.ready&&match[1]!==cPopup.searchText)cPopup.search(match[1]);if(!cPopup.ready)cPopup=null}else{if(cPopup!==null){cPopup.close();cPopup=null}}textlen=txt.length;if(textlen!=0&&$j("#jot-perms-icon").is(".unlock")){$j("#profile-jot-desc").html(window.isPublic)}else{$j("#profile-jot-desc").html("&nbsp;")}if(textlen<=140){$j("#character-counter").removeClass("red");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("grey")}if(textlen>140&&textlen<=420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("red");$j("#character-counter").addClass("orange")}if(textlen>420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("red")}$j("#character-counter").text(textlen)});ed.onInit.add(function(ed){ed.pasteAsPlainText=true;$j("#profile-jot-text-loading").hide();$j(".jothidden").show();if(typeof cb!="undefined")cb()})},plaintextFn:function(){$j("#profile-jot-text-loading").hide();$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");$j(".jothidden").show();if(typeof cb!="undefined")cb()}};InitMCEEditor(editorData);$j("a#jot-perms-icon").colorbox({inline:true,transition:"elastic"})}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function msgInitEditor(){var editorData={mode:"specific_textareas",editor_selector:"prvmail-text",convert_urls:false,setup:function(ed){cPopup=null;ed.onKeyDown.add(function(ed,e){if(cPopup!==null)cPopup.onkey(e)});ed.onKeyUp.add(function(ed,e){var txt=tinyMCE.activeEditor.getContent();match=txt.match(/@([^ \n]+)$/);if(match!==null){if(cPopup===null){cPopup=new ACPopup(this,baseurl+"/acl")}if(cPopup.ready&&match[1]!==cPopup.searchText)cPopup.search(match[1]);if(!cPopup.ready)cPopup=null}else{if(cPopup!==null){cPopup.close();cPopup=null}}textlen=txt.length;if(textlen!=0&&$j("#jot-perms-icon").is(".unlock")){$j("#profile-jot-desc").html(window.isPublic)}else{$j("#profile-jot-desc").html("&nbsp;")}});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)}})},plaintextFn:function(){$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}};InitMCEEditor(editorData)}function contactInitEditor(){var editorData={mode:"exact",elements:"contact-edit-info"};InitMCEEditor(editorData)}function eventInitEditor(){var editorData={mode:"textareas",setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}};InitMCEEditor(editorData)}function profInitEditor(){var editorData={mode:"textareas",setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}};InitMCEEditor(editorData)}function addeditortext(textElem,data){if(window.editSelect=="none"){var currentText=$j(textElem).val();$j(textElem).val(currentText+data)}else tinyMCE.execCommand("mceInsertRawHTML",false,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 jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}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()}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.preventDefault();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()})}}if(typeof window.geoTag==="function")window.geoTag();function confirmDelete(){return confirm(window.delItem)}function deleteCheckedItems(delID){if(confirm(window.delItems)){var checkedstr="";$j(delID).hide();$j(delID+"-rotator").show();$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);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){var bordercolor=$j("input").css("border-color");$j.get("filer/",function(data){$j.colorbox({html:data});$j.colorbox.resize();$j("#id_term").keypress(function(){$j(this).css("border-color",bordercolor)});$j("#select_term").change(function(){$j("#id_term").css("border-color",bordercolor)});$j("#filer_save").click(function(e){e.preventDefault();reply=$j("#id_term").val();if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1;$j.colorbox.close()}else{$j("#id_term").css("border-color","#FF0000")}return false})})}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()}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("")}
\ No newline at end of file
diff --git a/view/theme/frost/like_noshare.tpl b/view/theme/frost/like_noshare.tpl
new file mode 100644 (file)
index 0000000..5bf94f7
--- /dev/null
@@ -0,0 +1,7 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+       <a href="#" class="tool like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
+       {{ if $nolike }}
+       <a href="#" class="tool dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+       {{ endif }}
+       <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
index 840c404d8d2ab61480168e506c07d19c2489970c..167ebcb27d0bfc03c44d041c3242673d270a19ce 100644 (file)
@@ -67,11 +67,14 @@ div.section-wrapper {
 .field {
        margin-bottom: 2px;
        padding-bottom: 0px;
+       display: inline-block;
+       text-align: left;
 }
 
 .field label {
-       width: auto;
-       position: absolute;
+       width: 275px;
+       /*position: absolute;*/
+       display: inline-block;
        margin-left: 0px;
        font-weight: 700;
 }
@@ -85,30 +88,43 @@ div.section-wrapper {
        position: auto;
        /*margin-left: 100px;*/
 }
-.field.checkbox input {
+/*.field.checkbox input {
        width: auto;
        margin-left: 140px;
-}
+}*/
 
 #div_id_remember {
        margin-top: 10px;
        margin-bottom: 10px;
 }
+#div_id_remember label {
+       width: auto;
+       margin-right: 1em;
+}
 
 /*.openid input {*/
-#id_openid_url, .openid input {
+#id_openid_url, input.openid  {
        background: url(login-bg.gif) no-repeat;
        background-position: 0 50%;
        width: 182px;
        padding-left: 18px;
 }
 
-#wrapper_username input, #wrapper_password input, #wrapper_openid_url input {
+/*#wrapper_username input, #wrapper_password input, #wrapper_openid_url input {
        margin-left: 225px;
-}
+}*/
 
-#register-openid-wrapper input, #register-name-wrapper input, #register-email-wrapper input, #register-nickname-wrapper input {
+/*#register-openid-wrapper input, #register-name-wrapper input, #register-email-wrapper input, #register-nickname-wrapper input {
        margin-left: 275px;
+}*/
+
+#register-openid-wrapper {
+       display: inline-block;
+       text-align: left;
+}
+#label-register-openid {
+       display: inline-block;
+       width: 275px;
 }
 
 #login-name-wrapper input {
index be70d73d2fa05d4a1cfd7078f734c96d228f0e29..25339c327d91ff1803268fe23d86de19f82fb631 100644 (file)
@@ -1,2 +1,2 @@
-<!--<link rel="stylesheet" href="$baseurl/view/theme/frost/login-style.css" type="text/css" media="all" />-->
+{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost/login-style.css" type="text/css" media="all" />-->#}
 
diff --git a/view/theme/frost/mail_conv.tpl b/view/theme/frost/mail_conv.tpl
new file mode 100644 (file)
index 0000000..97e814e
--- /dev/null
@@ -0,0 +1,14 @@
+<div class="mail-conv-outside-wrapper">
+       <div class="mail-conv-sender" >
+               <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
+       </div>
+       <div class="mail-conv-detail" >
+               <div class="mail-conv-sender-name" >$mail.from_name</div>
+               <div class="mail-conv-date">$mail.date</div>
+               <div class="mail-conv-subject">$mail.subject</div>
+               <div class="mail-conv-body">$mail.body</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>
+       <div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/theme/frost/mail_list.tpl b/view/theme/frost/mail_list.tpl
new file mode 100644 (file)
index 0000000..5be7f38
--- /dev/null
@@ -0,0 +1,16 @@
+<div class="mail-list-outside-wrapper">
+       <div class="mail-list-sender" >
+               <a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
+       </div>
+       <div class="mail-list-detail">
+               <div class="mail-list-sender-name" >$from_name</div>
+               <div class="mail-list-date">$date</div>
+               <div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
+       <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
+               <a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
+       </div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
index bc6b9a9d58ed82e7eef4062e4a06272d761a7455..84448efd53f454d3caa5b417e368becf666142b8 100644 (file)
@@ -1,9 +1,3 @@
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
 
-<!--<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>-->
-<script type="text/javascript" src="js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-       msgInitEditor();
-</script>
-
-
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
index b10305bd853e6f6e412fe7e48363ee36cd353a17..c1eabcec74bd60653491cbde0ff5f1a14b529379 100644 (file)
@@ -2,9 +2,9 @@
 <script language="javascript" type="text/javascript">
        window.nickname = "$nickname";
        window.linkURL = "$linkurl";
-       var none = "none";      // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
-       window.editSelect = $editselect;
-       window.ajaxType = 'msg-header';
+       window.editSelect = "$editselect";
+       window.jotId = "#prvmail-text";
+       window.imageUploadButton = 'prvmail-upload';
        window.autocompleteType = 'msg-header';
 </script>
 
index adb9c9f073a7c1b210479ae5f322fc3da276ad66..3c9a4102fb813ab64982c80bb4c90f71f596a587 100644 (file)
@@ -5,7 +5,7 @@
 
        <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 nav-menu-link" rel="#system-menu-list">
        <a class="system-menu-link nav-link nav-menu-icon" href="$nav.settings.0" title="Main Menu" point="#system-menu-list">
        <img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
        </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">
        <img rel="#nav-notifications-menu" src="$baseurl/view/theme/frost/images/notifications.png">
        </a>
-       <span id="notify-update" class="nav-ajax-left"></span>
+       <span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></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>
                <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
@@ -68,7 +68,7 @@
        </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 nav-menu-link" rel="#contacts-menu-list">
        <a class="contacts-menu-link nav-link nav-menu-icon" href="$nav.contacts.0" title="Contacts" point="#contacts-menu-list">
        <img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
@@ -94,7 +94,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-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
        <img src="$baseurl/view/theme/frost/images/message.png">
        </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 nav-menu-link" rel="#network-menu-list">
        <a class="nav-menu-icon network-menu-link nav-link" href="$nav.network.0" title="Network" point="#network-menu-list">
        <img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
                <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.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 }}
        {{ endif }}
                
        </span>
-       <!--<span id="nav-end"></span>-->
+       {#<!--<span id="nav-end"></span>-->#}
        <span id="banner">$banner</span>
 </nav>
 
diff --git a/view/theme/frost/photo_drop.tpl b/view/theme/frost/photo_drop.tpl
new file mode 100644 (file)
index 0000000..f55e623
--- /dev/null
@@ -0,0 +1,4 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+       <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
+</div>
+<div class="wall-item-delete-end"></div>
index 5907f191921b9274213ddcc421a51186062796ad..5ed3c1d03611ce019284968e54495a2097c1dff7 100644 (file)
@@ -50,9 +50,9 @@
        <div id="photo-edit-end"></div>
 </form>
 
-<!--<script>
+{#<!--<script>
        $("a#photo-edit-perms-menu").colorbox({
                'inline' : true,
                'transition' : 'none'
        }); 
-</script>-->
+</script>-->#}
index 4c4ea73cd4295d3031504e1004689d90d7d153f5..73a08c13281b7dd6c72c13123c9d432b0ad4e963 100644 (file)
@@ -1,9 +1,8 @@
-
 <script type="text/javascript" src="js/country.min.js" ></script>
 
 <script language="javascript" type="text/javascript">
-       profInitEditor();
-       Fill_Country('$country_name');
-       Fill_States('$region');
+profInitEditor();
+Fill_Country('$country_name');
+Fill_States('$region');
 </script>
 
index 64dc2a2f2768e142977ebdb28458ee24099c8920..11b2a5b3a885b090029939abd14fc89bbda8b771 100644 (file)
@@ -168,7 +168,7 @@ $sexual
 $lbl_about
 </p>
 
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
+<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
 
 </div>
 <div id="about-jot-end"></div>
@@ -179,7 +179,7 @@ $lbl_about
 $lbl_hobbies
 </p>
 
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
+<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
 
 </div>
 <div id="interest-jot-end"></div>
@@ -190,7 +190,7 @@ $lbl_hobbies
 $lbl_likes
 </p>
 
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
+<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
 
 </div>
 <div id="likes-jot-end"></div>
@@ -201,7 +201,7 @@ $lbl_likes
 $lbl_dislikes
 </p>
 
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
+<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
 
 </div>
 <div id="dislikes-jot-end"></div>
@@ -212,7 +212,7 @@ $lbl_dislikes
 $lbl_social
 </p>
 
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
+<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
 
 </div>
 <div id="contact-jot-end"></div>
@@ -229,7 +229,7 @@ $lbl_social
 $lbl_music
 </p>
 
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
+<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
 
 </div>
 <div id="music-jot-end"></div>
@@ -239,7 +239,7 @@ $lbl_music
 $lbl_book
 </p>
 
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
+<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
 
 </div>
 <div id="book-jot-end"></div>
@@ -251,7 +251,7 @@ $lbl_book
 $lbl_tv 
 </p>
 
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
+<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
 
 </div>
 <div id="tv-jot-end"></div>
@@ -263,7 +263,7 @@ $lbl_tv
 $lbl_film
 </p>
 
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
+<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
 
 </div>
 <div id="film-jot-end"></div>
@@ -280,7 +280,7 @@ $lbl_film
 $lbl_love
 </p>
 
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
+<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
 
 </div>
 <div id="romance-jot-end"></div>
@@ -292,7 +292,7 @@ $lbl_love
 $lbl_work
 </p>
 
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
+<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
 
 </div>
 <div id="work-jot-end"></div>
@@ -304,7 +304,7 @@ $lbl_work
 $lbl_school 
 </p>
 
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
+<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
 
 </div>
 <div id="education-jot-end"></div>
diff --git a/view/theme/frost/search_item.tpl b/view/theme/frost/search_item.tpl
new file mode 100644 (file)
index 0000000..b78f05d
--- /dev/null
@@ -0,0 +1,64 @@
+<a name="$item.id" ></a>
+{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->#}
+       <div class="wall-item-content-wrapper $item.indent$item.previewing" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper" 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)">
+                               <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" /></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>
+                               {#<!--<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 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>-->#}
+                               {{ 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">-->#}
+                               <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>
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</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-body" id="wall-item-body-$item.id" >$item.body</div>
+                       {{ if $item.has_cats }}
+                       <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                       </div>
+                       {{ endif }}
+
+                       {{ if $item.has_folders }}
+                       <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                       </div>
+                       {{ endif }}
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {#<!--<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="icon drophide" title="$item.drop.delete" 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>
+       </div>
+       {#<!--<div class="wall-item-wrapper-end"></div>-->#}
+
+
+       <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+       {{ if $item.conv }}
+                       <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+       {{ endif }}
+       </div>
+
+{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+
+</div>
+
+-->#}
diff --git a/view/theme/frost/smarty3/contact_edit.tpl b/view/theme/frost/smarty3/contact_edit.tpl
new file mode 100644 (file)
index 0000000..7105d00
--- /dev/null
@@ -0,0 +1,93 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+       {{$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>
+       </div>
+
+       <div id="contact-edit-drop-link-end"></div>
+
+
+       <div id="contact-edit-nav-wrapper" >
+               <div id="contact-edit-links">
+                       <ul>
+                               <li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+                               <li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+                               {{if $lost_contact}}
+                                       <li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+                               {{/if}}
+                               {{if $insecure}}
+                                       <li><div id="insecure-message">{{$insecure}}</div></li>
+                               {{/if}}
+                               {{if $blocked}}
+                                       <li><div id="block-message">{{$blocked}}</div></li>
+                               {{/if}}
+                               {{if $ignored}}
+                                       <li><div id="ignore-message">{{$ignored}}</div></li>
+                               {{/if}}
+                               {{if $archived}}
+                                       <li><div id="archive-message">{{$archived}}</div></li>
+                               {{/if}}
+
+                               <li>&nbsp;</li>
+
+                               {{if $common_text}}
+                                       <li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+                               {{/if}}
+                               {{if $all_friends}}
+                                       <li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+                               {{/if}}
+
+
+                               <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+                               {{if $lblsuggest}}
+                                       <li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+                               {{/if}}
+
+                       </ul>
+               </div>
+       </div>
+       <div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+       {{if $poll_enabled}}
+               <div id="contact-edit-poll-wrapper">
+                       <div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+                       <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+               </div>
+       {{/if}}
+       <div id="contact-edit-end" ></div>
+
+       {{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+       <textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
+       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
index 3c01c0d9aa611bde10b069f498b705d1c8ffd1d4..962f0c346e6878367c222b83951754f844d729a4 100644 (file)
@@ -3,9 +3,5 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "{{$editselect}}";
-contactInitEditor();
-</script>
+<script language="javascript" type="text/javascript">contactInitEditor();</script>
 
index a7fb961089edeb3a245a694d5ff8bd0d58759095..959c4e2b418b424ba899c0937fab44bddb0ed5ba 100644 (file)
@@ -3,3 +3,7 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
+<script language="javascript" type="text/javascript">
+window.editSelect = "{{$editselect}}";
+</script>
+
index 4ed99a6e0e877da11c8457ec29629329df55aaf6..7cdb2e3f7a0fe54c072d5d06418895d4bc8f34ac 100644 (file)
@@ -6,20 +6,25 @@
 <!--[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">
+{{*<!--<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>-->*}}
+
+<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></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/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/js/fk.autocomplete.min.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/tiptip/jquery.tipTip.minified.js"></script>-->*}}
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/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/js/fk.autocomplete.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.min.js"></script>
 
diff --git a/view/theme/frost/smarty3/event.tpl b/view/theme/frost/smarty3/event.tpl
new file mode 100644 (file)
index 0000000..15c4e2b
--- /dev/null
@@ -0,0 +1,15 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+       <div class="event">
+       
+       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+       {{$event.html}}
+       {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+       {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
+       </div>
+       <div class="clear"></div>
+{{/foreach}}
index 0ff4e339b51127e14b92573b7e61c912a579002e..813047e6ab07beeda147a4ec45eac93e9bf7efe4 100644 (file)
@@ -6,7 +6,5 @@
 <script language="javascript" type="text/javascript"
           src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
 
-<script language="javascript" type="text/javascript">
-eventInitEditor();
-</script>
+<script language="javascript" type="text/javascript">eventInitEditor();</script>
 
diff --git a/view/theme/frost/smarty3/event_form.tpl b/view/theme/frost/smarty3/event_form.tpl
new file mode 100644 (file)
index 0000000..f4a9719
--- /dev/null
@@ -0,0 +1,55 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+<p>
+{{$desc}}
+</p>
+
+<form action="{{$post}}" method="post" >
+
+<input type="hidden" name="event_id" value="{{$eid}}" />
+<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="uri" value="{{$uri}}" />
+
+<div id="event-start-text">{{$s_text}}</div>
+{{$s_dsel}} {{$s_tsel}}
+
+<div id="event-finish-text">{{$f_text}}</div>
+{{$f_dsel}} {{$f_tsel}}
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">{{$t_text}}</div>
+<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">{{$d_orig}}</textarea>
+
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="event-location-textarea" rows="10" cols="70" name="location">{{$l_orig}}</textarea>
+<br />
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
+<div id="event-share-break"></div>
+
+{{$acl}}
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
index 9d1c4b5f946f15421af8e887ab96e591885277f2..ee23e430565421c23abb93c6550d95dd130aef88 100644 (file)
@@ -7,5 +7,6 @@
 
 <script language="javascript" type="text/javascript">
 window.aclType = 'event_head';
+window.editSelect = "{{$editselect}}";
 </script>
 
diff --git a/view/theme/frost/smarty3/group_drop.tpl b/view/theme/frost/smarty3/group_drop.tpl
new file mode 100644 (file)
index 0000000..2693228
--- /dev/null
@@ -0,0 +1,14 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
+       <a href="group/drop/{{$id}}?t={{$form_security_token}}" 
+               onclick="return confirmDelete();" 
+               id="group-delete-icon-{{$id}}" 
+               class="icon drophide group-delete-icon" 
+               {{*onmouseover="imgbright(this);" 
+               onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="group-delete-end"></div>
index ce89dc08ba06193e01adde66fb98f3346e9c7072..095743e9b20bb2a7370431f5bf9d8353a017c394 100644 (file)
@@ -7,7 +7,7 @@
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
 <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" />
index 055ecc5e61d0ff5d110906ad4425b54770dd52bf..ebbef166db3beb7d8cbbda08db0ddbbe7886c7ca 100644 (file)
@@ -3,8 +3,6 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-
 <script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
-
+<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
index 2ef86d5a8eb71eb90a53aeb9bb813ec1dc921404..92a6aed1d85258b588ff73937f132467ea89e177 100644 (file)
@@ -5,8 +5,7 @@
  *}}
 
 <script>
-       var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
-       window.editSelect = {{$editselect}};
+       window.editSelect = "{{$editselect}}";
        window.isPublic = "{{$ispublic}}";
        window.nickname = "{{$nickname}}";
        window.linkURL = "{{$linkurl}}";
@@ -16,7 +15,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';
        window.delItems = '{{$delitems}}';
 </script>
 
index 21485029fff1c929e93a722215f565d40f151298..dc4f2cfe1720332841f8c7a4a9d501c8914b398d 100644 (file)
@@ -43,7 +43,8 @@
                <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);" >
+       {{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->*}}
+       <div id="profile-link-wrapper" style="display: {{$visitor}};" >
                <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> 
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
@@ -72,7 +73,7 @@
        {{$jotplugins}}
        </div>
 
-<!--   <span id="jot-display-location" style="display: none;"></span>-->
+{{*<!--        <span id="jot-display-location" style="display: none;"></span>-->*}}
 
        <div id="jot-preview-content" style="display:none;"></div>
 
diff --git a/view/theme/frost/smarty3/like_noshare.tpl b/view/theme/frost/smarty3/like_noshare.tpl
new file mode 100644 (file)
index 0000000..1ad1eea
--- /dev/null
@@ -0,0 +1,12 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
+       <a href="#" class="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+       {{if $nolike}}
+       <a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+       {{/if}}
+       <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
index eff41619fee5404a91a8e4c76d25e44cd8495b9f..5cac7bd1d7de405986f394c73d802ab6d595a4dc 100644 (file)
@@ -3,5 +3,5 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost/login-style.css" type="text/css" media="all" />-->
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost/login-style.css" type="text/css" media="all" />-->*}}
 
diff --git a/view/theme/frost/smarty3/mail_conv.tpl b/view/theme/frost/smarty3/mail_conv.tpl
new file mode 100644 (file)
index 0000000..effaa73
--- /dev/null
@@ -0,0 +1,19 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-conv-outside-wrapper">
+       <div class="mail-conv-sender" >
+               <a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
+       </div>
+       <div class="mail-conv-detail" >
+               <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+               <div class="mail-conv-date">{{$mail.date}}</div>
+               <div class="mail-conv-subject">{{$mail.subject}}</div>
+               <div class="mail-conv-body">{{$mail.body}}</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>
+       <div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/theme/frost/smarty3/mail_list.tpl b/view/theme/frost/smarty3/mail_list.tpl
new file mode 100644 (file)
index 0000000..0607c15
--- /dev/null
@@ -0,0 +1,21 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-outside-wrapper">
+       <div class="mail-list-sender" >
+               <a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
+       </div>
+       <div class="mail-list-detail">
+               <div class="mail-list-sender-name" >{{$from_name}}</div>
+               <div class="mail-list-date">{{$date}}</div>
+               <div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+       <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+               <a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+       </div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
index de30e9bce144117777533cbc86b84f85bb6dd785..0115bfad40ff19eac8ae2d76fe5b204fac609cee 100644 (file)
@@ -3,12 +3,6 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
-<!--<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>-->
-<script type="text/javascript" src="js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-       msgInitEditor();
-</script>
-
-
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
index f5286890b81ffe2d26dceabfc24680539a3ed42c..bb7cac0e43689914fd3d98d3cc6badb95ff7b500 100644 (file)
@@ -7,9 +7,9 @@
 <script language="javascript" type="text/javascript">
        window.nickname = "{{$nickname}}";
        window.linkURL = "{{$linkurl}}";
-       var none = "none";      // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
-       window.editSelect = {{$editselect}};
-       window.ajaxType = 'msg-header';
+       window.editSelect = "{{$editselect}}";
+       window.jotId = "#prvmail-text";
+       window.imageUploadButton = 'prvmail-upload';
        window.autocompleteType = 'msg-header';
 </script>
 
index 98fffbe095ac5b707a178fe6ed3cdb6c0d51ff7e..db5f696baf70ff9c95556857311cd270abde2cb8 100644 (file)
@@ -10,7 +10,7 @@
 
        <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 nav-menu-link" rel="#system-menu-list">
        <a class="system-menu-link nav-link nav-menu-icon" href="{{$nav.settings.0}}" title="Main Menu" point="#system-menu-list">
        <img class="system-menu-link" src="{{$baseurl}}/view/theme/frost/images/menu.png">
        </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}}">
        <img rel="#nav-notifications-menu" src="{{$baseurl}}/view/theme/frost/images/notifications.png">
        </a>
-       <span id="notify-update" class="nav-ajax-left"></span>
+       <span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></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>
                <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
@@ -73,7 +73,7 @@
        </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 nav-menu-link" rel="#contacts-menu-list">
        <a class="contacts-menu-link nav-link nav-menu-icon" href="{{$nav.contacts.0}}" title="Contacts" point="#contacts-menu-list">
        <img class="contacts-menu-link" src="{{$baseurl}}/view/theme/frost/images/contacts.png">
@@ -99,7 +99,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-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
        <img src="{{$baseurl}}/view/theme/frost/images/message.png">
        </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 nav-menu-link" rel="#network-menu-list">
        <a class="nav-menu-icon network-menu-link nav-link" href="{{$nav.network.0}}" title="Network" point="#network-menu-list">
        <img class="network-menu-link" src="{{$baseurl}}/view/theme/frost/images/network.png">
                <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.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}}
        {{/if}}
                
        </span>
-       <!--<span id="nav-end"></span>-->
+       {{*<!--<span id="nav-end"></span>-->*}}
        <span id="banner">{{$banner}}</span>
 </nav>
 
diff --git a/view/theme/frost/smarty3/photo_drop.tpl b/view/theme/frost/smarty3/photo_drop.tpl
new file mode 100644 (file)
index 0000000..9b037d4
--- /dev/null
@@ -0,0 +1,9 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
+       <a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="wall-item-delete-end"></div>
index 34fd8a0c18ed04dcb7becbdce284d633518f1543..890c829fa00194b510f33abf0001c3e8d35f3863 100644 (file)
@@ -55,9 +55,9 @@
        <div id="photo-edit-end"></div>
 </form>
 
-<!--<script>
+{{*<!--<script>
        $("a#photo-edit-perms-menu").colorbox({
                'inline' : true,
                'transition' : 'none'
        }); 
-</script>-->
+</script>-->*}}
index d1c44d0a9d324adc7da2698469a944ed23971a80..dac8db42d573a3511b7a0a19b457deb49da19faf 100644 (file)
@@ -3,12 +3,11 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-
 <script type="text/javascript" src="js/country.min.js" ></script>
 
 <script language="javascript" type="text/javascript">
-       profInitEditor();
-       Fill_Country('{{$country_name}}');
-       Fill_States('{{$region}}');
+profInitEditor();
+Fill_Country('{{$country_name}}');
+Fill_States('{{$region}}');
 </script>
 
index 2a38795d66904b237302b8a5679bfba687e9fb48..1d25a0d9d0e768cfa82f1f03cefc58cfcb1d45e3 100644 (file)
 {{$lbl_about}}
 </p>
 
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
 
 </div>
 <div id="about-jot-end"></div>
 {{$lbl_hobbies}}
 </p>
 
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
 
 </div>
 <div id="interest-jot-end"></div>
 {{$lbl_likes}}
 </p>
 
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
 
 </div>
 <div id="likes-jot-end"></div>
 {{$lbl_dislikes}}
 </p>
 
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
 
 </div>
 <div id="dislikes-jot-end"></div>
 {{$lbl_social}}
 </p>
 
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
 
 </div>
 <div id="contact-jot-end"></div>
 {{$lbl_music}}
 </p>
 
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
 
 </div>
 <div id="music-jot-end"></div>
 {{$lbl_book}}
 </p>
 
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
 
 </div>
 <div id="book-jot-end"></div>
 {{$lbl_tv}} 
 </p>
 
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
 
 </div>
 <div id="tv-jot-end"></div>
 {{$lbl_film}}
 </p>
 
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
 
 </div>
 <div id="film-jot-end"></div>
 {{$lbl_love}}
 </p>
 
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
 
 </div>
 <div id="romance-jot-end"></div>
 {{$lbl_work}}
 </p>
 
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
 
 </div>
 <div id="work-jot-end"></div>
 {{$lbl_school}} 
 </p>
 
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
 
 </div>
 <div id="education-jot-end"></div>
diff --git a/view/theme/frost/smarty3/search_item.tpl b/view/theme/frost/smarty3/search_item.tpl
new file mode 100644 (file)
index 0000000..2b37b24
--- /dev/null
@@ -0,0 +1,69 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+       <div class="wall-item-content-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
+               <div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+                       <div class="wall-item-photo-wrapper" 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)">
+                               <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}}" /></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>
+                               {{*<!--<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 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>-->*}}
+                               {{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">-->*}}
+                               <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>
+                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</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-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+                       {{if $item.has_cats}}
+                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       </div>
+                       {{/if}}
+
+                       {{if $item.has_folders}}
+                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       </div>
+                       {{/if}}
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+                       {{*<!--<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="icon drophide" title="{{$item.drop.delete}}" 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>
+       </div>
+       {{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+
+
+       <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+       {{if $item.conv}}
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+       {{/if}}
+       </div>
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+
+</div>
+
+-->*}}
diff --git a/view/theme/frost/smarty3/suggest_friends.tpl b/view/theme/frost/smarty3/suggest_friends.tpl
new file mode 100644 (file)
index 0000000..8843d51
--- /dev/null
@@ -0,0 +1,21 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="profile-match-wrapper">
+       <div class="profile-match-photo">
+               <a href="{{$url}}">
+                       <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+               </a>
+       </div>
+       <div class="profile-match-break"></div>
+       <div class="profile-match-name">
+               <a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+       </div>
+       <div class="profile-match-end"></div>
+       {{if $connlnk}}
+       <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+       {{/if}}
+       <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
+</div>
index f5c9b3c63c66e0616f794da6f00701ca4ee1df34..fbaafa2674ed97e9ead4f4dc2493c0c993017557 100644 (file)
@@ -5,7 +5,7 @@
  *}}
 {{if $dropping}}
 <div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
-  <div id="item-delete-selected-top-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-top-icon" class="icon drophide" title="{{$dropping}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></div>
   <div id="item-delete-selected-top-desc" >{{$dropping}}</div>
 </div>
 <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
@@ -25,7 +25,7 @@
 
 {{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <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>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
index d6782484f8d9c4150dd62e128880536f8b546825..d6fbb3cf0673e2110f41064ad274d3b22823b8ac 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}} {{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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}}
                                <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>
-<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->
+{{*<!--                <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 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}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></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>
@@ -79,7 +79,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 tool 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..c7ad27401f5cb5456f59b16df5f59815f6b7a30e 100644 (file)
@@ -3,8 +3,7 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
 
-<script language="javascript" type="text/javascript">
-wallInitEditor();
-</script>
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
 
index dcf8ae94dfe5dfe8be55980e283ba25cc21b3b8b..6107a8a0870700b1eeb1f86e6b485c16515579fc 100644 (file)
@@ -6,6 +6,7 @@
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "{{$editselect}}";
-window.ajaxType = "wallmsg-header";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
 </script>
 
index 05e4e65b9bc6a8b0a977dc509f7715766f2a08e0..0e0ce6d71f318824bfacd5eeea3b6e82cf42253c 100644 (file)
@@ -92,12 +92,17 @@ blockquote {
 }
 
 #panel {
-       background-color: ivory;
        position: absolute;
        z-index: 2;
        width: 30%;
        padding: 25px;
-       border: 1px solid #444;
+
+/*     background-color: ivory;
+       border: 1px solid #444;*/
+
+       border-radius: 7px;
+       background-color: #222;
+       color: #eee;
 }
 
 .heart {
@@ -337,6 +342,11 @@ section {
 }
 .tabs li { margin: 0px; list-style: none; }
 .tabs a {
+/*     background-image: url(head.jpg);
+       background-repeat: repeat-x;    
+       background-position: 0px 0px;
+       background-size: auto 45px;*/
+
        padding: 0.4em 0.5em;
        margin-right: 0.5em;
        margin-bottom: 0.5em;
@@ -359,6 +369,9 @@ section {
 .tab.active {
        font-weight: bold;
 
+/*     background-image: url(head-flipped.jpg);
+       background-position: 0px -20px;*/
+
        box-shadow: 2px 2px 3px #aaa inset;
        -moz-box-shadow: 2px 2px 3px #aaa inset;
        -webkit-box-shadow: 2px 2px 3px #aaa inset;
@@ -375,6 +388,12 @@ footer {
        padding-bottom: 1em;
 }
 
+#maintenance-message {
+       font-size: 20px;
+       text-align: center;
+       margin-top: 10em;
+}
+
 .birthday-today, .event-today {
        font-weight: bold;
 }
@@ -1173,15 +1192,16 @@ input#dfrn-url {
        float: left;
        width:110px;
        margin-right:10px;
+       margin-bottom:10px;
 }
 .comment .wall-item-info {
        width: 70px;
 }
 
-.wall-item-photo-wrapper {
+/*.wall-item-photo-wrapper {
        margin-bottom: 10px;
        width: 100px;
-}
+}*/
 .wall-item-photo-menu-button {
        display: block;
        position: absolute;
@@ -1191,7 +1211,7 @@ input#dfrn-url {
        margin: 0px; padding: 0px;
        width: 16px;
        height: 16px;
-       top: 94px; left:0px;
+       top: 76px; left:0px;
        overflow: hidden;
        text-indent: 40px;
        display: none;
@@ -1203,7 +1223,7 @@ input#dfrn-url {
        background: #FFFFFF;
        position: absolute;
 /*     left: 10px; top: 90px;*/
-       left: 0px; top:110px;
+       left: 0px; top:92px;
        display: none;
        z-index: 10000;
 }
@@ -1219,7 +1239,7 @@ input#dfrn-url {
     left: 50px;
     margin: 0;
     position: absolute;
-    top: 70px;
+    top: 63px;
     width: 30px
 }
 .wallwall .wwto img {
@@ -1234,7 +1254,7 @@ input#dfrn-url {
 .wall-item-arrowphoto-wrapper {
     position: absolute;
     left: 75px;
-    top: 70px;
+    top: 63px;
     z-index: 100;
 }
 .wall-item-lock {
@@ -1354,15 +1374,34 @@ input#dfrn-url {
 
 .wall-item-content img {
        display: block;
-       margin-top: 10px;
+       margin-top: 12px;
+       margin-bottom: 12px;
        margin-right: auto;
        margin-left: auto;
+/*     max-width: 100%;*/
+       max-width: 400px; /* to make room for the shadow */
+       padding: 5px;
+
+       box-shadow: 0 0 10px #000;
+       -moz-box-shadow: 0 0 10px #000;
+       -webkit-box-shadow: 0 0 10px #000;
+}
+
+.shared_content img {
        max-width: 100%;
 }
 
+.comment .wall-item-content img {
+       max-width: 370px;
+}
+
 .wall-item-content img.smiley {
        display: inline;
        margin: auto;
+       padding: 0;
+       box-shadow: none;
+       -moz-box-shadow: none;
+       -webkit-box-shadow: none;
 }
 
 .divgrow-showmore {
@@ -1420,7 +1459,7 @@ input#dfrn-url {
 
 .comment .wall-item-tools {
        margin-left: 0px;
-       margin-top: 0px;
+       margin-top: 5px;
        padding-top: 0px;
 } 
 
@@ -1502,6 +1541,27 @@ input#dfrn-url {
        margin-left: 30px;
 }
 
+.shared_header {
+       border-top: 1px solid #aaa;
+       color: #999;
+
+       height: 42px; /* 32 px for the image plus 10 px for the margin around the image */
+       padding-top: 0.5em;
+       margin-top: 1em;
+       margin-bottom: 1em;
+       
+}
+.shared_header img {
+       float: left;
+
+       margin: auto 1em auto auto;
+       padding: 0;
+
+       box-shadow: none;
+       -moz-box-shadow: none;
+       -webkit-box-shadow: none;
+}
+
 #profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
        margin-top: 15px;
@@ -1925,7 +1985,10 @@ input#dfrn-url {
 }
 
 .contact-edit-submit {
-       margin-top: 20px;
+       margin-top: 10px;
+       clear: left;
+       display: block;
+       margin-bottom: 45px;
 }
 
 
@@ -2372,8 +2435,10 @@ aside input[type='text'] {
 }
 
 .photo-top-image-wrapper {
-/*     position: relative; */
-       float: left;
+/*     position: relative; 
+       float: left;*/
+       display: inline-block;
+       vertical-align: top;
        margin-top: 15px;
        margin-right: 15px;
        margin-left: 15px;
@@ -2381,8 +2446,13 @@ aside input[type='text'] {
 /*     width: 200px; height: 200px; 
        overflow: hidden; */
 }
-.photo-top-image-wrapper img {
-       max-width: 550px;
+.photo-album-image-wrapper img, .photo-top-image-wrapper img {
+       max-width: 225px;
+       padding: 5px;
+
+       box-shadow: 0 0 10px #000;
+       -moz-box-shadow: 0 0 10px #000;
+       -webkit-box-shadow: 0 0 10px #000;
 }
 .photo-top-album-name {
        width: 100%;
@@ -2510,9 +2580,8 @@ aside input[type='text'] {
 
 #photos-upload-choosefile-outer-wrapper {
        margin-top: 35px;
-       padding-top: 50px;
        padding-left: 50px;
-       position: relative;
+       margin-bottom: 4em;
 }
 #photos-upload-noshare-div {
        margin-top: 0px;
@@ -2578,12 +2647,13 @@ aside input[type='text'] {
 }
 
 #photo-edit-delete-button {
-       margin-left: 270px;
+/*     margin-left: 270px;*/
+       float: right;
 }
 #photos-upload-choose {
-       position: absolute;
+/*     position: absolute;
        top: 0px;
-       left: 55px;
+       left: 55px;*/
 }
 .settings-submit, .profile-edit-submit-button {
        margin-bottom: 10px;
@@ -2832,7 +2902,7 @@ aside input[type='text'] {
 }
 
 #event-share-text {
-       float: left;
+/*     float: left;*/
        margin-top: 10px;
        margin-left: 5px;
 }
@@ -2957,9 +3027,17 @@ aside input[type='text'] {
 /*#photo-photo {
        float: left;
 }*/
+#photo-photo {
+       display: block;
+       margin-left: auto;
+       margin-right: auto;
+       margin-bottom: 2em;
+       text-align: center;
+}
 #photo-photo img {
-       max-width: 555px;
-       margin-left: 5px;
+/*     max-width: 555px;
+       margin-left: 5px;*/
+       max-width: 100%;
 }
 #photo-photo-end {
        clear: both;
@@ -2989,11 +3067,18 @@ aside input[type='text'] {
 }
 
 .profile-match-wrapper {
-       float: left;
+       display: inline-block;
        padding: 10px;
-       width: 120px;
-       height: 120px;
+       /*width: 120px;
+       height: 120px;*/
        scroll: auto;
+       margin-bottom: 2em;
+       vertical-align: top;
+}
+.profile-match-wrapper .icon.drophide {
+       margin-left: auto;
+       margin-right: auto;
+       margin-top: 1em;
 }
 #profile-match-wrapper-end {
        clear: both;
@@ -3456,6 +3541,13 @@ aside input[type='text'] {
        background-repeat: no-repeat;
        opacity: 0.4;
 }
+.icon.drophide:hover {
+       display: block; width: 16px; height: 16px;
+       background-size: 100% 100%;
+       background-image: url('images/drop-16.png');
+       background-repeat: no-repeat;
+       opacity: 1.0;
+}
 .edit { background-position: -80px 0px;}
 /*.camera { background-position: -96px 0px;}*/
 .icon.camera{
@@ -3758,21 +3850,66 @@ aside input[type='text'] {
 }*/
 
 .attachtype {
-       display: block; width: 20px; height: 23px;
+       display: block;
        float: left;
-       background-image: url('../../../images/content-types.png');
-       background-position: -80px 0px;
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+       background-image: url('images/oxygen/unknown.png');
 }
 
 .body-attach {
        margin-top: 10px;
 }
 
-.type-video { background-position: 0px 0px; }
+/*.type-video { background-position: 0px 0px; }
 .type-image { background-position: -20px 0px; }
 .type-audio { background-position: -40px 0px; }
 .type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
+.type-unkn  { background-position: -80px 0px; }*/
+.type-video {
+       background-image: url('images/oxygen/video-x-generic.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}
+.type-image {
+       background-image: url('images/oxygen/image-x-generic.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}
+.type-audio {  background-image: url('images/oxygen/audio-x-generic.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}
+
+.type-text  {
+       background-image: url('images/oxygen/text-x-generic-2.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}
+.subtype-msword, .subtype-vnd-openxmlformats-officedocument-wordprocessingml-document  {
+       background-image: url('images/oxygen/application-msword.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}
+.subtype-pdf  {
+       background-image: url('images/oxygen/application-pdf.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}
+/*.type-unkn  {
+       background-image: url('images/oxygen/unknown.png');
+       background-size: 100% 100%;
+       width: 48px;
+       height: 48px;
+}*/
+
 
 
 /* autocomplete popup */
@@ -3852,6 +3989,33 @@ div.jGrowl-notification {
 .nav-notify.show {
        display: block;
 }
+ul#nav-network-notifications-popup {
+       text-align: center;
+       line-height: 18px;
+
+       border: 1px solid #AAAAAA;
+       border-radius: 5px;
+       -moz-border-radius: 5px;
+       -webkit-border-radius: 5px;
+
+       -moz-box-shadow: 3px 3px 5px #555;
+       -webkit-box-shadow: 3px 3px 5px #555;
+       box-shadow: 3px 3px 5px #555;
+
+       background: #FFFFFF;
+
+       display: none;
+       list-style: none;
+
+       width: 10em;
+       position: absolute;
+       margin: 0px;
+       top: 15px;
+       left: 55px;
+       padding: 1em 0px;
+
+       z-index: 11000;
+}
 ul.notifications-menu-popup {
        position: absolute;
        display: none;
diff --git a/view/theme/frost/suggest_friends.tpl b/view/theme/frost/suggest_friends.tpl
new file mode 100644 (file)
index 0000000..e0d1c29
--- /dev/null
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+       <div class="profile-match-photo">
+               <a href="$url">
+                       <img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
+               </a>
+       </div>
+       <div class="profile-match-break"></div>
+       <div class="profile-match-name">
+               <a href="$url" title="$name">$name</a>
+       </div>
+       <div class="profile-match-end"></div>
+       {{ if $connlnk }}
+       <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+       {{ endif }}
+       <a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);" #}onclick="return confirmDelete();" ></a>
+</div>
index 8deef782f04366fd9109b14dc14d56185f4eab8c..3decb2a11857331562c4ffff312a5c54ea2cd46e 100644 (file)
@@ -4,7 +4,7 @@
  * Name: Frost
  * 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.3.2
+ * Version: Version 0.4
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
@@ -30,3 +30,45 @@ function frost_content_loaded(&$a) {
 
 }
 
+function frost_install() {
+       register_hook('prepare_body_final', 'view/theme/frost/theme.php', 'frost_item_photo_links');
+
+       logger("installed theme frost");
+}
+
+function frost_uninstall() {
+       unregister_hook('bbcode', 'view/theme/frost/theme.php', 'frost_bbcode');
+
+       logger("uninstalled theme frost");
+}
+
+function frost_item_photo_links(&$a, &$body_info) {
+       require_once('include/Photo.php');
+       $phototypes = Photo::supportedTypes();
+
+       $occurence = 1;
+       $p = bb_find_open_close($body_info['html'], "<a", ">");
+       while($p !== false && ($occurence++ < 500)) {
+               $link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']);
+
+               $matches = array();
+               preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches);
+               if($matches) {
+
+                       // Replace the link for the photo's page with a direct link to the photo itself
+                       $newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link);
+
+                       // Add a "quiet" parameter to any redir links to prevent the "XX welcomes YY" info boxes
+                       $newlink = preg_replace("/href=\"([^\"]+)\/redir\/([^\"]+)&url=([^\"]+)\"/", 'href="$1/redir/$2&quiet=1&url=$3"', $newlink);
+
+                        // Having any arguments to the link for Colorbox causes it to fetch base64 code instead of the image
+                       $newlink = preg_replace("/\/[?&]zrl=([^&\"]+)/", '', $newlink);
+
+                       $body_info['html'] = str_replace($link, $newlink, $body_info['html']);
+
+               }
+               
+               $p = bb_find_open_close($body_info['html'], "<a", ">", $occurence);
+       }
+}
+
index cdafaad39cbfae196c58c61c1046feb6ea04d3af..a9875418311c3346a8541925180f41697da7dc95 100644 (file)
@@ -1,6 +1,6 @@
 {{ if $dropping }}
 <div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
-  <div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></div>
   <div id="item-delete-selected-top-desc" >$dropping</div>
 </div>
 <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
@@ -20,7 +20,7 @@ $live_update
 
 {{ if $dropping }}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <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>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
index 85b0183c4cc63cf56b67b369cb80b6917ffc13ca..9c63bef227d070d0475724ece2e2ed2761ed7053 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 $item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" 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 }}
                                <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>
-<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->
+{#<!--                <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 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" title="$item.localtime" ><a href="display/$user.nickname/$item.id">$item.ago</a></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>
@@ -74,7 +74,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 tool 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..6baa6e7dc115512a177ff81843476353f3acb726 100644 (file)
@@ -1,5 +1,4 @@
+<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
 
-<script language="javascript" type="text/javascript">
-wallInitEditor();
-</script>
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
 
index 9cd2bd6e2355796982b780c6dbf5f68781bdd752..75235394834c39d4f50cce17c09a1b96fd1297d2 100644 (file)
@@ -1,6 +1,7 @@
 
 <script language="javascript" type="text/javascript">
 window.editSelect = "$editselect";
-window.ajaxType = "wallmsg-header";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
 </script>