From ad6e04d0bbf812dfe048f1fdbde7aa5c787b6d1a Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 1 Dec 2010 00:57:18 +0000 Subject: Fixes #2555 content.php is the new display view for widgets git-svn-id: http://code.elgg.org/elgg/trunk@7484 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/widgets/filerepo/content.php | 71 +++++++++++++++++++ mod/file/views/default/widgets/filerepo/view.php | 71 ------------------- .../views/default/widgets/friends/content.php | 36 ++++++++++ mod/friends/views/default/widgets/friends/view.php | 36 ---------- .../default/widgets/a_users_groups/content.php | 54 +++++++++++++++ .../views/default/widgets/a_users_groups/view.php | 54 --------------- .../default/widgets/group_entities_widget/edit.php | 19 ----- .../default/widgets/group_entities_widget/view.php | 31 --------- .../default/widgets/group_members_widget/edit.php | 19 ----- .../default/widgets/group_members_widget/view.php | 31 --------- .../views/default/widgets/messageboard/content.php | 80 ++++++++++++++++++++++ .../views/default/widgets/messageboard/view.php | 80 ---------------------- mod/pages/views/default/widgets/pages/content.php | 27 ++++++++ mod/pages/views/default/widgets/pages/view.php | 27 -------- .../views/default/widgets/tagcloud/content.php | 14 ++++ .../views/default/widgets/tagcloud/view.php | 14 ---- .../views/default/widgets/thewire/content.php | 15 ++++ mod/thewire/views/default/widgets/thewire/view.php | 15 ---- .../views/default/widgets/twitter/content.php | 31 +++++++++ mod/twitter/views/default/widgets/twitter/view.php | 31 --------- views/default/widgets/wrapper.php | 9 ++- 21 files changed, 336 insertions(+), 429 deletions(-) create mode 100644 mod/file/views/default/widgets/filerepo/content.php delete mode 100644 mod/file/views/default/widgets/filerepo/view.php create mode 100644 mod/friends/views/default/widgets/friends/content.php delete mode 100644 mod/friends/views/default/widgets/friends/view.php create mode 100644 mod/groups/views/default/widgets/a_users_groups/content.php delete mode 100644 mod/groups/views/default/widgets/a_users_groups/view.php delete mode 100644 mod/groups/views/default/widgets/group_entities_widget/edit.php delete mode 100644 mod/groups/views/default/widgets/group_entities_widget/view.php delete mode 100644 mod/groups/views/default/widgets/group_members_widget/edit.php delete mode 100644 mod/groups/views/default/widgets/group_members_widget/view.php create mode 100644 mod/messageboard/views/default/widgets/messageboard/content.php delete mode 100644 mod/messageboard/views/default/widgets/messageboard/view.php create mode 100644 mod/pages/views/default/widgets/pages/content.php delete mode 100644 mod/pages/views/default/widgets/pages/view.php create mode 100644 mod/tagcloud/views/default/widgets/tagcloud/content.php delete mode 100644 mod/tagcloud/views/default/widgets/tagcloud/view.php create mode 100644 mod/thewire/views/default/widgets/thewire/content.php delete mode 100644 mod/thewire/views/default/widgets/thewire/view.php create mode 100644 mod/twitter/views/default/widgets/twitter/content.php delete mode 100644 mod/twitter/views/default/widgets/twitter/view.php diff --git a/mod/file/views/default/widgets/filerepo/content.php b/mod/file/views/default/widgets/filerepo/content.php new file mode 100644 index 000000000..41a968dce --- /dev/null +++ b/mod/file/views/default/widgets/filerepo/content.php @@ -0,0 +1,71 @@ +owner_guid; +$number = $vars['entity']->num_display; + +//get the layout view which is set by the user in the edit panel +$get_view = (int) $vars['entity']->gallery_list; +if (!$get_view || $get_view == 1) { + $view = "list"; +} else { + $view = "gallery"; +} + +//get the user's files +$options = array( + 'type' => 'object', + 'subtype' => 'file', + 'limit' => $number, + 'container_guid' => $owner_guid +); +$files = elgg_get_entities($options); + +//if there are some files, go get them +if ($files) { + + echo "
"; + + if ($view == "gallery") { + + echo "
"; + + //display in gallery mode + foreach ($files as $f) { + + $mime = $f->mimetype; + echo "getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . ""; + } + + echo "
"; + } else { + + //display in list mode + foreach ($files as $f) { + + $mime = $f->mimetype; + echo "
"; + echo "
getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "
"; + echo "
"; + echo "

" . $f->title . "

"; + echo "

" . elgg_view_friendly_time($f->time_created) . "

"; + echo "
"; + } + } + + + //get a link to the users files + $users_file_url = elgg_get_site_url() . "pg/file/" . get_user($f->owner_guid)->username; + + echo "
" . elgg_echo('file:more') . "
"; + echo "
"; +} else { + + echo "

" . elgg_echo("file:none") . "

"; +} +?> \ No newline at end of file diff --git a/mod/file/views/default/widgets/filerepo/view.php b/mod/file/views/default/widgets/filerepo/view.php deleted file mode 100644 index 41a968dce..000000000 --- a/mod/file/views/default/widgets/filerepo/view.php +++ /dev/null @@ -1,71 +0,0 @@ -owner_guid; -$number = $vars['entity']->num_display; - -//get the layout view which is set by the user in the edit panel -$get_view = (int) $vars['entity']->gallery_list; -if (!$get_view || $get_view == 1) { - $view = "list"; -} else { - $view = "gallery"; -} - -//get the user's files -$options = array( - 'type' => 'object', - 'subtype' => 'file', - 'limit' => $number, - 'container_guid' => $owner_guid -); -$files = elgg_get_entities($options); - -//if there are some files, go get them -if ($files) { - - echo "
"; - - if ($view == "gallery") { - - echo "
"; - - //display in gallery mode - foreach ($files as $f) { - - $mime = $f->mimetype; - echo "getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . ""; - } - - echo "
"; - } else { - - //display in list mode - foreach ($files as $f) { - - $mime = $f->mimetype; - echo "
"; - echo "
getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "
"; - echo "
"; - echo "

" . $f->title . "

"; - echo "

" . elgg_view_friendly_time($f->time_created) . "

"; - echo "
"; - } - } - - - //get a link to the users files - $users_file_url = elgg_get_site_url() . "pg/file/" . get_user($f->owner_guid)->username; - - echo "
" . elgg_echo('file:more') . "
"; - echo "
"; -} else { - - echo "

" . elgg_echo("file:none") . "

"; -} -?> \ No newline at end of file diff --git a/mod/friends/views/default/widgets/friends/content.php b/mod/friends/views/default/widgets/friends/content.php new file mode 100644 index 000000000..2f9ab71ea --- /dev/null +++ b/mod/friends/views/default/widgets/friends/content.php @@ -0,0 +1,36 @@ +owner_guid); + +// the number of friends to display +$num = (int) $vars['entity']->num_display; + +// get the correct size +$size = $vars['entity']->icon_size; + +// Get the user's friends +$friends = $owner->getFriends("", $num); + +// If there are any friends to view, view them +if (is_array($friends) && sizeof($friends) > 0) { + + echo "
"; + + foreach($friends as $friend) { + echo "
"; + echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size)); + echo "
"; + } + + echo "
"; +} diff --git a/mod/friends/views/default/widgets/friends/view.php b/mod/friends/views/default/widgets/friends/view.php deleted file mode 100644 index 2f9ab71ea..000000000 --- a/mod/friends/views/default/widgets/friends/view.php +++ /dev/null @@ -1,36 +0,0 @@ -owner_guid); - -// the number of friends to display -$num = (int) $vars['entity']->num_display; - -// get the correct size -$size = $vars['entity']->icon_size; - -// Get the user's friends -$friends = $owner->getFriends("", $num); - -// If there are any friends to view, view them -if (is_array($friends) && sizeof($friends) > 0) { - - echo "
"; - - foreach($friends as $friend) { - echo "
"; - echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size)); - echo "
"; - } - - echo "
"; -} diff --git a/mod/groups/views/default/widgets/a_users_groups/content.php b/mod/groups/views/default/widgets/a_users_groups/content.php new file mode 100644 index 000000000..462ac419c --- /dev/null +++ b/mod/groups/views/default/widgets/a_users_groups/content.php @@ -0,0 +1,54 @@ +num_display; +if (!$number) { + $number = 4; +} + +//the page owner +$owner = $vars['entity']->owner_guid; + +$groups = elgg_get_entities_from_relationship(array( + 'relationship' => 'member', + 'relationship_guid' => $owner, + 'types' => 'group', + 'limit' => $number, +)); + + +if ($groups) { + + echo "
"; + + foreach ($groups as $group) { + $icon = elgg_view( + "groups/icon", array( + 'entity' => $group, + 'size' => 'small', + ) + ); + + $group_link = $group->getURL(); + + echo <<<___END + +
+ $icon +
+

+ $group->name
+ $group->briefdescription +

+
+
+
+___END; + + } + echo "
"; +} diff --git a/mod/groups/views/default/widgets/a_users_groups/view.php b/mod/groups/views/default/widgets/a_users_groups/view.php deleted file mode 100644 index 462ac419c..000000000 --- a/mod/groups/views/default/widgets/a_users_groups/view.php +++ /dev/null @@ -1,54 +0,0 @@ -num_display; -if (!$number) { - $number = 4; -} - -//the page owner -$owner = $vars['entity']->owner_guid; - -$groups = elgg_get_entities_from_relationship(array( - 'relationship' => 'member', - 'relationship_guid' => $owner, - 'types' => 'group', - 'limit' => $number, -)); - - -if ($groups) { - - echo "
"; - - foreach ($groups as $group) { - $icon = elgg_view( - "groups/icon", array( - 'entity' => $group, - 'size' => 'small', - ) - ); - - $group_link = $group->getURL(); - - echo <<<___END - -
- $icon -
-

- $group->name
- $group->briefdescription -

-
-
-
-___END; - - } - echo "
"; -} diff --git a/mod/groups/views/default/widgets/group_entities_widget/edit.php b/mod/groups/views/default/widgets/group_entities_widget/edit.php deleted file mode 100644 index bd78d2940..000000000 --- a/mod/groups/views/default/widgets/group_entities_widget/edit.php +++ /dev/null @@ -1,19 +0,0 @@ - -

- - - - - -

\ No newline at end of file diff --git a/mod/groups/views/default/widgets/group_entities_widget/view.php b/mod/groups/views/default/widgets/group_entities_widget/view.php deleted file mode 100644 index 629dee85e..000000000 --- a/mod/groups/views/default/widgets/group_entities_widget/view.php +++ /dev/null @@ -1,31 +0,0 @@ -limit) - $limit = $vars['entity']->limit; - - $group_guid = $vars['entity']->group_guid; - - if ($group_guid) - { - $group = get_entity($group_guid); - $members = $group->getMembers($limit, $offset); - $count = $group->getMembers($limit, $offset, true); - - $result = list_entities_groups("", 0, $group_guid, $limit); - } - else - { - $result = elgg_echo('groups:widgets:entities:label:pleaseedit'); - } - - echo $result; -?> \ No newline at end of file diff --git a/mod/groups/views/default/widgets/group_members_widget/edit.php b/mod/groups/views/default/widgets/group_members_widget/edit.php deleted file mode 100644 index 58f8807d8..000000000 --- a/mod/groups/views/default/widgets/group_members_widget/edit.php +++ /dev/null @@ -1,19 +0,0 @@ - -

- - - - - -

\ No newline at end of file diff --git a/mod/groups/views/default/widgets/group_members_widget/view.php b/mod/groups/views/default/widgets/group_members_widget/view.php deleted file mode 100644 index 6dd99717b..000000000 --- a/mod/groups/views/default/widgets/group_members_widget/view.php +++ /dev/null @@ -1,31 +0,0 @@ -limit) - $limit = $vars['entity']->limit; - - $group_guid = $vars['entity']->group_guid; - - if ($group_guid) - { - $group = get_entity($group_guid); - $members = $group->getMembers($limit, $offset); - $count = $group->getMembers($limit, $offset, true); - - $result = elgg_view_entity_list($members, $count, $offset, $limit, false, false, false); - } - else - { - $result = elgg_echo('groups:widgets:members:label:pleaseedit'); - } - - echo $result; -?> \ No newline at end of file diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php new file mode 100644 index 000000000..8c1abb47b --- /dev/null +++ b/mod/messageboard/views/default/widgets/messageboard/content.php @@ -0,0 +1,80 @@ +num_display)) { + $num_display = $vars['entity']->num_display; +} + +//Just the loggedin user can post messages +if (isloggedin()) { +?> + + +
+ + + + + + + + + + + +
+ +
+ + +
+ +
+ + getAnnotations('messageboard', $num_display, 0, 'desc'); + +//as long as there is some content to display, display it +if (!empty($contents)) { + + echo elgg_view('messageboard/messageboard',array('annotation' => $contents)); + +} else { + + //put the required div on the page for the first message + echo "
"; + +} diff --git a/mod/messageboard/views/default/widgets/messageboard/view.php b/mod/messageboard/views/default/widgets/messageboard/view.php deleted file mode 100644 index 8c1abb47b..000000000 --- a/mod/messageboard/views/default/widgets/messageboard/view.php +++ /dev/null @@ -1,80 +0,0 @@ -num_display)) { - $num_display = $vars['entity']->num_display; -} - -//Just the loggedin user can post messages -if (isloggedin()) { -?> - - -
- - - - - - - - - - - -
- -
- - -
- -
- - getAnnotations('messageboard', $num_display, 0, 'desc'); - -//as long as there is some content to display, display it -if (!empty($contents)) { - - echo elgg_view('messageboard/messageboard',array('annotation' => $contents)); - -} else { - - //put the required div on the page for the first message - echo "
"; - -} diff --git a/mod/pages/views/default/widgets/pages/content.php b/mod/pages/views/default/widgets/pages/content.php new file mode 100644 index 000000000..f42a1a85f --- /dev/null +++ b/mod/pages/views/default/widgets/pages/content.php @@ -0,0 +1,27 @@ + +pages_num; + +if (!$num_display) { + $num_display = 4; +} + +$pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $num_display, 'full_view' => FALSE)); + +if ($pages) { + $pagesurl = elgg_get_site_url() . "pg/pages/owned/" . elgg_get_page_owner()->username; + $pages .= "
" . elgg_echo('pages:more') . "
"; +} + +echo "
" . $pages . "
"; \ No newline at end of file diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php deleted file mode 100644 index f42a1a85f..000000000 --- a/mod/pages/views/default/widgets/pages/view.php +++ /dev/null @@ -1,27 +0,0 @@ - -pages_num; - -if (!$num_display) { - $num_display = 4; -} - -$pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $num_display, 'full_view' => FALSE)); - -if ($pages) { - $pagesurl = elgg_get_site_url() . "pg/pages/owned/" . elgg_get_page_owner()->username; - $pages .= "
" . elgg_echo('pages:more') . "
"; -} - -echo "
" . $pages . "
"; \ No newline at end of file diff --git a/mod/tagcloud/views/default/widgets/tagcloud/content.php b/mod/tagcloud/views/default/widgets/tagcloud/content.php new file mode 100644 index 000000000..5ed71d66a --- /dev/null +++ b/mod/tagcloud/views/default/widgets/tagcloud/content.php @@ -0,0 +1,14 @@ +num_items; +if (!isset($num_items)) { + $num_items = 30; +} + +$options = array( + 'owner_guid' => elgg_get_page_owner_guid(), + 'threshold' => 1, + 'limit' => $num_items, + 'tag_name' => 'tags', +); +echo elgg_view_tagcloud($options); diff --git a/mod/tagcloud/views/default/widgets/tagcloud/view.php b/mod/tagcloud/views/default/widgets/tagcloud/view.php deleted file mode 100644 index 5ed71d66a..000000000 --- a/mod/tagcloud/views/default/widgets/tagcloud/view.php +++ /dev/null @@ -1,14 +0,0 @@ -num_items; -if (!isset($num_items)) { - $num_items = 30; -} - -$options = array( - 'owner_guid' => elgg_get_page_owner_guid(), - 'threshold' => 1, - 'limit' => $num_items, - 'tag_name' => 'tags', -); -echo elgg_view_tagcloud($options); diff --git a/mod/thewire/views/default/widgets/thewire/content.php b/mod/thewire/views/default/widgets/thewire/content.php new file mode 100644 index 000000000..bed5c140b --- /dev/null +++ b/mod/thewire/views/default/widgets/thewire/content.php @@ -0,0 +1,15 @@ +num_display; +if (!$num) { + $num = 4; +} + +$content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'container_guid' => $vars['entity']->owner_guid, 'limit' => $num, 'full_view' => FALSE, 'pagination' => FALSE)); + +echo $content; + +if ($content) { + $blogurl = elgg_get_site_url() . "pg/thewire/" . elgg_get_page_owner()->username; + echo "
".elgg_echo('thewire:moreposts')."
"; +} diff --git a/mod/thewire/views/default/widgets/thewire/view.php b/mod/thewire/views/default/widgets/thewire/view.php deleted file mode 100644 index bed5c140b..000000000 --- a/mod/thewire/views/default/widgets/thewire/view.php +++ /dev/null @@ -1,15 +0,0 @@ -num_display; -if (!$num) { - $num = 4; -} - -$content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire', 'container_guid' => $vars['entity']->owner_guid, 'limit' => $num, 'full_view' => FALSE, 'pagination' => FALSE)); - -echo $content; - -if ($content) { - $blogurl = elgg_get_site_url() . "pg/thewire/" . elgg_get_page_owner()->username; - echo "
".elgg_echo('thewire:moreposts')."
"; -} diff --git a/mod/twitter/views/default/widgets/twitter/content.php b/mod/twitter/views/default/widgets/twitter/content.php new file mode 100644 index 000000000..e429d0103 --- /dev/null +++ b/mod/twitter/views/default/widgets/twitter/content.php @@ -0,0 +1,31 @@ +twitter_username; +$num = $vars['entity']->twitter_num; + +// if the twitter username is empty, then do not show +if ($username) { + +?> + +
+ +

+ + +
+ +" . elgg_echo("twitter:notset") . ".

"; + +} diff --git a/mod/twitter/views/default/widgets/twitter/view.php b/mod/twitter/views/default/widgets/twitter/view.php deleted file mode 100644 index e429d0103..000000000 --- a/mod/twitter/views/default/widgets/twitter/view.php +++ /dev/null @@ -1,31 +0,0 @@ -twitter_username; -$num = $vars['entity']->twitter_num; - -// if the twitter username is empty, then do not show -if ($username) { - -?> - -
- -

- - -
- -" . elgg_echo("twitter:notset") . ".

"; - -} diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php index 20faf85a8..9c941a7c9 100644 --- a/views/default/widgets/wrapper.php +++ b/views/default/widgets/wrapper.php @@ -40,7 +40,14 @@ $widget_instance = "widget_instance_$handler"; } ?>
- +
-- cgit v1.2.3