X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftemplates%2Fgroup_side.tpl;h=947ae974e8aec1b4d1eb442d60bd2a746a346ed7;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=682da5e11861d640cddad7c69c83c0e85c0a623d;hpb=2e9d233367068fceac8005126d14a2002539c772;p=friendica.git

diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
index 682da5e118..947ae974e8 100644
--- a/view/theme/frio/templates/group_side.tpl
+++ b/view/theme/frio/templates/group_side.tpl
@@ -1,6 +1,22 @@
 <div class="widget" id="group-sidebar">
-	<h3>{{$title}}</h3>
-
+	<div id="sidebar-group-header">
+		<h3>{{$title}}</h3>
+		{{if ! $newgroup}}
+		<a class="group-edit-tool pull-right widget-action faded-icon" id="sidebar-edit-group" href="{{$grouppage}}" data-toggle="tooltip" title="{{$editgroupstext}}">
+			<i class="fa fa-pencil" aria-hidden="true"></i>
+		</a>
+		{{else}}
+		<a class="group-edit-tool pull-right widget-action faded-icon" id="sidebar-new-group" onclick="javascript:$('#group-new-form').fadeIn('fast');" data-toggle="tooltip" title="{{$createtext}}">
+			<i class="fa fa-plus" aria-hidden="true"></i>
+		</a>
+		<form id="group-new-form" action="group/new" method="post" style="display:none;">
+			<div class="form-group">
+				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+				<input name="groupname" id="id_groupname" class="form-control input-sm" placeholder="{{$creategroup}}">
+			</div>
+		</form>
+		{{/if}}
+	</div>
 	<div id="sidebar-group-list">
 		{{* The list of available groups *}}
 		<ul role="menu" id="sidebar-group-ul">
@@ -10,40 +26,29 @@
 					{{if $group.cid}}
 						<div class="checkbox pull-right group-checkbox ">
 							<input type="checkbox"
+								id="sidebar-group-checkbox-{{$group.id}}"
 								class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
 								onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
 								{{if $group.ismember}}checked="checked"{{/if}}
+								aria-checked="{{if $group.ismember}}true{{else}}false{{/if}}"
 							/>
-							<label for="group-{{$group.id}}"></label>
+							<label for="sidebar-group-checkbox-{{$group.id}}"></label>
 							<div class="clearfix"></div>
 						</div>
 					{{/if}}
 					{{if $group.edit}}
 						{{* if the group is editable show a little pencil for editing *}}
-						<a id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-tool pull-right" href="{{$group.edit.href}}" title="{{$edittext}}">
-							<i class="faded-icon fa fa-pencil" aria-hidden="true"></i><span class="sr-only">{{$edittext}}</span>
+						<a id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-tool pull-right faded-icon" href="{{$group.edit.href}}" data-toggle="tooltip" title="{{$edittext}}">
+							<i class="fa fa-pencil" aria-hidden="true"></i>
 						</a>
 					{{/if}}
 					<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element" href="{{$group.href}}">{{$group.text}}</a>
 				</li>
 			{{/foreach}}
+
+			{{if $ungrouped}}<li class="{{if $ungrouped_selected}}selected{{/if}} sidebar-group-li" id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></li>{{/if}}
 		</ul>
 	</div>
 
-	{{if $newgroup}}
-	<div id="sidebar-new-group">
-		{{* show the input field by clicking "new group" *}}
-		<a onclick="javascript:$('#group-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
-		<form id="group-new-form" action="group/new" method="post" style="display:none;">
-			<div class="form-group">
-				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-				<input name="groupname" id="id_groupname" class="form-control input-sm" placeholder="{{$creategroup}}">
-			</div>
-		</form>
-	</div>
-	{{else}}
-	<div id="sidebar-edit-groups"><a href="{{$grouppage}}">{{$editgroupstext}}</a></div>
-	{{/if}}
 
-	{{if $ungrouped}}<div id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></div>{{/if}}
 </div>