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

fix default channel

Browse Source
This commit is contained in:
friendica 2012-11-02 18:55:40 +11:00
parent 83cf11dd95
commit 9bb1b7e3ed
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mod/manage.php
View File

@ -11,14 +11,17 @@ function manage_content(&$a) {
$change_channel = ((argc() > 1) ? intval(argv(1)) : 0); $change_channel = ((argc() > 1) ? intval(argv(1)) : 0);
if((argc() > 2) && (argv(2) === 'primary')) { if((argc() > 2) && (argv(2) === 'default')) {
q("update channel set channel_primary = 0 where channel_account_id = %d", $r = q("select channel_id from channel where channel_id = %d and channel_account_id = %d limit 1",
intval(get_account_id())
);
q("update channel set channel_primary = 1 where channel_id = %d and channel_account_id = %d limit 1",
intval($change_channel), intval($change_channel),
intval(get_account_id()) intval(get_account_id())
); );
if($r) {
q("update account set account_default_channel = %d where account_id = %d limit 1",
intval($change_channel),
intval(get_account_id())
);
}
goaway(z_root() . '/manage'); goaway(z_root() . '/manage');
} }
@ -38,6 +41,7 @@ function manage_content(&$a) {
); );
$selected_channel = null; $selected_channel = null;
$account = get_app()->get_account();
if($r && count($r)) { if($r && count($r)) {
$channels = $r; $channels = $r;
@ -45,7 +49,8 @@ function manage_content(&$a) {
$channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']); $channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
if($channels[$x]['channel_id'] == local_user()) if($channels[$x]['channel_id'] == local_user())
$selected_channel = $channels[$x]; $selected_channel = $channels[$x];
$channels[$x]['primary_links'] = '1'; $channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : '');
$channels[$x]['default_links'] = '1';
} }
} }
} }
@ -60,8 +65,8 @@ function manage_content(&$a) {
'$msg_selected' => t('Current Channel'), '$msg_selected' => t('Current Channel'),
'$selected' => $selected_channel, '$selected' => $selected_channel,
'$desc' => t('Attach to one of your channels by selecting it.'), '$desc' => t('Attach to one of your channels by selecting it.'),
'$msg_primary' => t('Default Channel'), '$msg_default' => t('Default Channel'),
'$msg_make_primary' => t('Make Default'), '$msg_make_default' => t('Make Default'),
'$links' => $links, '$links' => $links,
'$all_channels' => $channels, '$all_channels' => $channels,
)); ));

2
view/css/mod_manage.css
View File

@ -12,7 +12,7 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.channel-selection-primary { .channel-selection-default {
font-size: 0.8em; font-size: 0.8em;
margin-bottom: 10px; margin-bottom: 10px;
} }

8
view/tpl/channel.tpl
View File

@ -1,9 +1,9 @@
<div class="channel-selection"> <div class="channel-selection">
{{ if $channel.primary_links }} {{ if $channel.default_links }}
{{ if $channel.channel_primary }} {{ if $channel.default }}
<div class="channel-selection-primary primary">$msg_primary</div> <div class="channel-selection-default default">$msg_default</div>
{{ else }} {{ else }}
<div class="channel-selection-primary"><a href="manage/$channel.channel_id/primary">$msg_make_primary</a></div> <div class="channel-selection-default"><a href="manage/$channel.channel_id/default">$msg_make_default</a></div>
{{ endif }} {{ endif }}
{{ endif }} {{ endif }}
<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a> <a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a>