14 files changed, 112 insertions, 23 deletions
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 35bbbe0fd..e40504c8f 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -7,7 +7,7 @@
 </div>
 </div>
 
-<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+<div class="contact-name" id="directory-name-{{$entry.id}}"  ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div>
 {{if $entry.connect}}
 <div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
 {{/if}}
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
new file mode 100755
index 000000000..a1800c994
--- /dev/null
+++ b/view/tpl/direntry_large.tpl
@@ -0,0 +1,34 @@
+<div class="directory-popup-item lframe" id="directory-item-{{$id}}" >
+<div class="generic-content-wrapper">
+
+<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" >
+<div class="contact-photo" id="directory-photo-{{$id}}" >
+<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a>
+</div>
+</div>
+
+<div class="contact-name" id="directory-name-{{$id}}"  >{{$name}}</div>
+{{if $connect}}
+<div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div>
+{{/if}}
+<div class="contact-details">{{$details}}</div>
+{{if $marital}}
+<div class="directory-marital">{{$marital}} </div>
+{{/if}}
+{{if $sexual}}
+<div class="directory-sexual">{{$sexual}} </div>
+{{/if}}
+{{if $homepage}}
+<div class="directory-homepage">{{$homepage}} </div>
+{{/if}}
+{{if $hometown}}
+<div class="directory-hometown">{{$hometown}} </div>
+{{/if}}
+{{if $about}}
+<div class="directory-about">{{$about}} </div>
+{{/if}}
+{{if $kw}}
+<div class="directory-keywords">{{$kw}} {{$keywords}}</div>
+{{/if}}
+</div>
+</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index a0bc9c805..e1e1e3080 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -12,7 +12,6 @@
 		<input type="hidden" name="post_id" value="{{$post_id}}" />
 		<input type="hidden" name="webpage" value="{{$webpage}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-
 		{{$mimeselect}}
 		{{$layoutselect}}
 
@@ -71,7 +70,7 @@
 	</div>
 	{{/if}}
 
-	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
+	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
 
 
 	<div id="profile-jot-perms-end"></div>
diff --git a/view/tpl/list_things.tpl b/view/tpl/list_things.tpl
new file mode 100644
index 000000000..fb8935d82
--- /dev/null
+++ b/view/tpl/list_things.tpl
@@ -0,0 +1,13 @@
+{{if $things}}
+{{foreach $things as $key => $items}}
+<b>{{$items.profile}} {{$key}}</b>
+<ul class="profile-thing-list">
+{{foreach $items as $item}}
+<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}}
+<a href="{{$item.url}}" >{{$item.term}}</a>
+</li>
+{{/foreach}}
+</ul>
+<div class="clear"></div>
+{{/foreach}}
+{{/if}}
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
index 4ad75a82e..b0cfed2e5 100755
--- a/view/tpl/oembed_video.tpl
+++ b/view/tpl/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
-	<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;'></div>
+<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
+	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
+	<div style="position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;"></div>
 </a>
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index d8175bdd2..9b6b182c8 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -2,7 +2,7 @@
 
 <div class="generic-content-wrapper" id="page-content-wrapper" >
 	<h3 class="page-title">{{$title}}</h3>
-	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zid={{$zid}}{{/if}}">{{$author}}</a></div>
 	<div class="page-date">{{$date}}</div>
 	<div class="page-body">{{$body}}</div>
 </div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index c170d47a3..a63bff78c 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,4 +1,3 @@
-{{include file="prettyphoto.tpl"}}
 <div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}">
 		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" />
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index cdaae67e4..e56fd5b57 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,5 +1,3 @@
-{{include file="prettyphoto.tpl"}}
-
 <div id="live-display"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
@@ -11,7 +9,7 @@
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">{{$desc}}</div>
diff --git a/view/tpl/prettyphoto.tpl b/view/tpl/prettyphoto.tpl
deleted file mode 100644
index 6d047e620..000000000
--- a/view/tpl/prettyphoto.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto();
-  });
-</script>
-
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
index b771a1ea2..856d689f1 100755
--- a/view/tpl/profile_listing_header.tpl
+++ b/view/tpl/profile_listing_header.tpl
@@ -2,7 +2,10 @@
 <p id="profile-listing-desc" class="button" >
 <a href="profile_photo" >{{$chg_photo}}</a>
 </p>
-<div id="profile-listing-new-link-wrapper" class="button" >
+<p id="profile-stuff-link" class="button">
+<a href="thing" title="{{$stuff_desc}}">{{$addstuff}}</a>
+</p>
+<p id="profile-listing-new-link-wrapper" class="button" >
 <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
 </div>
 
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 48c1ba525..916a946d3 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -2,8 +2,14 @@
 
 <form action="register" method="post" id="register-form">
 
-{{if $registertext}}
-<div id="register-desc" class="descriptive-paragraph">{{$registertext}}</div>
+
+
+{{if $reg_is}}
+<div id="register-desc" class="descriptive-paragraph">{{$reg_is}}</div>
+{{/if}}
+{{if $registertext}}<div id="register-text" class="descriptive-paragraph">{{$registertext}}</div>
+{{/if}}
+{{if $other_sites}}<div id="register-sites" class="descriptive-paragraph">{{$other_sites}}</div>
 {{/if}}
 
 {{if $invitations}}
diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl
new file mode 100644
index 000000000..2a8c06076
--- /dev/null
+++ b/view/tpl/show_thing.tpl
@@ -0,0 +1,16 @@
+<h2>{{$header}}</h2>
+{{if $thing}}
+<div class="thing-show">
+{{if $thing.imgurl}}<img src="{{$thing.imgurl}}" width="175" height="175" alt="{{$thing.term}}" />{{/if}}
+<a href="{{$thing.url}}" >{{$thing.term}}</a>
+</div>
+{{if $canedit}}
+<div class="thing-edit-links">
+<a href="thing/edit/{{$thing.term_hash}}" title="{{$edit}}"><i class="icon-pencil thing-edit-icon"></i></a>
+<a href="thing/drop/{{$thing.term_hash}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a>
+</div>
+<div class="thing-edit-links-end"></div>
+{{/if}}
+
+{{/if}}
+
diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
new file mode 100644
index 000000000..8379c15ae
--- /dev/null
+++ b/view/tpl/thing_edit.tpl
@@ -0,0 +1,29 @@
+<h2>{{$thing_hdr}}</h2>
+<form action="thing" method="post" >
+<input type="hidden" name="term_hash" value="{{$thing_hash}}" />
+
+{{if $multiprof }}
+<div class="thing-profile-label">{{$profile_lbl}}</div>
+
+<div class="thing-profile">{{$profile_select}}</div>
+{{/if}}
+
+<div class="thing-verb-label">{{$verb_lbl}}</div>
+
+<div class="thing-verb">{{$verb_select}}</div>
+
+
+<label class="thing-label" for="thing-term">{{$thing_lbl}}</label>
+<input type="text" class="thing-input" id="thing-term" name="term" value="{{$thething}}" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-url">{{$url_lbl}}</label>
+<input type="text" class="thing-input" id="thing-url" name="url" value="{{$theurl}}" />
+<div class="thing-field-end"></div>
+<label class="thing-label" for="thing-img">{{$img_lbl}}</label>
+<input type="text" class="thing-input" id="thing-img" name="img" value="{{$imgurl}}" />
+<div class="thing-field-end"></div>
+
+<div class="thing-end"></div> 
+
+<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
+</form>
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 437e93348..c19836a28 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -1,5 +1,3 @@
-{{include file="prettyphoto.tpl"}}
-
 {{if $pages}}
 
 	   <div id="pagelist-content-wrapper" class="generic-content-wrapper">
@@ -8,7 +6,7 @@
 					<div class="page-list-item">
 					{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}}
 					{{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}}
-					{{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" rel="xprettyPhoto[iframesx]" title="{{$preview}}"><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}}
+					{{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}}
 					{{$item.title}}
 					</div>
 				{{/foreach}}