From d32e05fb5e30dc634754e9d2e55cc7702a883ede Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Dec 2013 16:04:28 -0800 Subject: starting on the journey to comanche everywhere - beginning with widget conversions. There are approximately 20 which need to be wrapped for accessibility to comanche. --- include/group.php | 4 ++-- include/widgets.php | 8 ++++++++ mod/network.php | 4 ++-- version.inc | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/group.php b/include/group.php index d339301b4..8f690785d 100644 --- a/include/group.php +++ b/include/group.php @@ -229,7 +229,7 @@ function mini_group_select($uid,$group = '') { -function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = '') { +function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = '',$mode = 1) { $o = ''; @@ -272,7 +272,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 'cid' => $cid, 'text' => $rr['name'], 'selected' => $selected, - 'href' => (($each === 'network') ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']), + 'href' => (($mode == 0) ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']), 'edit' => $groupedit, 'ismember' => in_array($rr['id'],$member_of), ); diff --git a/include/widgets.php b/include/widgets.php index 87941f40f..5be77498c 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -32,3 +32,11 @@ function widget_tagcloud($args) { return $o; } +function widget_collections($args) { + require_once('include/group.php'); + $page = argv(0); + $gid = $_REQUEST['gid']; + + return group_side($page,$page,true,$_REQUEST['gid'],'',0); + +} \ No newline at end of file diff --git a/mod/network.php b/mod/network.php index f087149f3..b2eed8a73 100644 --- a/mod/network.php +++ b/mod/network.php @@ -47,8 +47,8 @@ function network_init(&$a) { ); } - - $a->page['aside'] .= group_side('network','network',true,$_GET['gid']); + require_once('include/widgets.php'); + $a->page['aside'] .= widget_collections(array()); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); $a->page['aside'] .= suggest_widget(); diff --git a/version.inc b/version.inc index 4844f6170..33910aea3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-07.520 +2013-12-08.521 -- cgit v1.2.3