Merge upstream

8 files changed, 33 insertions, 4 deletions

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index c44e2253a..095bd0df3 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -37,7 +37,7 @@
 			</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.to}} <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> {{$item.vwall}}{{/if}}<br />
+				<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}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
 		</div>			
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
new file mode 100644
index 000000000..58498e4d8
--- /dev/null
+++ b/view/tpl/dir_sort_links.tpl
@@ -0,0 +1,6 @@
+<div class="widget" id="dir_sort_links">
+<h3>{{$header}}</h3>
+<a href="directory?f=&order=">{{$normal}}</a><br />
+<a href="directory?f=&order=reverse">{{$reverse}}</a><br />
+<a href="directory?f=&order=date">{{$date}}</a><br />
+</div>
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index cb63f7ca2..f5dda4cc0 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,6 +1,6 @@
 	<div class='field acheckbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type="checkbox" class="abook-edit-them" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
-		<input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/>
+		<input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />{{if $field.5}} <span class="permission-inherited">{{$inherited}}</span> {{/if}}
 		<span class='field_abook_help'>{{$field.6}}</span>
 	</div>
diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
index 8b4c67b6f..5ae52aa8a 100755
--- a/view/tpl/generic_links_widget.tpl
+++ b/view/tpl/generic_links_widget.tpl
@@ -4,7 +4,7 @@
 	
 	<ul>
 		{{foreach $items as $item}}
-			<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+			<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li>
 		{{/foreach}}
 	</ul>
 	
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
new file mode 100644
index 000000000..25c127a15
--- /dev/null
+++ b/view/tpl/item_attach.tpl
@@ -0,0 +1,6 @@
+<div class="body-attach">
+{{foreach $attaches as $a}} 
+<a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a>
+{{/foreach}}
+<div class="clear"></div>
+</div>
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
new file mode 100644
index 000000000..ec2639a6f
--- /dev/null
+++ b/view/tpl/item_categories.tpl
@@ -0,0 +1,8 @@
+{{if $categories}}
+<div class="categorytags">
+{{foreach $categories as $cat}}
+<span class="item-category"><i class="icon-asterisk cat-icons"></i>&nbsp;{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
new file mode 100644
index 000000000..0e68a172a
--- /dev/null
+++ b/view/tpl/item_filer.tpl
@@ -0,0 +1,8 @@
+{{if $categories}}
+<div class="filesavetags">
+{{foreach $categories as $cat}}
+<span class="item-category"><i class="icon-folder-close cat-icons"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a></span>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index e6ddf3651..24966ad1d 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,8 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
-	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
 	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
+	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
+	<div class="clear">&nbsp;</div>
 </div>