harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contact group is now 'channel group'

Browse Source
This commit is contained in:
friendica 2012-10-27 03:54:44 -07:00
parent fb8b44f1b2
commit e29618ee0d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/group.php
View File

@ -267,10 +267,10 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$tpl = get_markup_template("group_side.tpl"); $tpl = get_markup_template("group_side.tpl");
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$title' => t('Contact Groups'), '$title' => t('Channel Groups'),
'$edittext' => t('Edit contact group'), '$edittext' => t('Edit channel group'),
'$createtext' => t('Create a new contact group'), '$createtext' => t('Create a new channel group'),
'$ungrouped' => (($every === 'contacts') ? t('Contacts not in any contact group') : ''), '$ungrouped' => (($every === 'contacts') ? t('Channels not in any group') : ''),
'$groups' => $groups, '$groups' => $groups,
'$add' => t('add'), '$add' => t('add'),
)); ));

18
mod/group.php
View File

@ -44,7 +44,7 @@ function group_post(&$a) {
intval(local_user()) intval(local_user())
); );
if(! count($r)) { if(! count($r)) {
notice( t('Contact group not found.') . EOL ); notice( t('Channel group not found.') . EOL );
goaway($a->get_baseurl() . '/contacts'); goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED return; // NOTREACHED
} }
@ -57,7 +57,7 @@ function group_post(&$a) {
intval($group['id']) intval($group['id'])
); );
if($r) if($r)
info( t('Contact group name changed.') . EOL ); info( t('Channel group name changed.') . EOL );
} }
$a->page['aside'] = group_side(); $a->page['aside'] = group_side();
@ -88,7 +88,7 @@ function group_content(&$a) {
return replace_macros($tpl, $context + array( return replace_macros($tpl, $context + array(
'$title' => t('Create a group of contacts/friends.'), '$title' => t('Create a group of contacts/friends.'),
'$gname' => array('groupname',t('Contact Group Name: '), '', ''), '$gname' => array('groupname',t('Channel Group Name: '), '', ''),
'$gid' => 'new', '$gid' => 'new',
'$form_security_token' => get_form_security_token("group_edit"), '$form_security_token' => get_form_security_token("group_edit"),
)); ));
@ -107,9 +107,9 @@ function group_content(&$a) {
if(count($r)) if(count($r))
$result = group_rmv(local_user(),$r[0]['name']); $result = group_rmv(local_user(),$r[0]['name']);
if($result) if($result)
info( t('Contact group removed.') . EOL); info( t('Channel group removed.') . EOL);
else else
notice( t('Unable to remove contact group.') . EOL); notice( t('Unable to remove channel group.') . EOL);
} }
goaway($a->get_baseurl() . '/group'); goaway($a->get_baseurl() . '/group');
// NOTREACHED // NOTREACHED
@ -134,7 +134,7 @@ function group_content(&$a) {
intval(local_user()) intval(local_user())
); );
if(! count($r)) { if(! count($r)) {
notice( t('Contact group not found.') . EOL ); notice( t('Channel group not found.') . EOL );
goaway($a->get_baseurl() . '/contacts'); goaway($a->get_baseurl() . '/contacts');
} }
$group = $r[0]; $group = $r[0];
@ -174,7 +174,7 @@ function group_content(&$a) {
$context = $context + array( $context = $context + array(
'$title' => t('Contact Group Editor'), '$title' => t('Contact Group Editor'),
'$gname' => array('groupname',t('Contact Group Name: '),$group['name'], ''), '$gname' => array('groupname',t('Channel Group Name: '),$group['name'], ''),
'$gid' => $group['id'], '$gid' => $group['id'],
'$drop' => $drop_txt, '$drop' => $drop_txt,
'$form_security_token' => get_form_security_token('group_edit'), '$form_security_token' => get_form_security_token('group_edit'),
@ -188,7 +188,7 @@ function group_content(&$a) {
$groupeditor = array( $groupeditor = array(
'label_members' => t('Members'), 'label_members' => t('Members'),
'members' => array(), 'members' => array(),
'label_contacts' => t('All Contacts'), 'label_contacts' => t('All Active Channels'),
'contacts' => array(), 'contacts' => array(),
); );
@ -218,7 +218,7 @@ function group_content(&$a) {
} }
$context['$groupeditor'] = $groupeditor; $context['$groupeditor'] = $groupeditor;
$context['$desc'] = t('Click on a contact to add or remove.'); $context['$desc'] = t('Click on a channel to add or remove.');
if($change) { if($change) {
$tpl = get_markup_template('groupeditor.tpl'); $tpl = get_markup_template('groupeditor.tpl');

4
view/theme/duepuntozero/css/style.css
View File

@ -2981,8 +2981,8 @@ aside input[type='text'] {
#lang-select-icon { #lang-select-icon {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
left: 0px; left: 4px;
top: 0px; top: 4px;
opacity: 0.2; opacity: 0.2;
filter:alpha(opacity=20); filter:alpha(opacity=20);
} }