Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Conflicts:
	update.php

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      );
 

database.sql

@@ -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`),

include/bb2diaspora.php

@@ -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);

include/bbcode.php

@@ -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;
 

include/markdownify/markdownify.php

@@ -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);
 

include/network.php

@@ -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);
 			

include/text.php

@@ -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;
 }
 

mod/display.php

@@ -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)
 		);

mod/parse_url.php

@@ -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
              */

mod/poke.php

@@ -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,

mods/readme.txt

@@ -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`);

update.php

@@ -1350,4 +1350,3 @@ function update_1154() {
 	if(!$r) return UPDATE_FAILED;
 	return UPDATE_SUCCESS;
 }
-

util/messages.po

@@ -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 ""
 

view/birthdays_reminder.tpl

@@ -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 }}
 

view/display-head.tpl

@@ -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>
+

view/events_reminder.tpl

@@ -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 }}
 

view/invite.tpl

@@ -23,4 +23,5 @@ $msg_text
 <input type="submit" name="submit" value="$submit" />
 </div>
 
-</form>
+</div>
+</form>

view/photos_upload.tpl

@@ -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;">

view/poke_content.tpl

@@ -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" />

view/theme/darkzero-NS/style.css

@@ -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;
 }
 

view/theme/darkzero/style.css

@@ -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;
 }
 

view/theme/diabook/style-profile.css

@@ -2549,4 +2549,9 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
+}
+
+.item-image-preview {
+  float: left;
+  margin-right: 10px;
+}

view/theme/diabook/style.css

@@ -2906,4 +2906,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
+}

view/theme/frost-mobile/TODO

@@ -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?
 
 

view/theme/frost-mobile/comment_item.tpl

@@ -19,10 +19,10 @@
 				<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>

view/theme/frost-mobile/display-head.tpl

@@ -0,0 +1,4 @@
+<script>
+	window.autoCompleteType = 'display-head';
+</script>
+

view/theme/frost-mobile/jot-header.tpl

@@ -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";

view/theme/frost-mobile/js/theme.js

@@ -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/',

view/theme/frost-mobile/nav.tpl

@@ -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>-->
@@ -13,11 +11,20 @@
 	<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 }}
@@ -123,10 +130,8 @@
 	</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>
 

view/theme/frost-mobile/photos_upload.tpl

@@ -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;">

view/theme/frost-mobile/style.css

@@ -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%;

view/theme/frost-mobile/theme.php

@@ -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>
  */

view/theme/frost-mobile/wall_item.tpl

@@ -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" 
@@ -16,29 +16,29 @@
 					</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>
@@ -64,19 +64,19 @@
 			{{ 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>-->

view/theme/frost-mobile/wallwall_item.tpl

@@ -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>-->
+

view/theme/frost/comment_item.tpl

@@ -19,10 +19,10 @@
 				<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>

view/theme/frost/display-head.tpl

@@ -0,0 +1,4 @@
+<script>
+	window.autoCompleteType = 'display-head';
+</script>
+

view/theme/frost/jot-header.tpl

@@ -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";

view/theme/frost/js/theme.js

@@ -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/',

view/theme/frost/nav.tpl

@@ -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>-->
@@ -13,11 +11,19 @@
 	<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>
@@ -123,11 +129,9 @@
 		{{ 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>
 

view/theme/frost/photos_upload.tpl

@@ -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;">

view/theme/frost/style.css

@@ -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);

view/theme/frost/theme.php

@@ -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>
  */

view/theme/frost/wall_item.tpl

@@ -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>
@@ -61,19 +61,19 @@
 			{{ 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>-->

view/theme/frost/wallwall_item.tpl

@@ -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>-->
+

view/theme/quattro/dark/style.css

@@ -341,11 +341,6 @@
   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;

view/theme/quattro/green/style.css

@@ -341,11 +341,6 @@
   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;

view/theme/quattro/quattro.less

@@ -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;