Merge branch 'master' of https://github.com/friendica/red

4 files changed, 28 insertions, 20 deletions

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 590213fd3..265a1a953 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -31,6 +31,22 @@
 
 
 
+
+{{if $is_pending}}
+<div class="abook-pending-contact">
+{{include file="field_checkbox.tpl" field=$unapproved}}
+</div>
+{{/if}}
+
+{{if $multiprofs }}
+<div>
+<h3>{{$lbl_vis1}}</h3>
+<div>{{$lbl_vis2}}</div>
+
+{{$profile_select}}
+</div>
+{{/if}}
+
 <h3>{{$permlbl}}</h3>
 <div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
 
@@ -38,20 +54,16 @@
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-{{if $noperms}}
+{{* {{if $noperms}}
 <div id="noperm-msg" class="warning-text">{{$noperms}}</div>
 <div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div>
 {{/if}}
+*}}
 
 
-{{if $is_pending}}
-<div class="abook-pending-contact">
-{{include file="field_checkbox.tpl" field=$unapproved}}
-</div>
-{{/if}}
 
 <br />
-<b>{{$quick}}</b>
+<h3>{{$quick}}</h3>
 <ul>
 {{if $self}}
 <li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li>
@@ -62,6 +74,9 @@
 <li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li>
 </ul>
 
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+
+
 <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
 
 <div id="abook-advanced-panel" style="display: block;">
@@ -76,14 +91,6 @@
 
 </div>
 
-{{if $multiprofs }}
-<div>
-<h3>{{$lbl_vis1}}</h3>
-<div>{{$lbl_vis2}}</div>
-
-{{$profile_select}}
-</div>
-{{/if}}
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index eb98063fa..e4cd1d20b 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -47,8 +47,8 @@ $('#chat-form').submit(function(ev) {
 
 function load_chats() {
 
-	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat,function(data) {
-		if(data.success) {
+	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
+		if(data.success && (! stopped)) {
 			update_inroom(data.inroom);
 			update_chats(data.chats);
 		}
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index ea9e775e2..324dbe426 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -13,7 +13,7 @@
 
 {{include file="field_input.tpl" field=$menu_name}} 
 {{include file="field_input.tpl" field=$menu_desc}}
-
+{{include file="field_checkbox.tpl" field=$menu_bookmark}}
 <div class="menuedit-submit-wrapper" >
 <input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" />
 </div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index b1a4f956d..c4b89a543 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -25,15 +25,16 @@
 {{include file="field_checkbox.tpl" field=$hide_presence}}
 
 
-<div id="settings-privacy-macros">{{$lbl_pmacro}}</div>
+<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3>
 <ul>
-<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li>
 <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li>
 <li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li>
+<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li>
 <li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li>
 </ul>
 
 
+<h3 id="settings-perm-advanced">{{$lbl_p2macro}}</h3>
 
 <div id="settings-permissions-wrapper">
 {{foreach $permiss_arr as $permit}}