Merge pull request #73 from simonlnu/master

dispy! (and minor formatting)

view/acl_selector.tpl

@@ -19,7 +19,7 @@ $(document).ready(function() {
 	if(typeof acl=="undefined"){
 		acl = new ACL(
 			baseurl+"/acl",
-			[$allowcid,$allowgid,$denycid,$denygid]
+			[ $allowcid,$allowgid,$denycid,$denygid ]
 		);
 	}
 });

view/jot.tpl

@@ -1,7 +1,7 @@
 <form id="profile-jot-form" action="$action" method="post">
 	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden" >&nbsp;</div>
+		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
 		<div id="character-counter" class="grey jothidden"></div>
 
 		<input type="hidden" name="type" value="$ptyp" />
@@ -43,11 +43,6 @@
 		</div>
 	</div>
 
-	
 </form>
 
 {{ if $content }}<script>initEditor();</script>{{ endif }}
-
-
-
-

view/theme/dispy/comment_item.tpl

@@ -0,0 +1,35 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<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>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				{{ if $qcomment }}
+                <ul class="qcomment-wrapper">
+				{{ for $qcomment as $qc }}				
+					<li class="fakelink qcomment"
+                    onclick="commentInsert(this,$id); return false;">$qc</li>
+				{{ endfor }}
+                </ul>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/dispy/contact_template.tpl

@@ -1,9 +1,9 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
+	<div class="contact-entry-photo-wrapper">
 		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
 		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)">
 
 			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
 
@@ -20,6 +20,8 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
 </div>

view/theme/dispy/conversation.tpl

@@ -0,0 +1,21 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+	{{ for $thread.items as $item }}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			</div>
+			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+		{{endif}}
+		{{if $item.comment_lastcollapsed}}</div>{{endif}}
+		
+		{{ inc $item.template }}{{ endinc }}
+		
+		
+	{{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+{{ endif }}

view/theme/dispy/group_side.tpl

@@ -5,6 +5,12 @@
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				{{ if $group.edit }}
+					<a 
+                        class="groupsideedit"
+                        href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+				{{ endif }}
 				{{ if $group.cid }}
 					<input type="checkbox" 
 						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
@@ -12,16 +18,12 @@
 						{{ if $group.ismember }}checked="checked"{{ endif }}
 					/>
 				{{ endif }}
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
 			</li>
 		{{ endfor }}
 	</ul>
 	</div>
   <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
+  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
   </div>
 </div>
 

view/theme/dispy/head.tpl

@@ -0,0 +1,99 @@
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<base href="$baseurl/" />
+<meta name="generator" content="$generator" />
+<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
+<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
+<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script>
+
+	var updateInterval = $update_interval;
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			obj.value = '';
+			obj.className = "comment-edit-text-full";
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '$comment';
+			obj.className="comment-edit-text-empty";
+			closeMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '$comment') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function showHideComments(id) {
+		if( $('#collapsed-comments-' + id).is(':visible')) {
+			$('#collapsed-comments-' + id).hide();
+			$('#hide-comments-' + id).html('$showmore');
+		}
+		else {
+			$('#collapsed-comments-' + id).show();
+			$('#hide-comments-' + id).html('$showfewer');
+		}
+	}
+
+    $(document).ready(function() {
+        function toggleToolbar() {
+            if ( $('#nav-floater').is(':visible') ) {
+                $('#nav-floater').slideUp('fast');
+                $('.floaterflip').css({
+                    backgroundPosition: '-210px -60px' 
+                });
+            } else {
+                $('#nav-floater').slideDown('fast');
+                $('.floaterflip').css({
+                    backgroundPosition: '-190px -60px'
+                });
+            }
+        };
+        $('.floaterflip').click(function() {
+            toggleToolbar();
+            return false;
+        });
+    });
+
+</script>
+
+

view/theme/dispy/jot-header.tpl

@@ -1,157 +1,137 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 var editor=false;
 var textlen = 0;
+var plaintext = '$editselect';
+var skin = 'default';
 
-function initEditor(cb) {
+function initEditor(cb){
-    if (editor==false) {
+	if (editor==false){
-        $("#profile-jot-text-loading").show();
+		$("#profile-jot-text-loading").show();
-		$("#jot-title-desc").show();
+		if(plaintext == 'none') {
- if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
-            $("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			editor = true;
-            $(".jothidden").show();
+			$("a#jot-perms-icon").fancybox({
-            editor = true;
+				'transitionIn' : 'elastic',
-            $("a#jot-perms-icon").fancybox({
+				'transitionOut' : 'elastic'
-                'transitionIn' : 'elastic',
+			});
-                'transitionOut' : 'elastic'
+			$(".jothidden").show();
-            });
+			if (typeof cb!="undefined") {
-	                            $("#profile-jot-submit-wrapper").show();
+                cb();
-								{{ if $newpost }}
+            }
-    	                            $("#profile-upload-wrapper").show();
+			return;
-        	                        $("#profile-attach-wrapper").show();
+		}	
-            	                    $("#profile-link-wrapper").show();
+		tinyMCE.init({
-                	                $("#profile-video-wrapper").show();
+			theme : "advanced",
-                    	            $("#profile-audio-wrapper").show();
+            skin : "default",
-                        	        $("#profile-location-wrapper").show();
+			mode : "specific_textareas",
-                            	    $("#profile-nolocation-wrapper").show();
+			editor_selector: $editselect,
-                                	$("#profile-title-wrapper").show();
+			auto_focus: "profile-jot-text",
-	                                $("#profile-jot-plugin-wrapper").show();
+			plugins : "bbcode,paste,fullscreen,autoresize",
-	                                $("#jot-preview-link").show();
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-								{{ endif }}   
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			force_p_newlines : false,
+			force_br_newlines : true,
+			forced_root_block : '',
+			convert_urls: false,
+			content_css: "$baseurl/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null) {
+						cPopup.onkey(e);
+                    }
+				});
 
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) { cPopup = null; }
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
 
-            if (typeof cb!="undefined") cb();
+					textlen = txt.length;
-            return;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-        }
+						$('#profile-jot-desc').html(ispublic);
-        tinyMCE.init({
+					}
-                theme : "advanced",
+					else {
-                mode : "specific_textareas",
+						$('#profile-jot-desc').html('&#160;');
-                editor_selector: /(profile-jot-text|prvmail-text)/,
+					}	 
-                plugins : "bbcode,paste,fullscreen,autoresize",
+
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+				 //Character count
-                theme_advanced_buttons2 : "",
+
-                theme_advanced_buttons3 : "",
+					if(textlen <= 140) {
-                theme_advanced_toolbar_location : "top",
+						$('#character-counter').removeClass('red');
-                theme_advanced_toolbar_align : "center",
+						$('#character-counter').removeClass('orange');
-                theme_advanced_blockformats : "blockquote,code",
+						$('#character-counter').addClass('grey');
-                //theme_advanced_resizing : true,
+					}
-                //theme_advanced_statusbar_location : "bottom",
+					if((textlen > 140) && (textlen <= 420)) {
-                paste_text_sticky : true,
+						$('#character-counter').removeClass('grey');
-                entity_encoding : "raw",
+						$('#character-counter').removeClass('red');
-                add_unload_trigger : false,
+						$('#character-counter').addClass('orange');
-                remove_linebreaks : false,
+					}
-                force_p_newlines : false,
+					if(textlen > 420) {
-                force_br_newlines : true,
+						$('#character-counter').removeClass('grey');
-                forced_root_block : '',
+						$('#character-counter').removeClass('orange');
-                convert_urls: false,
+						$('#character-counter').addClass('red');
-                content_css: "$baseurl/view/custom_tinymce.css",
+					}
-                theme_advanced_path : false,
+					$('#character-counter').text(textlen);
-                setup : function(ed) {
+				});
-                     //Character count
+
-                        ed.onKeyUp.add(function(ed, e) {
+				ed.onInit.add(function(ed) {
-                                var txt = tinyMCE.activeEditor.getContent();
+					ed.pasteAsPlainText = true;
-                                textlen = txt.length;
+					$("#profile-jot-text-loading").hide();
-                                if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+					$(".jothidden").show();
-                                        $('#profile-jot-desc').html(ispublic);
+					if (typeof cb!="undefined") cb();
-                                }
+				});
-                                else {
+			}
-                                        $('#profile-jot-desc').html('&nbsp;');
+		});
-                                }
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").fancybox({
+			'transitionIn' : 'elastic',
+			'transitionOut' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
 
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-                                $("#profile-jot-text-loading").hide();
-                                $("#profile-jot-submit-wrapper").show();
-                                $("#profile-upload-wrapper").show();
-                                $("#profile-attach-wrapper").show();
-                                $("#profile-link-wrapper").show();
-                                $("#profile-youtube-wrapper").show();
-                                $("#profile-video-wrapper").show();
-                                $("#profile-audio-wrapper").show();
-                                $("#profile-location-wrapper").show();
-                                $("#profile-nolocation-wrapper").show();
-                                $("#profile-title-wrapper").show();
-                                $("#profile-jot-plugin-wrapper").show();
-                                $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").fancybox({
-            'transitionIn' : 'none',
-            'transitionOut' : 'none'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
 </script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
 <script>
-    var ispublic = '$ispublic';
+	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
+
 	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
 		
-		$("#jot-title").mouseout(function() {
+		/* enable tinymce on focus and click */
-			$("#jot-title").hide();
+		$("#profile-jot-text").focus(enableOnUser);
-			var ttl = $("#jot-title").val();
+		$("#profile-jot-text").click(enableOnUser);
-			$('#jot-title-display').html(ttl);
-			if(ttl.length) {
-				$("#jot-title-display").show();
-			}
-			else {
-				$("#jot-title-desc").show();
-			}
-		});
-
-		$("#jot-title-display").hover(function() {
-			$("#jot-title-display").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
-
-		$("#jot-title-desc").click(function() {
-			$("#jot-title-desc").hide();
-			$("#jot-title").show();
-			$("#jot-title").focus();
-		});		
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -175,21 +155,7 @@ function initEditor(cb) {
 				}				 
 			}
 		);
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
 
-		}).trigger('change');
 
 	});
 
@@ -223,13 +189,6 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotGetVideo() {
-		reply = prompt("$utubeurl");
-		if(reply && reply.length) {
-			addeditortext('[youtube]' + reply + '[/youtube]');
-		}
-	}
-
 	function jotVideoURL() {
 		reply = prompt("$vidurl");
 		if(reply && reply.length) {
@@ -252,22 +211,18 @@ function initEditor(cb) {
 		}
 	}
 
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
 	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
+			if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
+			initEditor(function(){
-					addeditortext(data);
+				addeditortext(data);
-					$('#like-rotator-' + id).hide();
+				$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
+				$(window).scrollTop(0);
-				});
+			});
+
 		});
 	}
 
@@ -294,19 +249,36 @@ function initEditor(cb) {
 		}
 	}
 
+	function itemTag(id) {
+		reply = prompt("$term");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
 	}
 
-  function addeditortext(data) {
+	function addeditortext(data) {
-        if(plaintext == 'none') {
+		if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
+			var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
+			$("#profile-jot-text").val(currentText + data);
-        }
+		}
-        else
+		else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
+	}	
 
 	$geotag
 

view/theme/dispy/jot.tpl

@@ -1,14 +1,9 @@
+<form id="profile-jot-form" action="$action" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&#160;</div>
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+		<div id="character-counter" class="grey jothidden"></div>
 
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-		<div id="profile-rotator-wrapper" style="display: $visitor;" >
-			<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;"  />
-		</div> 		
-	</div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
 		<input type="hidden" name="type" value="$ptyp" />
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
 		<input type="hidden" name="return" value="$return_path" />
@@ -16,60 +11,47 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-title-wrapper">
+
-		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		<span id="jot-title-display" style="display: none;"></span>
+
-		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		<div id="jot-tools" class="jothidden" style="display:none">
+			<span class="icon border camera"><a href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></span>
+			<span class="icon border attach"><a href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></span>
+			<span class="icon border link"><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a></span>
+			<span class="icon border video"><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo"></a></span>
+			<span class="icon border audio"><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a></span>
+			<span class="icon border globe"><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a></span>
+			<span class="icon border noglobe"><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a></span>
+			$jotplugins
+			<ul id="profile-jot-submit-wrapper">
+				<li>
+					<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
+				</li>
+
+				<li id="profile-jot-perms" class="profile-jot-perms">
+					<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
+				</li>
+
+				<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
+
+			</ul>
+			<span id="profile-rotator" class="loading" style="display: none">
+				<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
 		</div>
-
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" style="display:none">
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang</div>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-</div>
-
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div>
 	
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
+	<div id="jot-preview-content" style="display:none;"></div>
-  	$jotplugins
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
 	</div>
-	<div id="profile-jot-tools-end"></div>
 
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
 </form>
-</div>
+
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
+{{ if $content }}<script>initEditor();</script>{{ endif }}

view/theme/dispy/mail_head.tpl

@@ -1,7 +1,5 @@
 <h3>$messages</h3>
 
-<ul class="tabs-wrapper">
+<div class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
+$tab_content
-<li><a href="message/sent" class="tabs">$outbox</a></li>
+</div>
-<li><a href="message/new" class="tabs">$new</a></li>
-</ul>

view/theme/dispy/nav.tpl

@@ -1,57 +1,116 @@
 <nav>
-  $langselector
+$langselector
 
-  <span id="banner">$banner</span>
+<span id="banner">$banner</span>
 
-  {{ if $nav.help }}<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>{{ endif }}
+<!-- yes, they're going the other way. seems that's how the template renderer
-  {{ if $nav.login }}<a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a> {{ endif }}
+works -->
-  <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
-  <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
 
-  <div id="user-menu" >
+    <div id="nav-floater">
-	  <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+    <div id="nav-buttons">
+    {{ if $nav.help }}
+    <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
+    {{ endif }}
+    {{ if $nav.apps }}
+    <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
+    {{ endif }}
+    <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a>
+    <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a>
+    {{ if $nav.messages }}
+    <a id="nav-messages-link" class="nav-link $nav.messages.2"
+    href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a>
+    {{ endif }}
+    {{ if $nav.notifications }}
+    <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+    <ul id="nav-notifications-menu" class="menu-popup">
+        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+        <li class="empty">$emptynotifications</li>
+    </ul>
+    {{ endif }}
+    {{ if $nav.community }}
+    <a id="nav-community-link" class="nav-link $nav.community.2"
+    href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
+    {{ endif }}
+    {{ if $nav.network }}
+    <a id="nav-network-link" class="nav-link $nav.network.2"
+    href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
+    {{ endif }}
+    {{ if $nav.home }}
+    <a id="nav-home-link" class="nav-link $nav.home.2"
+    href="$nav.home.0" title="$nav.home.1">$nav.home.1</a>
+    {{ endif }}
+    {{ 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 }}
+    </div>
 
-      <ul id="user-menu-popup" 
+    <div id="user-menu">
-           onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-           onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
 
+        {{ if $nav.register }}
+        <li>
+        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
+        </li>
+        {{ endif }}
 
-		  {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0"  title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
 
-	      {{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
+        {{ if $nav.contacts }}
+        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
+        {{ endif }}
+        {{ if $nav.profiles }}
+        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
+        {{ endif }}
+        {{ if $nav.settings }}
+        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
+        {{ endif }}
+        {{ if $nav.manage }}
+        <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
+        {{ endif }}
+        {{ if $nav.admin }}
+        <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
+        {{ endif }}
 
-	      {{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
+        {{ if $nav.login }}
+        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
+        {{ endif }}
 
-              {{ if $nav.community }}
+        {{ if $nav.logout }}
-              <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-              {{ endif }}
+        {{ endif }}
+        </ul>
+    </div>
 
-	      {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
+    <div id="notifications">
-	      {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
+        {{ if $nav.home }}
-	      {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
+        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
-	
+        {{ endif }}
-	      {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
+        {{ if $nav.network }}
-	      {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
+        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
-	      
+        {{ endif }}
-	      {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
+        {{ if $nav.notifications }}
-	
+        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
-		  {{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
+        {{ endif }}
-	
+        {{ if $nav.messages }}
-
+        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
-	      {{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
+        {{ endif }}
-      </ul>
+    </div>
-
+</div>
-	  <div id="notifications">
+    <a href="#" class="floaterflip"></a>
-      {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-      {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-      {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
-      {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-	  </div>
-
-  </div>
-
-
-  {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
 </nav>
 
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
 

view/theme/dispy/profile_vcard.tpl

@@ -2,34 +2,53 @@
 
 	<div class="fn label">$profile.name</div>
 	
-				
+	{{ if $pdesc }}
-	
+    <div class="title">$profile.pdesc</div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+    {{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
+	<div id="profile-photo-wrapper">
-
+    <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
-
+    </div>
 
 	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
+		<div class="location">
-		<dd class="adr">
+        <span class="location-label">$location</span>
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+		<div class="adr">
-			<span class="city-state-zip">
+			{{ if $profile.address }}
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+            <div class="street-address">$profile.address</div>{{ endif }}
-				<span class="region">$profile.region</span>
+			<span class="city-state-zip">$profile.zip</span>
-				<span class="postal-code">$profile.postal-code</span>
+            <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-			</span>
+            <span class="region">$profile.region</span>
+            <span class="postal-code">$profile.postal-code</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
+		</div>
-		</dl>
+		</div>
 	{{ endif }}
 
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	{{ if $gender }}
+    <div class="mf">
+        <span class="gender-label">$gender</span>
+        <span class="x-gender">$profile.gender</span>
+    </div>
+    {{ endif }}
 	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+	{{ if $profile.pubkey }}
+    <div class="key" style="display:none;">$profile.pubkey</div>
+    {{ endif }}
 
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+	{{ if $marital }}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>$marital</span>
+    <span class="marital-text">$profile.marital</span>
+    </div>
+    {{ endif }}
 
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+	{{ if $homepage }}
+    <div class="homepage">
+    <span class="homepage-label">$homepage</span>
+    <span class="homepage-url"><a href="$profile.homepage"
+    target="external-link">$profile.homepage</a></span>
+    </div>{{ endif }}
 
 	{{ inc diaspora_vcard.tpl }}{{ endinc }}
 	

view/theme/dispy/theme.php

@@ -0,0 +1,74 @@
+<?php
+$a->theme_info = array();
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+    $('.group-edit-icon').hover(
+        function() {
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.sidebar-group-element').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).addClass('icon');
+            $('#edit-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#edit-' + id).removeClass('icon');
+            $('#edit-' + id).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchdrop').hover(
+        function() {
+            $(this).addClass('drop');
+            $(this).addClass('icon');
+            $(this).removeClass('iconspacer'); },
+
+        function() {
+            $(this).removeClass('drop');
+            $(this).removeClass('icon');
+            $(this).addClass('iconspacer'); }
+    );
+
+    $('.savedsearchterm').hover(
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).addClass('icon');
+            $('#drop-' + id).addClass('drophide');
+            $('#drop-' + id).removeClass('iconspacer'); },
+
+        function() {
+            id = $(this).attr('id');
+            $('#drop-' + id).removeClass('icon');
+            $('#drop-' + id).removeClass('drophide');
+            $('#drop-' + id).addClass('iconspacer'); }
+        );
+
+    function toggleToolbar() {
+        if ( $('#nav-floater').is(':visible') ) {
+            $('#nav-floater').slideUp('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-210px -60px' 
+            });
+        } else {
+            $('#nav-floater').slideDown('fast');
+            $('.floaterflip').css({
+                backgroundPosition: '-190px -60px'
+            });
+        }
+    };
+    $('.floaterflip').click(function() {
+        toggleToolbar();
+        return false;
+    });
+});
+</script>
+EOT;

view/theme/dispy/wall_item.tpl

@@ -38,7 +38,7 @@
 				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
 			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>'
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 		
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -68,10 +68,10 @@
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike" 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 class="wall-item-outside-wrapper-end$item.indent"></div>
 

view/theme/dispy/wallwall_item.tpl

@@ -43,7 +43,7 @@
 				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
 			{{ endif }}
 			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>'
+				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 			{{ endif }}
 		
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
@@ -59,7 +59,7 @@
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
 						{{ for $item.tags as $tag }}
-							<span class='tag'>$tag</span>
+							<span class="tag">$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
@@ -72,7 +72,7 @@
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike" 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>