]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
authorDomovoy <domovoy@errlock.org>
Fri, 3 Aug 2012 16:57:37 +0000 (18:57 +0200)
committerDomovoy <domovoy@errlock.org>
Fri, 3 Aug 2012 16:57:37 +0000 (18:57 +0200)
Conflicts:
update.php

51 files changed:
boot.php
database.sql
include/bb2diaspora.php
include/bbcode.php
include/markdownify/markdownify.php
include/network.php
include/text.php
mod/display.php
mod/parse_url.php
mod/poke.php
mods/readme.txt [new file with mode: 0644]
update.php
util/messages.po
view/birthdays_reminder.tpl
view/display-head.tpl [new file with mode: 0644]
view/events_reminder.tpl
view/invite.tpl
view/photos_upload.tpl
view/poke_content.tpl
view/theme/darkzero-NS/style.css
view/theme/darkzero/style.css
view/theme/diabook/style-profile.css
view/theme/diabook/style.css
view/theme/frost-mobile/TODO
view/theme/frost-mobile/comment_item.tpl
view/theme/frost-mobile/display-head.tpl [new file with mode: 0644]
view/theme/frost-mobile/jot-header.tpl
view/theme/frost-mobile/js/theme.js
view/theme/frost-mobile/js/theme.min.js
view/theme/frost-mobile/nav.tpl
view/theme/frost-mobile/photos_upload.tpl
view/theme/frost-mobile/style.css
view/theme/frost-mobile/theme.php
view/theme/frost-mobile/wall_item.tpl
view/theme/frost-mobile/wallwall_item.tpl [new file with mode: 0644]
view/theme/frost/comment_item.tpl
view/theme/frost/display-head.tpl [new file with mode: 0644]
view/theme/frost/jot-header.tpl
view/theme/frost/js/theme.js
view/theme/frost/js/theme.min.js
view/theme/frost/nav.tpl
view/theme/frost/photos_upload.tpl
view/theme/frost/style.css
view/theme/frost/style.css.orig [deleted file]
view/theme/frost/theme.php
view/theme/frost/wall_item.tpl
view/theme/frost/wallwall_item.tpl [new file with mode: 0644]
view/theme/quattro/dark/style.css
view/theme/quattro/green/style.css
view/theme/quattro/quattro.less
view/theme/quattro/showmore-bg.jpg [new file with mode: 0644]

index e0b768171a19764ce9133476cb98a8af99781fe8..170c9953b9d4098948b8e1e05197a6785211e738 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1419' );
+define ( 'FRIENDICA_VERSION',      '3.0.1423' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1155      );
 
index 80ce05ba0cc998f619df3b0149ba94f515e7637e..fa4f1bd58b15d92595e74a19e3766aed51dbf079 100644 (file)
@@ -570,6 +570,9 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `moderated` (`moderated`),
   KEY `spam` (`spam`),
   KEY `author-name` (`author-name`),
+  KEY `uid_commented` (`uid`, `commented`),
+  KEY `uid_created` (`uid`, `created`),
+  KEY `uid_unseen` (`uid`, `unseen`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
index b95dee8f3b4b67541c9052b1cdba9cbcea83ec05..9ede42f6c7a66fab7597566296584d4e3968c3fc 100644 (file)
@@ -202,9 +202,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
        // the following was added on 10-January-2012 due to an inability of Diaspora's
        // new javascript markdown processor to handle links with images as the link "text"
        // It is not optimal and may be removed if this ability is restored in the future
-       if ($fordiaspora)
-               $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
-                                       "[url]$1[/url]\n[img]$2[/img]", $Text);
+       //if ($fordiaspora)
+       //      $Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
+       //                              "[url]$1[/url]\n[img]$2[/img]", $Text);
 
        // Convert it to HTML - don't try oembed
        $Text = bbcode($Text, $preserve_nl, false);
index 9ece3c3deca1c23fae7e7c6ab7df1c1354915450..d83cd35814a9f582c8b117d3b097f4026fe228d5 100644 (file)
@@ -224,6 +224,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
        // Check for list text
        $Text = str_replace("[*]", "<li>", $Text);
 
+       // Check for style sheet commands
+       $Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","<span style=\"$1;\">$2</span>",$Text);
+
+       // Check for CSS classes
+       $Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","<span class=\"$1\">$2</span>",$Text);
+
        // handle nested lists
        $endlessloop = 0;
 
index 7bbf1cbbed60c9047ff793bac8c104c4cdb97f27..0d4429a01336e10d9ce17ab43170201ae874bef1 100644 (file)
@@ -686,6 +686,10 @@ class Markdownify {
         #  [1]: mailto:mail@example.com Title
         $tag['href'] = 'mailto:'.$bufferDecoded;
       }
+
+      $this->out('['.$buffer.']('.$tag['href'].' "'.$tag['title'].'")', true);
+
+/*
       # [This link][id]
       foreach ($this->stack['a'] as $tag2) {
         if ($tag2['href'] == $tag['href'] && $tag2['title'] === $tag['title']) {
@@ -699,6 +703,7 @@ class Markdownify {
       }
 
       $this->out('['.$buffer.']['.$tag['linkID'].']', true);
+*/
     }
   }
   /**
@@ -737,7 +742,7 @@ class Markdownify {
 
 // ![Alt text](/path/to/img.jpg "Optional title")
     if ($this->parser->tagAttributes['title'] != "")
-      $this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].'"'.$this->parser->tagAttributes['title'].'")', true);
+      $this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].' "'.$this->parser->tagAttributes['title'].'")', true);
     else
       $this->out('!['.$this->parser->tagAttributes['alt'].']('.$this->parser->tagAttributes['src'].')', true);
 
index a95dde535c9fa967156b28806f9c508b9ed1b064..0fff5c7cc9eea0993682da0810cc2748b4819e11 100644 (file)
@@ -802,7 +802,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
        $s = htmlspecialchars_decode($s);
 
        $matches = null;
-       $c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
+       $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
        if($c) {
                require_once('include/Photo.php');
                foreach($matches as $mtch) {
@@ -823,6 +823,12 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
                                $scaled = $mtch[1];
                        $i = fetch_url($scaled);
 
+                       $cache = get_config('system','itemcache');
+                       if (($cache != '') and is_dir($cache)) {
+                               $cachefile = $cache."/".hash("md5", $scaled);
+                               file_put_contents($cachefile, $i);
+                       }
+
                        // guess mimetype from headers or filename
                        $type = guess_image_type($mtch[1],true);
                        
index 41030e677c6be2963fc236c8243110e86e64d7c4..1c50086aacb208d6e9848be317c9df2033353de3 100644 (file)
@@ -1578,7 +1578,7 @@ function undo_post_tagging($s) {
 
 function fix_mce_lf($s) {
        $s = str_replace("\r\n","\n",$s);
-       $s = str_replace("\n\n","\n",$s);
+//     $s = str_replace("\n\n","\n",$s);
        return $s;
 }
 
index 81ed174acc46daac65f51a62327382fce2763800..92ffd1a7095c7cc1b07bd8de1978f301fb84aa22 100644 (file)
@@ -16,15 +16,7 @@ function display_content(&$a) {
 
        $o = '<div id="live-display"></div>' . "\r\n";
 
-       $a->page['htmlhead'] .= <<<EOT
-<script>
-$(document).ready(function() {
-       $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-       // make auto-complete work in more places
-       $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-EOT;
+       $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
 
 
        $nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -126,7 +118,7 @@ EOT;
 
        }
        else {
-               $r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+               $r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
                        dbesc($item_id),
                        dbesc($item_id)
                );
index 5dd7de750b112b8b8f79aa094a79835e05833c1a..ea05055f0cefc69b461c29b5e009786320bcc2b8 100644 (file)
@@ -176,6 +176,9 @@ function parseurl_getsiteinfo($url) {
                 }
         } else {
                $src = completeurl($siteinfo["image"], $url);
+
+               unset($siteinfo["image"]);
+
                $photodata = getimagesize($src);
 
                if (($photodata[0] > 10) and ($photodata[1] > 10))
@@ -292,8 +295,7 @@ function parse_url_content(&$a) {
        $siteinfo = parseurl_getsiteinfo($url);
 
        if($siteinfo["title"] == "") {
-               echo print_r($siteinfo, true);
-               //echo sprintf($template,$url,$url,'') . $str_tags;
+               echo sprintf($template,$url,$url,'') . $str_tags;
                killme();
        } else {
                $text = $siteinfo["text"];
@@ -302,7 +304,7 @@ function parse_url_content(&$a) {
 
        $image = "";
 
-        if($siteinfo["image"] != ""){
+        if(sizeof($siteinfo["images"]) > 0){
             /*
               Execute below code only if image is present in siteinfo
              */
index 085415a76af84926b9f53a26373acc313d65b819..5cd88d7e2a8ee5d448a44d74d978eaa777601ce9 100644 (file)
@@ -27,8 +27,8 @@ function poke_init(&$a) {
        if(! $contact_id)
                return;
 
+       $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
 
-       $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
 
        logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
 
@@ -45,6 +45,32 @@ function poke_init(&$a) {
 
        $target = $r[0];
 
+       if($parent) {
+               $r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+                       from item where id = %d and parent = %d and uid = %d limit 1",
+                       intval($parent),
+                       intval($parent),
+                       intval($uid)
+               );
+               if(count($r)) {
+                       $parent_uri = $r[0]['uri'];
+                       $private    = $r[0]['private'];
+                       $allow_cid  = $r[0]['allow_cid'];
+                       $allow_gid  = $r[0]['allow_gid'];
+                       $deny_cid   = $r[0]['deny_cid'];
+                       $deny_gid   = $r[0]['deny_gid'];
+               }
+       }
+       else {
+
+               $private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+
+               $allow_cid     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+               $allow_gid     = (($private) ? '' : $a->user['allow_gid']);
+               $deny_cid      = (($private) ? '' : $a->user['deny_cid']);
+               $deny_gid      = (($private) ? '' : $a->user['deny_gid']);
+       }
+
        $poster = $a->contact;
 
        $uri = item_new_uri($a->get_hostname(),$owner_uid);
@@ -53,7 +79,7 @@ function poke_init(&$a) {
 
        $arr['uid']           = $uid;
        $arr['uri']           = $uri;
-       $arr['parent-uri']    = $uri;
+       $arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
        $arr['type']          = 'activity';
        $arr['wall']          = 1;
        $arr['contact-id']    = $poster['id'];
@@ -64,10 +90,10 @@ function poke_init(&$a) {
        $arr['author-link']   = $poster['url'];
        $arr['author-avatar'] = $poster['thumb'];
        $arr['title']         = '';
-       $arr['allow_cid']     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
-       $arr['allow_gid']     = (($private) ? '' : $a->user['allow_gid']);
-       $arr['deny_cid']      = (($private) ? '' : $a->user['deny_cid']);
-       $arr['deny_gid']      = (($private) ? '' : $a->user['deny_gid']);
+       $arr['allow_cid']     = $allow_cid;
+       $arr['allow_gid']     = $allow_gid;
+       $arr['deny_cid']      = $deny_cid;
+       $arr['deny_gid']      = $deny_gid;
        $arr['last-child']    = 1;
        $arr['visible']       = 1;
        $arr['verb']          = $activity;
@@ -132,12 +158,12 @@ function poke_content(&$a) {
 
 <script>$(document).ready(function() { 
        var a; 
-       a = $("#recip").autocomplete({ 
+       a = $("#poke-recip").autocomplete({ 
                serviceUrl: '$base/acl',
                minChars: 2,
                width: 350,
                onSelect: function(value,data) {
-                       $("#recip-complete").val(data);
+                       $("#poke-recip-complete").val(data);
                }                       
        });
        a.setOptions({ params: { type: 'a' }});
@@ -148,6 +174,9 @@ function poke_content(&$a) {
 </script>
 EOT;
 
+       $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
 
        $verbs = get_poke_verbs();
 
@@ -165,6 +194,7 @@ EOT;
                '$clabel' => t('Recipient'),
                '$choice' => t('Choose what you wish to do to recipient'),
                '$verbs' => $shortlist,
+               '$parent' => $parent,
                '$prv_desc' => t('Make this post private'),
                '$submit' => t('Submit'),
                '$name' => $name,
diff --git a/mods/readme.txt b/mods/readme.txt
new file mode 100644 (file)
index 0000000..9e79f84
--- /dev/null
@@ -0,0 +1,5 @@
+Site speed can be improved when the following indexes are set. They cannot be set through the update script because on large sites they will block the site for several minutes.
+
+CREATE INDEX `uid_commented` ON `item` (`uid`, `commented`);
+CREATE INDEX `uid_created` ON `item` (`uid`, `created`);
+CREATE INDEX `uid_unseen` ON `item` (`uid`, `unseen`);
index 789ff9f45dd32958b8c097c8ffc28f1a60a8fd10..c41acf6fbcf5e8d8c9d86209dae9e4f02f53ae3e 100644 (file)
@@ -1350,4 +1350,3 @@ function update_1154() {
        if(!$r) return UPDATE_FAILED;
        return UPDATE_SUCCESS;
 }
-
index 02a072caef1990b48d81c5e38a7543efd8a6b1b1..86bf30b5089a471c1a396c1207a046d0a2085aab 100644 (file)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1419\n"
+"Project-Id-Version: 3.0.1423\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-29 10:00-0700\n"
+"POT-Creation-Date: 2012-08-02 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:116 ../../mod/photos.php:938
-#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:109
+#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:139
 #: ../../mod/settings.php:86 ../../mod/settings.php:519
 #: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6
@@ -51,7 +51,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:166 ../../mod/message.php:38
 #: ../../mod/message.php:168 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
-#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/follow.php:9 ../../mod/display.php:130 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:408 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
@@ -127,7 +127,7 @@ msgstr ""
 #: ../../mod/photos.php:1285 ../../mod/photos.php:1325
 #: ../../mod/photos.php:1365 ../../mod/photos.php:1396
 #: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/poke.php:169 ../../mod/content.php:691
+#: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691
 #: ../../mod/contacts.php:341 ../../mod/settings.php:537
 #: ../../mod/settings.php:691 ../../mod/settings.php:752
 #: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294
@@ -742,6 +742,10 @@ msgstr ""
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
+#: ../../mod/editpost.php:135 ../../include/conversation.php:1166
+msgid "Friendica mobile web"
+msgstr ""
+
 #: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr ""
@@ -1218,23 +1222,23 @@ msgstr ""
 msgid "Please select your timezone:"
 msgstr ""
 
-#: ../../mod/poke.php:163
+#: ../../mod/poke.php:192
 msgid "Poke/Prod"
 msgstr ""
 
-#: ../../mod/poke.php:164
+#: ../../mod/poke.php:193
 msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../mod/poke.php:165
+#: ../../mod/poke.php:194
 msgid "Recipient"
 msgstr ""
 
-#: ../../mod/poke.php:166
+#: ../../mod/poke.php:195
 msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../mod/poke.php:168
+#: ../../mod/poke.php:198
 msgid "Make this post private"
 msgstr ""
 
@@ -2598,7 +2602,7 @@ msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:236
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488
 #: ../../include/text.php:677
 msgid "Save"
@@ -2982,8 +2986,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3692
+#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:29
+#: ../../mod/display.php:134 ../../include/items.php:3692
 msgid "Item not found."
 msgstr ""
 
@@ -3807,7 +3811,7 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:141 ../../mod/display.php:75
+#: ../../mod/profile.php:141 ../../mod/display.php:67
 msgid "Access to this profile has been restricted."
 msgstr ""
 
@@ -3894,7 +3898,7 @@ msgstr ""
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:135
+#: ../../mod/display.php:127
 msgid "Item has been removed."
 msgstr ""
 
@@ -4783,23 +4787,23 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:233
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:238
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:241
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:243
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:245
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
 
@@ -7500,7 +7504,7 @@ msgstr ""
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/network.php:843
+#: ../../include/network.php:849
 msgid "view full size"
 msgstr ""
 
@@ -7799,11 +7803,11 @@ msgstr ""
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:102 ../../include/bbcode.php:317
+#: ../../include/bbcode.php:102 ../../include/bbcode.php:323
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:282 ../../include/bbcode.php:302
+#: ../../include/bbcode.php:288 ../../include/bbcode.php:308
 msgid "$1 wrote:"
 msgstr ""
 
index a00e5c7f817e155b0b39ad56578996fba41cb249..8db7d22f4b2e929f51083c2d6e0593cfb6e2d0e2 100644 (file)
@@ -5,6 +5,6 @@
 {{ for $events as $event }}
 <div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 
diff --git a/view/display-head.tpl b/view/display-head.tpl
new file mode 100644 (file)
index 0000000..3d4e7e9
--- /dev/null
@@ -0,0 +1,8 @@
+<script>
+$(document).ready(function() {
+       $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+       // make auto-complete work in more places
+       $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+
index fe7e3398031c7a0bbee47d16d8d65af2374aed70..f641a5faf4ec93b519d509b5695eba8717e4de05 100644 (file)
@@ -5,6 +5,6 @@
 {{ for $events as $event }}
 <div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 
index 01a45c774fc08bb0c58ea4a0b985568f8143292d..a47ef0162938997127235c1a53765fdc6a635b19 100644 (file)
@@ -23,4 +23,5 @@ $msg_text
 <input type="submit" name="submit" value="$submit" />
 </div>
 
-</form>
\ No newline at end of file
+</div>
+</form>
index c20028296fac64392dcbc16d63fd113e01fa69dd..2a820d9c7dc8922e3e27269474d0d6d10c9de74b 100644 (file)
@@ -28,6 +28,7 @@
                <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
                <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
                </a>
+       </div>
        <div id="photos-upload-perms-end"></div>
 
        <div style="display: none;">
index 18438787a3ae8f960c3faf95b7eb0a07b302a975..b9e089f5b3c23f48270960cd3159e0c1e45e830c 100644 (file)
@@ -8,9 +8,9 @@
 
 <div id="poke-recip-label">$clabel</div>
 <br />
-<input id="recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off">
-<input id="recip-complete" type="hidden" value="$id" name="cid">
-
+<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
+<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
+<input id="poke-parent" type="hidden" value="$parent" name="parent" />
 <br />
 <br />
 <div id="poke-action-label">$choice</div>
@@ -24,7 +24,7 @@
 <br />
 <br />
 <div id="poke-private-desc">$prv_desc</div>
-<input type="checkbox" name="private" value="1" />
+<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
 <br />
 <br />
 <input type="submit" name="submit" value="$submit" />
index 5d1bb6310c6c0650da9238c6bd78648a8c32a63d..8d106bdc9f085f4a68570fe52634ebd50e05ace8 100644 (file)
@@ -49,7 +49,7 @@ background: #444;
        color: #99CCFF;
 }
 
-.wall-item-photo-menu li a {
+.wall-item-photo-menu li a, .contact-photo-menu {
        color: #CCCCCC; background-color: #333333;
 }
 
index 55644e462d90e52ed64aba201f62e08c02217054..4838208709bf031a89add78a858157953c159e5b 100644 (file)
@@ -49,7 +49,7 @@ background: #444;
        color: #99CCFF;
 }
 
-.wall-item-photo-menu li a {
+.wall-item-photo-menu li a, .contact-photo-menu {
        color: #CCCCCC; background-color: #333333;
 }
 
index 63b2eb544a4121e675aae1ab559fefd0453e798b..927549fa33f7bd48a53cd1c106eafcf1cdb1fb45 100644 (file)
@@ -2549,4 +2549,9 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
\ No newline at end of file
+}
+
+.item-image-preview {
+  float: left;
+  margin-right: 10px;
+}
index 68bfd5d3a9213a0750b8b37460c941898497ab06..286559b859b9906a3fefc177bee882fe5da0c498 100644 (file)
@@ -2906,4 +2906,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
\ No newline at end of file
+}
index 691154c3cb5736670fde27d961d4b4eba6c69bd0..cc35b63050057d996079a5e8e1849cdda05eb6a1 100644 (file)
@@ -14,8 +14,10 @@ Photo album display?
 
 - Admin: access to more pages than summary?
 
+- Embedded video playback is way too big
+
 - Needs to be faster!
-       - Reduce DOM elements (4100 for 10 items)
+       - Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
        - Automatically set limit of 10 items for Network and Profile?
 
 
index 8fb578369503f94de85f0f02de2593cfd246be72..b5b0e9d289954f34b0fba8a04b1fa1729ef57b12 100755 (executable)
                                <input type="hidden" name="jsreload" value="$jsreload" />
                                <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 
-                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
-                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-                               </div>
-                               <div class="comment-edit-photo-end"></div>
+                               <!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+                                       <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+                               <!--</div>-->
+                               <!--<div class="comment-edit-photo-end"></div>-->
                                <ul class="comment-edit-bb-$id">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="$edbold"
@@ -49,7 +49,7 @@
                                                style="cursor: pointer;" title="$edvideo"
                                                onclick="insertFormatting('$comment','video', $id);"></a></li>-->
                                </ul>   
-                               <div class="comment-edit-bb-end"></div>
+                               <!--<div class="comment-edit-bb-end"></div>-->
 <!--                           <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->
                                <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
                                {{ if $qcomment }}
@@ -68,7 +68,7 @@
                                        <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->
                                </div>
 
-                               <div class="comment-edit-end"></div>
+                               <!--<div class="comment-edit-end"></div>-->
                        </form>
 
                </div>
diff --git a/view/theme/frost-mobile/display-head.tpl b/view/theme/frost-mobile/display-head.tpl
new file mode 100644 (file)
index 0000000..1fc82ae
--- /dev/null
@@ -0,0 +1,4 @@
+<script>
+       window.autoCompleteType = 'display-head';
+</script>
+
index d409edea44a977d941df43f6e13a2c44912e0c82..66a2c87962a528e034feb55b6cc23b8f045a1928 100644 (file)
@@ -1,5 +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.isPublic = "$ispublic";
        window.nickname = "$nickname";
index 83a0f172bc9e9ee9d687a6d0388f2339b08442a6..6cbeb2a32cb8b86889f3e30c6bb3a32ee77cef9c 100644 (file)
@@ -93,6 +93,13 @@ $j(document).ready(function() {
                        $j('#drop-' + id).removeClass('icon');$j('#drop-' + id).removeClass('drophide'); $j('#drop-' + id).addClass('iconspacer');}
        );*/
 
+       if(window.autoCompleteType == "display-head") {
+               //$j(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+               // make auto-complete work in more places
+               //$j(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+               $j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+       }
+
        if(window.aclType == "event_head") {
                $j('#events-calendar').fullCalendar({
                        events: baseurl + '/events/json/',
index 2401b81a2ad252e0ccd9597f77da988c6bbb067f..b54cb1bc916cf9045e481400ddb112921e313517 100644 (file)
@@ -1 +1 @@
-function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID]));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(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
+function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),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(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
index bc12409e2c868bb30b57b859bda2377c160755b4..54f7b54ca5735d16cf84a83d12ae12d9d9243ac0 100644 (file)
@@ -3,8 +3,6 @@
 
 <!--   <div id="site-location">$sitelocation</div> -->
 
-       {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
        <span id="nav-link-wrapper" >
 
 <!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
        <img rel="#system-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/menu.png">
 <!--   </a>-->
        <ul id="system-menu-list" class="nav-menu-list">
-                       {{ if $nav.manage }}
-                       <li>
-                       <a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-                       </li>
-                       {{ endif }}
+               {{ if $nav.login }}
+               <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+               {{ endif }}
+
+               {{ if $nav.register }}
+               <a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+               {{ endif }}
+
+               {{ if $nav.manage }}
+               <li>
+               <a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+               </li>
+               {{ endif }}
+
                {{ if $nav.settings }}
                <li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
                {{ endif }}
        </ul>
        </div>
 
-       {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-               
        </span>
-       <span id="nav-end"></span>
+       <!--<span id="nav-end"></span>-->
        <span id="banner">$banner</span>
 </nav>
 
index 0260045b165de5b7cfa0af2aeba72cda0bf96241..d354bc589c74aa2831925a457a491557e118ca24 100644 (file)
@@ -28,6 +28,7 @@
                <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
                <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
                </a>
+       </div>
        <div id="photos-upload-perms-end"></div>
 
        <div style="display: none;">
index ec260de79df6f7abbb2f0853ac41e20edbbf1348..ea80faa476f0cba863cf4390894c33d6c44b3e6f 100644 (file)
@@ -1185,7 +1185,7 @@ input#dfrn-url {
        display: none;
        z-index: 10000;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
 .wall-item-photo-menu li a { display: block; padding: 2px; }
 .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
@@ -1205,7 +1205,7 @@ input#dfrn-url {
        height: 30px !important;
 }
 
-.wallwall .wall-item-photo-end {
+.wallwall /*.wall-item-photo-end*/ {
        clear: both;
 }
 
@@ -1247,7 +1247,7 @@ input#dfrn-url {
 
 .wall-item-like-buttons {
        float: left;
-       margin-right: 10px;
+       margin-right: 3px;
 }
 
 .like-rotator {
@@ -1294,18 +1294,18 @@ input#dfrn-url {
        float: right;
 }
 
-.wall-item-delete-end {
+/*.wall-item-delete-end {
        clear: both;
-}
+}*/
 
 .wall-item-delete-icon {
        border: none;
 }
 
 
-.wall-item-wrapper-end {
+/*.wall-item-wrapper-end {
        clear: both;
-}
+}*/
 .wall-item-name-link {
        font-weight: bold;
        text-decoration: none;
@@ -1343,9 +1343,9 @@ input#dfrn-url {
        /*width: 450px;*/
 }
 
-.wall-item-title-end {
+/*.wall-item-title-end {
        clear: both;
-}
+}*/
 
 .wall-item-body {
        text-align: justify;
@@ -1370,7 +1370,7 @@ input#dfrn-url {
 /*     background-image: url("head.jpg");
        background-position: 0 -20px;
        background-repeat: repeat-x;*/
-       padding: 5px 10px 0px;
+       padding: 5px 5px 0px;
        height: 32px;
 }
 .wall-item-author {
@@ -1394,6 +1394,7 @@ input#dfrn-url {
 }
 
 .comment-wwedit-wrapper {
+       display: block;
        margin-top: 15px;
        background: #f3f3f3;
        margin-left: 10px;
@@ -3461,7 +3462,7 @@ aside input[type='text'] {
        background-image: url('../../../images/icons.png');
 }
 .article { background-position: 0px 0px;}
-.audio { display: none; background-position: -16px 0px;}
+.icon.audio { display: none; background-position: -16px 0px;}
 .block { background-position: -32px 0px;}
 /*.drop { background-position: -48px 0px;}
 .drophide { background-position: -64px 0px;}*/
@@ -3571,7 +3572,8 @@ aside input[type='text'] {
        background-image: url('images/unlock.png');
        background-repeat: no-repeat;
 }
-.video { display: none; background-position: -48px -32px;}
+.icon.video { display: none; background-position: -48px -32px;}
+.oembed.video a { display: block; }
 .youtube { background-position: -64px -32px;}
 /*.attach { background-position: -80px -32px; }*/
 .icon.attach {
@@ -3633,9 +3635,9 @@ aside input[type='text'] {
        margin: 20px 10px 0 0;
        visibility: none;
 }
-[class^="comment-edit-bb-end"] {
+/*[class^="comment-edit-bb-end"] {
        clear: both;
-}
+}*/
 .editicon {
     display: inline-block;
        background-size: 100% 100%;
index b3e6c703905ab83e31d86c17a9991c960b42d19f..e2cbae29f83709426e3ac39eb26e4105bb9538f0 100644 (file)
@@ -4,7 +4,7 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2
+ * Version: Version 0.2.2
  * Author: Zach P <windforest@f.shmuz.in>
  * Maintainer: Zach P <windforest@f.shmuz.in>
  */
index 65e2812f9aa1d8bc385e5ab293a2fd181a5b84d3..1867afe157a6cc2e084c2afe6e0046592de9273d 100644 (file)
@@ -1,5 +1,5 @@
 <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-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
 <!--                   <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                        </ul>
                                </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="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>
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
                                
-               </div>
+               <!--</div>-->
                <br />
 
                <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='tag'>$tag</span>
+                                                       <span class='body-tag tag'>$tag</span>
                                                {{ endfor }}
-                                       </div>
+                                       <!--</div>-->
                        </div>
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
@@ -51,7 +51,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="icon remote-link$item.sparkle"></a></div>
+                               <!--<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a></div>-->
                        {{ endif }}
                        {{ if $item.edpost }}
                                <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                        {{ if $item.filer }}
                        <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="icon drophide" title="$item.drop.delete" 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" id="wall-item-delete-wrapper-$item.id" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       <!--</div>-->
                                {{ if $item.drop.dropping }}<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>
-       <div class="wall-item-comment-wrapper" >
+       <!--<div class="wall-item-comment-wrapper" >-->
        $item.comment
-       </div>
+       <!--</div>-->
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
diff --git a/view/theme/frost-mobile/wallwall_item.tpl b/view/theme/frost-mobile/wallwall_item.tpl
new file mode 100644 (file)
index 0000000..1139872
--- /dev/null
@@ -0,0 +1,87 @@
+<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-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+                               <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+                               <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+                       </div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+<!--                   <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+                               onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->
+                       <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                               <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></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="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> $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<br />
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$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 class="body-tag">-->
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='body-tag tag'>$tag</span>
+                                               {{ endfor }}
+                                       <!--</div>-->
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ if $item.vote }}
+                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </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>-->
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       {{ endif }}
+                       {{ if $item.filer }}
+                       <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" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       <!--</div>-->
+                               {{ if $item.drop.dropping }}<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-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>
+       <div class="wall-item-comment-separator"></div>
+       <!--<div class="wall-item-comment-wrapper">-->
+       $item.comment
+       <!--</div>-->
+
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
+
index 2b15cbc7ee4899363a05c91b151bf68d3f349133..bdc2ef5e6db3b2f04de5a5c0f511e71ea9cbef51 100755 (executable)
                                <input type="hidden" name="jsreload" value="$jsreload" />
                                <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 
-                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
-                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-                               </div>
-                               <div class="comment-edit-photo-end"></div>
+<!--                           <div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+                                       <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+<!--                           </div>-->
+                               <!--<div class="comment-edit-photo-end"></div>-->
                                <ul class="comment-edit-bb-$id">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="$edbold"
@@ -49,7 +49,7 @@
                                                style="cursor: pointer;" title="$edvideo"
                                                onclick="insertFormatting('$comment','video', $id);"></a></li>
                                </ul>   
-                               <div class="comment-edit-bb-end"></div>
+<!--                           <div class="comment-edit-bb-end"></div>-->
 <!--                           <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->
                                <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
                                {{ if $qcomment }}
@@ -68,7 +68,7 @@
                                        <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
                                </div>
 
-                               <div class="comment-edit-end"></div>
+                               <!--<div class="comment-edit-end"></div>-->
                        </form>
 
                </div>
diff --git a/view/theme/frost/display-head.tpl b/view/theme/frost/display-head.tpl
new file mode 100644 (file)
index 0000000..1fc82ae
--- /dev/null
@@ -0,0 +1,4 @@
+<script>
+       window.autoCompleteType = 'display-head';
+</script>
+
index dfcfc68af14eef2e6994cd641b67733455828409..16fd4731705ae7cd10801aa984426cedbf1aee72 100644 (file)
@@ -1,5 +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.isPublic = "$ispublic";
        window.nickname = "$nickname";
index e17a47843a25c9387d1be28de80faaf73b0a0bdc..9094398b4f7f2e39c474670a02d739e458321501 100644 (file)
@@ -78,6 +78,13 @@ $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");
+       }
+
        if(window.aclType == "event_head") {
                $j('#events-calendar').fullCalendar({
                        events: baseurl + '/events/json/',
index 86c4d132992f1caea0f7e838bc78bd5f00ef8434..5831190f99179fa59f63fe0ad5eae347bf8d9f27 100644 (file)
@@ -1 +1 @@
-function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$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=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html("&nbsp;"),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}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:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$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":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},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-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$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.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(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
+function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.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:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("&lt;","<"),r=r.replace("&gt;",">"),r=r.replace("&amp;","&"),r=r.replace("&quot;",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$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=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html("&nbsp;"),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}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:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="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:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$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":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},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-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$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")}),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(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
index da7554257d1c20c238a56906efa585115a35dc4f..6ae19650e02bf5aea7875a4ac3555dfe099e0758 100644 (file)
@@ -3,8 +3,6 @@
 
        <div id="site-location">$sitelocation</div>
 
-       {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
        <span id="nav-link-wrapper" >
 
 <!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
        <img class="system-menu-link" src="/view/theme/frost/images/menu.png">
        </a>
        <ul id="system-menu-list" class="nav-menu-list">
-                       {{ if $nav.manage }}
-                       <li>
-                       <a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-                       </li>
-                       {{ endif }}
+               {{ if $nav.login }}
+               <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+               {{ endif }}
+
+               {{ if $nav.register }}
+               <a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+               {{ endif }}
+
+               {{ if $nav.manage }}
+               <li>
+               <a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+               </li>
+               {{ endif }}
 
                {{ if $nav.settings }}
                <li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
                {{ endif }}
        </ul>
        </div>
-
-       {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
                
        </span>
-       <span id="nav-end"></span>
+       <!--<span id="nav-end"></span>-->
        <span id="banner">$banner</span>
 </nav>
 
index 1e748fb55ade477734080ef84ad593b8778117ad..2aa12a3ca1309b74ea418f8d501e3ad106efc2bf 100644 (file)
@@ -30,6 +30,7 @@
                <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
                <span id="jot-perms-icon" class="icon $lockstate  photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
                </a>
+       </div>
        <div id="photos-upload-perms-end"></div>
 
        <div style="display: none;">
index 6e52c888fd015ff00cb1c99a4309a207ddceacfe..3bc9ad1cd034cfa091ce50ca3a0281e8b12486d1 100644 (file)
@@ -1157,7 +1157,7 @@ input#dfrn-url {
        display: none;
        z-index: 10000;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
 .wall-item-photo-menu li a { display: block; padding: 2px; }
 .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
@@ -1177,7 +1177,7 @@ input#dfrn-url {
        height: 30px !important;
 }
 
-.wallwall .wall-item-photo-end {
+.wallwall /*.wall-item-photo-end*/ {
        clear: both;
 }
 
@@ -1267,18 +1267,18 @@ input#dfrn-url {
        float: right;
 }
 
-.wall-item-delete-end {
+/*.wall-item-delete-end {
        clear: both;
-}
+}*/
 
 .wall-item-delete-icon {
        border: none;
 }
 
 
-.wall-item-wrapper-end {
+/*.wall-item-wrapper-end {
        clear: both;
-}
+}*/
 .wall-item-name-link {
        font-weight: bold;
        text-decoration: none;
@@ -1311,9 +1311,9 @@ input#dfrn-url {
        /*width: 450px;*/
 }
 
-.wall-item-title-end {
+/*.wall-item-title-end {
        clear: both;
-}
+}*/
 
 .wall-item-body {
        text-align: justify;
@@ -1357,6 +1357,7 @@ input#dfrn-url {
 }
 
 .comment-wwedit-wrapper {
+       display: block;
        margin-top: 15px;
        background: #f3f3f3;
        margin-left: 50px;
@@ -3524,9 +3525,9 @@ aside input[type='text'] {
        margin: 10px 10px 0 0;
        visibility: none;
 }
-[class^="comment-edit-bb-end"] {
+/*[class^="comment-edit-bb-end"] {
        clear: both;
-}
+}*/
 .editicon {
     display: inline-block;
 /*    background-image: url(bbedit.png);
diff --git a/view/theme/frost/style.css.orig b/view/theme/frost/style.css.orig
deleted file mode 100644 (file)
index f8483c0..0000000
+++ /dev/null
@@ -1,3658 +0,0 @@
-/**
- * duepuntozero Frindika style
- * Fabio Comuni <fabrix.xm@gmail.com>
- *
- * Heavily modified for Frost
- * Zach P
- */
-
-
-/* generals */
-body {
-       font-family: helvetica,arial,freesans,clean,sans-serif;
-       font-size: 12px;
-/*     line-height: 24px;*/
-       background-color: #ffffff;
-       background-image: url(head.jpg);
-       background-repeat: repeat-x;
-       color: #505050;
-       margin: 0px;
-}
-
-div.container {
-       display: block;
-       width: 785 px;
-       margin-top: 0px;
-       margin-bottom: 0px;
-       margin-left: auto;
-       margin-right: auto;
-}
-
-a, a:visited, a:link { color: #3465a4; text-decoration: none; }
-a:hover {text-decoration: underline; }
-
-input {
-       border: 1px solid #666666;
-       -moz-border-radius: 3px;
-       border-radius: 3px;     
-       padding: 3px;
-}
-
-img { border :0px; }
-
-#id_openid_url, .openid input {
-   background: url(login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
-}
-.openid:hover {
-
-}
-
-#id_openid_url {
-       width: 384px;
-}
-
-code {
-       font-family: Courier, monospace;
-       white-space: pre;
-       display: block;
-       overflow: auto;
-       border: 1px solid #444;
-       background: #EEE;
-       color: #444;
-       padding: 10px;
-       margin-top: 20px; 
-}
-
-blockquote {
-       background-color: #f4f8f9;
-       border-left: 4px solid #dae4ee;
-       padding: 0.4em;
-}
-
-.icollapse-wrapper, .ccollapse-wrapper {
-       border: 1px solid #CCC;
-       padding: 5px;
-}
-
-.hide-comments-outer {
-       margin-left: 0px;
-       font-weight: 700;
-       opacity: 0.4;
-}
-.hide-comments-outer:hover {
-       opacity: 1.0;
-}
-.hide-comments {
-       margin-left: 5px;
-}
-
-#panel {
-       background-color: ivory;
-       position: absolute;
-       z-index: 2;
-       width: 30%;
-       padding: 25px;
-       border: 1px solid #444;
-}
-
-.heart {
-       color: #FF0000;
-       font-size: 100%;
-       margin-right: 5px;
-}
-
-
-
-/* nav */
-nav {
-       height: 94px;
-       width: 1100px;
-       display: block;
-       margin-top: 0px;
-       margin-bottom: 0px;
-       margin-left: auto;
-       margin-right: auto;
-}
-nav #site-location {
-       color: #888a85;
-       font-size: 0.8em;
-       position: absolute;
-}
-
-.error-message {
-       color: #FF0000;
-       font-size: 1.1em;
-       border: 1px solid #FF8888;
-       background-color: #FFEEEE;
-       padding: 10px;
-}
-
-.info-message {
-       color: #204a87;
-       font-size: 1.1em;
-       border: 1px solid #3465a4;
-       background-color: #d7e3f1;
-       padding: 10px;
-}
-
-
-nav #banner {
-       display: block;
-       margin-top: 14px;
-       position: absolute;
-}
-nav #banner #logo-text a {
-       font-size: 40px;
-       font-weight: bold;
-       margin-left: 3px;
-       color: #000000;
-
-}
-nav #banner #logo-text a:hover { text-decoration: none; }
-
-
-/* ZP REMOVE? nav-commlink */
-.nav-commlink, .nav-login-link {
-       display: block;
-       height: 15px;
-       margin-top: 67px;
-       margin-right: 2px;
-       /*padding: 6px 10px;*/
-       padding: 6px 3px;
-       float: left;
-       bottom: 140px;
-       border: 1px solid #babdb6;
-       border-bottom: 0px;
-       background-color: #aec0d3;
-       color: #565854;         
-       -moz-border-radius: 3px 3px 0px 0px;
-       border-radius: 3px 3px 0px 0px; 
-}
-
-.nav-commlink.selected {
-       background-color: #ffffff;
-       border-bottom: 1px solid #ffffff;
-       color: #000000 !important;
-       margin-top: 64px;
-       padding-top: 6px;
-       padding-bottom: 8px;
-}
-
-.nav-ajax-left.show {
-       position: absolute;
-       font-size: 0.8em;
-       top: 25px;
-       right: 5px;
-       padding: 1px 2px;
-       border-radius: 4px;
-       -moz-border-radius: 4px;
-       -webkit-border-radius: 4px;
-       background-color: gold !important;
-}
-
-
-
-nav #nav-link-wrapper .nav-link {
-       /*border-right: 1px solid #babdb6;*/
-}
-
-nav .nav-link img {
-       margin-top: 24px;
-       margin-bottom: 0.2em;
-       margin-right: 1em;
-       margin-left: 1em;
-       background-color: transparent !important;
-}
-
-.nav-button-container {
-       float: right;
-       position: relative;
-}
-
-.nav-button-container .nav-ajax-left {
-}
-/*
-#system-menu-list {
-       line-height: 18px;
-       position: absolute;
-       right: -33px;
-       width: 10em;
-       padding: 1em 0px;
-}
-
-#contacts-menu-list {
-       line-height: 18px;
-       position: absolute;
-       right: -33px;
-       width: 10em;
-       padding: 1em 0px;
-}
-
-#network-menu-list {
-       line-height: 18px;
-       position: absolute;
-       right: -33px;
-       width: 10em;
-       padding: 1em 0px;
-}
-*/
-.nav-menu-list {
-       text-align: center;
-       line-height: 18px;
-
-       border-left: 1px solid #AAAAAA;/*#444444;*/
-       border-right: 1px solid #AAAAAA;
-       border-top: 1px solid #AAAAAA;
-       border-bottom: 1px solid #AAAAAA;
-
-       -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;
-       right: -33px;
-       padding: 1em 0px;
-
-       z-index: 10000;
-}
-
-
-
-div.main-container {
-       width: 1180px;
-       margin: 0px auto;
-       display: block;
-       position: relative;
-}
-
-div.main-content-loading {
-       position: absolute;
-       top: 200px;
-       left: 50%;
-       display: none;
-}
-
-
-/* aside */
-aside {
-       display: block;
-       min-height: 112px;
-
-       width: 250px;
-
-       padding: 1em;
-       margin: 1em 0px 0px 0px;
-
-       position: absolute;
-
-/*     float:left;*/
-}
-
-#dfrn-request-link {
-       display: block;
-       color: #FFFFFF;
-       -webkit-border-radius: 5px ;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-       padding: 5px;
-       font-weight: bold;
-       background: #3465a4 url('friendika-16.png') no-repeat 95% center;
-}
-#wallmessage-link {
-       display: block;
-       color: #FFFFFF;
-       -webkit-border-radius: 5px ;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-       padding: 5px;
-       font-weight: bold;
-       background-color: #3465a4;
-}
-
-/* section */
-div.section-wrapper {
-       width: 565px;
-
-       margin-left: auto;
-       margin-right: auto;
-
-       padding-right:2em;
-
-       display: block;
-
-       background-color: #ffffff;
-       background-image: url(border.jpg);
-       background-position: top right;
-       background-repeat: no-repeat;
-}
-
-section {
-       margin: 0px 0px 0px 0px;
-
-       width: 100%;
-
-       padding-left: 1em;
-       padding-right: 1em;
-       padding-top: 1em;
-
-       background-image: url(border.jpg);
-       background-position: top left;
-       background-repeat: no-repeat;
-
-       min-height: 112px;
-       border-top: 1px solid #babdb6;  
-}
-
-.tabs {
-       height: 27px;
-       background-image: url(head.jpg);
-       background-repeat: repeat-x;    
-       background-position: 0px -20px;
-       border-bottom: 1px solid #babdb6;
-       padding:0px;
-}
-.tabs li { margin: 0px; list-style: none; }
-.tab {
-       display:block;
-       float:left;
-       padding: 0.4em;
-       /*margin-right: 1em;*/
-       margin-right: 3px ;
-}
-.tab.active {
-       font-weight: bold;
-       
-}
-
-
-/* footer */
-footer {
-    display: none;
-
-}
-
-.birthday-today, .event-today {
-       font-weight: bold;
-}
-/*
-div.wall-item-content-wrapper.shiny {
-  background-image: url('shiny.png');
-  background-position: -5px 30px;
-  background-repeat:no-repeat;
-}*/
-
-.preview {
-       background: #FFFFC8;
-}
-
-#theme-preview {
-       margin: 15px 0 15px 150px;
-}
-
-/* from default */
-#jot-perms-icon, 
-#profile-location,
-#profile-nolocation,
-#profile-youtube, 
-#profile-video, 
-#profile-audio,
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-upload-wrapper,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
-       cursor: pointer;
-}
-
-#jot-perms-icon {
-       float: left;
-}
-
-#jot-title, #jot-category {
-       border: 0px;
-       margin: 0px;
-       height: 20px;
-       width: 530px;
-       margin-bottom: 5px;
-       font-weight: bold;
-       border: 1px solid #ffffff;
-}
-
-#jot-title::-webkit-input-placeholder{font-weight: normal;}
-#jot-category::-webkit-input-placeholder{font-weight: normal;}
-#jot-title:-moz-placeholder{font-weight: normal;}
-#jot-category:-moz-placeholder{font-weight: normal;}
-               
-       
-#jot-title:hover,
-#jot-title:focus,
-#jot-category:hover,
-#jot-category:focus {
-       border: 1px solid #cccccc; 
-}
-
-.jothidden { display:none; }
-
-
-.fakelink, .fakelink:visited, .fakelink:link {
-       color: #3465a4;
-       text-decoration: none;
-       cursor: pointer;
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-.lockview {
-       cursor: pointer;
-}
-
-#group-sidebar {
-       margin-bottom: 10px;
-}
-
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
-       padding: 3px;
-       -moz-border-radius: 3px;
-       border-radius: 3px;     
-       border: 1px solid #CCCCCC;
-       background: #F8F8F8;
-       font-weight: bold;
-}
-
-.settings-widget .selected {
-       padding: 3px;
-       -moz-border-radius: 3px;
-       border-radius: 3px;     
-       border: 1px solid #CCCCCC;
-       background: #F8F8F8;
-       font-weight: bold;
-}
-
-.fakelink:hover {
-       color: #3465a4;
-       text-decoration: underline;
-       cursor: pointer;
-}
-.smalltext {
-       font-size: 0.7em;
-}
-#sysmsg {
-       /*width: 600px;*/
-       margin-bottom: 10px;
-}
-
-#register-fill-ext {
-       margin-bottom: 25px;
-}
-
-#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
-       float: left;
-       width: 350px;
-       margin-top: 10px;
-}
-
-#register-name, #register-email, #register-nickname {
-       float: left;
-       margin-top: 10px;
-       width: 150px;
-}
-
-#register-openid {
-       float: left;
-       margin-top: 10px;
-       width: 130px;
-}
-
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
-       clear: both;
-}
-
-#register-nickname-desc {
-       margin-top: 30px;
-       width: 650px;
-}
-#register-sitename {
-       float: left;
-       margin-top: 10px;
-}
-
-#register-submit-button {
-       margin-top: 10px;
-}
-
-
-#login_standard {
-       width: 210px;
-       float: left;
-}
-#login_openid {
-       width: 210px;
-       margin-left: 250px;
-}
-
-#login_standard input,
-#login_openid input {
-       width: 180px;
-}
-
-#login-extra-links {
-       clear: both;
-}
-
-#register-link, #lost-password-link {
-       float: left;
-       font-size: 80%;
-       margin-right: 15px;
-}
-
-#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
-       height: 50px;
-}
-
-#login-submit-button {
-/*     margin-top: 10px; */
-       margin-left: 200px;
-}
-
-
-input#dfrn-url {
-       float: left;
-       background: url(friendika-16.png) no-repeat;
-       background-position: 2px center;
-       font-size: 17px;
-       padding-left: 21px;
-       height: 21px;
-       background-color: #FFFFFF;
-       color: #000000;
-       margin-bottom: 20px;
-}
-
-#dfrn-url-label {
-       float: left;
-       width: 250px;
-}
-
-#dfrn-request-url-end {
-       clear: both;
-}
-
-#knowyouyes, #knowyouno {
-       float: left;
-}
-
-#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
-
-       float: none;
-}
-#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
-       float: left;
-       width: 75px;
-       margin-left: 50px;
-       margin-bottom: 7px;
-}
-#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
-       clear: both;
-
-}
-
-#dfrn-request-message-wrapper {
-       margin-bottom: 50px;
-}
-#dfrn-request-submit-wrapper {
-       clear: both;
-       margin-left: 50px;
-}
-
-#dfrn-request-info-wrapper {
-       margin-left: 50px;
-}
-
-
-
-#cropimage-wrapper, #cropimage-preview-wrapper {
-       float: left;
-       padding: 30px;
-}
-
-#crop-image-form {
-       margin-top: 30px;
-       clear: both;
-}
-
-.intro-wrapper {
-       margin-top: 20px;
-}
-
-.intro-fullname {
-       font-size: 1.1em;
-       font-weight: bold;
-
-}
-.intro-desc {
-       margin-bottom: 20px;
-       font-weight: bold;
-}
-
-.intro-note {
-       padding: 10px;
-}
-
-.intro-end {
-       padding: 30px;
-}
-
-.intro-form {
-       float: left;
-}
-.intro-approve-form {
-       clear: both;
-}
-.intro-approve-as-friend-end {
-       clear: both;
-}
-.intro-submit-approve, .intro-submit-ignore {
-       margin-right: 20px;
-}
-.intro-submit-approve {
-       margin-top: 15px;
-}
-
-.intro-approve-as-friend-label, .intro-approve-as-fan-label {
-       float: left;
-       width: 100px;
-       margin-left: 20px;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-       float: left;
-}
-.intro-form-end {
-       clear: both;
-}
-.intro-approve-as-friend-desc {
-       margin-top: 15px;
-}
-.intro-approve-as-end {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-.intro-end {
-       clear: both;
-       margin-bottom: 30px;
-}
-.aprofile dt {
-       font-weight: bold;
-}
-#page-profile .title {
-       font-weight: bold;
-}
-#profile-vcard-break {
-       clear: both;
-}
-#profile-extra-links {
-       clear: both;
-       margin-top: 10px;
-}
-
-#profile-extra-links ul {
-       list-style-type: none;
-       padding: 0px;
-}
-
-
-#profile-extra-links li {
-       margin-top: 5px;
-}
-
-#profile-edit-links ul {
-       list-style-type: none;
-}
-
-#profile-edit-links li {
-       margin-top: 10px;
-}
-.profile-edit-side-div {
-       float: right;
-}
-.profile-edit-side-link {
-       opacity: 0.3;
-       filter:alpha(opacity=30);
-}
-.profile-edit-side-link:hover {
-       opacity: 1.0;
-       filter:alpha(opacity=100);
-}
-
-.view-contact-wrapper {
-       margin-top: 20px;
-       float: left;
-       margin-left: 20px;
-       width: 180px;
-}
-
-.contact-wrapper {
-       float: left;
-       width: 150px;
-       height: 150px;
-       overflow: auto;
-}
-
-#view-contact-end {
-       clear: both;
-}
-
-
-#viewcontacts {
-       margin-top: 15px;
-}
-#profile-edit-default-desc {
-       color: #FF0000;
-       border: 1px solid #FF8888;
-       background-color: #FFEEEE;
-       padding: 7px;
-}
-
-#profile-edit-clone-link-wrapper {
-       float: left;
-       margin-left: 50px;
-       margin-bottom: 20px;
-       width: 300px;
-}
-
-
-#profile-edit-links-end {
-       clear: both;
-       margin-bottom: 15px;
-}
-
-.profile-listing-photo {
-       border: none;
-}
-
-.profile-edit-submit-wrapper {
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-#profile-photo-link-select-wrapper {
-       margin-top: 2em;
-}
-
-#profile-photo-submit-wrapper {
-       margin-top: 10px;
-}
-
-#profile-photo-wrapper img {
-       width:175px;
-       height:175px;
-       padding: 12px;
-}
-
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label,
-#profile-edit-hometown-label {
-       float: left;
-       width: 175px;
-}
-
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no {
-       float: left;
-       margin-bottom: 20px;
-}
-#settings-normal,
-#settings-soapbox,
-#settings-freelove,
-#settings-community {
-       float: left;
-}
-#settings-notifications label {
-       margin-left: 20px;
-}
-#settings-notify-desc, #settings-activity-desc {
-       font-weight: bold;
-       margin-bottom: 15px;
-}
-#settings-pagetype-desc {
-       color: #666666;
-       margin-bottom: 15px;
-}
-
-#profile-in-dir-yes-label,
-#profile-in-dir-no-label,
-#profile-in-netdir-yes-label,
-#profile-in-netdir-no-label,
-#hide-wall-yes-label,
-#hide-wall-no-label,
-#hide-friends-yes-label,
-#hide-friends-no-label {
-       margin-left: 125px;
-       float: left;
-       width: 50px;
-}
-
-#profile-edit-with-label {
-       width: 175px;
-       margin-left: 20px;
-}
-
-#profile-publish-yes-reg,
-#profile-publish-no-reg {
-       float: left;
-       margin-bottom: 10px;
-}
-
-#profile-publish-yes-label-reg,
-#profile-publish-no-label-reg {
-       margin-left: 350px;
-       float: left;
-       width: 50px;
-}
-
-#profile-publish-break-reg,
-#profile-publish-end-reg {
-       clear: both;
-}
-
-
-#profile-edit-pdesc-desc,
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-       float: left;
-       margin-left: 20px;
-}
-
-
-#profile-edit-homepage, #profile-edit-hometown {
-       float: left;
-       margin-bottom: 35px;
-}
-#settings-normal-label,
-#settings-soapbox-label,
-#settings-community-label,
-#settings-freelove-label {
-       float: left;
-       width: 200px;
-}
-#settings-normal-desc,
-#settings-soapbox-desc,
-#settings-community-desc,
-#settings-freelove-desc {
-       /*float: left;
-       margin-left: 75px;*/
-    clear: left;
-    color: #666666;
-    display: block;
-    margin-bottom: 20px        
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-edit-hometown-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end,
-#settings-normal-break,
-#settings-soapbox-break,
-#settings-community-break,
-#settings-freelove-break {
-       clear: both;
-}
-
-.settings-widget ul {
-       list-style-type: none;
-       padding: 0px;
-}
-
-.settings-widget li {
-       margin-left: 24px;
-       margin-bottom: 8px;
-}
-
-
-#gender-select, #marital-select, #sexual-select {
-       width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-       color: #FF0000;
-       float: left;
-}
-
-#contacts-display-wrapper {
-       padding-left: 0px;
-}
-
-#contacts-main {
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-.contact-entry-wrapper {
-       float: left;
-/*     width: 120px;
-       height: 120px;*/
-       padding-right: 17px; 
-       width: 95px;
-       height: 170px;
-}
-#contacts-search-end {
-       margin-bottom: 10px;
-}
-
-.contact-entry-direction-icon {
-       margin-top: 24px;
-       margin-right: 2px;
-}
-
-.contact-entry-photo img {
-       border: none;
-}
-.contact-entry-photo-end {
-       clear: both;
-}
-.contact-entry-name {
-       float: left;
-       margin-left: 0px;
-       margin-right: 10px;
-       padding-bottom: 5px;
-       width: 120px;
-       font-weight: 600;
-       overflow: hidden;
-}
-.contact-entry-details {
-       font-style: italic;
-       font-size: 10px;
-       font-weight: 500;
-}
-.contact-entry-network {
-       font-size: 10px;
-       font-weight: 500;
-}
-.contact-entry-edit-links {
-       margin-top: 6px;
-       margin-left: 10px;
-       width: 16px;
-}
-.contact-entry-nav-wrapper {
-       float: left;
-       margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-       border: none;
-       margin-right: 15px;
-}
-.contact-entry-photo {
-       float: left;
-       position: relative;
-}
-.contact-entry-end {
-       clear: both;
-}
-
-#fsuggest-desc, #fsuggest-submit-wrapper {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#network-star-link{
-       margin-top: 10px;
-}
-.network-star {
-       float: left;
-       margin-right: 5px;
-}
-#network-bmark-link {
-       margin-top: 10px;
-}
-
-.wall-item-content-wrapper {
-       margin-top: 60px;
-       padding-top: 30px;
-       border-top: 2px solid #AAA;
-       position: relative;
-
-}
-
-.wall-item-content-wrapper.comment {
-       margin-top: 10px;
-       padding-top: none;
-       margin-left: 50px;
-       border: none;
-}
-
-.wall-item-like, .wall-item-dislike {
-       font-style: italic;
-       margin-left: 0px;
-       opacity: 0.4;
-}
-.wall-item-like:hover, .wall-item-dislike:hover {
-       opacity: 1.0;
-}
-
-.wall-item-like.comment, .wall-item-dislike.comment {
-       margin-left: 50px;
-}
-
-.wall-item-info {
-       display: block;
-       float: left;
-       width:110px;
-       margin-right:10px;
-}
-.comment .wall-item-info {
-       width: 70px;
-}
-
-.wall-item-photo-wrapper {
-       margin-bottom: 10px;
-       width: 100px;
-}
-.wall-item-photo-menu-button {
-       display: block;
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 94px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
-}
-.wall-item-photo-menu {
-       width: auto;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-/*     left: 10px; top: 90px;*/
-       left: 0px; top:110px;
-       display: none;
-       z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.comment .wall-item-photo-menu-button {        /*top: 44px;*/ top: 64px;}
-.comment .wall-item-photo-menu { /*top: 60px;*/ top: 80px; }
-
-.wallwall .wwto {
-    left: 50px;
-    margin: 0;
-    position: absolute;
-    top: 70px;
-    width: 30px
-}
-.wallwall .wwto img {
-       width: 30px !important;
-       height: 30px !important;
-}
-
-.wallwall .wall-item-photo-end {
-       clear: both;
-}
-
-.wall-item-arrowphoto-wrapper {
-    position: absolute;
-    left: 75px;
-    top: 70px;
-    z-index: 100;
-}
-.wall-item-wrapper {
-       margin-left:10px;
-}
-.wall-item-lock {
-       margin-top: 30px;
-       left: 105px;
-       position: absolute;
-       top: 1px;       
-}
-.comment .wall-item-lock {
-       left: 65px;
-}
-
-.wall-item-ago {
-       color: #888888;
-       font-size: 0.8em;
-}
-
-.wall-item-location {
-       overflow: hidden;
-       /* add ellipsis on text overflow               */
-       /* this work on safari, opera, ie, chrome.     */
-       /* firefox users have to wait support or we    */
-       /* can use a jquery plugin http://bit.ly/zJskg */
-       text-overflow: ellipsis;
-       -o-text-overflow: ellipsis;
-       width: 100%;
-}
-
-.wall-item-like-buttons {
-       float: left;
-       margin-right: 10px;
-/*     padding-right: 10px; */
-/*     border-right: 2px solid #fff; */
-}
-
-.like-rotator {
-       margin-left: 5px;
-}
-
-.wall-item-like-buttons > a,
-.wall-item-like-buttons > img {
-       float: left;
-}
-
-.wall-item-like-buttons img {
-       cursor: pointer;
-}
-
-.wall-item-share-buttons {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-
-.editpost {
-       margin-left: 10px;
-       float: left;
-}
-.star-item {
-       margin-left: 10px;
-       float: left;    
-}
-.tag-item {
-       margin-left: 10px;
-       float: left;    
-}
-
-.filer-item {
-       margin-left: 10px;
-       float: left;
-}
-
-.wall-item-links-wrapper {
-       float: left;
-}
-
-.wall-item-delete-wrapper {
-       float: right;
-}
-
-.wall-item-delete-end {
-       clear: both;
-}
-
-.wall-item-delete-icon {
-       border: none;
-}
-
-
-.wall-item-wrapper-end {
-       clear: both;
-}
-.wall-item-name-link {
-       font-weight: bold;
-       text-decoration: none;
-       color: #3172BD;
-}
-.wall-item-photo {
-       border: none;
-}
-.comment .wall-item-photo {
-       width: 50px !important; 
-       height: 50px !important;
-}
-.wall-item-content {
-       margin-left: 10px;
-       padding-right: 1em;
-       max-height: 500px;
-       overflow: auto;
-}
-
-.wall-item-content img {
-       max-width: 100%;
-}
-
-
-
-.wall-item-title {
-       float: left;
-       font-weight: bold;
-       font-size: 1.6em; 
-       /*width: 450px;*/
-}
-
-.wall-item-title-end {
-       clear: both;
-}
-
-.wall-item-body {
-       text-align: justify;
-       float: left;
-       /*width: 450px;*/
-       width: 100%;
-       margin-top: 10px;
-       line-height: 18px;
-}
-
-.wall-item-tools {
-       clear: both;
-/*     background-image: url("head.jpg");
-       background-position: 0 -20px;
-       background-repeat: repeat-x;*/
-       margin-top: 10px;
-       margin-left: 0px;
-       margin-bottom: 7px;
-/*     padding: 5px 10px 0px;*/
-       padding: 5px 10px 0px 2px;
-       height: 28px;
-       border-bottom: 1px solid #ddd;
-}
-.wall-item-author {
-/*     margin-top: 10px;*/
-       margin-top: 0px;
-}
-
-.comment .wall-item-tools {
-/*     background:none;*/
-/*     background-image: url("head.jpg");
-       background-position: 0 -20px;
-       background-repeat: repeat-x;*/
-       margin-left: 0px;
-} 
-
-.comment-edit-wrapper {
-       margin-top: 15px;
-       background: #f3f3f3;
-       margin-left: 50px;
-}
-
-.comment-wwedit-wrapper {
-       margin-top: 15px;
-       background: #f3f3f3;
-       margin-left: 50px;
-}
-
-.comment-edit-photo {
-       margin-top: 10px;
-       margin-left: 10px;
-       margin-bottom: 10px;
-       width: 70px;
-       float: left;
-}
-.comment-edit-photo img {
-       width: 25px;
-}
-.comment-edit-text-empty, .comment-edit-text-full {
-       float: left;
-       margin-top: 10px;
-       -moz-border-radius: 3px;
-       border-radius: 3px;     
-       border: 1px solid #cccccc;
-       padding: 3px 1px 1px 3px;
-}
-
-.comment-edit-text-empty {
-       color: gray;
-       height: 30px;
-       width: 175px;
-       overflow: auto;
-       margin-bottom: 10px;
-}
-
-.comment-edit-text-full {
-       color: black;
-       height: 150px;
-       width: 350px;
-       overflow: auto;
-}
-
-.comment-edit-text-end {
-       clear: both;
-}
-
-.comment-edit-submit {
-       margin: 10px 0px 10px 110px;
-}
-
-#profile-jot-plugin-wrapper,
-#profile-jot-submit-wrapper {
-       margin-top: 15px;
-}
-
-#profile-jot-submit {
-       float: left;
-}
-#profile-upload-wrapper {
-       float: left;
-       margin-left: 30px;
-}
-#profile-attach-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-rotator {
-       float: left;
-       margin-left: 30px;
-}
-#profile-link-wrapper {
-       float: left;
-       margin-left: 30px;
-}
-#profile-youtube-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-video-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-audio-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-location-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#jot-preview-link {
-       float: left;
-       margin-left: 45px;
-       margin-top: 0px !important;
-}
-
-
-#profile-nolocation-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-title-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-
-#profile-jot-perms {
-       float: left;
-       margin-left: 100px;
-       font-weight: bold;
-       font-size: 1.2em;
-}
-
-
-#profile-jot-perms-end {
-       /*clear: left;*/
-       height: 30px;
-}
-
-#profile-jot-plugin-end{
-  clear: both;
-}
-.profile-jot-net {
-       float: left;
-       margin-right: 10px;
-       margin-top: 5px;
-       margin-bottom: 5px;
-}
-
-#profile-jot-networks-end {
-       clear: both;
-}
-
-#profile-jot-end {
-       /*clear: both;*/
-       margin-bottom: 30px;
-}
-#about-jot-submit-wrapper {
-       margin-top: 15px;
-}
-#about-jot-end {
-       margin-bottom: 30px;
-}
-#contacts-main {
-       margin-bottom: 30px;
-}
-
-#profile-listing-desc {
-       margin-left: 30px;
-}
-
-#profile-listing-new-link-wrapper {
-       margin-left: 30px;
-       margin-bottom: 30px;
-}
-.profile-listing-photo-wrapper {
-       float: left;
-}
-
-.profile-listing-edit-buttons-wrapper {
-       clear: both;
-}
-.profile-listing-photo-edit-link {
-       float: left;
-       width: 125px;
-}
-.profile-listing-end {
-       clear: both;
-}
-.profile-listing-edit-buttons-wrapper img{
-       border: none;
-       margin-right: 20px;
-}
-.profile-listing {
-       margin-top: 25px;
-}
-.profile-listing-name {
-       float: left;
-       margin-left: 32px;
-       margin-top: 10px;
-       color: #3172BD;
-       font-weight: bold;
-       width: 200px;
-
-}
-.fortune {
-       margin-top: 50px;
-       color: #4444FF;
-       font-weight: bold;
-       margin-bottom: 20px;
-}
-
-
-.directory-end {
-       clear: both;
-}
-.directory-name {
-       text-align: center;
-}
-.directory-photo {
-       margin-left: 25px;
-}
-.directory-details {
-       font-size: 0.7em;
-       text-align: center;
-       margin-left: 5px;
-       margin-right: 5px;
-}
-.directory-item {
-       float: left;
-/*     width: 225px;
-       height: 260px;*/
-       padding-left: 25px;
-       width: 150px;
-       height: 225px;
-       overflow: auto;
-}
-
-#directory-search-wrapper {
-       margin-top: 20px;
-       margin-right: 20px;
-       margin-bottom: 50px;
-}
-
-#directory-search-end {
-}
-
-.directory-photo-img {
-       width: 125px;
-       border: none;
-}
-
-
-.pager {
-  margin-top: 35px;
-  margin-bottom: 20px;
-  padding: 10px;
-  text-align: center;
-  font-size: 1.0em;
-}
-
-
-.pager_first,
-.pager_last,
-.pager_prev,
-.pager_next,
-.pager_n {
-/*     background: #EEE;*/
-}
-
-.pager_first a,
-.pager_last a,
-.pager_prev a,
-.pager_next a,
-.pager_n a {
-       border: 1px solid black;
-       border-radius: 7px;
-       text-decoration: none;
-       padding: 4px 6px 4px 3px;
-       opacity: 0.5;
-}
-.pager_first a:hover,
-.pager_last a:hover,
-.pager_prev a:hover,
-.pager_next a:hover,
-.pager_n a:hover {
-       opacity: 1.0;
-}
-
-.pager_current {
-  border: 1px solid black;
-  border-radius: 7px;
-  background: #FFCCCC;
-  padding: 4px 6px 4px 3px;
-}
-
-
-#advanced-profile-name-wrapper,
-#advanced-profile-gender-wrapper,
-#advanced-profile-dob-wrapper,
-#advanced-profile-age-wrapper,
-#advanced-profile-marital-wrapper,
-#advanced-profile-sexual-wrapper,
-#advanced-profile-homepage-wrapper,
-#advanced-profile-politic-wrapper,
-#advanced-profile-religion-wrapper,
-#advanced-profile-about-wrapper,
-#advanced-profile-interest-wrapper,
-#advanced-profile-contact-wrapper,
-#advanced-profile-music-wrapper,
-#advanced-profile-book-wrapper,
-#advanced-profile-tv-wrapper,
-#advanced-profile-film-wrapper,
-#advanced-profile-romance-wrapper,
-#advanced-profile-work-wrapper,
-#advanced-profile-education-wrapper {
-       margin-top: 20px;
-}
-
-#advanced-profile-name-text,
-#advanced-profile-gender-text,
-#advanced-profile-dob-text,
-#advanced-profile-age-text,
-#advanced-profile-marital-text,
-#advanced-profile-sexual-text,
-#advanced-profile-homepage-text,
-#advanced-profile-politic-text,
-#advanced-profile-religion-text,
-#advanced-profile-about-text,
-#advanced-profile-interest-text,
-#advanced-profile-contact-text,
-#advanced-profile-music-text,
-#advanced-profile-book-text,
-#advanced-profile-tv-text,
-#advanced-profile-film-text,
-#advanced-profile-romance-text,
-#advanced-profile-work-text,
-#advanced-profile-education-text {
-       width: 300px;
-       float: left;
-}
-
-#advanced-profile-name-end,
-#advanced-profile-gender-end,
-#advanced-profile-dob-end,
-#advanced-profile-age-end,
-#advanced-profile-marital-end,
-#advanced-profile-sexual-end,
-#advanced-profile-homepage-end,
-#advanced-profile-politic-end,
-#advanced-profile-religion-end {
-       height: 10px;
-}
-
-#advanced-profile-about-end,
-#advanced-profile-interest-end,
-#advanced-profile-contact-end,
-#advanced-profile-music-end,
-#advanced-profile-book-end,
-#advanced-profile-tv-end,
-#advanced-profile-film-end,
-#advanced-profile-romance-end,
-#advanced-profile-work-end,
-#advanced-profile-education-end {
-
-
-}
-
-#advanced-profile-name,
-#advanced-profile-gender,
-#advanced-profile-dob,
-#advanced-profile-age,
-#advanced-profile-marital,
-#advanced-profile-sexual,
-#advanced-profile-homepage,
-#advanced-profile-politic,
-#advanced-profile-religion {
-       float: left;
-
-}
-
-
-#advanced-profile-about,
-#advanced-profile-interest,
-#advanced-profile-contact,
-#advanced-profile-music,
-#advanced-profile-book,
-#advanced-profile-tv,
-#advanced-profile-film,
-#advanced-profile-romance,
-#advanced-profile-work,
-#advanced-profile-education {
-       margin-top: 10px;
-       margin-left: 50px;
-       margin-right: 20px;
-       padding: 10px;
-       border: 1px solid #CCCCCC;
-}
-
-#advanced-profile-with {
-       float: left;
-       margin-left: 15px;
-}
-
-#contact-edit-wrapper {
-       margin-top: 10px;
-}
-
-#contact-edit-banner-name {
-       font-size: 1.4em;
-       font-weight: bold;
-}
-
-#contact-edit-poll-wrapper {
-       margin-top: 15px;
-}
-
-#contact-edit-poll-text {
-       margin-top: 15px;
-       margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-       margin-top: 15px;
-}
-
-#contact-edit-links{
-       clear: both;
-}
-
-#contact-edit-links ul {
-       list-style: none;
-       list-style-type: none;
-       margin-left: 0px;
-       padding-left: 0px;
-}
-
-#contact-edit-links li {
-       margin-top: 5px;
-}
-
-#contact-edit-drop-link {
-       float: right;
-       margin-right: 20px;
-}
-
-#contact-edit-nav-end {
-       clear: both;
-}
-
-#contact-edit-wrapper {
-       width: 100%;
-}
-
-#contact-edit-end {
-       clear: both;
-       margin-top: 15px;
-}
-
-#contact-profile-selector {
-       width: 175px;
-       margin-left: 175px;
-}
-
-.contact-edit-submit {
-       margin-top: 20px;
-}
-
-
-.contact-photo-menu-button {
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 64px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
-}
-.contact-photo-menu {
-       width: auto;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 0px; top: 90px;
-       display: none;
-       z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-#block-message, #ignore-message, #archive-message, #lost-contact-message {
-       color: #FF0000;
-}
-
-#profile-edit-insecure {
-       margin-top: 20px;
-       color: #FF0000;
-       font-size: 1.1em;
-       border: 1px solid #FF8888;
-       background-color: #FFEEEE;
-       padding-left: 5px;
-       /*: 3px 3px 3px 5px; */
-       width: 587px;
-}
-
-#profile-jot-text {
-       height: 20px;
-       color:#cccccc;
-       border: 1px solid #cccccc;
-       padding: 3px 0px 0px 5px;
-       -moz-border-radius: 3px;
-       border-radius: 3px;     
-}
-
-
-/** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-       display:block!important;
-}
-
-#photos-usage-message {
-       margin-bottom: 15px;
-}
-
-
-#acl-wrapper {
-       width: 690px;
-       float:left;
-}
-#acl-search {
-       float:right;
-       background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-       padding-right:20px;
-}
-#acl-showall {
-       float: left;
-       display: block;
-       width: auto;
-       height: 18px;
-       background-color: #cccccc;
-       background-image: url("../../../images/show_all_off.png");
-       background-position: 7px 7px;
-       background-repeat: no-repeat;
-       padding: 7px 5px 0px 30px;
-       -webkit-border-radius: 5px ;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-       color: #999999;
-}
-#acl-showall.selected {
-       color: #000000;
-       background-color: #ff9900;
-       background-image: url("../../../images/show_all_on.png");
-}
-
-#acl-list {
-       height: 210px;
-       border: 1px solid #cccccc;
-       clear: both;
-       margin-top: 30px;
-       overflow: auto;
-}
-#acl-list-content {
-       
-}
-.acl-list-item {
-       display: block;
-       width: 150px;
-       height: 30px;
-       border: 1px solid #cccccc;
-       margin: 5px;
-       float: left;
-}
-.acl-list-item img{
-       width:22px;
-       height: 22px;
-       float: left;
-       margin: 4px;
-}
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
-       font-size: 8px;
-       display: block;
-       width: 40px;
-       height: 10px;
-       float: left;
-       color: #999999;
-       background-color: #cccccc;
-       background-position: 3px 3px;
-       background-repeat: no-repeat;
-       margin-right: 5px;
-       -webkit-border-radius: 2px ;
-       -moz-border-radius: 2px;
-       border-radius: 2px;
-       padding-left: 15px;
-}
-#acl-wrapper a:hover {
-       text-decoration: none;
-       color:#000000;
-}
-.acl-button-show { background-image: url("../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
-
-.acl-button-show.selected {
-       color: #000000;
-       background-color: #9ade00;
-       background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
-       color: #000000;
-       background-color: #ff4141;
-       background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
-/** /acl **/
-
-
-#group-new-submit-wrapper {
-       margin-top: 30px;
-}
-
-#group-edit-name-label {
-       float: left;
-       width: 175px;
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-#group-edit-name {
-       float: left;
-       width: 225px;
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-#group-edit-name-wrapper {
-
-
-}
-
-
-#group_members_select_label {
-       display: block;
-       float: left;
-       width: 175px;
-}
-
-.group_members_select {
-       float: left;
-       width: 230px;
-       overflow: auto;
-}
-
-#group_members_select_end {
-       clear: both;
-}
-#group-edit-name-end {
-       clear: both;
-}
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
-       margin-bottom: 10px;
-       margin-top: 20px;
-}
-
-#prvmail-submit {
-       float: left;
-       margin-top: 10px;
-       margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
-       float: left;
-       margin-top: 10px;
-       margin-right: 10px;
-       width: 24px;
-}
-
-#prvmail-end {
-       clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
-       float: left;
-}
-.mail-list-detail {
-       margin-left: 20px;
-}
-
-.mail-list-subject {
-       font-size: 1.1em;
-       margin-top: 10px;
-}
-a.mail-list-link {
-    display: block;
-    font-size: 1.3em;
-    padding: 4px 0;
-}
-
-/*
-*a.mail-list-link:hover {
-*      background-color: #15607B;
-*      color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
-       clear: both;
-}
-
-.mail-list-outside-wrapper {
-       margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
-       float: right;
-       margin-right: 30px;
-       margin-top: 15px;
-}
-
-.mail-list-delete-icon {
-       border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
-       float: left;
-}
-.mail-conv-detail {
-       margin-left: 20px;
-       width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-       clear: both;
-}
-
-.mail-conv-outside-wrapper {
-       margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-       float: right;
-       margin-right: 30px;
-       margin-top: 15px;
-}
-.mail-conv-break {
-       clear: both;
-}
-
-.mail-conv-delete-icon {
-       border: none;
-}
-
-.message-links ul {
-       list-style-type: none;
-       padding: 0px;
-}
-
-.message-links li {
-       margin-top: 10px;
-       float: left;
-}
-.message-links a {
-       padding: 3px 5px;
-}
-
-.message-links-end {
-       clear: both;
-}
-
-#sidebar-group-list ul {
-       list-style-type: none;
-}
-
-#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
-       display: inline-block;
-       height: 12px;
-       width: 12px;
-}
-
-#sidebar-group-list li {
-       margin-top: 10px;
-}
-
-.nets-ul, .fileas-ul, .categories-ul {
-       list-style-type: none;
-}
-
-.nets-ul li, .fileas-ul li, .categories-ul li {
-       margin-top: 10px;
-}
-
-.nets-link {
-       margin-left: 24px;
-}
-.nets-all {
-       margin-left: 42px;
-}
-
-.fileas-link, .categories-link {
-       margin-left: 24px;
-}
-
-.fileas-all, .categories-all {
-       margin-left: 0px;
-}
-
-#search-save {
-       margin-left: 5px;
-}
-.groupsideedit {
-       margin-right: 10px;
-}
-#saved-search-ul {
-       list-style-type: none;
-}
-.savedsearchdrop, .savedsearchterm {
-       float: left;
-       margin-top: 10px;
-}
-.savedsearchterm {
-       margin-left: 10px;
-}
-
-
-#side-follow-wrapper {
-       margin-top: 20px;
-}
-#side-follow-url, #side-peoplefind-url {
-       margin-top: 5px;
-}
-#side-follow-submit, #side-peoplefind-submit {
-       margin-top: 15px;
-}
-
-#side-match-link {
-       margin-top: 10px;
-}
-
-aside input[type='text'] {
- width: 174px;
-}
-
-.widget {
-       border: 1px solid #DDDDDD;
-       padding: 8px;
-       margin-top: 5px;
-       -moz-border-radius:5px;
-       -webkit-border-radius:5px;
-       border-radius:5px;
-
-}
-
-
-/*.photos {
-       height: auto;
-       overflow: auto;
-}*/
-
-.photos-end {
-       clear: both;
-       margin-bottom: 25px;
-}
-
-.photo-album-image-wrapper {
-       float: left;
-       margin-top: 15px;
-       margin-right: 15px;
-       margin-left: 15px;
-/*     width: 200px; height: 200px; 
-       overflow: hidden; 
-       position: relative; */
-}
-.photo-album-image-wrapper .caption {
-       display: none; 
-       width: 100%;
-/*     position: absolute; */
-       bottom: 0px; 
-       padding: 0.5em 0.5em 0px 0.5em;
-       background-color: rgba(245, 245, 255, 0.8);
-       border-bottom: 2px solid #CCC;
-       margin: 0px;
-}
-.photo-album-image-wrapper a:hover .caption {
-       display:block;
-}
-
-#photo-album-end {
-       clear: both;
-       margin-bottom: 25px;
-}
-
-.photo-top-image-wrapper {
-/*     position: relative; */
-       float: left;
-       margin-top: 15px;
-       margin-right: 15px;
-       margin-left: 15px;
-       margin-bottom: 15px;
-/*     width: 200px; height: 200px; 
-       overflow: hidden; */
-}
-.photo-top-album-name {
-       width: 100%;
-       min-height: 2em;
-/*     position: absolute;  */
-       bottom: 0px; 
-       padding: 0px 3px;
-       padding-top: 0.5em;
-       background-color: rgb(255, 255, 255);
-}
-#photo-top-end {
-       clear: both;
-}
-
-#photo-top-links {
-       margin-bottom: 30px;
-       margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
-       float: left;
-       width: 175px;
-}
-
-#photos-upload-noshare {
-       margin-bottom: 10px;
-}
-#photos-upload-existing-album-text {
-       float: left;
-       width: 175px;
-}
-#photos-upload-newalbum {
-       float: left;
-}
-#photos-upload-album-select {
-       float: left;
-}
-
-#photos-upload-spacer {
-       margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-       clear: both;
-}
-#photos-upload-exist-end {
-       margin-bottom: 15px;
-}
-#photos-upload-submit {
-       margin-top: 15px;
-}
-
-#photos_upload_applet_wrapper {
-       margin-bottom: 15px;
-}
-
-#photos-upload-no-java-message {
-       margin-bottom: 15px;
-}
-
-#profile-jot-desc {
-       /*float: left;*/
-       /*width: 480px;*/
-       width: 100%;
-       color: #FF0000;
-       margin-top: 10px;
-       margin-bottom: 10px;
-}
-
-#character-counter {
-       float: right;
-       font-size: 120%;
-}
-
-#character-counter.grey {
-       color: #888888;
-}
-
-#character-counter.orange {
-       color: orange;
-}
-#character-counter.red {
-       color: red;
-}
-
-#profile-jot-banner-end {
-       /* clear: both; */ 
-}
-
-#photos-upload-select-files-text {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
-       color: #8888FF;
-       text-decoration: none;
-       cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-       color: #0000FF;
-       text-decoration: underline;
-       cursor: pointer;
-}
-#settings-default-perms-menu {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
-       float: left;
-       width: 150px;
-}
-
-#photo-edit-perms-end {
-       margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
-       float: left;
-       margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-       margin-bottom: 15px;
-}
-#photo-like-div {
-       margin-bottom: 25px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
-       clear: both;
-}
-
-#photo-edit-rotate-end {
-       margin-bottom: 15px;
-}
-
-#photo-edit-delete-button {
-       margin-left: 200px;
-}
-#photo-edit-end {
-       margin-bottom: 35px;
-}
-#photo-caption {
-       font-size: 110%;
-       font-weight: bold;
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#in-this-photo-text {
-       color: #0000FF;
-       margin-left: 30px;
-}
-
-#in-this-photo {
-       margin-left: 60px;
-       margin-top: 10px;
-       margin-bottom: 20px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#photo-album-edit-drop {
-       margin-left: 200px;
-}
-
-.group-delete-wrapper {
-       float: right;
-       margin-right: 50px;
-}
-
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-#dfrn-request-networks {
-       margin-bottom: 30px;
-}
-
-#pause {
-  position: fixed;
-  bottom: 5px;
-  right: 5px;
-}
-
-.sparkle {
-       cursor: url('lock.cur'), pointer;
-/*     cursor: pointer !important; */
-}
-
-.contact-block-div {
-       float: left;
-       width: 52px;
-       height: 52px;
-}
-.contact-block-textdiv {
-       float: left;
-       width: 150px;
-       height: 34px;
-}
-
-#contact-block-end {
-       clear: both;
-}
-.contact-block-link {
-       float: left;
-}
-.contact-block-img {
-       width:48px;
-       height:48px;
-}
-
-#tag-remove {
-       margin-bottom: 15px;
-}
-
-#tagrm li {
-       margin-bottom: 10px;
-}
-
-#tagrm-submit, #tagrm-cancel {
-       margin-top: 25px;
-}
-
-#tagrm-cancel {
-       margin-left: 15px;
-}
-
-.wall-item-conv {
-       margin-top: 5px;
-       margin-bottom: 25px;
-}
-
-#search-submit {
-       margin-left: 15px;
-}
-
-#search-box {
-       margin-bottom: 25px;
-}
-
-.location-label, .gender-label, .marital-label, .homepage-label {
-       float: left;
-       text-align: right;
-       display: block;
-       width: 65px;
-}
-
-.adr, .x-gender, .marital-text, .homepage-url {
-       float: left;
-       display: block;
-       margin-left: 8px;
-}
-
-.profile-clear {
-       clear: both;
-}
-
-
-.clear {
-       clear: both;
-}
-
-.cc-license {
-       margin-top: 50px;
-       font-size: 70%;
-}
-
-
-#plugin-settings-link, #account-settings-link {
-       margin-bottom: 10px;
-}
-
-#uexport-link {
-       margin-bottom: 20px;
-}
-
-/* end from default */
-       
-
-.fn {
-       padding: 0px 0px 5px 12px;
-       font-size: 120%;
-       font-weight: bold;
-}
-
-.vcard .title {
-       margin-bottom: 5px;
-       margin-left: 12px;
-}
-
-.vcard dl {
-       clear: both;
-}
-
-#birthday-title {
-       float: left;
-       font-weight: bold;      
-}
-
-#birthday-adjust {
-       float: left;
-       font-size: 75%;
-       margin-left: 10px;
-}
-
-#birthday-title-end {
-       clear: both;
-}
-
-.birthday-list {
-       margin-left: 15px;
-}
-
-#birthday-wrapper {
-       margin-bottom: 20px;
-}
-
-#network-new-link {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-
-.tool-wrapper {
-  float: left;
-  margin-left: 15px;
-}
-
-.tool-link {
-  cursor: pointer;
-}
-
-.eventcal {
-       float: left;
-       font-size: 20px;
-}
-
-#event-summary-text {
-       margin-top: 15px;
-}
-
-#event-share-checkbox {
-       float: left;
-       margin-top: 10px;
-}
-
-#event-share-text {
-       float: left;
-       margin-top: 10px;
-       margin-left: 5px;
-}
-
-#event-share-break {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-#event-summary {
-       width: 400px;
-}
-
-.vevent {
-       border: 1px solid #CCCCCC;
-}
-
-.vevent .event-summary {
-       margin-left: 10px;
-       margin-right: 10px;
-       font-weight: bold;
-}
-
-.vevent .event-description, .vevent .event-location {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-.vevent .event-start {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-
-#new-event-link {
-       margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link {
-       float: left;
-       margin-top: 4px;
-       margin-right: 4px;
-       margin-bottom: 15px;
-}
-
-.event-description:before {
-       content: url('../../../images/calendar.png');
-       margin-right: 15px;
-}
-
-.event-start, .event-end {
-       margin-left: 10px;
-       width: 330px;
-       clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
-       float: right;
-}
-
-.event-list-date {
-       margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
-       float: left;
-       margin-left: 32px;
-       margin-right: 32px;
-       margin-top: 64px;
-}
-.event-calendar-end {
-       clear: both;
-}
-
-.calendar {
-       font-family: Courier, monospace;
-}
-.today {
-       font-weight: bold;
-       color: #FF0000;
-}
-
-.settings-block {
-       border: 1px solid #AAA;
-       margin: 10px;
-       padding: 10px;
-}
-
-.app-title {
-       margin: 10px;
-}
-
-#identity-manage-desc {
-       margin-top:15px;
-       margin-bottom: 15px;
-}
-
-#identity-manage-choose {
-       margin-bottom: 15px;
-}
-
-#identity-submit {
-       margin-top: 20px;
-}
-
-#photo-prev-link, #photo-next-link {
-       padding: 10px;
-       float: left;
-}
-
-#photo-photo {
-       float: left;
-}
-
-#photo-photo-end {
-       clear: both;
-}
-
-.profile-match-photo {
-       float: left;
-       text-align: center;
-       width: 120px;
-}
-
-.profile-match-name {
-       float: left;
-       text-align: center;
-       width: 120px;
-       overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
-       clear: both;
-}
-
-.profile-match-connect {
-       text-align: center;
-       font-weight: bold;
-}
-
-.profile-match-wrapper {
-       float: left;
-       padding: 10px;
-       width: 120px;
-       height: 120px;
-       scroll: auto;
-}
-#profile-match-wrapper-end {
-       clear: both;
-}
-.side-link {
-       margin-bottom: 15px;
-}
-
-#language-selector {
-       position: absolute;
-       top: 0px;
-       left: 16px;
-}
-
-#group-members {
-       margin-top: 20px;
-       padding: 10px;
-       height: 250px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#group-members-end {
-       clear: both;
-}
-
-#group-separator {
-       margin-top: 10px;
-       margin-bottom: 10px;
-}
-
-#group-all-contacts {
-       padding: 10px;
-       height: 450px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#group-all-contacts-end {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-#group-edit-desc {
-       margin-top: 15px;
-}
-
-
-#prof-members {
-       margin-top: 20px;
-       padding: 10px;
-       height: 250px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#prof-members-end {
-       clear: both;
-}
-
-#prof-separator {
-       margin-top: 10px;
-       margin-bottom: 10px;
-}
-
-#prof-all-contacts {
-       padding: 10px;
-       height: 450px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#prof-all-contacts-end {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-#prof-edit-desc {
-       margin-top: 15px;
-}
-
-#crepair-name-label,
-#crepair-nick-label,
-#crepair-attag-label,
-#crepair-url-label,
-#crepair-request-label,
-#crepair-confirm-label,
-#crepair-notify-label,
-#crepair-photo-label,
-#crepair-poll-label {
-       float: left;
-       width: 200px;
-       margin-bottom: 15px;
-}
-
-#crepair-name,
-#crepair-nick,
-#crepair-attag,
-#crepair-url,
-#crepair-request,
-#crepair-confirm,
-#crepair-notify,
-#crepair-photo,
-#crepair-poll {
-       float: left;
-       width: 300px;
-}
-
-
-#netsearch-box {
-       margin-top: 20px;       
-}
-
-#netsearch-box #search-submit {
-       margin: 5px 0px 0px 0px;
-}
-
-.required {
-       color: #FF0000;
-}
-
-#event-start-text, #event-finish-text {
-       margin-top: 10px;
-       margin-bottom: 5px;
-}
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
-       float: left;
-}
-#event-datetime-break {
-       margin-bottom: 10px;
-}
-
-#event-nofinish-break, #event-adjust-break {
-       clear: both;
-}
-
-#event-desc-text, #event-location-text {
-       margin-top: 10px;
-       margin-bottom: 5px;
-}
-#event-submit {
-       margin-top: 10px;
-}
-
-.body-tag, .filesavetags, .categorytags {
-       opacity: 0.5;
-       filter:alpha(opacity=50);
-}
-
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
-       opacity: 1.0 !important;
-       filter:alpha(opacity=100) !important;
-}
-
-.item-select {
-       opacity: 0.1;
-       filter:alpha(opacity=10);
-       float: right;
-       margin-right: 10px;
-
-}
-.item-select:hover, .checkeditem {
-       opacity: 1;
-       filter:alpha(opacity=100);
-}
-
-
-#item-delete-selected {
-       margin-top: 30px;
-}
-
-#item-delete-selected-end {
-       clear: both;
-}
-#item-delete-selected-icon, #item-delete-selected-desc {
-       float: left;
-       margin-right: 5px;
-}
-#item-delete-selected-desc:hover {
-       text-decoration: underline;
-}
-
-#lang-select-icon {
-       cursor: pointer;
-       position: absolute;
-       left: 0px;
-       top: 0px;
-       opacity: 0.2;
-       filter:alpha(opacity=20);
-}
-
-#lang-select-icon:hover {
-       opacity: 1;
-       filter:alpha(opacity=100);
-}
-
-.notif-image {
-       height: 80px;
-       width: 80px;
-       margin-right: 15px;
-}
-.notification-listing-end {
-       clear: both;
-       margin-bottom: 15px;
-}
-
-
-
-/**
- * Plugins settings
- */
-
-.settings-block > h3,
-.settings-heading {
-       border-bottom: 1px solid #babdb6;
-}
-
-/**
- * Form fields
- */
-.field {
-       margin-bottom: 10px;
-       padding-bottom: 10px;
-       overflow: auto;
-       width: 100%
-}
-
-.field label {
-       float: left;
-       width: 200px;
-}
-
-.field input,
-.field textarea {
-       width: 400px;
-}
-.field textarea { height: 100px; }
-.field_help {
-       display: block;
-       margin-left: 200px;
-       color: #666666;
-       
-}
-
-
-.field .onoff {
-       float: left;
-       width: 80px;
-}
-.field .onoff a {
-       display: block;
-       border:1px solid #666666;
-       background-image:url("../../../images/onoff.jpg");
-       background-repeat: no-repeat;
-       padding: 4px 2px 2px 2px;
-       height: 16px;
-       text-decoration: none;
-}
-.field .onoff .off {
-       border-color:#666666;
-       padding-left: 40px;
-       background-position: left center;
-       background-color: #cccccc;
-       color: #666666;
-       text-align: right;
-}
-.field .onoff .on {
-       border-color:#204A87;
-       padding-right: 40px;
-       background-position: right center;
-       background-color: #D7E3F1;
-       color: #204A87;
-       text-align: left;
-}
-.hidden { display: none!important; }
-
-.field.radio .field_help { margin-left: 0px; }
-
-/**
- * ADMIN
- */
-#pending-update {
-       float:right;
-       color: #ffffff;
-       font-weight: bold;
-       background-color: #FF0000;
-       padding: 0em 0.3em;
-       
-}
-#adminpage dl {
-       clear: left;
-       margin-bottom: 2px;
-       padding-bottom: 2px;
-       border-bottom: 1px solid black;
-}
-#adminpage dt {
-       width: 200px;
-       float: left;
-       font-weight: bold;
-}
-#adminpage dd {
-       margin-left: 200px;
-}
-
-#adminpage h3 {
-       border-bottom: 1px solid #cccccc;
-}
-#adminpage .field label {
-       font-weight: bold;
-}
-#adminpage .submit {
-       clear:left;
-       text-align: right;
-}
-
-#adminpage #pluginslist {
-       margin: 0px; padding: 0px;
-}
-#adminpage .plugin {
-       list-style: none;
-       display: block;
-       border: 1px solid #888888;
-       padding: 1em;
-       margin-bottom: 5px;
-       clear: left;
-}
-#adminpage .plugin .desc { margin-left: 2.5em;}
-#adminpage .toggleplugin {
-       float:left;
-       margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
-
-/*
- * UPDATE
- */
-.popup {       
-       width: 100%; height: 100%;
-       top:0px; left:0px;
-       position: absolute;
-       display: none;
-}
-
-.popup .background {
-       background-color: rgba(0,0,0,128);
-       opacity: 0.5;
-       width: 100%; height: 100%;
-       position: absolute;
-       top:0px; left:0px;
-}
-.popup .panel {
-       top:25%;left:25%;width:50%;height:50%;
-       padding: 1em;
-       position: absolute;
-       border: 4px solid #000000;
-       background-color: #FFFFFF;
-}
-.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
-.popup .panel .panel_in { width: 100%; height: 100%;   position: relative; }
-.popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
-.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
-.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;}
-
-/**
- * OAuth
- */
-.oauthapp {
-       height: auto; overflow: auto;
-       border-bottom: 2px solid #cccccc;
-       padding-bottom: 1em;
-       margin-bottom: 1em;     
-}
-.oauthapp img {
-       float: left;
-       width: 48px; height: 48px;
-       margin: 10px;
-}
-.oauthapp img.noicon {
-       background-image: url("../../../images/icons/48/plugin.png");
-       background-position: center center;
-       background-repeat: no-repeat;
-}
-.oauthapp a {
-       float: left;
-}
-
-/**
- * ICONS
- */
-.iconspacer {
-       display: block; width: 16px; height: 16px;
-}
-
-.icon {
-       display: block; width: 16px; height: 16px;
-       background-image: url('../../../images/icons.png');
-}
-.article { background-position: 0px 0px;}
-/*.audio { background-position: -16px 0px;}*/
-.audio {
-       display: block; width: 24px; height: 24px;
-       background-size: 100% 100%;
-       background-image: url('images/speaker.png');
-       background-repeat: no-repeat;
-}
-.block { background-position: -32px 0px;}
-/*.drop { background-position: -48px 0px;}*/
-.drop {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/drop-16.png');
-       background-repeat: no-repeat;
-       opacity: 1.0;
-}
-/*.drophide { background-position: -64px 0px;}*/
-.drophide {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/drop-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.edit { background-position: -80px 0px;}
-/*.camera { background-position: -96px 0px;}*/
-.camera{
-       display: block; width: 24px; height: 18px;
-       margin-top: 4px;
-       background-size: 100% 100%;
-       background-image: url('images/camera.png');
-       background-repeat: no-repeat;
-}
-/*.dislike { background-position: -112px 0px;}*/
-.dislike {
-       display: block; width: 15px; height: 16px;/* 23 24*/
-       background-size: 100% 100%;
-       background-image: url('images/disapprove-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.dislike:hover {
-       opacity: 1.0;
-}
-/*.like { background-position: -128px 0px;}*/
-.like {
-       display: block; width: 15px; height: 16px;/* 23 24*/
-       margin-right: 6px;
-       background-size: 100% 100%;
-       background-image: url('images/approve-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.like:hover {
-       opacity: 1.0;
-}
-/*.link { background-position: -144px 0px;}*/
-.link {
-       display: block; width: 24px; height: 24px;
-       background-size: 100% 100%;
-       background-image: url('images/link.png');
-       background-repeat: no-repeat;
-}
-
-/*.globe { background-position: 0px -16px;}*/
-.globe {
-       display: block; width: 24px; height: 24px;
-       background-size: 100% 100%;
-       background-image: url('images/globe.png');
-       background-repeat: no-repeat;
-}
-.noglobe { background-position: -16px -16px;}
-.no { background-position: -32px -16px;}
-.pause { background-position: -48px -16px;}
-.play { background-position: -64px -16px;}
-/*.pencil { background-position: -80px -16px;}*/
-.pencil {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/pencil-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.pencil:hover {
-       opacity: 1.0;
-}
-/*.small-pencil { background-position: -96px -16px;}*/
-.small-pencil {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/pencil-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.small-pencil:hover {
-       opacity: 1.0;
-}
-/*.recycle { background-position: -112px -16px;}*/
-.recycle {
-       display: block; width: 16px; height: 16px;/*24 23*/
-       background-size: 100% 100%;
-       background-image: url('images/recycle-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.recycle:hover {
-       opacity: 1.0;
-}
-/*.remote-link { background-position: -128px -16px;}*/
-.remote-link {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/remote-link-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.remote-link:hover {
-       opacity: 1.0;
-}
-.share { background-position: -144px -16px;}
-
-.tools { background-position: 0px -32px;}
-/*.lock { background-position: -16px -32px;}*/
-.lock {
-       display: block; width: 14px; height: 21px;
-       margin-top: 1px;
-       background-size: 100% 100%;
-       background-image: url('images/lock-24.png');
-       background-repeat: no-repeat;
-}
-/*.unlock { background-position: -32px -32px;}*/
-.unlock {
-       display: block; width: 14px; height: 24px;
-       margin-top: -2px;
-       background-size: 100% 100%;
-       background-image: url('images/unlock-24.png');
-       background-repeat: no-repeat;
-}
-/*.video { background-position: -48px -32px;}*/
-.video {
-       display: block; width: 24px; height: 24px;
-       background-size: 100% 100%;
-       background-image: url('images/video.png');
-       background-repeat: no-repeat;
-}
-
-.youtube { background-position: -64px -32px;}
-/*.attach { background-position: -80px -32px; }*/
-.attach {
-       display: block; width: 24px; height: 24px;
-       background-size: 100% 100%;
-       background-image: url('images/paperclip-24.png');
-       background-repeat: no-repeat;
-}
-
-.language { background-position: -96px -32px; }
-.prev { background-position: -112px -32px; }
-.next { background-position: -128px -32px; }
-.on { background-position: -144px -32px; }
-
-.off { background-position: 0px -48px; }
-/*.starred { background-position: -16px -48px; }*/
-.starred {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/star-yellow-16.png');
-       background-repeat: no-repeat;
-}
-/*.unstarred { background-position: -32px -48px; }*/
-.unstarred {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/star-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.unstarred:hover {
-       opacity: 1.0;
-}
-/*.tagged { background-position: -48px -48px; }*/
-.tagged {
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/tag-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.tagged:hover {
-       opacity: 1.0;
-}
-.yellow { background-position: -64px -48px; }
-
-
-.filer-icon {
-/*     display: block; width: 16px; height: 16px;
-       background-image: url('file.gif');*/
-       display: block; width: 16px; height: 16px;
-       background-size: 100% 100%;
-       background-image: url('images/folder-16.png');
-       background-repeat: no-repeat;
-       opacity: 0.4;
-}
-.filer-icon:hover {
-       opacity: 1.0;
-}
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-[class^="comment-edit-bb"] {
-       list-style: none;
-       display: none;
-       margin: 0px 0 -5px 60px;
-       width: 75%;
-}
-[class^="comment-edit-bb"] > li {
-       display: inline-block;
-       margin: 10px 10px 0 0;
-       visibility: none;
-}
-[class^="comment-edit-bb-end"] {
-       clear: both;
-}
-.editicon {
-    display: inline-block;
-/*    background-image: url(bbedit.png);
-       background-color: #fff;*/
-       background-size: 100% 100%;
-       background-repeat: no-repeat;
-       background-color: #f3f3f3;
-    text-decoration: none;
-       opacity: 0.4;
-}
-.editicon:hover {
-/*     background-color: #ccc;*/
-       opacity: 1.0;
-}
-.boldbb {
-/*     background-position: 0px 0px;*/
-    width: 15px;
-    height: 16px;
-       background-image: url('images/boldB-serif-16.png');
-}
-/*.boldbb:hover {
-       background-position: 0px -16px;
-}*/
-.italicbb {
-/*     background-position: -16px 0px;*/
-    width: 9px;
-    height: 16px;
-       background-image: url('images/italicI-serif-16.png');
-}
-/*.italicbb:hover {
-       background-position: -16px -16px;
-}*/
-.underlinebb {
-/*     background-position: -32px 0px;*/
-    width: 14px;
-    height: 16px;
-       background-image: url('images/underlineU-serif-16.png');
-}
-/*.underlinebb:hover {
-       background-position: -32px -16px;
-}*/
-.quotebb {
-/*     background-position: -48px 0px;*/
-    width: 20px;
-    height: 20px;
-       background-image: url('images/quote.png');
-}
-/*.quotebb:hover {
-       background-position: -48px -16px;
-}*/
-.codebb {
-/*     background-position: -64px 0px;*/
-    width: 20px;
-    height: 20px;
-       background-image: url('images/code.png');
-}
-/*.codebb:hover {
-       background-position: -64px -16px;
-}*/
-.imagebb {
-/*     background-position: -80px 0px;*/
-    width: 20px;/*16*/
-    height: 15px;/*12*/
-       margin-bottom: 2px;
-       background-image: url('images/camera.png');
-}
-/*.imagebb:hover {
-       background-position: -80px -16px;
-}*/
-.urlbb {
-/*     background-position: -96px 0px;*/
-       width: 20px;
-       height: 20px;
-       background-image: url('images/link.png');
-}
-/*.urlbb:hover {
-       background-position: -96px -16px;
-}*/
-.videobb {
-/*     background-position: -112px 0px;*/
-       width: 20px;
-       height: 20px;
-       background-image: url('images/video.png');
-}
-/*.videobb:hover {
-       background-position: -112px -16px;
-}*/
-
-.attachtype {
-       display: block; width: 20px; height: 23px;
-       float: left;
-       background-image: url('../../../images/content-types.png');
-}
-
-.body-attach {
-       margin-top: 10px;
-}
-
-.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; }
-
-
-/* autocomplete popup */
-.acpopup {
-       max-height:150px;
-       background-color:#ffffff;
-       overflow:auto;
-       z-index:100000;
-       border:1px solid #cccccc;
-}
-.acpopupitem {
-       background-color:#ffffff; padding: 4px;
-       clear:left;
-}
-.acpopupitem img {
-       float: left;
-       margin-right: 4px;
-}
-
-.acpopupitem.selected {
-       color: #FFFFFF; background: #3465A4;
-}
-
-/* popup notifications */
-div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
-}
-div.jGrowl div.info {
-  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
-}
-#jGrowl.top-right {
-       top: 15px;
-       right: 15px;
-}
-.qcomment {
-       border: 1px solid #EEE;
-       padding: 3px;
-       margin-top: 15px;
-       margin-left: 25px;
-       width: 125px;
-       overflow-y: auto;
-}
-
-
-.qcomment option {
-       width: 125px;
-       overflow-x: hidden;
-}
-
-.qcomment {
-       opacity: 0.3;
-       filter:alpha(opacity=30);
-}
-.qcomment:hover {
-       opacity: 1.0;
-       filter:alpha(opacity=100);
-}
-
-/* notifications popup menu */
-.nav-notify {
-       display: none;
-       position: absolute;
-       font-size: 10px;
-       padding: 1px 3px;
-       top: 0px;
-       right: -10px;
-       min-width: 15px;
-       text-align: right;
-}
-.nav-notify.show {
-       display: block;
-}
-ul.notifications-menu-popup {
-       position: absolute;
-       display: none;
-       width: 10em;
-       margin: 0px;
-       padding: 0px;
-       list-style: none;
-       z-index: 100000;
-       right: 0px;
-}
-#nav-notifications-menu {
-       width: 320px;
-       max-height: 400px;
-       overflow-y: scroll;overflow-style:scrollbar;
-       background-color:#FFFFFF;
-       -moz-border-radius: 5px;
-       -webkit-border-radius: 5px;
-       border-radius:5px;
-       border: 1px solid #AAA;
-       -moz-box-shadow: 3px 3px 5px #555;
-       -webkit-box-shadow: 3px 3px 5px #555;
-       box-shadow: 3px 3px 5px #555;
-}
-#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
-#nav-notifications-menu img { float: left; margin-right: 5px; }
-#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
-#nav-notifications-menu li {
-       padding: 7px 0px 7px 10px;
-       word-wrap:normal;
-       border-bottom: 1px solid #000;
-}
-
-#nav-notifications-menu li:hover {
-
-}
-
-#nav-notifications-menu a:hover {
-       text-decoration: underline;
-}
-
-.notif-item a {
-       color: #000000;
-}
-
-.notif-item a:hover {
-       text-decoration: underline;
-}
-
-.notif-image {
-       width: 32px;
-       height: 32px;
-       padding: 7px 7px 0px 0px;
-}
-
-.notify-seen {
-       background: #DDDDDD;
-}
-
-#id_term_label {
-       width:75px;
-}
-#id_term {
-       width:100px;
-}
-
-#recip {
-       
-}
-.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
-.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
-.autocomplete .selected { background:#F0F0F0; }
-.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
-
-#datebrowse-sidebar select {
-       margin-left: 40px;
-       width: 130px;
-}
-
-#theme-version {
-       display: block;
-       font-weight: bold;
-}
index 1bf1f8fea36e3033b64ca8c728ebfcad68f4e4b3..24dee31d0dd6c16d2b9cd69489db9906bcfd4199 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.2
+ * Version: Version 0.2.2
  * Author: Zach P <windforest@f.shmuz.in>
  * Maintainer: Zach P <windforest@f.shmuz.in>
  */
index 60dde76000d72012fea6933ea7bbea3776d4f54e..6903f6e3037064ee023d1c20df319beb8123c1d1 100644 (file)
@@ -1,5 +1,5 @@
 <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-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
@@ -9,33 +9,33 @@
                                        <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>
+                               <!--<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="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>
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
                                
-               </div>  
+               <!--</div>-->
                <div class="wall-item-content" id="wall-item-content-$item.id" >
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-                       <div class="wall-item-title-end"></div>
+                       <!--<div class="wall-item-title-end"></div>-->
                        <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-                                       <div class="body-tag">
+<!--                                   <div class="body-tag">-->
                                                {{ for $item.tags as $tag }}
-                                                       <span class='tag'>$tag</span>
+                                                       <span class='body-tag tag'>$tag</span>
                                                {{ endfor }}
-                                       </div>
+<!--                                   </div>-->
                        </div>
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
@@ -48,7 +48,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="icon remote-link$item.sparkle"></a></div>
+                               <!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
                        {{ endif }}
                        {{ if $item.edpost }}
                                <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                        {{ if $item.filer }}
                        <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="icon drophide" title="$item.drop.delete" 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.dropping }}<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>
-       <div class="wall-item-comment-wrapper" >
+       <!--<div class="wall-item-comment-wrapper" >-->
        $item.comment
-       </div>
+       <!--</div>-->
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl
new file mode 100644 (file)
index 0000000..8260517
--- /dev/null
@@ -0,0 +1,86 @@
+<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-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+                               <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+                               <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+                       </div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+                       <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+                               onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+                               <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="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> $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<br />
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$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 class="body-tag">-->
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='body-tag tag'>$tag</span>
+                                               {{ endfor }}
+                                       <!--</div>-->
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ if $item.vote }}
+                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </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>-->
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       {{ endif }}
+                       {{ if $item.filer }}
+                       <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" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       <!--</div>-->
+                               {{ if $item.drop.dropping }}<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-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>
+       <div class="wall-item-comment-separator"></div>
+       <!--<div class="wall-item-comment-wrapper">-->
+       $item.comment
+       <!--</div>-->
+
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
+
index 72febbf525dbfd01c8795803ceff82d85053863d..087d9c746f1d8f9e2ee32b3434c86b0a0d2f1228 100644 (file)
   height: 16px;
   background-position: 0px 0px;
 }
-
-.sparkle {
-       cursor: url('icons/lock.cur'), pointer;
-}
-
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -904,6 +899,9 @@ section {
   width: 770px;
   padding: 0px 20px 0px 10px;
 }
+.sparkle {
+  cursor: url('icons/lock.cur'), pointer;
+}
 /* wall item */
 .tread-wrapper {
   background-color: #eff0f1;
@@ -1141,6 +1139,16 @@ section {
   width: 25px;
   height: 25px;
 }
+span[id^="showmore-teaser"] {
+  background: url("showmore-bg.jpg") no-repeat center bottom;
+}
+span[id^="showmore-wrap"] {
+  border-top: 1px solid #999999;
+  color: #999999;
+  display: block;
+  text-align: center;
+  background-color: #eff0f1;
+}
 #pause {
   position: fixed;
   bottom: 5px;
index b1efb557fddf8c94235a8826ea390846ad694162..9c28473c616d22c27c7623c6b8eaeecd819ff254 100644 (file)
   height: 16px;
   background-position: 0px 0px;
 }
-
-.sparkle {
-       cursor: url('icons/lock.cur'), pointer;
-}
-
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -904,6 +899,9 @@ section {
   width: 770px;
   padding: 0px 20px 0px 10px;
 }
+.sparkle {
+  cursor: url('icons/lock.cur'), pointer;
+}
 /* wall item */
 .tread-wrapper {
   background-color: #eff0f1;
@@ -1141,6 +1139,16 @@ section {
   width: 25px;
   height: 25px;
 }
+span[id^="showmore-teaser"] {
+  background: url("showmore-bg.jpg") no-repeat center bottom;
+}
+span[id^="showmore-wrap"] {
+  border-top: 1px solid #999999;
+  color: #999999;
+  display: block;
+  text-align: center;
+  background-color: #eff0f1;
+}
 #pause {
   position: fixed;
   bottom: 5px;
index 0dac79bf9c2ceedce648491342fe22948f9b6fd4..b5f0af669685ebe661fc19bb02def9f7c0a0e368 100644 (file)
@@ -422,6 +422,10 @@ section {
        padding:0px 20px 0px 10px;
 }
 
+.sparkle {
+  cursor: url('icons/lock.cur'), pointer;
+}
+
 /* wall item */
 .tread-wrapper { 
        background-color: @ThreadBackgroundColor;
@@ -590,6 +594,17 @@ section {
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
 
+span[id^="showmore-teaser"]{
+    background: url("showmore-bg.jpg") no-repeat center bottom;
+}
+span[id^="showmore-wrap"] {
+    border-top: 1px solid #999999;
+    color: #999999;
+    display: block;
+    text-align: center;
+    background-color: @ThreadBackgroundColor;
+}
+
 
 #pause {
  position: fixed;
diff --git a/view/theme/quattro/showmore-bg.jpg b/view/theme/quattro/showmore-bg.jpg
new file mode 100644 (file)
index 0000000..e76015c
Binary files /dev/null and b/view/theme/quattro/showmore-bg.jpg differ