Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/css/style.css

whatever

28 files changed, 281 insertions, 207 deletions

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index d21073b56..c98350843 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -1,18 +1,34 @@
-<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>
+<div class="modal" id="aclModal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h4 class="modal-title">{{$aclModalTitle}}</h4>
+			</div>
+			<div class="modal-body">
+				<div id="acl-wrapper">
+					<button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
+					<input type="text" id="acl-search" placeholder="&#xf002;">
+					<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>
+					<button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
+					<button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
+				</div>
+				{{if $jotnets}}
+				{{$jotnets}}
+				{{/if}}
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
 <script>
 $(document).ready(function() {
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index fdf070aa2..cb3827bf2 100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -14,6 +14,7 @@
 <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.channels.2}}'><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></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.hubloc.2}}'><a href='{{$admin.hubloc.0}}'>{{$admin.hubloc.1}}</a></li>
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
new file mode 100755
index 000000000..d8f5f626f
--- /dev/null
+++ b/view/tpl/admin_channels.tpl
@@ -0,0 +1,50 @@
+<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 class = "generic-content-wrapper" id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/channels" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_channels}}</h3>
+		{{if $channels}}
+			<table id='channels'>
+				<thead>
+				<tr>
+					{{foreach $th_channels as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $channels as $c}}
+					<tr>
+						<td class='channel_id'>{{$c.channel_id}}</td>
+						<td class='channel_name'>{{$c.channel_name}}</td>
+						<td class='channel_address'>{{$c.channel_address}}</td>
+						<td class="checkbox"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
+						<td class="tools">
+							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-remove admin-icons'></i></a>
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('channels_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_channels_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_channels_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO CHANNELS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 9b90fb4b0..c6c15cec4 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -64,10 +64,9 @@
 	{{include file="field_input.tpl" field=$maximagesize}}
 	
 	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
 	{{include file="field_checkbox.tpl" field=$block_public}}
 	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 98a1c7846..204b5114a 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -16,6 +16,7 @@
 	var bParam_page = {{$page}};
 	var bParam_wall = {{$wall}};
 	var bParam_list = {{$list}};
+	var bParam_fh = {{$fh}};
 
 	var bParam_search = "{{$search}}";
 	var bParam_order = "{{$order}}";
@@ -40,6 +41,7 @@
 		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
 		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
 		if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list;
+		if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh;
 		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
 		if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order;
 		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
diff --git a/view/tpl/channel_id_select.tpl b/view/tpl/channel_id_select.tpl
new file mode 100644
index 000000000..ecebd4bc0
--- /dev/null
+++ b/view/tpl/channel_id_select.tpl
@@ -0,0 +1,7 @@
+{{if $channels}}
+<select name="dest_channel" id="dest-channel-select"> 
+{{foreach $channels as $c}}
+<option {{if $c.channel_id == $selected}}selected="selected"{{/if}} value="{{$c.channel_id}}">{{$c.channel_name}}</option>
+{{/foreach}}
+</select>
+{{/if}}
\ No newline at end of file
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index 86eadb132..287f95cc0 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -2,10 +2,11 @@
 
 <form action="chat" method="post" >
 {{include file="field_input.tpl" field=$name}}
-<br />
-<br />
+<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
 {{$acl}}
 <div class="clear"></div>
+<br />
+<br />
 <input type="submit" name="submit" value="{{$submit}}" />
 </form>
 
diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
index 3d34d7c57..fa6bfbdfa 100755
--- a/view/tpl/common_tabs.tpl
+++ b/view/tpl/common_tabs.tpl
@@ -1,6 +1,8 @@
-<ul class="tabs">
-	{{foreach $tabs as $tab}}
-		<li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-	{{/foreach}}
-</ul>
+<div id="tabs-collapse-1" class="navbar-collapse collapse">
+	<ul class="nav nav-tabs nav-justified">
+		{{foreach $tabs as $tab}}
+			<li class="{{$tab.sel}}" {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>
 <div class="tabs-end"></div>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
new file mode 100755
index 000000000..44866c323
--- /dev/null
+++ b/view/tpl/connection_template.tpl
@@ -0,0 +1,9 @@
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
+	<div class="contact-entry-photo-wrapper" >
+		<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+	<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
+	<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$edit}}</a></div>
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/tpl/contacts-template.tpl b/view/tpl/connections.tpl
index 0c7e01038..f254ce8c2 100755
--- a/view/tpl/contacts-template.tpl
+++ b/view/tpl/connections.tpl
@@ -15,7 +15,7 @@
 
 
 {{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
+	{{include file="connection_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 869692bfa..31e3cad85 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -9,18 +9,20 @@
 <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{* comment out for now. let's see if somebody is missing it. if yes we need a better visual concept.
 			{{if $item.owner_url}}
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
 				<a href="{{$item.owner_url}}" 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>
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" /></a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
 			{{/if}}
+			*}}
 			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
 				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
 				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" 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>
@@ -30,16 +32,11 @@
 
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}}<br />
 
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
+		</div>
+		<div class="wall-item-author dropdown">
+				{{if $item.lock}}<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;{{/if}}<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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>
@@ -112,10 +109,11 @@
 {{/foreach}}
 {{/if}}
 
+{{if $item.comment}}
 <div class="wall-item-comment-wrapper" >
 	{{$item.comment}}
 </div>
-
+{{/if}}
 
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl
new file mode 100644
index 000000000..a68781698
--- /dev/null
+++ b/view/tpl/field_colorinput.tpl
@@ -0,0 +1,6 @@
+	<div class='field input color'>
+		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+		<input class='color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
+		<div id='end_{{$field.0}}' class='field_end'></div>
+	</div>
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
index f1e78b897..efb43224c 100644
--- a/view/tpl/hdr.tpl
+++ b/view/tpl/hdr.tpl
@@ -3,5 +3,3 @@
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
 </ul>
-
-<div id="panel" style="display: none;"></div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index c676cd773..e7b41523f 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,6 +1,6 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0">
 <meta name="generator" content="{{$generator}}" />
 
 <!--[if IE]>
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
new file mode 100644
index 000000000..e01243077
--- /dev/null
+++ b/view/tpl/help.tpl
@@ -0,0 +1,3 @@
+<div id = "help-content" class="generic-content-wrapper">
+{{$content}}
+</div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 80421d552..27b081b57 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -6,9 +6,9 @@ var plaintext = '{{$editselect}}';
 
 function initEditor(cb){
 	if (editor==false){
-		$("#profile-jot-text-loading").spin('small');
+		$("#profile-jot-text-loading").spin('small').show();
 		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").spin(false);
+			$("#profile-jot-text-loading").spin(false).hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
 			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
@@ -77,7 +77,7 @@ function initEditor(cb){
 
 				ed.onInit.add(function(ed) {
 					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").spin(false);
+					$("#profile-jot-text-loading").spin(false).hide();
 					$(".jothidden").show();
 					if (typeof cb!="undefined") cb();
 				});
@@ -86,11 +86,7 @@ function initEditor(cb){
 		});
 
 		editor = true;
-		// setup acl popup
-		  $("a#jot-perms-icon").colorbox({ 
-				  'inline' : true, 
-				  'transition' : 'elastic' 
-			});
+
 	} else {
 		if (typeof cb!="undefined") cb();
 	}
@@ -112,11 +108,14 @@ function enableOnUser(){
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
+		var upload_title = $('#wall-image-upload').attr('title');
+		var attach_title = $('#wall-file-upload').attr('title');
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
 				name: 'userfile',
+				title: upload_title,
 				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
 					addeditortext(response);
@@ -129,6 +128,7 @@ function enableOnUser(){
 			'wall-file-upload',
 			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
 				name: 'userfile',
+				title: attach_title,
 				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
 					addeditortext(response);
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index e1e1e3080..c4fdba0f5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,5 +1,4 @@
 <div id="profile-jot-wrapper" >
-
 	<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}}" />
@@ -12,85 +11,95 @@
 		<input type="hidden" name="post_id" value="{{$post_id}}" />
 		<input type="hidden" name="webpage" value="{{$webpage}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		{{if $showacl}}{{$acl}}{{/if}}
 		{{$mimeselect}}
 		{{$layoutselect}}
-
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $id_select}}
+			<div class="channel-id-select-div">
+			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+			</div>
+		{{/if}}
+		<div id="jot-title-wrap">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		</div>
 		{{if $catsenabled}}
-		<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-category-wrap">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		</div>
 		{{/if}}
 		{{if $webpage}}
-		<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div>
+		<div id="jot-pagetitle-wrap">
+			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" />
+		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
+		</div>
+		<div id="profile-jot-submit-wrapper" class="jothidden">
+			<div id="profile-jot-submit-left" class="btn-group pull-left">
+				{{if $visitor}}
+				<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
+					<i class="icon-camera jot-icons"></i>
+				</button>
+				<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
+					<i id="wall-file-upload" class="icon-paper-clip jot-icons"></i>
+				</button>
+				<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+					<i id="profile-link" class="icon-link jot-icons"></i>
+				</button>
+				<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
+					<i id="profile-video" class="icon-facetime-video jot-icons"></i>
+				</button>
+				<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
+					<i id="profile-audio" class="icon-volume-up jot-icons"></i>
+				</button>
+				<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
+					<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+				</button>
+				<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+					<i id="profile-location" class="icon-globe jot-icons"></i>
+				</button>
+				{{/if}}
+				{{if $feature_expire}}
+				<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+					<i id="profile-expires" class="icon-eraser jot-icons"></i>
+				</button>
+				{{/if}}
+				{{if $feature_encrypt}}
+				<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+					<i id="profile-encrypt" class="icon-key jot-icons"></i>
+				</button>
+				{{/if}}
+			</div>
+			<div id="profile-rotator-wrapper">
+				<div id="profile-rotator"></div>
+			</div>
+			<div id="profile-jot-submit-right" class="btn-group pull-right">
+				{{if $showacl}}
+				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+					<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
+				</button>
+				{{/if}}
+				{{if $preview}}
+				<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
+					<i class="icon-eye-open jot-icons" ></i>
+				</button>
+				{{/if}}
+				<button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button>
+			</div>
+			<div id="profile-jot-perms-end"></div>
+			<div id="profile-jot-plugin-wrapper">
+				{{$jotplugins}}
+			</div>
 		</div>
 		<div id="profile-jot-text-loading"></div>
+		<div id="profile-jot-end" class="clear"></div>
+		<div id="jot-preview-content" style="display:none;"></div>
+	</form>
+</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" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i>
-	</div> 
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
-		<i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-		<i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i>
-	</div> 
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
-		<i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
-	</div>
-	<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
-		<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
-	</div> 
-	<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
-		<i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
-	</div> 
-
-
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-		<div id="profile-rotator"></div>
-	</div>  
-
-	{{if $showacl}}
-	<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>
-	{{/if}}
-
-	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
-
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-	{{$jotplugins}}
-	</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"/>
-			{{$jotnets}}
-		</div>
-	</div>
 <!-- Modal for item expiry-->
-<div class="modal fade" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -127,13 +136,7 @@
     });
   });
 </script>
-</div>
-
-
 
-
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>initEditor();</script>{{/if}}
+{{if $content}}
+<script>initEditor();</script>
+{{/if}}
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 8f13f80c9..482005e44 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -16,18 +16,9 @@
 {{include file="field_checkbox.tpl" field=$newwin}}
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
+	<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+	{{$aclselect}}
 	<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>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index a4baaf48b..5aa3b0f01 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -5,7 +5,10 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="show_hide" data-target="#region_1">
+			<button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1">
+				<i class="icon-circle-arrow-down" id="expand-tabs-icon"></i>
+			</button>
+			<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
 				<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
 			</button>
 			{{if $userinfo}}
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 09932e545..0e8c8017c 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,8 +1,25 @@
 <div class="widget">
 <script>
-$("#note-text").live('input paste',function(e){
-	$.post('notes', { 'note_text' : $('#note-text').val() });
+var noteSaveTimer = null;
+$(document).on('focusout',"#note-text",function(e){
+	if(noteSaveTimer)
+		clearTimeout(noteSaveTimer);
+	notePostFinal();
+	noteSaveTimer = null;
+});
+
+$(document).on('focusin',"#note-text",function(e){
+	noteSaveTimer = setTimeout(noteSaveChanges,10000);
 });
+
+function notePostFinal() {
+	$.post('notes/sync', { 'note_text' : $('#note-text').val() });
+}
+
+function noteSaveChanges() {
+	$.post('notes', { 'note_text' : $('#note-text').val() });
+	noteSaveTimer = setTimeout(noteSaveChanges,10000);
+}
 </script>
 
 <h3>{{$banner}}</h3>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f5e5bb7b5..01f135522 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -53,16 +53,10 @@
 	<div id="photo-edit-rotate-end"></div>
 
 	<div id="settings-default-perms" class="settings-default-perms" >
-		<span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span>
-		<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$edit.permissions}}</a>
+		<span id="jot-perms-icon" class="{{$edit.lockstate}}" ></span>
+		<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
+		{{$edit.aclselect}}
 		<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;">
-					{{$edit.aclselect}}     
-				</div>
-			</div>
-		</div>
 	</div>                                                                                  
 	<br/>
 	<div id="settings-default-perms-end"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 102c4d872..62591c648 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -24,18 +24,12 @@
 
 
 	<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>
+		<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
+		<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
 	</div>
+	{{$aclselect}}
 	<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}}
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index 6720d3628..1a8323926 100755
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
@@ -1,9 +1,17 @@
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
+{{if $style == 'list'}}
+<ul id="posted-date-selector">
+{{foreach $dates as $d}}
+<li class="posted-date-li"><a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a></li>
+{{/foreach}}
+</ul>
+{{else}}
 <select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}">
 {{foreach $dates as $d}}
-<option value="{{$url}}?dend={{$d.1}}&dbegin={{$d.2}}" >{{$d.0}}</option>
+<option value="{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}" >{{$d.0}}</option>
 {{/foreach}}
 </select>
+{{/if}}
 </div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 3330a338f..118bd846f 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -37,14 +37,16 @@
 	<div id="prvmail-link-wrapper" >
 		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
 	</div> 
-
-    <div id="prvmail-expire-wrapper" style="display: {{$feature_expire}};" >
-        <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
-    </div>
-	<div id="prvmail-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
+	{{if $feature_expire}}
+	<div id="prvmail-expire-wrapper" >
+		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i>
+	</div>
+	{{/if}}
+	{{if $feature_encrypt}}
+	<div id="prvmail-encrypt-wrapper" >
 		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i>
 	</div> 
-
+	{{/if}}
 	<div id="prvmail-rotator-wrapper" >
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div> 
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index c5acfa4a4..81ce4e136 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -16,15 +16,12 @@
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></i>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
 		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}"  title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a><br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>				
+		<div class="wall-item-author dropdown">
+
+               {{if $item.lock}}<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;{{/if}}<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}}<br />
+                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</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>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 49dff4822..accd8f106 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -34,7 +34,7 @@
 </ul>
 
 
-<button type="button" class="btn btn-xs btn-warning" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
+<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
 
 
 
@@ -67,24 +67,15 @@
 
 {{include file="field_yesno.tpl" field=$blocktags}}
 
-{{include file="field_input.tpl" field=$maxreq}}
 
-{{include file="field_input.tpl" field=$cntunkmail}}
+{{include file="field_input.tpl" field=$expire}}
+
 </div>
 
 <div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
+	<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+	{{$aclselect}}
 	<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>
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
index 4bcc5bbdb..57f383788 100755
--- a/view/tpl/xrd_host.tpl
+++ b/view/tpl/xrd_host.tpl
@@ -4,15 +4,8 @@
  
     <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='lrdd' template='{{$zroot}}/xrd/?uri={uri}' />
 	<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>
-
+        href="{{$zroot}}/oexchange/xrd" />
 
 </XRD>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 035ab251f..20d438dd5 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -2,28 +2,17 @@
 <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>