diff options
| author | friendica <info@friendica.com> | 2012-09-02 20:30:47 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-09-02 20:30:47 -0700 |
| commit | aff33531acfdee5b21a96bb1723ae656be13ce91 (patch) | |
| tree | 5e04d727df019787d2a201eb8cd0973f3e06f42e | |
| parent | 58ddd2d565e320f62e0524b2a0eaaef4b940f60c (diff) | |
| download | volse-hubzilla-aff33531acfdee5b21a96bb1723ae656be13ce91.tar.gz volse-hubzilla-aff33531acfdee5b21a96bb1723ae656be13ce91.tar.bz2 volse-hubzilla-aff33531acfdee5b21a96bb1723ae656be13ce91.zip | |
channel/identity selection manage page
| -rw-r--r-- | mod/manage.php | 38 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/tpl/channel.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/channels.tpl | 7 |
4 files changed, 39 insertions, 15 deletions
diff --git a/mod/manage.php b/mod/manage.php index e0e99b123..c33f2c217 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -87,22 +87,46 @@ function manage_content(&$a) { return; } - $active = null; + $change_channel = ((argc() > 1) ? intval($argv(1)) : 0); + if($change_channel) { + $r = q("select * from entity where entity_id = %d and entity_account_id = %d limit 1", + intval($change_channel), + intval(get_account_id()) + ); + if($r && count($r)) { + $_SESSION['uid'] = intval($r[0]['entity_id']); + get_app()->identity = $r[0]; + $_SESSION['theme'] = $r[0]['entity_theme']; + date_default_timezone_set($r[0]['entity_timezone']); + } + } + + + $channels = null; if(local_user()) { - $r = q("select * from entity where entity_id = %d limit 1", - intval(local_user()) + $r = q("select entity.*, contact.* from entity left join contact on entity.entity_id = contact.uid + where entity.entity_account_id = %d and contact.self = 1", + intval(get_account_id()) ); - if($r && count($r)) - $active = $r[0]; + if($r && count($r)) { + $channels = $r; + for($x = 0; $x < count($channels); $x ++) + $channels[$x]['link'] = 'manage/' . intval($channels[$x]['entity_id']); + } } + $links = array( + array( 'zentity', t('Create a new channel'), t('New Channel')) + ); + $o = replace_macros(get_markup_template('channels.tpl'), array( - '$header' => t('Manage Profile Channels'), + '$header' => t('Manage Channels'), '$desc' => t('These are your Profile Channels. Select any Profile Channel to attach and make that the current channel.'), - '$active' => $active, + '$links' => $links, + '$all_channels' => $channels, )); diff --git a/version.inc b/version.inc index 4902adee3..2a8741dac 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2012-09-01.64 +2012-09-02.65 diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index a18c4c1bb..eb9635ce8 100644 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,2 +1,5 @@ -<img class="channel-photo" src="$channel.photo" alt="$channel.name" /> -<div class="channel-name">$channel.name</div> +<div class="channel-selection"> +<a href="$channel.link" class="channel-selection-photo-link" title="$channel.entity_name"><img class="channel-photo" src="$channel.thumb" alt="$channel.entity_name" /></a> +<a href="$channel.link" class="channel-selection-name-link" title="$channel.entity_name"><div class="channel-name">$channel.entity_name</div></a> +</div> +<div class="channel-selection-end"></div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index bfff3964f..50366efa6 100644 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,5 @@ <h3>$header</h3> -<div id="channels-desc" class="descriptive-text">$desc</div> {{ if $links }} {{ for $links as $l }} @@ -8,12 +7,10 @@ {{ endfor }} {{ endif }} -<div align="center">{{ inc channel.tpl with $chn = $active }}</div> -<div align="center">$act_desc</div> - +<div id="channels-desc" class="descriptive-text">$desc</div> {{ for $all_channels as $chn }} -{{ inc channel.tpl with $channel = $chn }} +{{ inc channel.tpl with $channel=$chn }}{{ endinc }} {{ endfor }} <div class="channels-end"></div> |