From 3b394ea43fd3bc011f98a9160a8b408283f97ebc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 25 Oct 2012 18:42:42 -0700
Subject: comments sort of working again but now need to fix the threading
 which was ported when it was only half working

---
 view/tpl/register.tpl    | 80 ++++++++++++++++++++----------------------------
 view/tpl/wall_thread.tpl | 71 +++++++++++++++++++++++-------------------
 view/tpl/zregister.tpl   | 45 ---------------------------
 3 files changed, 74 insertions(+), 122 deletions(-)
 delete mode 100644 view/tpl/zregister.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 244762c4b..4b565718d 100644
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,57 +1,45 @@
-<h3>$regtitle</h3>
+<h2>$title</h2>
 
 <form action="register" method="post" id="register-form">
 
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<p id="register-fill-desc">$fillwith</p>
-	<p id="register-fill-ext">$fillext</p>
+{{ if $registertext }}
+<div id="register-desc" class="descriptive-paragraph">$registertext</div>
+{{ endif }}
 
 {{ if $invitations }}
-
 	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
 
+	<label for="register-invite" id="label-register-invite" class="register-label">$label_invite</label>
+	<input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="$invite_code" />
+	<div id="register-invite-feedback" class="register-feedback"></div>
+	<div id="register-invite-end" class="register-field-end"></div>
 {{ endif }}
 
+	<label for="register-email" id="label-register-email" class="register-label" >$label_email</label>
+	<input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="$email" />
+	<div id="register-email-feedback" class="register-feedback"></div>
+	<div id="register-email-end"  class="register-field-end"></div>
+
+	<label for="register-password" id="label-register-password" class="register-label" >$label_pass1</label>
+	<input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="$pass1" />
+	<div id="register-password-feedback" class="register-feedback"></div>
+	<div id="register-password-end"  class="register-field-end"></div>
+
+	<label for="register-password2" id="label-register-password2" class="register-label" >$label_pass2</label>
+	<input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="$pass2" />
+	<div id="register-password2-feedback" class="register-feedback"></div>
+	<div id="register-password2-end"  class="register-field-end"></div>
+
+	{{ if $enable_tos }}
+	<input type="checkbox" name="tos" id="register-tos" value="1" />
+	<label for="register-tos" id="label-register-tos">$label_tos</label>
+	<div id="register-tos-feedback" class="register-feedback"></div>
+	<div id="register-tos-end"  class="register-field-end"></div>
+	{{ else }}
+	<input type="hidden" name="tos" value="1" />
+	{{ endif }}
+
+	<input type="submit" name="submit" id="register-submit-button" value="$submit" />
+	<div id="register-submit-end" class="register-field-end"></div>
 
-	<div id="register-name-wrapper" >
-		<label for="register-name" id="label-register-name" >$namelabel</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<p id="register-nickname-desc" >$nickdesc</p>
-
-	<div id="register-nickname-wrapper" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" ><div id="register-sitename">@$sitename</div>
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	$publish
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
 </form>
-
-$license
-
-
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
index ade8264fa..a67334e33 100644
--- a/view/tpl/wall_thread.tpl
+++ b/view/tpl/wall_thread.tpl
@@ -6,38 +6,40 @@
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
-{{ if $item.threaded }}
-<div class="wall-item-outside-wrapper $item.indent$item.previewing threaded" id="wall-item-outside-wrapper-$item.id" >
-{{ else }}
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-{{ endif }}
+<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" 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" 
-				 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"  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>
+		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
+			{{ if $item.owner_url }}
+			<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>
+			{{ endif }}
+			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" 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>
-						$item.item_photo_menu
-					</ul>
-				</div>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul>
+                        $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 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"  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>	
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$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>
@@ -47,6 +49,15 @@
 							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
+			{{ if $item.has_cats }}
+			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
+
+			{{ if $item.has_folders }}
+			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+			</div>
+			{{ endif }}
 			</div>
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$item.id">
@@ -59,7 +70,7 @@
 			</div>
 			{{ endif }}
 			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title"  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="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>
@@ -71,39 +82,37 @@
 			{{ 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 }}	
+			{{ 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>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
-	</div>
+	</div>	
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
 	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
 
 			{{ if $item.threaded }}
 			{{ if $item.comment }}
-			<div class="wall-item-comment-wrapper$item.indent" >
+			<div class="wall-item-comment-wrapper $item.indent" >
 				$item.comment
 			</div>
 			{{ endif }}
 			{{ endif }}
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+<div class="wall-item-outside-wrapper-end $item.indent" ></div>
 </div>
 {{ for $item.children as $item }}
 	{{ inc $item.template }}{{ endinc }}
 {{ endfor }}
 
-{{ if $item.comment }}
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
 {{ endif }}
-{{ endif }}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
-
diff --git a/view/tpl/zregister.tpl b/view/tpl/zregister.tpl
deleted file mode 100644
index 3a2c38a13..000000000
--- a/view/tpl/zregister.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<h2>$title</h2>
-
-<form action="zregister" method="post" id="zregister-form">
-
-{{ if $registertext }}
-<div id="zregister-desc" class="descriptive-paragraph">$registertext</div>
-{{ endif }}
-
-{{ if $invitations }}
-	<p id="register-invite-desc">$invite_desc</p>
-
-	<label for="zregister-invite" id="label-zregister-invite" class="zregister-label">$label_invite</label>
-	<input type="text" maxlength="72" size="32" name="invite_code" id="zregister-invite" class="zregister-input" value="$invite_code" />
-	<div id="zregister-invite-feedback" class="zregister-feedback"></div>
-	<div id="zregister-invite-end" class="zregister-field-end"></div>
-{{ endif }}
-
-	<label for="zregister-email" id="label-zregister-email" class="zregister-label" >$label_email</label>
-	<input type="text" maxlength="72" size="32" name="email" id="zregister-email" class="zregister-input" value="$email" />
-	<div id="zregister-email-feedback" class="zregister-feedback"></div>
-	<div id="zregister-email-end"  class="zregister-field-end"></div>
-
-	<label for="zregister-password" id="label-zregister-password" class="zregister-label" >$label_pass1</label>
-	<input type="password" maxlength="72" size="32" name="password" id="zregister-password" class="zregister-input" value="$pass1" />
-	<div id="zregister-password-feedback" class="zregister-feedback"></div>
-	<div id="zregister-password-end"  class="zregister-field-end"></div>
-
-	<label for="zregister-password2" id="label-zregister-password2" class="zregister-label" >$label_pass2</label>
-	<input type="password" maxlength="72" size="32" name="password2" id="zregister-password2" class="zregister-input" value="$pass2" />
-	<div id="zregister-password2-feedback" class="zregister-feedback"></div>
-	<div id="zregister-password2-end"  class="zregister-field-end"></div>
-
-	{{ if $enable_tos }}
-	<input type="checkbox" name="tos" id="zregister-tos" value="1" />
-	<label for="zregister-tos" id="label-zregister-tos">$label_tos</label>
-	<div id="zregister-tos-feedback" class="zregister-feedback"></div>
-	<div id="zregister-tos-end"  class="zregister-field-end"></div>
-	{{ else }}
-	<input type="hidden" name="tos" value="1" />
-	{{ endif }}
-
-	<input type="submit" name="submit" id="zregister-submit-button" value="$submit" />
-	<div id="zregister-submit-end" class="zregister-field-end"></div>
-
-</form>
-- 
cgit v1.2.3