Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

4 files changed, 71 insertions, 37 deletions

diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
index d9412a6f7..88f037abe 100755
--- a/view/tpl/group_edit.tpl
+++ b/view/tpl/group_edit.tpl
@@ -1,26 +1,30 @@
-<div class="generic-content-wrapper-styled">
-<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}}'>
-		
-		{{include file="field_input.tpl" field=$gname}}
-		{{include file="field_checkbox.tpl" field=$public}}
-		{{if $drop}}{{$drop}}{{/if}}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="{{$submit}}" >
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			<button type="button" class="btn btn-sm btn-outline-secondary" onclick="openClose('group_tools')"><i class="fa fa-pencil"></i> {{$details_label}}</button>
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
-
+		<h2>{{$title}}</h2>
+	</div>
 
-{{if $groupeditor}}
-	<div id="group-update-wrapper">
-		{{include file="groupeditor.tpl"}}
+	<div id="group_tools" class="clearfix section-content-tools-wrapper" style="display: none">
+		<form action="group/{{$gid}}" id="group-edit-form" method="post" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token_edit}}'>
+			{{include file="field_input.tpl" field=$gname}}
+			{{include file="field_checkbox.tpl" field=$public}}
+			<a href="group/drop/{{$gid}}?t={{$form_security_token_drop}}" onclick="return confirmDelete();" class="btn btn-sm btn-danger">
+				{{$delete}}
+			</a>
+			<button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button>
+		</form>
+	</div>
+	<div class="section-content-info-wrapper">
+		{{$desc}}
+	</div>
+	<div class="section-content-wrapper">
+		<div id="group-update-wrapper" class="clearfix">
+			{{include file="groupeditor.tpl"}}
+		</div>
 	</div>
-{{/if}}
-{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
 </div>
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
index c79bb0a2a..94c275c7e 100755
--- a/view/tpl/groupeditor.tpl
+++ b/view/tpl/groupeditor.tpl
@@ -1,16 +1,12 @@
-<div id="group">
-<h3>{{$groupeditor.label_members}}</h3>
-<div id="group-members" class="contact_list">
-{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
-</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">
-{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
-</div>
-<div id="group-all-contacts-end"></div>
+<div id="contacts" class="list-group float-left w-50 pr-2">
+	<h3>{{$groupeditor.label_contacts}}</h3>
+	<div id="group-all-contacts" class="contact_list">
+	{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+	</div>
+</div>
+<div id="group" class="list-group float-right w-50">
+	<h3>{{$groupeditor.label_members}}</h3>
+	<div id="group-members" class="contact_list">
+	{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+	</div>
 </div>
diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl
new file mode 100644
index 000000000..c1b621349
--- /dev/null
+++ b/view/tpl/micropro_card.tpl
@@ -0,0 +1,6 @@
+<a class="list-group-item{{if $class}} {{$class}}{{/if}} fakelink" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}>
+	<img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}}
+	<span class="contactname">{{$name}}</span>
+	<span class="dropdown-sub-text">{{$addr}}</span>
+	<span class="dropdown-sub-text">{{$network}}</span>
+</a>
diff --git a/view/tpl/privacy_groups.tpl b/view/tpl/privacy_groups.tpl
new file mode 100644
index 000000000..b4e27ef2c
--- /dev/null
+++ b/view/tpl/privacy_groups.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="clearfix section-title-wrapper">
+		<button type="button" class="btn btn-sm btn-success float-right" onclick="openClose('group_tools')"><i class="fa fa-plus-circle"></i> {{$add_new_label}}</button>
+		<h2>{{$title}}</h2>
+	</div>
+	<div id="group_tools" class="clearfix section-content-tools-wrapper"{{if ! $new}} style="display: none"{{/if}}>
+		<form action="group/new" id="group-edit-form" method="post" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{include file="field_input.tpl" field=$gname}}
+			{{include file="field_checkbox.tpl" field=$public}}
+			<button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button>
+		</form>
+	</div>
+
+	<table id="groups-index">
+		<tr>
+			<th width="99%">{{$name_label}}</th>
+			<th width="1%">{{$count_label}}</th>
+		</tr>
+
+		{{foreach $entries as $group}}
+		<tr id="groups-index-{{$group.id}}" class="group-index-row">
+			<td><a href="group/{{$group.id}}">{{$group.name}}</a></td>
+			<td>{{$group.count}}</td>
+		</tr>
+		{{/foreach}}
+	</table>
+</div>