MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1554 from FlxAlbroscheit/develop-1

Browse source 
Issue #1504: Creating groups directly from the sidebar in contacts-page
This commit is contained in:
Tobias Diekershoff 2015-05-13 19:59:58 +02:00
commit 2dd8db7de8
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/group.php
View file

@ -270,6 +270,8 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
'$title' => t('Groups'), '$title' => t('Groups'),
'$edittext' => t('Edit group'), '$edittext' => t('Edit group'),
'$createtext' => t('Create a new group'), '$createtext' => t('Create a new group'),
'$creategroup' => t('Group Name: '),
'$form_security_token' => get_form_security_token("group_edit"),
'$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''), '$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''),
'$groups' => $groups, '$groups' => $groups,
'$add' => t('add'), '$add' => t('add'),

7
view/templates/group_side.tpl
View file

@ -1,4 +1,3 @@
<div class="widget" id="group-sidebar"> <div class="widget" id="group-sidebar">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
@ -22,7 +21,11 @@
</ul> </ul>
</div> </div>
<div id="sidebar-new-group"> <div id="sidebar-new-group">
<a href="group/new">{{$createtext}}</a> <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;">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<input name="groupname" id="id_groupname" placeholder="{{$creategroup}}">
</form>
</div> </div>
{{if $ungrouped}} {{if $ungrouped}}
<div id="sidebar-ungrouped"> <div id="sidebar-ungrouped">