Merge branch 'upstream'

7 files changed, 23 insertions, 8 deletions

diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
index 6e7629094..ea840e1b3 100755
--- a/view/tpl/admin_hubloc.tpl
+++ b/view/tpl/admin_hubloc.tpl
@@ -1,9 +1,6 @@
 <div class="generic-content-wrapper" id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
-	<form action="{{$baseurl}}/admin/hubloc" method="post">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	
 	<table id='server'>
 		<thead>
 			<tr>
@@ -14,9 +11,13 @@
 			
 			{{foreach $hubloc as $hub}}<tr>
 			<td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td>
-			<td><input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
+			<td>
+			<form action="{{$baseurl}}/admin/hubloc" method="post">
+			<input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}">
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 			<input type="submit" name="check" value="check" >
 			<input type="submit" name="repair" value="repair" ></td>
+			</form>
 			</tr>{{/foreach}}
 		</tbody>
 	</table>
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
new file mode 100644
index 000000000..d2cf4d7b0
--- /dev/null
+++ b/view/tpl/chatroomlist.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+<h3>{{$header}}</h3>
+{{if $items}}
+<table>
+{{foreach $items as $item}}
+<tr><td>{{$item.cr_name}}</td><td>{{$item.cr_inroom}}</td></tr>
+{{/foreach}}
+</table>
+{{/if}}
+</div>
+
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
index a3fa7e4c3..f00448175 100755
--- a/view/tpl/direntry_large.tpl
+++ b/view/tpl/direntry_large.tpl
@@ -13,7 +13,7 @@
 <div class="clear"></div>
 
 
-<div class="contact-name" id="directory-name-{{$id}}"  >{{$name}}</div>
+<div class="contact-name" id="directory-name-{{$id}}"  >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div>
 {{if $connect}}
 <div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div>
 {{/if}}
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index 25c127a15..7dc8dfd59 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,6 +1,6 @@
+<div class="clear"></div>
 <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/photo_view.tpl b/view/tpl/photo_view.tpl
index e56fd5b57..93e9abfa5 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -24,7 +24,7 @@
 <div id="photo-edit-edit" style="display: none;">
 <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" >
 
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
+	<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
 
 	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
 	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" />
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index aaee02ab5..7a857fd67 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -16,7 +16,7 @@
 	</div>
 	{{/if}}
 
-	<div class="fn label">{{$profile.name}}</div>
+	<div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
 		
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 7b6add231..b1a4f956d 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -22,6 +22,9 @@
 
 <h3 class="settings-heading">{{$h_prv}}</h3>
 
+{{include file="field_checkbox.tpl" field=$hide_presence}}
+
+
 <div id="settings-privacy-macros">{{$lbl_pmacro}}</div>
 <ul>
 <li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li>