major theme re-org, only duepuntozero and slackr working atm

author: friendica <info@friendica.com> 2012-08-01 05:02:43 -0700
committer: friendica <info@friendica.com> 2012-08-01 05:02:43 -0700
commit: dcbc0c0c9516adf616023615871439b4015fa686 (patch)
tree: 451f1e7f53e9635a2640bef66c4541d1dd4b6c10 /view/tpl
parent: 7a0894287268658361c90e2f4d1b77f8ca5739a6 (diff)
download: volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.tar.gz
volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.tar.bz2
volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.zip
200 files changed, 5529 insertions, 0 deletions
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
new file mode 100644
index 000000000..bf4d4e949
--- /dev/null
+++ b/view/tpl/404.tpl
@@ -0,0 +1 @@
+<h1>$message</h1>
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
new file mode 100644
index 000000000..e5231b0f8
--- /dev/null
+++ b/view/tpl/acl_selector.tpl
@@ -0,0 +1,28 @@
+<div id="acl-wrapper">
+	<input id="acl-search">
+	<a href="#" id="acl-showall">$showall</a>
+	<div id="acl-list">
+		<div id="acl-list-content">
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
+<div class="acl-list-item" rel="acl-template" style="display:none">
+	<img src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>$show</a>
+	<a href="#" class='acl-button-hide'>$hide</a>
+</div>
+
+<script>
+$(document).ready(function() {
+	setTimeout( function () {
+		if(typeof acl=="undefined"){
+			acl = new ACL(
+				baseurl+"/acl",
+				[ $allowcid,$allowgid,$denycid,$denygid ]
+			);
+		}
+	}, 5000 );
+});
+</script>
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
new file mode 100644
index 000000000..ca1f4985c
--- /dev/null
+++ b/view/tpl/admin_aside.tpl
@@ -0,0 +1,42 @@
+<script>
+	// update pending count //
+	$(function(){
+
+		$("nav").bind('nav-update',  function(e,data){
+			var elm = $('#pending-update');
+			var register = $(data).find('register').text();
+			if (register=="0") { reigster=""; elm.hide();} else { elm.show(); }
+			elm.html(register);
+		});
+	});
+</script>
+<h4><a href="$admurl">$admtxt</a></h4>
+<ul class='admin linklist'>
+	<li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+	<li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+	<li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+	<li class='admin link button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
+	<li class='admin link button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
+</ul>
+
+{{ if $admin.update }}
+<ul class='admin linklist'>
+	<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+	<li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{ endif }}
+
+
+{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
+<ul class='admin linklist'>
+	{{ for $admin.plugins_admin as $l }}
+	<li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
+	{{ endfor }}
+</ul>
+	
+	
+<h4>$logtxt</h4>
+<ul class='admin linklist'>
+	<li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+</ul>
+
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
new file mode 100644
index 000000000..b777cf420
--- /dev/null
+++ b/view/tpl/admin_logs.tpl
@@ -0,0 +1,19 @@
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/logs" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_logs" value="$submit" /></div>
+	
+	</form>
+	
+	<h3>$logname</h3>
+	<div style="width:100%; height:400px; overflow: auto; "><pre>$data</pre></div>
+<!--	<iframe src='$baseurl/$logname' style="width:100%; height:400px"></iframe> -->
+	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="$clear" /></div> -->
+</div>
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
new file mode 100644
index 000000000..74b56bb4e
--- /dev/null
+++ b/view/tpl/admin_plugins.tpl
@@ -0,0 +1,15 @@
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+		<ul id='pluginslist'>
+		{{ for $plugins as $p }}
+			<li class='plugin $p.1'>
+				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t&amp;t=$form_security_token' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
+				<a href='$baseurl/admin/$function/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span>
+				{{ if $p.2.experimental }} $experimental {{ endif }}{{ if $p.2.unsupported }} $unsupported {{ endif }}
+
+					<div class='desc'>$p.2.description</div>
+			</li>
+		{{ endfor }}
+		</ul>
+</div>
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
new file mode 100644
index 000000000..931c7b83c
--- /dev/null
+++ b/view/tpl/admin_plugins_details.tpl
@@ -0,0 +1,36 @@
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t&amp;t=$form_security_token">$action</a></p>
+	<p>$info.description</p>
+	
+	<p class="author">$str_author
+	{{ for $info.author as $a }}
+		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
+	{{ endfor }}
+	</p>
+
+	<p class="maintainer">$str_maintainer
+	{{ for $info.maintainer as $a }}
+		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
+	{{ endfor }}
+	</p>
+	
+	{{ if $screenshot }}
+	<a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a>
+	{{ endif }}
+
+	{{ if $admin_form }}
+	<h3>$settings</h3>
+	<form method="post" action="$baseurl/admin/$function/$plugin/">
+		$admin_form
+	</form>
+	{{ endif }}
+
+	{{ if $readme }}
+	<h3>Readme</h3>
+	<div id="plugin_readme">
+		$readme
+	</div>
+	{{ endif }}
+</div>
diff --git a/view/tpl/admin_remoteupdate.tpl b/view/tpl/admin_remoteupdate.tpl
new file mode 100644
index 000000000..874c6e626
--- /dev/null
+++ b/view/tpl/admin_remoteupdate.tpl
@@ -0,0 +1,98 @@
+<script src="js/jquery.htmlstream.js"></script>
+<script>
+	/* ajax updater */
+	function updateEnd(data){
+		//$("#updatepopup .panel_text").html(data);
+		$("#remoteupdate_form").find("input").removeAttr('disabled');
+		$(".panel_action_close").fadeIn()	
+	}
+	function updateOn(data){
+		
+		var patt=/§([^§]*)§/g; 
+		var matches = data.match(patt);
+		$(matches).each(function(id,data){
+			data = data.replace(/§/g,"");
+			d = data.split("@");
+			console.log(d);
+			elm = $("#updatepopup .panel_text #"+d[0]);
+			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
+			if (elm.length==0){
+				$("#updatepopup .panel_text").append(html);
+			} else {
+				$(elm).replaceWith(html);
+			}
+		});
+		
+		
+	}
+	
+	$(function(){
+		$("#remoteupdate_form").submit(function(){
+			var data={};
+			$(this).find("input").each(function(i, e){
+				name = $(e).attr('name');
+				value = $(e).val();
+				e.disabled = true;
+				data[name]=value;
+			});
+
+			$("#updatepopup .panel_text").html("");
+			$("#updatepopup").show();
+			$("#updatepopup .panel").hide().slideDown(500);
+			$(".panel_action_close").hide().click(function(){
+				$("#updatepopup .panel").slideUp(500, function(){
+					$("#updatepopup").hide();
+				});				
+			});
+
+			$.post(
+				$(this).attr('action'), 
+				data, 
+				updateEnd,
+				'text',
+				updateOn
+			);
+
+			
+			return false;
+		})
+	});
+</script>
+<div id="updatepopup" class="popup">
+	<div class="background"></div>
+	<div class="panel">
+		<div class="panel_in">
+			<h1>Friendica Update</h1>
+			<div class="panel_text"></div>
+			<div class="panel_actions">
+				<input type="button" value="$close" class="panel_action_close">
+			</div>
+		</div>
+	</div>
+</div>
+<div id="adminpage">
+	<dl> <dt>Your version:</dt><dd>$localversion</dd> </dl>
+{{ if $needupdate }}
+	<dl> <dt>New version:</dt><dd>$remoteversion</dd> </dl>
+
+	<form id="remoteupdate_form" method="POST" action="$baseurl/admin/update">
+	<input type="hidden" name="$remotefile.0" value="$remotefile.2">
+
+	{{ if $canwrite }}
+		<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
+	{{ else }}
+		<h3>Your friendica installation is not writable by web server.</h3>
+		{{ if $canftp }}
+			<p>You can try to update via FTP</p>
+			{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
+			{{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
+			{{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
+			{{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
+			<div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
+		{{ endif }}
+	{{ endif }}
+	</form>
+{{ else }}
+<h4>No updates</h4>
+{{ endif }}
+</div>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
new file mode 100644
index 000000000..3ca03262d
--- /dev/null
+++ b/view/tpl/admin_site.tpl
@@ -0,0 +1,91 @@
+<script>
+	$(function(){
+		
+		$("#cnftheme").fancybox({
+			width: 800,
+			autoDimensions: false,
+			onStart: function(){
+				var theme = $("#id_theme :selected").val();
+				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
+			}, 
+			onComplete: function(){
+				$("div#fancybox-content form").submit(function(e){
+					var url = $(this).attr('action');
+					// can't get .serialize() to work...
+					var data={};
+					$(this).find("input").each(function(){
+						data[$(this).attr('name')] = $(this).val();
+					});
+					$(this).find("select").each(function(){
+						data[$(this).attr('name')] = $(this).children(":selected").val();
+					});
+					console.log(":)", url, data);
+					
+					$.post(url, data, function(data) {
+						if(timer) clearTimeout(timer);
+						NavUpdate();
+						$.fancybox.close();
+					})
+					
+					return false;
+				});
+				
+			}
+		});
+	});
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$registration</h3>
+	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+	
+	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+
+	<h3>$upload</h3>
+	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+	
+	<h3>$corporate</h3>
+	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	<h3>$advanced</h3>
+	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	
+	</form>
+</div>
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
new file mode 100644
index 000000000..4efe1960c
--- /dev/null
+++ b/view/tpl/admin_summary.tpl
@@ -0,0 +1,40 @@
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+
+	<dl>
+		<dt>$queues.label</dt>
+		<dd>$queues.deliverq - $queues.queue</dd>
+	</dl>
+	<dl>
+		<dt>$pending.0</dt>
+		<dd>$pending.1</dt>
+	</dl>
+
+	<dl>
+		<dt>$users.0</dt>
+		<dd>$users.1</dd>
+	</dl>
+	{{ for $accounts as $p }}
+		<dl>
+			<dt>$p.0</dt>
+			<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
+		</dl>
+	{{ endfor }}
+
+
+	<dl>
+		<dt>$plugins.0</dt>
+		
+		{{ for $plugins.1 as $p }}
+			<dd>$p</dd>
+		{{ endfor }}
+		
+	</dl>
+
+	<dl>
+		<dt>$version.0</dt>
+		<dd>$version.1 - $build</dt>
+	</dl>
+
+
+</div>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
new file mode 100644
index 000000000..f67e4a0f7
--- /dev/null
+++ b/view/tpl/admin_users.tpl
@@ -0,0 +1,89 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools">
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
new file mode 100644
index 000000000..56a7b73fc
--- /dev/null
+++ b/view/tpl/album_edit.tpl
@@ -0,0 +1,15 @@
+<div id="photo-album-edit-wrapper">
+<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
+
+
+<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
+<input type="text" size="64" name="albumname" value="$album" >
+
+<div id="photo-album-edit-name-end"></div>
+
+<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
+<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete();" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
new file mode 100644
index 000000000..3281e59dd
--- /dev/null
+++ b/view/tpl/api_config_xml.tpl
@@ -0,0 +1,66 @@
+<config>
+ <site>
+  <name>$config.site.name</name>
+  <server>$config.site.server</server>
+  <theme>default</theme>
+  <path></path>
+  <logo>$config.site.logo</logo>
+
+  <fancy>true</fancy>
+  <language>en</language>
+  <email>$config.site.email</email>
+  <broughtby></broughtby>
+  <broughtbyurl></broughtbyurl>
+  <timezone>UTC</timezone>
+  <closed>$config.site.closed</closed>
+
+  <inviteonly>false</inviteonly>
+  <private>$config.site.private</private>
+  <textlimit>$config.site.textlimit</textlimit>
+  <ssl>$config.site.ssl</ssl>
+  <sslserver>$config.site.sslserver</sslserver>
+  <shorturllength>30</shorturllength>
+
+</site>
+ <license>
+  <type>cc</type>
+  <owner></owner>
+  <url>http://creativecommons.org/licenses/by/3.0/</url>
+  <title>Creative Commons Attribution 3.0</title>
+  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
+
+</license>
+ <nickname>
+  <featured></featured>
+</nickname>
+ <profile>
+  <biolimit></biolimit>
+</profile>
+ <group>
+  <desclimit></desclimit>
+</group>
+ <notice>
+
+  <contentlimit></contentlimit>
+</notice>
+ <throttle>
+  <enabled>false</enabled>
+  <count>20</count>
+  <timespan>600</timespan>
+</throttle>
+ <xmpp>
+
+  <enabled>false</enabled>
+  <server>INVALID SERVER</server>
+  <port>5222</port>
+  <user>update</user>
+</xmpp>
+ <integration>
+  <source>StatusNet</source>
+
+</integration>
+ <attachments>
+  <uploads>false</uploads>
+  <file_quota>0</file_quota>
+</attachments>
+</config>
diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
new file mode 100644
index 000000000..0ea7eb13b
--- /dev/null
+++ b/view/tpl/api_friends_xml.tpl
@@ -0,0 +1,5 @@
+<users type="array">
+	{{for $users as $user }}
+	{{inc api_user_xml.tpl }}{{endinc}}
+	{{endfor}}
+</users>
diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
new file mode 100644
index 000000000..36ec1993d
--- /dev/null
+++ b/view/tpl/api_ratelimit_xml.tpl
@@ -0,0 +1,6 @@
+<hash>
+ <remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
+ <hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
+ <reset-time type="datetime">$hash.reset_time</reset-time>
+ <reset_time_in_seconds type="integer">$hash.resettime_in_seconds</reset_time_in_seconds>
+</hash>
diff --git a/view/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
new file mode 100644
index 000000000..f6cd9c2c0
--- /dev/null
+++ b/view/tpl/api_status_xml.tpl
@@ -0,0 +1,46 @@
+<status>{{ if $status }}
+    <created_at>$status.created_at</created_at>
+    <id>$status.id</id>
+    <text>$status.text</text>
+    <source>$status.source</source>
+    <truncated>$status.truncated</truncated>
+    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
+    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
+    <favorited>$status.favorited</favorited>
+    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
+    <geo>$status.geo</geo>
+    <coordinates>$status.coordinates</coordinates>
+    <place>$status.place</place>
+    <contributors>$status.contributors</contributors>
+	<user>
+	  <id>$status.user.id</id>
+	  <name>$status.user.name</name>
+	  <screen_name>$status.user.screen_name</screen_name>
+	  <location>$status.user.location</location>
+	  <description>$status.user.description</description>
+	  <profile_image_url>$status.user.profile_image_url</profile_image_url>
+	  <url>$status.user.url</url>
+	  <protected>$status.user.protected</protected>
+	  <followers_count>$status.user.followers</followers_count>
+	  <profile_background_color>$status.user.profile_background_color</profile_background_color>
+  	  <profile_text_color>$status.user.profile_text_color</profile_text_color>
+  	  <profile_link_color>$status.user.profile_link_color</profile_link_color>
+  	  <profile_sidebar_fill_color>$status.user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+  	  <profile_sidebar_border_color>$status.user.profile_sidebar_border_color</profile_sidebar_border_color>
+  	  <friends_count>$status.user.friends_count</friends_count>
+  	  <created_at>$status.user.created_at</created_at>
+  	  <favourites_count>$status.user.favourites_count</favourites_count>
+  	  <utc_offset>$status.user.utc_offset</utc_offset>
+  	  <time_zone>$status.user.time_zone</time_zone>
+  	  <profile_background_image_url>$status.user.profile_background_image_url</profile_background_image_url>
+  	  <profile_background_tile>$status.user.profile_background_tile</profile_background_tile>
+  	  <profile_use_background_image>$status.user.profile_use_background_image</profile_use_background_image>
+  	  <notifications></notifications>
+  	  <geo_enabled>$status.user.geo_enabled</geo_enabled>
+  	  <verified>$status.user.verified</verified>
+  	  <following></following>
+  	  <statuses_count>$status.user.statuses_count</statuses_count>
+  	  <lang>$status.user.lang</lang>
+  	  <contributors_enabled>$status.user.contributors_enabled</contributors_enabled>
+	  </user>
+{{ endif }}</status>
diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
new file mode 100644
index 000000000..7509a2dc1
--- /dev/null
+++ b/view/tpl/api_test_xml.tpl
@@ -0,0 +1 @@
+<ok>$ok</ok>
diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
new file mode 100644
index 000000000..fb4f51f59
--- /dev/null
+++ b/view/tpl/api_timeline_atom.tpl
@@ -0,0 +1,90 @@
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
+ <id>$rss.self</id>
+ <title>Friendika</title>
+ <subtitle>Friendika API feed</subtitle>
+ <logo>$rss.logo</logo>
+ <updated>$rss.atom_updated</updated>
+ <link type="text/html" rel="alternate" href="$rss.alternate"/>
+ <link type="application/atom+xml" rel="self" href="$rss.self"/>
+ 
+ 
+ <author>
+	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<uri>$user.url</uri>
+	<name>$user.name</name>
+	<link rel="alternate" type="text/html" href="$user.url"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/>
+	<georss:point></georss:point>
+	<poco:preferredUsername>$user.screen_name</poco:preferredUsername>
+	<poco:displayName>$user.name</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>$user.url</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
+ </author>
+
+ <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
+ <activity:subject>
+	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<id>$user.contact_url</id>
+	<title>$user.name</title>
+	<link rel="alternate" type="text/html" href="$user.url"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/>
+	<poco:preferredUsername>$user.screen_name</poco:preferredUsername>
+	<poco:displayName>$user.name</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>$user.url</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
+ </activity:subject>
+ 
+ 
+  	{{ for $statuses as $status }}
+	<entry>
+		<activity:object-type>$status.objecttype</activity:object-type>
+		<id>$status.message_id</id>
+		<title>$status.text</title>
+		<content type="html">$status.statusnet_html</content>
+		<link rel="alternate" type="text/html" href="$status.url"/>
+		<activity:verb>$status.verb</activity:verb>
+		<published>$status.published</published>
+		<updated>$status.updated</updated>
+
+		<link rel="self" type="application/atom+xml" href="$status.self"/>
+		<link rel="edit" type="application/atom+xml" href="$status.edit"/>
+		<statusnet:notice_info local_id="$status.id" source="$status.source" >
+		</statusnet:notice_info>
+
+		<author>
+			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+			<uri>$status.user.url</uri>
+			<name>$status.user.name</name>
+			<link rel="alternate" type="text/html" href="$status.user.url"/>
+			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$status.user.profile_image_url"/>
+
+			<georss:point/>
+			<poco:preferredUsername>$status.user.screen_name</poco:preferredUsername>
+			<poco:displayName>$status.user.name</poco:displayName>
+			<poco:address/>
+			<poco:urls>
+				<poco:type>homepage</poco:type>
+				<poco:value>$status.user.url</poco:value>
+				<poco:primary>true</poco:primary>
+			</poco:urls>
+		</author>
+		<link rel="ostatus:conversation" type="text/html" href="$status.url"/> 
+
+	</entry>    
+    {{ endfor }}
+</feed>
diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
new file mode 100644
index 000000000..40239273c
--- /dev/null
+++ b/view/tpl/api_timeline_rss.tpl
@@ -0,0 +1,26 @@
+<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
+  <channel>
+    <title>Friendika</title>
+    <link>$rss.alternate</link>
+    <atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
+    <description>Friendika timeline</description>
+    <language>$rss.language</language>
+    <ttl>40</ttl>
+	<image>
+		<link>$user.link</link>
+		<title>$user.name's items</title>
+		<url>$user.profile_image_url</url>
+	</image>
+	
+{{ for $statuses as $status }}
+  <item>
+    <title>$status.user.name: $status.text</title>
+    <description>$status.text</description>
+    <pubDate>$status.created_at</pubDate>
+    <guid>$status.url</guid>
+    <link>$status.url</link>
+    <twitter:source>$status.source</twitter:source>
+  </item>
+{{ endfor }}
+  </channel>
+</rss>
diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
new file mode 100644
index 000000000..4a32b411b
--- /dev/null
+++ b/view/tpl/api_timeline_xml.tpl
@@ -0,0 +1,20 @@
+<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
+{{ for $statuses as $status }} <status>
+  <text>$status.text</text>
+  <truncated>$status.truncated</truncated>
+  <created_at>$status.created_at</created_at>
+  <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
+  <source>$status.source</source>
+  <id>$status.id</id>
+  <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
+  <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
+  <geo>$status.geo</geo>
+  <favorited>$status.favorited</favorited>
+{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
+  <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
+  <url>$status.url</url>
+  <coordinates>$status.coordinates</coordinates>
+  <place>$status.place</place>
+  <contributors>$status.contributors</contributors>
+ </status>
+{{ endfor }}</statuses>
diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl
new file mode 100644
index 000000000..d286652c0
--- /dev/null
+++ b/view/tpl/api_user_xml.tpl
@@ -0,0 +1,46 @@
+  <user>
+   <id>$user.id</id>
+   <name>$user.name</name>
+   <screen_name>$user.screen_name</screen_name>
+   <location>$user.location</location>
+   <description>$user.description</description>
+   <profile_image_url>$user.profile_image_url</profile_image_url>
+   <url>$user.url</url>
+   <protected>$user.protected</protected>
+   <followers_count>$user.followers_count</followers_count>
+   <friends_count>$user.friends_count</friends_count>
+   <created_at>$user.created_at</created_at>
+   <favourites_count>$user.favourites_count</favourites_count>
+   <utc_offset>$user.utc_offset</utc_offset>
+   <time_zone>$user.time_zone</time_zone>
+   <statuses_count>$user.statuses_count</statuses_count>
+   <following>$user.following</following>
+   <profile_background_color>$user.profile_background_color</profile_background_color>
+   <profile_text_color>$user.profile_text_color</profile_text_color>
+   <profile_link_color>$user.profile_link_color</profile_link_color>
+   <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+   <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
+   <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
+   <profile_background_tile>$user.profile_background_tile</profile_background_tile>
+   <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
+   <notifications>$user.notifications</notifications>
+   <geo_enabled>$user.geo_enabled</geo_enabled>
+   <verified>$user.verified</verified>
+   <lang>$user.lang</lang>
+   <contributors_enabled>$user.contributors_enabled</contributors_enabled>
+   <status>{{ if $user.status }}
+    <created_at>$user.status.created_at</created_at>
+    <id>$user.status.id</id>
+    <text>$user.status.text</text>
+    <source>$user.status.source</source>
+    <truncated>$user.status.truncated</truncated>
+    <in_reply_to_status_id>$user.status.in_reply_to_status_id</in_reply_to_status_id>
+    <in_reply_to_user_id>$user.status.in_reply_to_user_id</in_reply_to_user_id>
+    <favorited>$user.status.favorited</favorited>
+    <in_reply_to_screen_name>$user.status.in_reply_to_screen_name</in_reply_to_screen_name>
+    <geo>$user.status.geo</geo>
+    <coordinates>$user.status.coordinates</coordinates>
+    <place>$user.status.place</place>
+    <contributors>$user.status.contributors</contributors>
+  {{ endif }}</status>
+  </user>
diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl
new file mode 100644
index 000000000..4c7f8c94c
--- /dev/null
+++ b/view/tpl/apps.tpl
@@ -0,0 +1,7 @@
+<h3>$title</h3>
+
+<ul>
+	{{ for $apps as $ap }}
+	<li>$ap</li>
+	{{ endfor }}
+</ul>
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
new file mode 100644
index 000000000..2feb547ee
--- /dev/null
+++ b/view/tpl/atom_feed.tpl
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:thr="http://purl.org/syndication/thread/1.0"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:media="http://purl.org/syndication/atommedia"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
+	  xmlns:statusnet="http://status.net/schema/api/1/" > 
+
+  <id>$feed_id</id>
+  <title>$feed_title</title>
+  <generator uri="http://friendica.com" version="$version">Friendica</generator>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  $hub
+  $salmon
+  $community
+
+  <updated>$feed_updated</updated>
+
+  <dfrn:owner>
+    <name dfrn:updated="$namdate" >$name</name>
+    <uri dfrn:updated="$uridate" >$profile_page</uri>
+    <link rel="photo"  type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
+    <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
+    $birthday
+  </dfrn:owner>
diff --git a/view/tpl/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl
new file mode 100644
index 000000000..0bae62b52
--- /dev/null
+++ b/view/tpl/atom_feed_dfrn.tpl
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:thr="http://purl.org/syndication/thread/1.0"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:media="http://purl.org/syndication/atommedia"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
+      xmlns:as="http://activitystrea.ms/spec/1.0/"
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
+	  xmlns:statusnet="http://status.net/schema/api/1/" > 
+
+  <id>$feed_id</id>
+  <title>$feed_title</title>
+  <generator uri="http://friendica.com" version="$version">Friendica</generator>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  $hub
+  $salmon
+  $community
+
+  <updated>$feed_updated</updated>
+
+  <author>
+    <name dfrn:updated="$namdate" >$name</name>
+    <uri dfrn:updated="$uridate" >$profile_page</uri>
+    <link rel="photo"  type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
+    <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
+    $birthday
+  </author>
diff --git a/view/tpl/atom_mail.tpl b/view/tpl/atom_mail.tpl
new file mode 100644
index 000000000..bf7c3efc8
--- /dev/null
+++ b/view/tpl/atom_mail.tpl
@@ -0,0 +1,17 @@
+
+<dfrn:mail>
+
+	<dfrn:sender>
+		<dfrn:name>$name</dfrn:name>
+		<dfrn:uri>$profile_page</dfrn:uri>
+		<dfrn:avatar>$thumb</dfrn:avatar>
+	</dfrn:sender>
+
+	<dfrn:id>$item_id</dfrn:id>
+	<dfrn:in-reply-to>$parent_id</dfrn:in-reply-to>
+	<dfrn:sentdate>$created</dfrn:sentdate>
+	<dfrn:subject>$subject</dfrn:subject>
+	<dfrn:content>$content</dfrn:content>
+
+</dfrn:mail>
+
diff --git a/view/tpl/atom_suggest.tpl b/view/tpl/atom_suggest.tpl
new file mode 100644
index 000000000..66c61f9b6
--- /dev/null
+++ b/view/tpl/atom_suggest.tpl
@@ -0,0 +1,11 @@
+
+<dfrn:suggest>
+
+	<dfrn:url>$url</dfrn:url>
+	<dfrn:name>$name</dfrn:name>
+	<dfrn:photo>$photo</dfrn:photo>
+	<dfrn:request>$request</dfrn:request>
+	<dfrn:note>$note</dfrn:note>
+
+</dfrn:suggest>
+
diff --git a/view/tpl/auto_request.tpl b/view/tpl/auto_request.tpl
new file mode 100644
index 000000000..961de9bb3
--- /dev/null
+++ b/view/tpl/auto_request.tpl
@@ -0,0 +1,37 @@
+
+<h1>$header</h1>
+
+<p id="dfrn-request-intro">
+$page_desc<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
+<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
+<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+{{ if $emailnet }}<li>$emailnet</li>{{ endif }}
+</ul>
+</p>
+<p>
+$invite_desc
+</p>
+<p>
+$desc
+</p>
+
+<form action="dfrn_request/$nickname" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+
+<div id="dfrn-request-info-wrapper" >
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
+	</div>
+</form>
diff --git a/view/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
new file mode 100644
index 000000000..8db7d22f4
--- /dev/null
+++ b/view/tpl/birthdays_reminder.tpl
@@ -0,0 +1,10 @@
+{{ if $count }}
+<div id="birthday-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('birthday-wrapper');">$event_reminders ($count)</div>
+<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div>
+<div id="birthday-title-end"></div>
+{{ 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>
+{{ endif }}
+
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
new file mode 100644
index 000000000..5dbd871a8
--- /dev/null
+++ b/view/tpl/categories_widget.tpl
@@ -0,0 +1,12 @@
+<div id="categories-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="categories-ul">
+		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
new file mode 100644
index 000000000..a1d4e1043
--- /dev/null
+++ b/view/tpl/comment_item.tpl
@@ -0,0 +1,34 @@
+		<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 }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ 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>
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
new file mode 100644
index 000000000..1f610d8c4
--- /dev/null
+++ b/view/tpl/common_friends.tpl
@@ -0,0 +1,12 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="$url">
+			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="$url" title="$name[$tags]">$name</a>
+	</div>
+	<div class="profile-match-end"></div>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
new file mode 100644
index 000000000..f8ceff46a
--- /dev/null
+++ b/view/tpl/common_tabs.tpl
@@ -0,0 +1,5 @@
+<ul class="tabs">
+	{{ for $tabs as $tab }}
+		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
+	{{ endfor }}
+</ul>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
new file mode 100644
index 000000000..a79648712
--- /dev/null
+++ b/view/tpl/contact_block.tpl
@@ -0,0 +1,12 @@
+<div id="contact-block">
+<h4 class="contact-block-h4">$contacts</h4>
+{{ if $micropro }}
+		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<div class='contact-block-content'>
+		{{ for $micropro as $m }}
+			$m
+		{{ endfor }}
+		</div>
+{{ endif }}
+</div>
+<div class="clear"></div>
diff --git a/view/tpl/contact_edit.tpl b/view/tpl/contact_edit.tpl
new file mode 100644
index 000000000..4f99b4aca
--- /dev/null
+++ b/view/tpl/contact_edit.tpl
@@ -0,0 +1,89 @@
+
+<h2>$header</h2>
+
+<div id="contact-edit-wrapper" >
+
+	$tab_str
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">$relation_text</div></li>
+				<li><div id="contact-edit-nettype">$nettype</div></li>
+				{{ if $lost_contact }}
+					<li><div id="lost-contact-message">$lost_contact</div></li>
+				{{ endif }}
+				{{ if $insecure }}
+					<li><div id="insecure-message">$insecure</div></li>
+				{{ endif }}
+				{{ if $blocked }}
+					<li><div id="block-message">$blocked</div></li>
+				{{ endif }}
+				{{ if $ignored }}
+					<li><div id="ignore-message">$ignored</div></li>
+				{{ endif }}
+				{{ if $archived }}
+					<li><div id="archive-message">$archived</div></li>
+				{{ endif }}
+
+				<li>&nbsp;</li>
+
+				{{ if $common_text }}
+					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
+				{{ endif }}
+				{{ if $all_friends }}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
+				{{ endif }}
+
+
+				<li><a href="network/?cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
+				{{ if $lblsuggest }}
+					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
+				{{ endif }}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" />
+
+	{{ if $poll_enabled }}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
+			<span id="contact-edit-poll-text">$updpub</span> $poll_interval <span id="contact-edit-update-now" class="button"><a href="contacts/$contact_id/update" >$udnow</a></span>
+		</div>
+	{{ endif }}
+	<div id="contact-edit-end" ></div>
+
+	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+
+<div id="contact-edit-info-wrapper">
+<h4>$lbl_info1</h4>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2</p> 
+</div>
+$profile_select
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
+
+</form>
+</div>
diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl
new file mode 100644
index 000000000..9cfd81710
--- /dev/null
+++ b/view/tpl/contact_head.tpl
@@ -0,0 +1,30 @@
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "$editselect",
+	elements: "contact-edit-info",
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "blockquote,code",
+	gecko_spellcheck : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	force_p_newlines : false,
+	force_br_newlines : true,
+	forced_root_block : '',
+	content_css: "$baseurl/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
new file mode 100644
index 000000000..1334f58b1
--- /dev/null
+++ b/view/tpl/contact_slider.tpl
@@ -0,0 +1,4 @@
+<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="$val" /></div>
+<script>
+	$("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '$intimate', '|', '$friends', '|', '$coworkers', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
+</script>
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
new file mode 100644
index 000000000..48930b48a
--- /dev/null
+++ b/view/tpl/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<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)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</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-end" ></div>
+</div>
diff --git a/view/tpl/contacts-template.tpl b/view/tpl/contacts-template.tpl
new file mode 100644
index 000000000..ecb342bf4
--- /dev/null
+++ b/view/tpl/contacts-template.tpl
@@ -0,0 +1,26 @@
+<h1>$header{{ if $total }} ($total){{ endif }}</h1>
+
+{{ if $finding }}<h4>$finding</h4>{{ endif }}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="$cmd" method="get" >
+<span class="contacts-search-desc">$desc</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+$tabs
+
+
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+
diff --git a/view/tpl/content.tpl b/view/tpl/content.tpl
new file mode 100644
index 000000000..466045d39
--- /dev/null
+++ b/view/tpl/content.tpl
@@ -0,0 +1,2 @@
+<div id="content-begin"></div>
+<div id="content-end"></div>
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
new file mode 100644
index 000000000..b7222f154
--- /dev/null
+++ b/view/tpl/conv.tpl
@@ -0,0 +1,17 @@
+{{ for $threads as $thread }}
+<div id="thread-wrapper-$thread.id" class="thread-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 }}
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
new file mode 100644
index 000000000..ed3e87050
--- /dev/null
+++ b/view/tpl/conv_frame.tpl
@@ -0,0 +1,11 @@
+<div id="threads-begin"></div>
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
new file mode 100644
index 000000000..70cd389c9
--- /dev/null
+++ b/view/tpl/conversation.tpl
@@ -0,0 +1,28 @@
+<div id="threads-begin"></div>
+{{ for $threads as $thread }}
+<div id="thread-wrapper-$thread.id" class="thread-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 }}
+<div id="threads-end"></div>
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}
diff --git a/view/tpl/crepair.tpl b/view/tpl/crepair.tpl
new file mode 100644
index 000000000..a3e532b61
--- /dev/null
+++ b/view/tpl/crepair.tpl
@@ -0,0 +1,46 @@
+
+<form id="crepair-form" action="crepair/$contact_id" method="post" >
+
+<h4>$contact_name</h4>
+
+<label id="crepair-name-label" class="crepair-label" for="crepair-name">$label_name</label>
+<input type="text" id="crepair-name" class="crepair-input" name="name" value="$contact_name" />
+<div class="clear"></div>
+
+<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">$label_nick</label>
+<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="$contact_nick" />
+<div class="clear"></div>
+
+<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">$label_attag</label>
+<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="$contact_attag" />
+<div class="clear"></div>
+
+<label id="crepair-url-label" class="crepair-label" for="crepair-url">$label_url</label>
+<input type="text" id="crepair-url" class="crepair-input" name="url" value="$contact_url" />
+<div class="clear"></div>
+
+<label id="crepair-request-label" class="crepair-label" for="crepair-request">$label_request</label>
+<input type="text" id="crepair-request" class="crepair-input" name="request" value="$request" />
+<div class="clear"></div>
+ 
+<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">$label_confirm</label>
+<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="$confirm" />
+<div class="clear"></div>
+
+<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">$label_notify</label>
+<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="$notify" />
+<div class="clear"></div>
+
+<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">$label_poll</label>
+<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="$poll" />
+<div class="clear"></div>
+
+<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">$label_photo</label>
+<input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" />
+<div class="clear"></div>
+
+<input type="submit" name="submit" value="$lbl_submit" />
+
+</form>
+
+
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
new file mode 100644
index 000000000..4c0ca3d63
--- /dev/null
+++ b/view/tpl/cropbody.tpl
@@ -0,0 +1,58 @@
+<h1>$title</h1>
+<p id="cropimage-desc">
+$desc
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+	function onEndCrop( coords, dimensions ) {
+		$( 'x1' ).value = coords.x1;
+		$( 'y1' ).value = coords.y1;
+		$( 'x2' ).value = coords.x2;
+		$( 'y2' ).value = coords.y2;
+		$( 'width' ).value = dimensions.width;
+		$( 'height' ).value = dimensions.height;
+	}
+
+	Event.observe( window, 'load', function() {
+		new Cropper.ImgWithPreview(
+		'croppa',
+		{
+			previewWrap: 'previewWrap',
+			minWidth: 175,
+			minHeight: 175,
+			maxWidth: 640,
+			maxHeight: 640,
+			ratioDim: { x: 100, y:100 },
+			displayOnInit: true,
+			onEndCrop: onEndCrop
+		}
+		);
+	}
+	);
+
+</script>
+
+<form action="profile_photo/$resource" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<input type='hidden' name='profile' value='$profile'>
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="$done" />
+</div>
+
+</form>
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
new file mode 100644
index 000000000..48f375426
--- /dev/null
+++ b/view/tpl/crophead.tpl
@@ -0,0 +1,4 @@
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl
new file mode 100644
index 000000000..9a7d2e18d
--- /dev/null
+++ b/view/tpl/delegate.tpl
@@ -0,0 +1,57 @@
+<h3>$header</h3>
+
+<div id="delegate-desc" class="delegate-desc">$desc</div>
+
+{{ if $managers }}
+<h3>$head_managers</h3>
+
+{{ for $managers as $x }}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="#" >
+<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
+</a>
+</div>
+
+{{ endfor }}
+<div class="clear"></div>
+<hr />
+{{ endif }}
+
+
+<h3>$head_delegates</h3>
+
+{{ if $delegates }}
+{{ for $delegates as $x }}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="$base/delegate/remove/$x.uid" >
+<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
+</a>
+</div>
+
+{{ endfor }}
+<div class="clear"></div>
+{{ else }}
+$none
+{{ endif }}
+<hr />
+
+
+<h3>$head_potentials</h3>
+{{ if $potentials }}
+{{ for $potentials as $x }}
+
+<div class="contact-block-div">
+<a class="contact-block-link" href="$base/delegate/add/$x.uid" >
+<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
+</a>
+</div>
+
+{{ endfor }}
+<div class="clear"></div>
+{{ else }}
+$none
+{{ endif }}
+<hr />
+
diff --git a/view/tpl/dfrn_req_confirm.tpl b/view/tpl/dfrn_req_confirm.tpl
new file mode 100644
index 000000000..6c916323c
--- /dev/null
+++ b/view/tpl/dfrn_req_confirm.tpl
@@ -0,0 +1,21 @@
+
+<p id="dfrn-request-homecoming" >
+$welcome
+<br />
+$please
+
+</p>
+<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
+<input type="hidden" name="dfrn_url" value="$dfrn_url" />
+<input type="hidden" name="confirm_key" value="$confirm_key" />
+<input type="hidden" name="localconfirm" value="1" />
+$aes_allow
+
+<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
+<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
+
+
+<div id="dfrn-request-homecoming-submit-wrapper" >
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
+</div>
+</form>
+\ No newline at end of file
diff --git a/view/tpl/dfrn_request.tpl b/view/tpl/dfrn_request.tpl
new file mode 100644
index 000000000..4f8a87ea2
--- /dev/null
+++ b/view/tpl/dfrn_request.tpl
@@ -0,0 +1,59 @@
+
+<h1>$header</h1>
+
+<p id="dfrn-request-intro">
+$page_desc<br />
+$invite_desc
+</p>
+<p>
+$desc
+</p>
+
+<form action="dfrn_request/$nickname" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+<p id="dfrn-request-options">
+$pls_answer
+</p>
+
+<div id="dfrn-request-info-wrapper" >
+
+
+<p id="doiknowyou">
+$does_know
+</p>
+
+		<div id="dfrn-request-know-yes-wrapper">
+		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">$yes</label>
+		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
+
+		<div id="dfrn-request-knowyou-break" ></div>	
+		</div>
+		<div id="dfrn-request-know-no-wrapper">
+		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">$no</label>
+		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
+
+		<div id="dfrn-request-knowyou-end"></div>
+		</div>
+
+
+<p id="dfrn-request-message-desc">
+$add_note
+</p>
+	<div id="dfrn-request-message-wrapper">
+	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
+	</div>
+
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
+	</div>
+</form>
diff --git a/view/tpl/diasp_dec_hdr.tpl b/view/tpl/diasp_dec_hdr.tpl
new file mode 100644
index 000000000..e87c61888
--- /dev/null
+++ b/view/tpl/diasp_dec_hdr.tpl
@@ -0,0 +1,8 @@
+<decrypted_hdeader>
+  <iv>$inner_iv</iv>
+  <aes_key>$inner_key</aes_key>
+  <author>
+    <name>$author_name</name>
+    <uri>$author_uri</uri>
+  </author>
+</decrypted_header>
diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl
new file mode 100644
index 000000000..6ef4ab664
--- /dev/null
+++ b/view/tpl/diaspora_comment.tpl
@@ -0,0 +1,11 @@
+<XML>
+  <post>
+    <comment>
+      <guid>$guid</guid>
+      <parent_guid>$parent_guid</parent_guid>
+      <author_signature>$authorsig</author_signature>
+      <text>$body</text>
+      <diaspora_handle>$handle</diaspora_handle>
+    </comment>
+  </post>
+</XML>
+\ No newline at end of file
diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl
new file mode 100644
index 000000000..e82de1171
--- /dev/null
+++ b/view/tpl/diaspora_comment_relay.tpl
@@ -0,0 +1,12 @@
+<XML>
+  <post>
+    <comment>
+      <guid>$guid</guid>
+      <parent_guid>$parent_guid</parent_guid>
+      <parent_author_signature>$parentsig</parent_author_signature>
+      <author_signature>$authorsig</author_signature>
+      <text>$body</text>
+      <diaspora_handle>$handle</diaspora_handle>
+    </comment>
+  </post>
+</XML>
+\ No newline at end of file
diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl
new file mode 100644
index 000000000..12807ba59
--- /dev/null
+++ b/view/tpl/diaspora_conversation.tpl
@@ -0,0 +1,29 @@
+<XML>
+  <post>
+    <conversation>
+      <guid>$conv.guid</guid>
+      <subject>$conv.subject</subject>
+      <created_at>$conv.created_at</created_at>
+
+      {{ for $conv.messages as $msg }}
+
+      <message>
+        <guid>$msg.guid</guid>
+        <parent_guid>$msg.parent_guid</parent_guid>
+        {{ if $msg.parent_author_signature }}
+        <parent_author_signature>$msg.parent_author_signature</parent_author_signature>
+        {{ endif }}
+        <author_signature>$msg.author_signature</author_signature>
+        <text>$msg.text</text>
+        <created_at>$msg.created_at</created_at>
+        <diaspora_handle>$msg.diaspora_handle</diaspora_handle>
+        <conversation_guid>$msg.conversation_guid</conversation_guid>
+      </message>
+
+      {{ endfor }}
+
+      <diaspora_handle>$conv.diaspora_handle</diaspora_handle>
+      <participant_handles>$conv.participant_handles</participant_handles>
+    </conversation>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl
new file mode 100644
index 000000000..a777aeebe
--- /dev/null
+++ b/view/tpl/diaspora_like.tpl
@@ -0,0 +1,12 @@
+<XML>
+  <post>
+    <like>
+      <target_type>$target_type</target_type>
+      <guid>$guid</guid>
+      <parent_guid>$parent_guid</parent_guid>
+      <author_signature>$authorsig</author_signature>
+      <positive>$positive</positive>
+      <diaspora_handle>$handle</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl
new file mode 100755
index 000000000..8b67f4de3
--- /dev/null
+++ b/view/tpl/diaspora_like_relay.tpl
@@ -0,0 +1,13 @@
+<XML>
+  <post>
+    <like>
+      <guid>$guid</guid>
+      <target_type>$target_type</target_type>
+      <parent_guid>$parent_guid</parent_guid>
+      <parent_author_signature>$parentsig</parent_author_signature>
+      <author_signature>$authorsig</author_signature>
+      <positive>$positive</positive>
+      <diaspora_handle>$handle</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl
new file mode 100644
index 000000000..667b8d53f
--- /dev/null
+++ b/view/tpl/diaspora_message.tpl
@@ -0,0 +1,13 @@
+<XML>
+  <post>
+      <message>
+        <guid>$msg.guid</guid>
+        <parent_guid>$msg.parent_guid</parent_guid>
+        <author_signature>$msg.author_signature</author_signature>
+        <text>$msg.text</text>
+        <created_at>$msg.created_at</created_at>
+        <diaspora_handle>$msg.diaspora_handle</diaspora_handle>
+        <conversation_guid>$msg.conversation_guid</conversation_guid>
+      </message>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl
new file mode 100644
index 000000000..75ca7f15c
--- /dev/null
+++ b/view/tpl/diaspora_photo.tpl
@@ -0,0 +1,13 @@
+<XML>
+  <post>
+    <photo>
+      <remote_photo_path>$path</remote_photo_path>
+      <remote_photo_name>$filename</remote_photo_name>
+      <status_message_guid>$msg_guid</status_message_guid>
+      <guid>$guid</guid>
+      <diaspora_handle>$handle</diaspora_handle>
+      <public>$public</public>
+      <created_at>$created_at</created_at>
+    </photo>
+  </post>
+</XML>
+\ No newline at end of file
diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl
new file mode 100644
index 000000000..1ba3ebb1f
--- /dev/null
+++ b/view/tpl/diaspora_post.tpl
@@ -0,0 +1,11 @@
+<XML>
+  <post>
+    <status_message>
+      <raw_message>$body</raw_message>
+      <guid>$guid</guid>
+      <diaspora_handle>$handle</diaspora_handle>
+      <public>$public</public>
+      <created_at>$created</created_at>
+    </status_message>
+  </post>
+</XML>
+\ No newline at end of file
diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl
new file mode 100644
index 000000000..e5c3d3cad
--- /dev/null
+++ b/view/tpl/diaspora_profile.tpl
@@ -0,0 +1,16 @@
+<XML>
+ <post><profile>
+  <diaspora_handle>$handle</diaspora_handle>
+  <first_name>$first</first_name>
+  <last_name>$last</last_name>
+  <image_url>$large</image_url>
+  <image_url_small>$small</image_url_small>
+  <image_url_medium>$medium</image_url_medium>
+  <birthday>$dob</birthday>
+  <gender>$gender</gender>
+  <bio>$about</bio>
+  <location>$location</location>
+  <searchable>$searchable</searchable>
+  <tag_string>$tags</tag_string>
+</profile></post>
+      </XML>
diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl
new file mode 100644
index 000000000..e76c7c6c5
--- /dev/null
+++ b/view/tpl/diaspora_relay_retraction.tpl
@@ -0,0 +1,10 @@
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>$type</target_type>
+      <target_guid>$guid</target_guid>
+      <target_author_signature>$signature</target_author_signature>
+      <sender_handle>$handle</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl
new file mode 100755
index 000000000..73cff8343
--- /dev/null
+++ b/view/tpl/diaspora_relayable_retraction.tpl
@@ -0,0 +1,11 @@
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>$target_type</target_type>
+      <target_guid>$guid</target_guid>
+      <parent_author_signature>$parentsig</parent_author_signature>
+      <target_author_signature>$authorsig</target_author_signature>
+      <sender_handle>$handle</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl
new file mode 100644
index 000000000..6d5b6e22b
--- /dev/null
+++ b/view/tpl/diaspora_retract.tpl
@@ -0,0 +1,9 @@
+<XML>
+  <post>
+    <retraction>
+      <post_guid>$guid</post_guid>
+      <type>$type</type>
+      <diaspora_handle>$handle</diaspora_handle>
+    </retraction>
+  </post>
+</XML>
+\ No newline at end of file
diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl
new file mode 100644
index 000000000..c16341b1e
--- /dev/null
+++ b/view/tpl/diaspora_share.tpl
@@ -0,0 +1,8 @@
+<XML>
+  <post>
+    <request>
+      <sender_handle>$sender</sender_handle>
+      <recipient_handle>$recipient</recipient_handle>
+    </request>
+  </post>
+</XML>
+\ No newline at end of file
diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl
new file mode 100644
index 000000000..22120e287
--- /dev/null
+++ b/view/tpl/diaspora_signed_retract.tpl
@@ -0,0 +1,10 @@
+<XML>
+  <post>
+    <signed_retraction>
+      <target_guid>$guid</target_guid>
+      <target_type>$type</target_type>
+      <sender_handle>$handle</sender_handle>
+      <target_author_signature>$signature</target_author_signature>
+    </signed_retraction>
+  </post>
+</XML>
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
new file mode 100644
index 000000000..de3981a94
--- /dev/null
+++ b/view/tpl/diaspora_vcard.tpl
@@ -0,0 +1,57 @@
+<div style="display:none;">
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<a class="nickname url uid" href="$diaspora.podloc/" rel="me">$diaspora.nickname</a>
+		</dd>
+	</dl>
+	<dl class='entity_fn'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn'>$diaspora.fullname</span>
+		</dd>
+	</dl>
+
+	<dl class='entity_given_name'>
+		<dt>First name</dt>
+		<dd>
+		<span class='given_name'>$diaspora.firstname</span>
+		</dd>
+	</dl>
+	<dl class='entity_family_name'>
+		<dt>Family name</dt>
+		<dd>
+		<span class='family_name'>$diaspora.lastname</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">$diaspora.searchable</span>
+		</dd>
+	</dl>
+</div>
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
new file mode 100644
index 000000000..1f03540f2
--- /dev/null
+++ b/view/tpl/directory_header.tpl
@@ -0,0 +1,16 @@
+<h1>$sitedir</h1>
+
+$globaldir
+$admin
+
+$finding
+
+<div id="directory-search-wrapper">
+<form id="directory-search-form" action="directory" method="get" >
+<span class="dirsearch-desc">$desc</span>
+<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
+</form>
+</div>
+<div id="directory-search-end"></div>
+
diff --git a/view/tpl/directory_item.tpl b/view/tpl/directory_item.tpl
new file mode 100644
index 000000000..b45da4465
--- /dev/null
+++ b/view/tpl/directory_item.tpl
@@ -0,0 +1,11 @@
+
+<div class="directory-item lframe" id="directory-item-$id" >
+	<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" src="$photo" alt="$alt-text" title="$alt-text" /></a>
+		</div>
+	</div>
+
+	<div class="contact-name" id="directory-name-$id">$name</div>
+	<div class="contact-details">$details</div>
+</div>
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
new file mode 100644
index 000000000..3d4e7e96a
--- /dev/null
+++ b/view/tpl/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>
+
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
new file mode 100644
index 000000000..43f72f15c
--- /dev/null
+++ b/view/tpl/email_notify_html.tpl
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>$banner</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
+
+
+	<tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr>
+
+
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td>
+		<td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
+	<tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr>
+	<tr><td></td><td>$thanks</td></tr>
+	<tr><td></td><td>$site_admin</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
new file mode 100644
index 000000000..018bb6078
--- /dev/null
+++ b/view/tpl/email_notify_text.tpl
@@ -0,0 +1,13 @@
+
+$preamble
+	
+$title
+
+$textversion
+				
+$tsitelink
+$titemlink
+
+$thanks
+$site_admin
+
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
new file mode 100644
index 000000000..ac9f889ec
--- /dev/null
+++ b/view/tpl/event.tpl
@@ -0,0 +1,10 @@
+{{ for $events as $event }}
+	<div class="event">
+	
+	{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
+	$event.html
+	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
+	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
+	</div>
+	<div class="clear"></div>
+{{ endfor }}
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
new file mode 100644
index 000000000..536c52b0f
--- /dev/null
+++ b/view/tpl/event_form.tpl
@@ -0,0 +1,49 @@
+<h3>$title</h3>
+
+<p>
+$desc
+</p>
+
+<form action="$post" method="post" >
+
+<input type="hidden" name="event_id" value="$eid" />
+<input type="hidden" name="cid" value="$cid" />
+<input type="hidden" name="uri" value="$uri" />
+
+<div id="event-start-text">$s_text</div>
+$s_dsel $s_tsel
+
+<div id="event-finish-text">$f_text</div>
+$f_dsel $f_tsel
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">$t_text</div>
+<input type="text" id="event-summary" name="summary" value="$t_orig" />
+
+
+<div id="event-desc-text">$d_text</div>
+<textarea id="event-desc-textarea" name="desc">$d_orig</textarea>
+
+
+<div id="event-location-text">$l_text</div>
+<textarea id="event-location-textarea" name="location">$l_orig</textarea>
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div>
+<div id="event-share-break"></div>
+
+$acl
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="$submit" />
+</form>
+
+
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
new file mode 100644
index 000000000..471748b97
--- /dev/null
+++ b/view/tpl/event_head.tpl
@@ -0,0 +1,139 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+
+<script>
+	function showEvent(eventid) {
+		$.get(
+			'$baseurl/events/?id='+eventid,
+			function(data){
+				$.fancybox(data);
+			}
+		);			
+	}
+	
+	$(document).ready(function() {
+		$('#events-calendar').fullCalendar({
+			events: '$baseurl/events/json/',
+			header: {
+				left: 'prev,next today',
+				center: 'title',
+				right: 'month,agendaWeek,agendaDay'
+			},			
+			timeFormat: 'H(:mm)',
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			},
+			
+			eventRender: function(event, element, view) {
+				//console.log(view.name);
+				if (event.item['author-name']==null) return;
+				switch(view.name){
+					case "month":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.title
+					));
+					break;
+					case "agendaWeek":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+					case "agendaDay":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+				}
+			}
+			
+		})
+		
+		// center on date
+		var args=location.href.replace(baseurl,"").split("/");
+		if (args.length>=4) {
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+		
+	});
+</script>
+
+
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "textareas",
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		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 : '',
+		content_css: "$baseurl/view/custom_tinymce.css",
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+			});
+		}
+
+	});
+
+
+	$(document).ready(function() { 
+
+		$('#event-share-checkbox').change(function() {
+
+			if ($('#event-share-checkbox').is(':checked')) { 
+				$('#acl-wrapper').show();
+			}
+			else {
+				$('#acl-wrapper').hide();
+			}
+		}).trigger('change');
+
+
+		$('#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-public').hide();
+			});
+			if(selstr == null) {
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
new file mode 100644
index 000000000..b0e182c56
--- /dev/null
+++ b/view/tpl/events-js.tpl
@@ -0,0 +1,6 @@
+$tabs
+<h2>$title</h2>
+
+<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
+
+<div id="events-calendar"></div>
diff --git a/view/tpl/events.tpl b/view/tpl/events.tpl
new file mode 100644
index 000000000..5a9787de3
--- /dev/null
+++ b/view/tpl/events.tpl
@@ -0,0 +1,24 @@
+$tabs
+<h2>$title</h2>
+
+<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
+
+<div id="event-calendar-wrapper">
+	<a href="$previus.0" class="prevcal $previus.2"><div id="event-calendar-prev" class="icon s22 prev" title="$previus.1"></div></a>
+	$calendar
+	<a href="$next.0" class="nextcal $next.2"><div id="event-calendar-prev" class="icon s22 next" title="$next.1"></div></a>
+</div>
+<div class="event-calendar-end"></div>
+
+
+{{ for $events as $event }}
+	<div class="event">
+	{{ if $event.is_first }}<hr /><a name="link-$event.j" ><div class="event-list-date">$event.d</div></a>{{ endif }}
+	{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
+	$event.html
+	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
+	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
+	</div>
+	<div class="clear"></div>
+
+{{ endfor }}
diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl
new file mode 100644
index 000000000..f641a5faf
--- /dev/null
+++ b/view/tpl/events_reminder.tpl
@@ -0,0 +1,10 @@
+{{ if $count }}
+<div id="event-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('event-wrapper');">$event_reminders ($count)</div>
+<div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div>
+<div id="event-title-end"></div>
+{{ 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>
+{{ endif }}
+
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
new file mode 100644
index 000000000..c6e4cb08e
--- /dev/null
+++ b/view/tpl/failed_updates.tpl
@@ -0,0 +1,17 @@
+<h2>$banner</h2>
+
+<div id="failed_updates_desc">$desc</div>
+
+{{ if $failed }}
+{{ for $failed as $f }}
+
+<h4>$f</h4>
+<ul>
+<li><a href="$base/admin/dbsync/mark/$f">$mark</a></li>
+<li><a href="$base/admin/dbsync/$f">$apply</a></li>
+</ul>
+
+<hr />
+{{ endfor }}
+{{ endif }}
+
diff --git a/view/tpl/fake_feed.tpl b/view/tpl/fake_feed.tpl
new file mode 100644
index 000000000..c37071cf4
--- /dev/null
+++ b/view/tpl/fake_feed.tpl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom" >
+
+  <id>fake feed</id>
+  <title>fake title</title>
+
+  <updated>1970-01-01T00:00:00Z</updated>
+
+  <author>
+    <name>Fake Name</name>
+    <uri>http://example.com</uri>
+  </author>
+
diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl
new file mode 100644
index 000000000..35f5afd39
--- /dev/null
+++ b/view/tpl/field.tpl
@@ -0,0 +1,4 @@
+
+ {{ if $field.0==select }}
+ {{ inc field_select.tpl }}{{ endinc }}
+ {{ endif }}
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
new file mode 100644
index 000000000..afab29243
--- /dev/null
+++ b/view/tpl/field_checkbox.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field checkbox'>
+		<label for='id_$field.0'>$field.1</label>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
new file mode 100644
index 000000000..a4dc8e571
--- /dev/null
+++ b/view/tpl/field_combobox.tpl
@@ -0,0 +1,18 @@
+	
+	<div class='field combobox'>
+		<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
+		{# html5 don't work on Chrome, Safari and IE9
+		<input id="id_$field.0" type="text" list="data_$field.0" >
+		<datalist id="data_$field.0" >
+		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
+		</datalist> #}
+		
+		<input id="id_$field.0" type="text" value="$field.2">
+		<select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())">
+			<option value="">$field.5</option>
+			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
+		</select>
+		
+		<span class='field_help'>$field.3</span>
+	</div>
+
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
new file mode 100644
index 000000000..be15d3f60
--- /dev/null
+++ b/view/tpl/field_custom.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field custom'>
+		<label for='$field.0'>$field.1</label>
+		$field.2
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
new file mode 100644
index 000000000..748d93f3e
--- /dev/null
+++ b/view/tpl/field_input.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field input'>
+		<label for='id_$field.0'>$field.1</label>
+		<input name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
new file mode 100644
index 000000000..47a513a55
--- /dev/null
+++ b/view/tpl/field_intcheckbox.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field checkbox'>
+		<label for='id_$field.0'>$field.1</label>
+		<input type="checkbox" name='$field.0' id='id_$field.0' value="$field.3" {{ if $field.2 }}checked="true"{{ endif }}>
+		<span class='field_help'>$field.4</span>
+	</div>
diff --git a/view/tpl/field_openid.tpl b/view/tpl/field_openid.tpl
new file mode 100644
index 000000000..acd93ff62
--- /dev/null
+++ b/view/tpl/field_openid.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field input openid'>
+		<label for='id_$field.0'>$field.1</label>
+		<input name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
new file mode 100644
index 000000000..e604b7f5d
--- /dev/null
+++ b/view/tpl/field_password.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field password'>
+		<label for='id_$field.0'>$field.1</label>
+		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
new file mode 100644
index 000000000..a915e8eb3
--- /dev/null
+++ b/view/tpl/field_radio.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field radio'>
+		<label for='id_$field.0_$field.2'>$field.1</label>
+		<input type="radio" name='$field.0' id='id_$field.0_$field.2' value="$field.2" {{ if $field.4 }}checked="true"{{ endif }}>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
new file mode 100644
index 000000000..c124ee000
--- /dev/null
+++ b/view/tpl/field_richtext.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field richtext'>
+		<label for='id_$field.0'>$field.1</label>
+		<textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl
new file mode 100644
index 000000000..d79eb48e0
--- /dev/null
+++ b/view/tpl/field_select.tpl
@@ -0,0 +1,8 @@
+	
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0'>
+			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		</select>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
new file mode 100644
index 000000000..765b285d9
--- /dev/null
+++ b/view/tpl/field_select_raw.tpl
@@ -0,0 +1,8 @@
+	
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0'>
+			$field.4
+		</select>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
new file mode 100644
index 000000000..2425cdd3b
--- /dev/null
+++ b/view/tpl/field_textarea.tpl
@@ -0,0 +1,6 @@
+	
+	<div class='field textarea'>
+		<label for='id_$field.0'>$field.1</label>
+		<textarea name='$field.0' id='id_$field.0'>$field.2</textarea>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
new file mode 100644
index 000000000..5847d8664
--- /dev/null
+++ b/view/tpl/field_themeselect.tpl
@@ -0,0 +1,9 @@
+	<script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script>
+	<div class='field select'>
+		<label for='id_$field.0'>$field.1</label>
+		<select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" >
+			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		</select>
+		<span class='field_help'>$field.3</span>
+		<div id="theme-preview"></div>
+	</div>
diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
new file mode 100644
index 000000000..5d4a775c2
--- /dev/null
+++ b/view/tpl/field_yesno.tpl
@@ -0,0 +1,13 @@
+	<div class='field yesno'>
+		<label for='id_$field.0'>$field.1</label>
+		<div class='onoff' id="id_$field.0_onoff">
+			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
+			<a href="#" class='off'>
+				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
+			</a>
+			<a href="#" class='on'>
+				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
+			</a>
+		</div>
+		<span class='field_help'>$field.3</span>
+	</div>
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
new file mode 100644
index 000000000..54fba7435
--- /dev/null
+++ b/view/tpl/fileas_widget.tpl
@@ -0,0 +1,12 @@
+<div id="fileas-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="fileas-ul">
+		<li class="tool"><a href="$base" class="fileas-link fileas-all{{ if $sel_all }} fileas-selected{{ endif }}">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool"><a href="$base?f=&file=$term.name" class="fileas-link{{ if $term.selected }} fileas-selected{{ endif }}">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
new file mode 100644
index 000000000..1e97237f4
--- /dev/null
+++ b/view/tpl/filebrowser.tpl
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:50px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
+				</ul>
+			</div>
+			<div class="filebrowser files $type">
+				<ul>
+				{{ for $files as $f }}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
+				{{ endfor }}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
new file mode 100644
index 000000000..ae837d6b7
--- /dev/null
+++ b/view/tpl/filer_dialog.tpl
@@ -0,0 +1,4 @@
+{{ inc field_combobox.tpl }}{{ endinc }}
+<div class="settings-submit-wrapper" >
+	<input id="filer_save" type="button" class="settings-submit" value="$submit" />
+</div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
new file mode 100644
index 000000000..259e74a93
--- /dev/null
+++ b/view/tpl/follow.tpl
@@ -0,0 +1,8 @@
+<div id="follow-sidebar" class="widget">
+	<h3>$connect</h3>
+	<div id="connect-desc">$desc</div>
+	<form action="follow" method="post" />
+		<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
+	</form>
+</div>
+
diff --git a/view/tpl/follow_slap.tpl b/view/tpl/follow_slap.tpl
new file mode 100644
index 000000000..0d0889f7d
--- /dev/null
+++ b/view/tpl/follow_slap.tpl
@@ -0,0 +1,25 @@
+	<entry>
+		<author>
+			<name>$name</name>
+			<uri>$profile_page</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
+		</author>
+
+		<id>$item_id</id>
+		<title>$title</title>
+		<published>$published</published>
+		<content type="$type" >$content</content>
+
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>$profile_page</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
+		<poco:preferredUsername>$nick</poco:preferredUsername>
+		<poco:displayName>$name</poco:displayName>
+		</as:actor>
+ 		<as:verb>$verb</as:verb>
+		$ostat_follow
+	</entry>
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
new file mode 100644
index 000000000..f3404f783
--- /dev/null
+++ b/view/tpl/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget{{ if $class }} $class{{ endif }}">
+	{{if $title}}<h3>$title</h3>{{endif}}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul>
+		{{ for $items as $item }}
+			<li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
new file mode 100644
index 000000000..2cbebbb8e
--- /dev/null
+++ b/view/tpl/group_drop.tpl
@@ -0,0 +1,9 @@
+<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
+	<a href="group/drop/$id?t=$form_security_token" 
+		onclick="return confirmDelete();" 
+		id="group-delete-icon-$id" 
+		class="icon drophide group-delete-icon" 
+		onmouseover="imgbright(this);" 
+		onmouseout="imgdull(this);" ></a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
new file mode 100644
index 000000000..2fa2b1a55
--- /dev/null
+++ b/view/tpl/group_edit.tpl
@@ -0,0 +1,23 @@
+<h2>$title</h2>
+
+
+<div id="group-edit-wrapper" >
+	<form action="group/$gid" id="group-edit-form" method="post" >
+		<input type='hidden' name='form_security_token' value='$form_security_token'>
+		
+		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
+		{{ if $drop }}$drop{{ endif }}
+		<div id="group-edit-submit-wrapper" >
+			<input type="submit" name="submit" value="$submit" >
+		</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>
+
+
+{{ if $groupeditor }}
+	<div id="group-update-wrapper">
+		{{ inc groupeditor.tpl }}{{ endinc }}
+	</div>
+{{ endif }}
+{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
new file mode 100644
index 000000000..3809cb994
--- /dev/null
+++ b/view/tpl/group_selection.tpl
@@ -0,0 +1,8 @@
+<div class="field custom">
+<label for="group-selection" id="group-selection-lbl">$label</label>
+<select name="group-selection" id="group-selection" >
+{{ for $groups as $group }}
+<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
+{{ endfor }}
+</select>
+</div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
new file mode 100644
index 000000000..ebb194d9c
--- /dev/null
+++ b/view/tpl/group_side.tpl
@@ -0,0 +1,33 @@
+<div class="widget" id="group-sidebar">
+<h3>$title</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{ for $groups as $group }}
+			<li class="sidebar-group-li">
+				{{ if $group.cid }}
+					<input type="checkbox" 
+						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+						{{ if $group.ismember }}checked="checked"{{ endif }}
+					/>
+				{{ endif }}			
+				{{ if $group.edit }}
+					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
+				{{ endif }}
+				<a id="sidebar-group-element-$group.id" 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>
+  </div>
+  {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
+</div>
+
+
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
new file mode 100644
index 000000000..755985eb3
--- /dev/null
+++ b/view/tpl/groupeditor.tpl
@@ -0,0 +1,16 @@
+<div id="group">
+<h3>$groupeditor.label_members</h3>
+<div id="group-members" class="contact_list">
+{{ for $groupeditor.members as $c}} $c {{ endfor }}
+</div>
+<div id="group-members-end"></div>
+<hr id="group-separator" />
+</div>
+
+<div id="contacts">
+<h3>$groupeditor.label_contacts</h3>
+<div id="group-all-contacts" class="contact_list">
+{{ for $groupeditor.contacts as $m}} $m {{ endfor }}
+</div>
+<div id="group-all-contacts-end"></div>
+</div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
new file mode 100644
index 000000000..34efa1bd8
--- /dev/null
+++ b/view/tpl/head.tpl
@@ -0,0 +1,131 @@
+<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="$baseurl/library/jslider/bin/jquery.slider.min.css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="$page_css" media="all" />
+{{ if $module_css }}
+<link rel="stylesheet" type="text/css" href="$module_css" media="all" />
+{{ endif }}
+<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+
+<link rel="shortcut icon" href="$baseurl/images/friendica-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/jquery.timeago.js"></script>
+<script type="text/javascript" src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.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 src="$baseurl/library/jslider/bin/jquery.slider.min.js"></script>
+<script>
+
+	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
+
+	function confirmDelete() { return confirm("$delitem"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '$comment') {
+			obj.value = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).show();
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '$comment';
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).hide();
+			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 qCommentInsert(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).val();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+		$(obj).val('');
+	}
+
+	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');
+		}
+	}
+
+	// jquery.timeago localisations
+
+	var tago01 = $t01 ;
+	var tago02 = $t02 ;
+	var tago03 = "$t03" ;
+	var tago04 = "$t04" ;
+	var tago05 = "$t05" ;
+	var tago06 = "$t06" ;
+	var tago07 = "$t07" ;
+	var tago08 = "$t08" ;
+	var tago09 = "$t09" ;
+	var tago10 = "$t10" ;
+	var tago11 = "$t11" ;
+	var tago12 = "$t12" ;
+	var tago13 = "$t13" ;
+	var tago14 = "$t14" ;
+	var tago15 = "$t15" ;
+	var tago16 = "$t16" ;
+	var tago17 = $t17 ;
+
+</script>
+
+
diff --git a/view/tpl/hide_comments.tpl b/view/tpl/hide_comments.tpl
new file mode 100644
index 000000000..55ee9dd7b
--- /dev/null
+++ b/view/tpl/hide_comments.tpl
@@ -0,0 +1,4 @@
+<div class="hide-comments-outer">
+<span id="hide-comments-total-$id" class="hide-comments-total">$num_comments</span> <span id="hide-comments-$id" class="hide-comments fakelink" onclick="showHideComments($id);">$hide_text</span>
+</div>
+<div id="collapsed-comments-$id" class="collapsed-comments" style="display: $display;">
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
new file mode 100644
index 000000000..b3a5f46ff
--- /dev/null
+++ b/view/tpl/install.tpl
@@ -0,0 +1,10 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
+$text
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
new file mode 100644
index 000000000..176611d4b
--- /dev/null
+++ b/view/tpl/install_checks.tpl
@@ -0,0 +1,24 @@
+<h1>$title</h1>
+<h2>$pass</h2>
+<form  action="$baseurl/index.php?q=install" method="post">
+<table>
+{{ for $checks as $check }}
+	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
+	{{if $check.help }}
+	<tr><td colspan="3"><blockquote>$check.help</blockquote></td></tr>
+	{{endif}}
+{{ endfor }}
+</table>
+
+{{ if $phpath }}
+	<input type="hidden" name="phpath" value="$phpath">
+{{ endif }}
+
+{{ if $passed }}
+	<input type="hidden" name="pass" value="2">
+	<input type="submit" value="$next">
+{{ else }}
+	<input type="hidden" name="pass" value="1">
+	<input type="submit" value="$reload">
+{{ endif }}
+</form>
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
new file mode 100644
index 000000000..1302b5a70
--- /dev/null
+++ b/view/tpl/install_db.tpl
@@ -0,0 +1,30 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+<p>
+$info_01<br>
+$info_02<br>
+$info_03
+</p>
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
+<form id="install-form" action="$baseurl/install" method="post">
+
+<input type="hidden" name="phpath" value="$phpath" />
+<input type="hidden" name="pass" value="3" />
+
+{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
+{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
+
+
+<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+
+</form>
+
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
new file mode 100644
index 000000000..05b87f904
--- /dev/null
+++ b/view/tpl/install_settings.tpl
@@ -0,0 +1,25 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
+<form id="install-form" action="$baseurl/install" method="post">
+
+<input type="hidden" name="phpath" value="$phpath" />
+<input type="hidden" name="dbhost" value="$dbhost" />
+<input type="hidden" name="dbuser" value="$dbuser" />
+<input type="hidden" name="dbpass" value="$dbpass" />
+<input type="hidden" name="dbdata" value="$dbdata" />
+<input type="hidden" name="pass" value="4" />
+
+{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
+$timezone
+
+<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+
+</form>
+
diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl
new file mode 100644
index 000000000..e7fd53ca4
--- /dev/null
+++ b/view/tpl/intros.tpl
@@ -0,0 +1,28 @@
+
+<div class="intro-wrapper" id="intro-$contact_id" >
+
+<p class="intro-desc">$str_notifytype $notify_type</p>
+<div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
+<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
+<div class="intro-knowyou">$knowyou</div>
+<div class="intro-note" id="intro-note-$contact_id">$note</div>
+<div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
+<form class="intro-form" action="notifications/$intro_id" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="dfrn_confirm" method="post">
+{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
+<input type="hidden" name="dfrn_id" value="$dfrn_id" >
+<input type="hidden" name="intro_id" value="$intro_id" >
+<input type="hidden" name="contact_id" value="$contact_id" >
+
+$dfrn_text
+
+<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
new file mode 100644
index 000000000..a47ef0162
--- /dev/null
+++ b/view/tpl/invite.tpl
@@ -0,0 +1,27 @@
+<form action="invite" method="post" id="invite-form" >
+<div id="invite-wrapper">
+
+<h3>$invite</h3>
+
+<div id="invite-recipient-text">
+$addr_text
+</div>
+
+<div id="invite-recipient-textarea">
+<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea>
+</div>
+
+<div id="invite-message-text">
+$msg_text
+</div>
+
+<div id="invite-message-textarea">
+<textarea id="invite-message" name="message" rows="10" cols="72" >$default_message</textarea>
+</div>
+
+<div id="invite-submit-wrapper">
+<input type="submit" name="submit" value="$submit" />
+</div>
+
+</div>
+</form>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
new file mode 100644
index 000000000..f777e997f
--- /dev/null
+++ b/view/tpl/jot-header.tpl
@@ -0,0 +1,318 @@
+
+<script language="javascript" type="text/javascript">
+
+var editor=false;
+var textlen = 0;
+var plaintext = '$editselect';
+
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").fancybox({
+				'transitionIn' : 'elastic',
+				'transitionOut' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}	
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: $editselect,
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			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,
+			file_browser_callback : "fcFileBrowser",
+			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; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+				 //Character count
+
+					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();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+
+		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();
+}
+
+</script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
+<script>
+	var ispublic = '$ispublic';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("$vidurl");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("$audurl");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("$whereareu", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').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("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	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 itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	$geotag
+
+</script>
+
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
new file mode 100644
index 000000000..91de628ac
--- /dev/null
+++ b/view/tpl/jot.tpl
@@ -0,0 +1,85 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></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" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<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-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
+		<div id="jot-text-wrap">
+		<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>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: $visitor;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon 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" style="display: $visitor;" >
+		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</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 id="jot-preview-content" style="display:none;"></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>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
new file mode 100644
index 000000000..b0f71e73b
--- /dev/null
+++ b/view/tpl/jot_geotag.tpl
@@ -0,0 +1,8 @@
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
new file mode 100644
index 000000000..b3a527b40
--- /dev/null
+++ b/view/tpl/lang_selector.tpl
@@ -0,0 +1,10 @@
+<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</div>
+<div id="language-selector" style="display: none;" >
+	<form action="#" method="post" >
+		<select name="system_language" onchange="this.form.submit();" >
+			{{ for $langs.0 as $v=>$l }}
+				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
+			{{ endfor }}
+		</select>
+	</form>
+</div>
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
new file mode 100644
index 000000000..2651ea1f8
--- /dev/null
+++ b/view/tpl/like_noshare.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+	<a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
+	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
new file mode 100644
index 000000000..9f098c1d4
--- /dev/null
+++ b/view/tpl/login.tpl
@@ -0,0 +1,27 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	<div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
new file mode 100644
index 000000000..efc971df8
--- /dev/null
+++ b/view/tpl/logout.tpl
@@ -0,0 +1,6 @@
+<form action="$dest_url" method="post" >
+<div class="logout-wrapper">
+<input type="hidden" name="auth-params" value="logout" />
+<input type="submit" name="submit" id="logout-button" value="$logout" />
+</div>
+</form>
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
new file mode 100644
index 000000000..cd3644157
--- /dev/null
+++ b/view/tpl/lostpass.tpl
@@ -0,0 +1,18 @@
+<h3>$title</h3>
+
+<p id="lostpass-desc">
+$desc
+</p>
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper">
+        <label for="login-name" id="label-login-name">$name</label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+
diff --git a/view/tpl/magicsig.tpl b/view/tpl/magicsig.tpl
new file mode 100644
index 000000000..75f9bc475
--- /dev/null
+++ b/view/tpl/magicsig.tpl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
+<me:data type="application/atom+xml">
+$data
+</me:data>
+<me:encoding>$encoding</me:encoding>
+<me:alg>$algorithm</me:alg>
+<me:sig key_id="$keyhash">$signature</me:sig>
+</me:env>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
new file mode 100644
index 000000000..75a4506f6
--- /dev/null
+++ b/view/tpl/mail_conv.tpl
@@ -0,0 +1,14 @@
+<div class="mail-conv-outside-wrapper">
+	<div class="mail-conv-sender" >
+		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >$mail.from_name</div>
+		<div class="mail-conv-date">$mail.date</div>
+		<div class="mail-conv-subject">$mail.subject</div>
+		<div class="mail-conv-body">$mail.body</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
new file mode 100644
index 000000000..8fbc12929
--- /dev/null
+++ b/view/tpl/mail_display.tpl
@@ -0,0 +1,10 @@
+
+{{ for $mails as $mail }}
+	{{ inc mail_conv.tpl }}{{endinc}}
+{{ endfor }}
+
+{{ if $canreply }}
+{{ inc prv_message.tpl }}{{ endinc }}
+{{ else }}
+$unknown_text
+{{endif }}
+\ No newline at end of file
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
new file mode 100644
index 000000000..afb65f537
--- /dev/null
+++ b/view/tpl/mail_head.tpl
@@ -0,0 +1,3 @@
+<h3>$messages</h3>
+
+$tab_content
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
new file mode 100644
index 000000000..22e35dec8
--- /dev/null
+++ b/view/tpl/mail_list.tpl
@@ -0,0 +1,16 @@
+<div class="mail-list-outside-wrapper">
+	<div class="mail-list-sender" >
+		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >$from_name</div>
+		<div class="mail-list-date">$date</div>
+		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
+		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
new file mode 100644
index 000000000..0bcf1384f
--- /dev/null
+++ b/view/tpl/main_slider.tpl
@@ -0,0 +1,23 @@
+<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="$val" /></div>
+<script>
+	$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '$intimate', '|', '$friends', '|', '$coworkers', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { 
+	var carr = v.split(";"); 
+	network_cmin = carr[0]; 
+	network_cmax = carr[1];
+	networkRefresh();
+ } });
+
+	var slideTimer = null;
+	function networkRefresh() {
+		if((document.readyState !== "complete") || (slideTimer !== null))
+			return;
+		setTimeout(function() { $("#profile-jot-text-loading").show(); }, 1000 );
+		slideTimer = setTimeout(networkTimerRefresh,2000);
+	}
+
+	function networkTimerRefresh() {
+		slideTimer = null;
+		page_load = true;
+		liveUpdate();
+	}
+</script>
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
new file mode 100644
index 000000000..b052845ae
--- /dev/null
+++ b/view/tpl/match.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<div class="profile-match-photo">
+		<a href="$url">
+			<img src="$photo" alt="$name" title="$name[$tags]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="$url" title="$name[$tags]">$name</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
+
+</div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
new file mode 100644
index 000000000..fce771bd5
--- /dev/null
+++ b/view/tpl/message_side.tpl
@@ -0,0 +1,10 @@
+<div id="message-sidebar" class="widget">
+	<div id="message-new"><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
+	
+	<ul class="message-ul">
+		{{ for $tabs as $t }}
+			<li class="tool"><a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/tpl/moderated_comment.tpl b/view/tpl/moderated_comment.tpl
new file mode 100644
index 000000000..911c35f33
--- /dev/null
+++ b/view/tpl/moderated_comment.tpl
@@ -0,0 +1,34 @@
+		<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>
+				<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
+					<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
+					<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
+					<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
+					<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
+					<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
+				</div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
+
+				<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>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
new file mode 100644
index 000000000..2d1ea7a61
--- /dev/null
+++ b/view/tpl/msg-header.tpl
@@ -0,0 +1,97 @@
+
+<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 plaintext = '$editselect';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		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",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload/$nickname',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
new file mode 100644
index 000000000..4675c3e5c
--- /dev/null
+++ b/view/tpl/nav.tpl
@@ -0,0 +1,68 @@
+<nav>
+	$langselector
+
+	<div id="site-location">$sitelocation</div>
+
+	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.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 }}
+
+	<span id="nav-link-wrapper" >
+
+	{{ 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 }}
+		
+	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$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.3" >$nav.apps.1</a>{{ endif }}
+
+	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+	{{ if $nav.network }}
+	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.home }}
+	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.community }}
+	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+	{{ endif }}
+	{{ if $nav.introductions }}
+	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{ endif }}
+	{{ if $nav.messages }}
+	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{ endif }}
+
+
+
+	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+
+		{{ if $nav.notifications }}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<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.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">$banner</span>
+</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>
diff --git a/view/tpl/netfriend.tpl b/view/tpl/netfriend.tpl
new file mode 100644
index 000000000..c2a92ce9e
--- /dev/null
+++ b/view/tpl/netfriend.tpl
@@ -0,0 +1,14 @@
+<div class="intro-approve-as-friend-desc">$approve_as</div>
+
+<div class="intro-approve-as-friend-wrapper">
+	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">$as_friend</label>
+	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
+	<div class="intro-approve-friend-break" ></div>	
+</div>
+<div class="intro-approve-as-friend-end"></div>
+<div class="intro-approve-as-fan-wrapper">
+	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">$as_fan</label>
+	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
+	<div class="intro-approve-fan-break"></div>
+</div>
+<div class="intro-approve-as-end"></div>
diff --git a/view/tpl/nets.tpl b/view/tpl/nets.tpl
new file mode 100644
index 000000000..b0cb8890c
--- /dev/null
+++ b/view/tpl/nets.tpl
@@ -0,0 +1,10 @@
+<div id="nets-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
+	<ul class="nets-ul">
+	{{ for $nets as $net }}
+	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	{{ endfor }}
+	</ul>
+</div>
diff --git a/view/tpl/nogroup-template.tpl b/view/tpl/nogroup-template.tpl
new file mode 100644
index 000000000..dd00ed097
--- /dev/null
+++ b/view/tpl/nogroup-template.tpl
@@ -0,0 +1,12 @@
+<h1>$header</h1>
+
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
new file mode 100644
index 000000000..1a13b68b9
--- /dev/null
+++ b/view/tpl/notifications.tpl
@@ -0,0 +1,8 @@
+
+<h1>$notif_header</h1>
+
+{{ inc common_tabs.tpl }}{{ endinc }}
+
+<div class="notif-network-wrapper">
+	$notif_content
+</div>
diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl
new file mode 100644
index 000000000..73cc9f948
--- /dev/null
+++ b/view/tpl/notifications_comments_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl
new file mode 100644
index 000000000..73cc9f948
--- /dev/null
+++ b/view/tpl/notifications_dislikes_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl
new file mode 100644
index 000000000..73cc9f948
--- /dev/null
+++ b/view/tpl/notifications_friends_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl
new file mode 100644
index 000000000..389144d9b
--- /dev/null
+++ b/view/tpl/notifications_likes_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link" target="friendica-notification"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/notifications_network_item.tpl b/view/tpl/notifications_network_item.tpl
new file mode 100644
index 000000000..bd86548fc
--- /dev/null
+++ b/view/tpl/notifications_network_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="{$item_link}" target="friendica-notifications"><img src="{$item_image}" class="notif-image">{$item_text} <span class="notif-when">{$item_when}</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl
new file mode 100644
index 000000000..73cc9f948
--- /dev/null
+++ b/view/tpl/notifications_posts_item.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl
new file mode 100644
index 000000000..73cc9f948
--- /dev/null
+++ b/view/tpl/notify.tpl
@@ -0,0 +1,3 @@
+<div class="notif-item">
+	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+</div>
+\ No newline at end of file
diff --git a/view/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
new file mode 100644
index 000000000..31f02ac50
--- /dev/null
+++ b/view/tpl/oauth_authorize.tpl
@@ -0,0 +1,10 @@
+<h1>$title</h1>
+
+<div class='oauthapp'>
+	<img src='$app.icon'>
+	<h4>$app.name</h4>
+</div>
+<h3>$authorize</h3>
+<form method="POST">
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="$yes" /></div>
+</form>
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
new file mode 100644
index 000000000..51eaea248
--- /dev/null
+++ b/view/tpl/oauth_authorize_done.tpl
@@ -0,0 +1,4 @@
+<h1>$title</h1>
+
+<p>$info</p>
+<code>$code</code>
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
new file mode 100755
index 000000000..d3a9a9311
--- /dev/null
+++ b/view/tpl/oembed_video.tpl
@@ -0,0 +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>
diff --git a/view/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
new file mode 100644
index 000000000..c7e6df498
--- /dev/null
+++ b/view/tpl/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        
+    <Subject>$base</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+
+    <Link 
+        rel="icon" 
+        href="$base/images/friendika-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="$base/images/friendika-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="$base/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
new file mode 100644
index 000000000..374fcaac9
--- /dev/null
+++ b/view/tpl/opensearch.tpl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+	<ShortName>Friendika@$nodename</ShortName>
+	<Description>Search in Friendika@$nodename</Description>
+	<Contact>http://bugs.friendika.com/</Contact>
+	<Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image>
+	<Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image>
+	<Url type="text/html" 
+        template="$baseurl/search?search={searchTerms}"/>
+	<Url type="application/opensearchdescription+xml"
+      	rel="self"
+      	template="$baseurl/opensearch" />        
+</OpenSearchDescription>
+\ No newline at end of file
diff --git a/view/tpl/pagetypes.tpl b/view/tpl/pagetypes.tpl
new file mode 100644
index 000000000..c9022a1c1
--- /dev/null
+++ b/view/tpl/pagetypes.tpl
@@ -0,0 +1,5 @@
+	{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
new file mode 100644
index 000000000..3c2692d25
--- /dev/null
+++ b/view/tpl/peoplefind.tpl
@@ -0,0 +1,14 @@
+<div id="peoplefind-sidebar" class="widget">
+	<h3>$findpeople</h3>
+	<div id="peoplefind-desc">$desc</div>
+	<form action="dirfind" method="post" />
+		<input id="side-peoplefind-url" type="text" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
+	</form>
+	<div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
+	<div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div>
+	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div>
+	{{ if $inv }} 
+	<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
+	{{ endif }}
+</div>
+
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
new file mode 100644
index 000000000..cc3dcfb9c
--- /dev/null
+++ b/view/tpl/photo_album.tpl
@@ -0,0 +1,7 @@
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
+	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
+		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" />
+		<p class='caption'>$desc</p>		
+	</a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
new file mode 100644
index 000000000..b4ea62b45
--- /dev/null
+++ b/view/tpl/photo_drop.tpl
@@ -0,0 +1,4 @@
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
+	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+</div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/photo_edit.tpl b/view/tpl/photo_edit.tpl
new file mode 100644
index 000000000..53b69caae
--- /dev/null
+++ b/view/tpl/photo_edit.tpl
@@ -0,0 +1,50 @@
+
+<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="$item_id" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
+	<input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
+	<input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">
+			$rotatecw<br>
+			$rotateccw
+		</div>
+		<input type="radio" name="rotate" value="1" /><br>
+		<input type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/>
+			<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				$aclselect
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
new file mode 100644
index 000000000..22884e848
--- /dev/null
+++ b/view/tpl/photo_item.tpl
@@ -0,0 +1,22 @@
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+	<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
+		<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+		<img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
+	</div>
+
+	<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+		<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
+		<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+	</div>
+	<div class="wall-item-content" id="wall-item-content-$id" >
+		<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+		<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+	</div>
+	$drop
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-comment-separator"></div>
+	$comment
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+</div>
+
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
new file mode 100644
index 000000000..155cab51d
--- /dev/null
+++ b/view/tpl/photo_top.tpl
@@ -0,0 +1,8 @@
+
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$photo.id">
+	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$photo.id" title="$photo.title">
+		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo$photo.twist" id="photo-top-photo-$photo.id" />
+	</a>
+	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
+</div>
+
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
new file mode 100644
index 000000000..732caf690
--- /dev/null
+++ b/view/tpl/photo_view.tpl
@@ -0,0 +1,37 @@
+<div id="live-display"></div>
+<h3><a href="$album.0">$album.1</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{ if $tools }}
+<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
+|
+<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
+{{ endif }}
+{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
+</div>
+
+{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
+<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
+{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+<div id="photo-photo-end"></div>
+<div id="photo-caption">$desc</div>
+{{ if $tags }}
+<div id="in-this-photo-text">$tags.0</div>
+<div id="in-this-photo">$tags.1</div>
+{{ endif }}
+{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
+
+{{ if $likebuttons }}
+<div id="photo-like-div">
+	$likebuttons
+	$like
+	$dislike	
+</div>
+{{ endif }}
+
+$comments
+
+$paginate
+
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
new file mode 100644
index 000000000..1df78cb7b
--- /dev/null
+++ b/view/tpl/photos_recent.tpl
@@ -0,0 +1,11 @@
+<h3>$title</h3>
+{{ if $can_post }}
+<a id="photo-top-upload-link" href="$upload.1">$upload.0</a>
+{{ endif }}
+
+<div class="photos">
+{{ for $photos as $photo }}
+	{{ inc photo_top.tpl }}{{ endinc }}
+{{ endfor }}
+</div>
+<div class="photos-end"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
new file mode 100644
index 000000000..93c0b7d54
--- /dev/null
+++ b/view/tpl/photos_upload.tpl
@@ -0,0 +1,46 @@
+<h3>$pagename</h3>
+
+<div id="photos-usage-message">$usage</div>
+
+<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">$existalbumtext</div>
+		$albumselect
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
+	</div>
+
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<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;">
+		<div id="photos-upload-permissions-wrapper">
+			$aclselect
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	$uploader
+
+	$default
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
new file mode 100644
index 000000000..4d84cee41
--- /dev/null
+++ b/view/tpl/poco_entry_xml.tpl
@@ -0,0 +1,7 @@
+<entry>
+{{ if $entry.id }}<id>$entry.id</id>{{ endif }}
+{{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
+{{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
+{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }}
+{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }}
+</entry>
diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
new file mode 100644
index 000000000..9549b695d
--- /dev/null
+++ b/view/tpl/poco_xml.tpl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<response>
+{{ if $response.sorted }}<sorted>$response.sorted</sorted>{{ endif }}
+{{ if $response.filtered }}<filtered>$response.filtered</filtered>{{ endif }}
+{{ if $response.updatedSince }}<updatedSince>$response.updatedSince</updatedSince>{{ endif }}
+<startIndex>$response.startIndex</startIndex>
+<itemsPerPage>$response.itemsPerPage</itemsPerPage>
+<totalResults>$response.totalResults</totalResults>
+
+
+{{ if $response.totalResults }}
+{{ for $response.entry as $entry }}
+{{ inc poco_entry_xml.tpl }}{{ endinc }}
+{{ endfor }}
+{{ else }}
+<entry></entry>
+{{ endif }}
+</response>
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
new file mode 100644
index 000000000..b9e089f5b
--- /dev/null
+++ b/view/tpl/poke_content.tpl
@@ -0,0 +1,32 @@
+<h3>$title</h3>
+
+<div id="poke-desc">$desc</div>
+
+<form action="poke" method="get">
+<br />
+<br />
+
+<div id="poke-recip-label">$clabel</div>
+<br />
+<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>
+<br />
+<br />
+<select name="verb" id="poke-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+<div id="poke-private-desc">$prv_desc</div>
+<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
+<br />
+<br />
+<input type="submit" name="submit" value="$submit" />
+</form>
+
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
new file mode 100644
index 000000000..3e2ee5a3e
--- /dev/null
+++ b/view/tpl/posted_date_widget.tpl
@@ -0,0 +1,9 @@
+<div id="datebrowse-sidebar" class="widget">
+	<h3>$title</h3>
+<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="$size">
+{{ for $dates as $d }}
+<option value="$url/$d.1/$d.2" >$d.0</option>
+{{ endfor }}
+</select>
+</div>
diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
new file mode 100644
index 000000000..2477654b3
--- /dev/null
+++ b/view/tpl/profed_head.tpl
@@ -0,0 +1,36 @@
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "$editselect",
+	plugins : "bbcode,paste",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_blockformats : "blockquote,code",
+	gecko_spellcheck : true,
+	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 : '',
+	content_css: "$baseurl/view/custom_tinymce.css",
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onInit.add(function(ed) {
+            ed.pasteAsPlainText = true;
+        });
+    }
+
+});
+
+
+</script>
+
diff --git a/view/tpl/profile-hide-friends.tpl b/view/tpl/profile-hide-friends.tpl
new file mode 100644
index 000000000..9ecacfbe0
--- /dev/null
+++ b/view/tpl/profile-hide-friends.tpl
@@ -0,0 +1,16 @@
+<p id="hide-friends-text">
+$desc
+</p>
+
+		<div id="hide-friends-yes-wrapper">
+		<label id="hide-friends-yes-label" for="hide-friends-yes">$yes_str</label>
+		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
+
+		<div id="hide-friends-break" ></div>	
+		</div>
+		<div id="hide-friends-no-wrapper">
+		<label id="hide-friends-no-label" for="hide-friends-no">$no_str</label>
+		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
+
+		<div id="hide-friends-end"></div>
+		</div>
diff --git a/view/tpl/profile-hide-wall.tpl b/view/tpl/profile-hide-wall.tpl
new file mode 100644
index 000000000..10185e243
--- /dev/null
+++ b/view/tpl/profile-hide-wall.tpl
@@ -0,0 +1,16 @@
+<p id="hide-wall-text">
+$desc
+</p>
+
+		<div id="hide-wall-yes-wrapper">
+		<label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label>
+		<input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" />
+
+		<div id="hide-wall-break" ></div>	
+		</div>
+		<div id="hide-wall-no-wrapper">
+		<label id="hide-wall-no-label" for="hide-wall-no">$no_str</label>
+		<input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0"  />
+
+		<div id="hide-wall-end"></div>
+		</div>
diff --git a/view/tpl/profile-in-directory.tpl b/view/tpl/profile-in-directory.tpl
new file mode 100644
index 000000000..56b28d37e
--- /dev/null
+++ b/view/tpl/profile-in-directory.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+$desc
+</p>
+
+		<div id="profile-in-dir-yes-wrapper">
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">$yes_str</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
+
+		<div id="profile-in-dir-break" ></div>	
+		</div>
+		<div id="profile-in-dir-no-wrapper">
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">$no_str</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
+
+		<div id="profile-in-dir-end"></div>
+		</div>
diff --git a/view/tpl/profile-in-netdir.tpl b/view/tpl/profile-in-netdir.tpl
new file mode 100644
index 000000000..882ad2d17
--- /dev/null
+++ b/view/tpl/profile-in-netdir.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+$desc
+</p>
+
+		<div id="profile-in-netdir-yes-wrapper">
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">$yes_str</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
+
+		<div id="profile-in-netdir-break" ></div>	
+		</div>
+		<div id="profile-in-netdir-no-wrapper">
+		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">$no_str</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
+
+		<div id="profile-in-netdir-end"></div>
+		</div>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
new file mode 100644
index 000000000..b02b7f27d
--- /dev/null
+++ b/view/tpl/profile_advanced.tpl
@@ -0,0 +1,170 @@
+<h2>$title</h2>
+
+<dl id="aprofile-fullname" class="aprofile">
+ <dt>$profile.fullname.0</dt>
+ <dd>$profile.fullname.1</dd>
+</dl>
+
+{{ if $profile.gender }}
+<dl id="aprofile-gender" class="aprofile">
+ <dt>$profile.gender.0</dt>
+ <dd>$profile.gender.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.birthday }}
+<dl id="aprofile-birthday" class="aprofile">
+ <dt>$profile.birthday.0</dt>
+ <dd>$profile.birthday.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.age }}
+<dl id="aprofile-age" class="aprofile">
+ <dt>$profile.age.0</dt>
+ <dd>$profile.age.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.marital }}
+<dl id="aprofile-marital" class="aprofile">
+ <dt><span class="heart">&hearts;</span>  $profile.marital.0</dt>
+ <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.sexual }}
+<dl id="aprofile-sexual" class="aprofile">
+ <dt>$profile.sexual.0</dt>
+ <dd>$profile.sexual.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.pub_keywords }}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>$profile.pub_keywords.0</dt>
+ <dd>$profile.pub_keywords.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.homepage }}
+<dl id="aprofile-homepage" class="aprofile">
+ <dt>$profile.homepage.0</dt>
+ <dd>$profile.homepage.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.hometown }}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>$profile.hometown.0</dt>
+ <dd>$profile.hometown.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.politic }}
+<dl id="aprofile-politic" class="aprofile">
+ <dt>$profile.politic.0</dt>
+ <dd>$profile.politic.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.religion }}
+<dl id="aprofile-religion" class="aprofile">
+ <dt>$profile.religion.0</dt>
+ <dd>$profile.religion.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.about }}
+<dl id="aprofile-about" class="aprofile">
+ <dt>$profile.about.0</dt>
+ <dd>$profile.about.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.interest }}
+<dl id="aprofile-interest" class="aprofile">
+ <dt>$profile.interest.0</dt>
+ <dd>$profile.interest.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.likes }}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>$profile.likes.0</dt>
+ <dd>$profile.likes.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.dislikes }}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>$profile.dislikes.0</dt>
+ <dd>$profile.dislikes.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.contact }}
+<dl id="aprofile-contact" class="aprofile">
+ <dt>$profile.contact.0</dt>
+ <dd>$profile.contact.1</dd>
+</dl>
+{{ endif }}
+
+
+{{ if $profile.music }}
+<dl id="aprofile-music" class="aprofile">
+ <dt>$profile.music.0</dt>
+ <dd>$profile.music.1</dd>
+</dl>
+{{ endif }}
+
+
+{{ if $profile.book }}
+<dl id="aprofile-book" class="aprofile">
+ <dt>$profile.book.0</dt>
+ <dd>$profile.book.1</dd>
+</dl>
+{{ endif }}
+
+
+{{ if $profile.tv }}
+<dl id="aprofile-tv" class="aprofile">
+ <dt>$profile.tv.0</dt>
+ <dd>$profile.tv.1</dd>
+</dl>
+{{ endif }}
+
+
+{{ if $profile.film }}
+<dl id="aprofile-film" class="aprofile">
+ <dt>$profile.film.0</dt>
+ <dd>$profile.film.1</dd>
+</dl>
+{{ endif }}
+
+
+{{ if $profile.romance }}
+<dl id="aprofile-romance" class="aprofile">
+ <dt>$profile.romance.0</dt>
+ <dd>$profile.romance.1</dd>
+</dl>
+{{ endif }}
+
+
+{{ if $profile.work }}
+<dl id="aprofile-work" class="aprofile">
+ <dt>$profile.work.0</dt>
+ <dd>$profile.work.1</dd>
+</dl>
+{{ endif }}
+
+{{ if $profile.education }}
+<dl id="aprofile-education" class="aprofile">
+ <dt>$profile.education.0</dt>
+ <dd>$profile.education.1</dd>
+</dl>
+{{ endif }}
+
+
+
+
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
new file mode 100644
index 000000000..bc342cc3b
--- /dev/null
+++ b/view/tpl/profile_edit.tpl
@@ -0,0 +1,322 @@
+$default
+
+<h1>$banner</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
+<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
+<li></li>
+<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
+<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
+<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
+$gender
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
+<div id="profile-edit-dob" >
+$dob $age
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+$hide_friends
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
+<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
+<option selected="selected" >$country_name</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >$region</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
+<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
+$marital
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
+<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
+<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
+$sexual
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
+<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
+<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
+<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" >
+<p id="about-jot-desc" >
+$lbl_about
+</p>
+
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" >
+<p id="interest-jot-desc" >
+$lbl_hobbies
+</p>
+
+<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" >
+<p id="likes-jot-desc" >
+$lbl_likes
+</p>
+
+<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" >
+<p id="dislikes-jot-desc" >
+$lbl_dislikes
+</p>
+
+<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" >
+<p id="contact-jot-desc" >
+$lbl_social
+</p>
+
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" >
+<p id="music-jot-desc" >
+$lbl_music
+</p>
+
+<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" >
+<p id="book-jot-desc" >
+$lbl_book
+</p>
+
+<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" >
+<p id="tv-jot-desc" >
+$lbl_tv 
+</p>
+
+<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" >
+<p id="film-jot-desc" >
+$lbl_film
+</p>
+
+<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" >
+<p id="romance-jot-desc" >
+$lbl_love
+</p>
+
+<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" >
+<p id="work-jot-desc" >
+$lbl_work
+</p>
+
+<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" >
+<p id="education-jot-desc" >
+$lbl_school 
+</p>
+
+<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
diff --git a/view/tpl/profile_edlink.tpl b/view/tpl/profile_edlink.tpl
new file mode 100644
index 000000000..ea787b9f5
--- /dev/null
+++ b/view/tpl/profile_edlink.tpl
@@ -0,0 +1,2 @@
+<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
+<div class="clear"></div>
+\ No newline at end of file
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
new file mode 100644
index 000000000..7ff6d685b
--- /dev/null
+++ b/view/tpl/profile_entry.tpl
@@ -0,0 +1,11 @@
+
+<div class="profile-listing" >
+<div class="profile-listing-photo-wrapper" >
+<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
+</div>
+<div class="profile-listing-photo-end"></div>
+<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
+<div class="profile-listing-visible">$visible</div>
+</div>
+<div class="profile-listing-end"></div>
+
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
new file mode 100644
index 000000000..61a273792
--- /dev/null
+++ b/view/tpl/profile_listing_header.tpl
@@ -0,0 +1,8 @@
+<h1>$header</h1>
+<p id="profile-listing-desc" class="button" >
+<a href="profile_photo" >$chg_photo</a>
+</p>
+<div 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/profile_photo.tpl b/view/tpl/profile_photo.tpl
new file mode 100644
index 000000000..04ee8f916
--- /dev/null
+++ b/view/tpl/profile_photo.tpl
@@ -0,0 +1,26 @@
+<h1>$title</h1>
+
+<form enctype="multipart/form-data" action="profile_photo" method="post">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<div id="profile-photo-upload-wrapper">
+<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="48" />
+</div>
+
+<label id="profile-photo-profiles-label" for="profile-photo-profiles">$lbl_profiles </label>
+<select name="profile" id="profile-photo-profiles" />
+{{ for $profiles as $p }}
+<option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option>
+{{ endfor }}
+</select>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+$select
+</div>
+\ No newline at end of file
diff --git a/view/tpl/profile_publish.tpl b/view/tpl/profile_publish.tpl
new file mode 100644
index 000000000..8fd0bc913
--- /dev/null
+++ b/view/tpl/profile_publish.tpl
@@ -0,0 +1,16 @@
+<p id="profile-publish-desc-$instance">
+$pubdesc
+</p>
+
+		<div id="profile-publish-yes-wrapper-$instance">
+		<label id="profile-publish-yes-label-$instance" for="profile-publish-yes-$instance">$str_yes</label>
+		<input type="radio" name="profile_publish_$instance" id="profile-publish-yes-$instance" $yes_selected value="1" />
+
+		<div id="profile-publish-break-$instance" ></div>	
+		</div>
+		<div id="profile-publish-no-wrapper-$instance">
+		<label id="profile-publish-no-label-$instance" for="profile-publish-no-$instance">$str_no</label>
+		<input type="radio" name="profile_publish_$instance" id="profile-publish-no-$instance" $no_selected value="0"  />
+
+		<div id="profile-publish-end-$instance"></div>
+		</div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
new file mode 100644
index 000000000..d1e684795
--- /dev/null
+++ b/view/tpl/profile_vcard.tpl
@@ -0,0 +1,50 @@
+<div class="vcard">
+
+	<div class="fn label">$profile.name</div>
+	
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ 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 $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 }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+			{{ if $wallmessage }}
+				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
new file mode 100644
index 000000000..ecfef95d6
--- /dev/null
+++ b/view/tpl/prv_message.tpl
@@ -0,0 +1,33 @@
+
+<h3>$header</h3>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="message" method="post" >
+
+$parent
+
+<div id="prvmail-to-label">$to</div>
+$select
+
+<div id="prvmail-subject-label">$subject</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
+
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
new file mode 100644
index 000000000..497b93396
--- /dev/null
+++ b/view/tpl/pwdreset.tpl
@@ -0,0 +1,17 @@
+<h3>$lbl1</h3>
+
+<p>
+$lbl2
+</p>
+<p>
+$lbl3
+</p>
+<p>
+$newpass
+</p>
+<p>
+$lbl4 $lbl5
+</p>
+<p>
+$lbl6
+</p>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
new file mode 100644
index 000000000..244762c4b
--- /dev/null
+++ b/view/tpl/register.tpl
@@ -0,0 +1,57 @@
+<h3>$regtitle</h3>
+
+<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 $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>
+
+{{ endif }}
+
+
+	<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/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
new file mode 100644
index 000000000..9e0562878
--- /dev/null
+++ b/view/tpl/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+<div id="remote-friends-in-common" class="bigwidget">
+	<div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ if $linkmore }}<a href="$base/common/rem/$uid/$cid">$more</a>{{ endif }}</div>
+	{{ if $items }}
+	{{ for $items as $item }}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="$item.url">
+				<img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="$itemurl" title="$item.name">$item.name</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{ endfor }}
+	{{ endif }}
+	<div id="rfic-end" class="clear"></div>
+</div>
+
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
new file mode 100644
index 000000000..a3ca8d4cf
--- /dev/null
+++ b/view/tpl/removeme.tpl
@@ -0,0 +1,20 @@
+<h1>$title</h1>
+
+<div id="remove-account-wrapper">
+
+<div id="remove-account-desc">$desc</div>
+
+<form action="$basedir/removeme" autocomplete="off" method="post" >
+<input type="hidden" name="verify" value="$hash" />
+
+<div id="remove-account-pass-wrapper">
+<label id="remove-account-pass-label" for="remove-account-pass">$passwd</label>
+<input type="password" id="remove-account-pass" name="qxz_password" />
+</div>
+<div id="remove-account-pass-end"></div>
+
+<input type="submit" name="submit" value="$submit" />
+
+</form>
+</div>
+
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
new file mode 100644
index 000000000..a204c48ff
--- /dev/null
+++ b/view/tpl/saved_searches_aside.tpl
@@ -0,0 +1,14 @@
+<div class="widget" id="saved-search-list">
+	<h3 id="search">$title</h3>
+	$searchbox
+	
+	<ul id="saved-search-ul">
+		{{ for $saved as $search }}
+		<li class="saved-search-li clear">
+			<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.displayterm</a>
+		</li>
+		{{ endfor }}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
new file mode 100644
index 000000000..dc4a43c6a
--- /dev/null
+++ b/view/tpl/search_item.tpl
@@ -0,0 +1,62 @@
+<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-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" 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>
+			<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>
+
+				<div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</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='tag'>$tag</span>
+				{{ endfor }}
+				</div>
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-$item.id">
+			<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.pagedropping }}<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-conv" id="wall-item-conv-$item.id" >
+	{{ if $item.conv }}
+			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+	{{ endif }}
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
new file mode 100644
index 000000000..bebd0c12a
--- /dev/null
+++ b/view/tpl/settings.tpl
@@ -0,0 +1,145 @@
+<h1>$ptitle</h1>
+
+$nickname_block
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>$expire.advanced</h3>
+			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$aclselect
+		</div>
+	</div>
+
+	</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
new file mode 100644
index 000000000..84171dc8d
--- /dev/null
+++ b/view/tpl/settings_addons.tpl
@@ -0,0 +1,10 @@
+<h1>$title</h1>
+
+
+<form action="settings/addon" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+$settings_addons
+
+</form>
+
diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
new file mode 100644
index 000000000..07a86e4fe
--- /dev/null
+++ b/view/tpl/settings_connectors.tpl
@@ -0,0 +1,9 @@
+<h1>$title</h1>
+
+<form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+$settings_connectors
+
+</form>
+
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
new file mode 100644
index 000000000..70895a1f8
--- /dev/null
+++ b/view/tpl/settings_display.tpl
@@ -0,0 +1,21 @@
+<h1>$ptitle</h1>
+
+<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+{{ if $theme_config }}
+<h2>Theme settings</h2>
+$theme_config
+{{ endif }}
+
+</form>
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
new file mode 100644
index 000000000..eb4721d50
--- /dev/null
+++ b/view/tpl/settings_nick_set.tpl
@@ -0,0 +1,5 @@
+
+<div id="settings-nick-wrapper" >
+<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
+</div>
+<div id="settings-nick-end" ></div>
diff --git a/view/tpl/settings_nick_subdir.tpl b/view/tpl/settings_nick_subdir.tpl
new file mode 100644
index 000000000..303c24df7
--- /dev/null
+++ b/view/tpl/settings_nick_subdir.tpl
@@ -0,0 +1,6 @@
+<p>
+It appears that your website is located in a subdirectory of the<br />
+$hostname website, so this setting may not work reliably.<br />
+</p>
+<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
+</p>
+\ No newline at end of file
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
new file mode 100644
index 000000000..890c4ee6c
--- /dev/null
+++ b/view/tpl/settings_oauth.tpl
@@ -0,0 +1,31 @@
+<h1>$title</h1>
+
+
+<form action="settings/oauth" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+	<div id="profile-edit-links">
+		<ul>
+			<li>
+				<a id="profile-edit-view-link" href="$baseurl/settings/oauth/add">$add</a>
+			</li>
+		</ul>
+	</div>
+
+	{{ for $apps as $app }}
+	<div class='oauthapp'>
+		<img src='$app.icon' class="{{ if $app.icon }} {{ else }}noicon{{ endif }}">
+		{{ if $app.name }}<h4>$app.name</h4>{{ else }}<h4>$noname</h4>{{ endif }}
+		{{ if $app.my }}
+			{{ if $app.oauth_token }}
+			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="$app.oauth_token">$remove</button></div>
+			{{ endif }}
+		{{ endif }}
+		{{ if $app.my }}
+		<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit">&nbsp;</a>
+		<a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete">&nbsp;</a>
+		{{ endif }}		
+	</div>
+	{{ endfor }}
+
+</form>
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
new file mode 100644
index 000000000..e6f2abdc2
--- /dev/null
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -0,0 +1,17 @@
+<h1>$title</h1>
+
+<form method="POST">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+{{ inc field_input.tpl with $field=$name }}{{ endinc }}
+{{ inc field_input.tpl with $field=$key }}{{ endinc }}
+{{ inc field_input.tpl with $field=$secret }}{{ endinc }}
+{{ inc field_input.tpl with $field=$redirect }}{{ endinc }}
+{{ inc field_input.tpl with $field=$icon }}{{ endinc }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="cancel" class="settings-submit" value="$cancel" />
+</div>
+
+</form>
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
new file mode 100644
index 000000000..e97b5e8cc
--- /dev/null
+++ b/view/tpl/suggest_friends.tpl
@@ -0,0 +1,16 @@
+<div class="profile-match-wrapper">
+	<a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
+	<div class="profile-match-photo">
+		<a href="$url">
+			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="$url" title="$name">$name</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
+</div>
+\ No newline at end of file
diff --git a/view/tpl/suggestions.tpl b/view/tpl/suggestions.tpl
new file mode 100644
index 000000000..656336496
--- /dev/null
+++ b/view/tpl/suggestions.tpl
@@ -0,0 +1,21 @@
+
+<div class="intro-wrapper" >
+
+<p class="intro-desc">$str_notifytype $notify_type</p>
+<div class="intro-madeby">$madeby</div>
+<div class="intro-fullname" >$fullname</div>
+<a class="intro-url-link" href="$url" ><img class="intro-photo lframe" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
+<div class="intro-note" >$note</div>
+<div class="intro-wrapper-end"></div>
+<form class="intro-form" action="notifications/$intro_id" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="$request" method="get">
+{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/tpl/tag_slap.tpl b/view/tpl/tag_slap.tpl
new file mode 100644
index 000000000..6449df496
--- /dev/null
+++ b/view/tpl/tag_slap.tpl
@@ -0,0 +1,30 @@
+	<entry>
+		<author>
+			<name>$name</name>
+			<uri>$profile_page</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb" />
+		</author>
+
+		<id>$item_id</id>
+		<title>$title</title>
+		<published>$published</published>
+		<content type="$type" >$content</content>
+		<link rel="mentioned" href="$accturi" />
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>$profile_page</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="$thumb"/>
+		<poco:preferredUsername>$nick</poco:preferredUsername>
+		<poco:displayName>$name</poco:displayName>
+		</as:actor>
+ 		<as:verb>$verb</as:verb>
+		<as:object>
+		<as:object-type></as:object-type>
+		</as:object>
+		<as:target>
+		<as:object-type></as:object-type>
+		</as:target>
+	</entry>
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
new file mode 100644
index 000000000..d6f01643e
--- /dev/null
+++ b/view/tpl/viewcontact_template.tpl
@@ -0,0 +1,9 @@
+<h3>$title</h3>
+
+{{ for $contacts as $contact }}
+	{{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+
+<div id="view-contact-end"></div>
+
+$paginate
diff --git a/view/tpl/wall_item.tpl b/view/tpl/wall_item.tpl
new file mode 100644
index 000000000..458677433
--- /dev/null
+++ b/view/tpl/wall_item.tpl
@@ -0,0 +1,79 @@
+<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-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" 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>
+			<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>
+				<div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</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='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="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="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $item.drop.pagedropping }}<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-wrapper" >
+	$item.comment
+	</div>
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
diff --git a/view/tpl/wallmessage.tpl b/view/tpl/wallmessage.tpl
new file mode 100644
index 000000000..66b2bc3a0
--- /dev/null
+++ b/view/tpl/wallmessage.tpl
@@ -0,0 +1,32 @@
+
+<h3>$header</h3>
+
+<h4>$subheader</h4>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="wallmessage/$nickname" method="post" >
+
+$parent
+
+<div id="prvmail-to-label">$to</div>
+$recipname
+
+<div id="prvmail-subject-label">$subject</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
+
+<div id="prvmail-message-label">$yourmessage</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/tpl/wallmsg-header.tpl b/view/tpl/wallmsg-header.tpl
new file mode 100644
index 000000000..cb3922572
--- /dev/null
+++ b/view/tpl/wallmsg-header.tpl
@@ -0,0 +1,82 @@
+
+<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 plaintext = '$editselect';
+
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		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",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script>
+
+	function jotGetLink() {
+		reply = prompt("$linkurl");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/tpl/wallwall_item.tpl b/view/tpl/wallwall_item.tpl
new file mode 100644
index 000000000..983c03287
--- /dev/null
+++ b/view/tpl/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>
+                        $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 id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.localtime">$item.ago</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</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='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="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="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+			</div>
+				{{ if $item.drop.pagedropping }}<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>
+
diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
new file mode 100644
index 000000000..25cda533c
--- /dev/null
+++ b/view/tpl/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="$baseurl/" />
+	<Link rel="http://joindiaspora.com/guid" type="text/html" href="$dspr_guid" />
+	<Link rel="diaspora-public-key" type="RSA" href="$dspr_key" />
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
new file mode 100644
index 000000000..94e3c2146
--- /dev/null
+++ b/view/tpl/xrd_host.tpl
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
+     xmlns:hm='http://host-meta.net/xrd/1.0'>
+ 
+    <hm:Host>$zhost</hm:Host>
+ 
+    <Link rel='lrdd' template='$domain/xrd/?uri={uri}' />
+    <Link rel='acct-mgmt' href='$domain/amcd' />
+    <Link rel='http://services.mozilla.com/amcd/0.1' href='$domain/amcd' />
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+        href="$domain/oexchange/xrd" />
+
+    <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+        type="http://salmon-protocol.org/ns/magic-key"
+        mk:key_id="1">$bigkey</Property>
+
+
+</XRD>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
new file mode 100644
index 000000000..3a6ca7ba7
--- /dev/null
+++ b/view/tpl/xrd_person.tpl
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+ 
+    <Subject>$accturi</Subject>
+	<Alias>$accturi</Alias>
+    <Alias>$profile_url</Alias>
+ 
+    <Link rel="http://purl.org/macgirvin/dfrn/1.0"
+          href="$profile_url" />
+    <Link rel="http://schemas.google.com/g/2010#updates-from" 
+          type="application/atom+xml" 
+          href="$atom" />
+    <Link rel="http://webfinger.net/rel/profile-page"
+          type="text/html"
+          href="$profile_url" />
+    <Link rel="http://microformats.org/profile/hcard"
+          type="text/html"
+          href="$hcard_url" />
+    <Link rel="http://portablecontacts.net/spec/1.0"
+          href="$poco_url" />
+    <Link rel="http://webfinger.net/rel/avatar"
+          type="image/jpeg"
+          href="$photo" />
+ 
+	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+          type="http://salmon-protocol.org/ns/magic-key"
+          mk:key_id="1">$bigkey</Property>
+
+</XRD>
diff --git a/view/tpl/zentity.tpl b/view/tpl/zentity.tpl
new file mode 100644
index 000000000..f34042d05
--- /dev/null
+++ b/view/tpl/zentity.tpl
@@ -0,0 +1,46 @@
+<h2>$title</h2>
+
+<form action="zregister" method="post" id="zregister-form">
+
+{{ if $registertext }}
+<div id="zregister-desc" style="color: #888; margin-bottom: 50px;" 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_id" id="zregister-invite" class="zregister-input" value="$invite_id" >
+	</div>
+	<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="text" 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>
+
+	<div class="clear">
+	<div style="color: #888;">$label_pass2</div>
+	<div id="zregister-password2-end"  class="zregister-field-end"></div>
+
+	<div style="margin-bottom: 25px;">&nbsp;</div>
+
+
+	<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>
+
+	<input type="submit" name="submit" id="zregister-submit-button" value="$submit" />
+	<div id="zregister-submit-end" class="zregister-field-end"></div>
+
+</form>
diff --git a/view/tpl/zregister.tpl b/view/tpl/zregister.tpl
new file mode 100644
index 000000000..356b1b61d
--- /dev/null
+++ b/view/tpl/zregister.tpl
@@ -0,0 +1,45 @@
+<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_id" id="zregister-invite" class="zregister-input" value="$invite_id" >
+	</div>
+	<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>
+
+
+	<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>
+
+	<input type="submit" name="submit" id="zregister-submit-button" value="$submit" />
+	<div id="zregister-submit-end" class="zregister-field-end"></div>
+
+</form>
author	friendica <info@friendica.com>	2012-08-01 05:02:43 -0700
committer	friendica <info@friendica.com>	2012-08-01 05:02:43 -0700
commit	dcbc0c0c9516adf616023615871439b4015fa686 (patch)
tree	451f1e7f53e9635a2640bef66c4541d1dd4b6c10 /view/tpl
parent	7a0894287268658361c90e2f4d1b77f8ca5739a6 (diff)
download	volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.tar.gz volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.tar.bz2 volse-hubzilla-dcbc0c0c9516adf616023615871439b4015fa686.zip