From 195e5060fe480717471826cbe1f2ed094109d837 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 14 May 2011 17:12:55 +0000 Subject: Refs #2104 more category work for bundled plugins git-svn-id: http://code.elgg.org/elgg/trunk@9068 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/manifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/groups') diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml index 32671397d..c67a5307f 100644 --- a/mod/groups/manifest.xml +++ b/mod/groups/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.8 bundled + social Provides group support for elgg http://www.elgg.org/ See COPYRIGHT.txt -- cgit v1.2.3 From a59b9ec70ef9c8aaf0ae2e03bdc66753da415d08 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 18 May 2011 01:08:27 +0000 Subject: Fixes #3464 group discussion replies work on activity page git-svn-id: http://code.elgg.org/elgg/trunk@9096 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/start.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/groups') diff --git a/mod/groups/start.php b/mod/groups/start.php index 9de7f1cc1..73bdd08a9 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -734,7 +734,7 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) { 'href' => "#groups-reply-$object->guid", 'text' => elgg_view_icon('speech-bubble'), 'title' => elgg_echo('reply:this'), - 'class' => "elgg-toggler", + 'link_class' => "elgg-toggler", 'priority' => 50, ); $return[] = ElggMenuItem::factory($options); -- cgit v1.2.3 From 6edf852e9c5e352e02140ba9f2ab93b3a8750172 Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 20 May 2011 01:08:10 +0000 Subject: Refs #2104 changed extension to enhancement and added security, widget, and theme categories git-svn-id: http://code.elgg.org/elgg/trunk@9105 36083f99-b078-4883-b0ff-0f9b5a30f544 --- languages/en.php | 5 ++++- mod/blog/manifest.xml | 1 + mod/bookmarks/manifest.xml | 1 + mod/categories/manifest.xml | 1 + mod/diagnostics/manifest.xml | 2 ++ mod/embed/manifest.xml | 1 + mod/file/manifest.xml | 1 + mod/garbagecollector/manifest.xml | 1 + mod/groups/manifest.xml | 1 + mod/htmlawed/manifest.xml | 1 + mod/invitefriends/manifest.xml | 1 + mod/logrotate/manifest.xml | 1 + mod/messageboard/manifest.xml | 1 + mod/pages/manifest.xml | 1 + mod/tagcloud/manifest.xml | 1 + mod/tinymce/manifest.xml | 2 +- mod/twitter/manifest.xml | 1 + mod/uservalidationbyemail/manifest.xml | 1 + mod/zaudio/manifest.xml | 2 +- 19 files changed, 23 insertions(+), 3 deletions(-) (limited to 'mod/groups') diff --git a/languages/en.php b/languages/en.php index 768658c99..509de7fb0 100644 --- a/languages/en.php +++ b/languages/en.php @@ -597,11 +597,14 @@ $english = array( 'admin:plugins:category:bundled' => 'Bundled', 'admin:plugins:category:content' => 'Content', 'admin:plugins:category:development' => 'Development', - 'admin:plugins:category:extension' => 'Extensions', + 'admin:plugins:category:enhancement' => 'Enhancements', 'admin:plugins:category:api' => 'Service/API', 'admin:plugins:category:communication' => 'Communication', + 'admin:plugins:category:security' => 'Security and Spam', 'admin:plugins:category:social' => 'Social', 'admin:plugins:category:multimedia' => 'Multimedia', + 'admin:plugins:category:theme' => 'Themes', + 'admin:plugins:category:widget' => 'Widgets', 'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.', 'admin:plugins:markdown:unknown_file' => 'Unknown file.', diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml index f0ec96e8b..991462060 100644 --- a/mod/blog/manifest.xml +++ b/mod/blog/manifest.xml @@ -5,6 +5,7 @@ 1.8 bundled content + widget Blog plugin Adds simple blogging capabilities to your Elgg installation. http://elgg.org/ diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml index 88921dcce..72e9af9b0 100644 --- a/mod/bookmarks/manifest.xml +++ b/mod/bookmarks/manifest.xml @@ -5,6 +5,7 @@ 1.8 bundled content + widget Add and comment on bookmarks. Adds the ability for users to bookmark internal and external sites. Other users can then comment on the bookmarks. http://www.elgg.org/ diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml index 43df13d02..15d7192c1 100644 --- a/mod/categories/manifest.xml +++ b/mod/categories/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.8 bundled + enhancement Add site-wide categories Site-wide Categories lets administrators define categories that users across the site can add content to. http://www.elgg.org/ diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml index f84b07cd4..7821d128d 100644 --- a/mod/diagnostics/manifest.xml +++ b/mod/diagnostics/manifest.xml @@ -4,6 +4,8 @@ Core developers 1.8 bundled + developer + admin Elgg diagnostics tool http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml index 102daa761..f61d27c23 100644 --- a/mod/embed/manifest.xml +++ b/mod/embed/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.8 bundled + enhancement Allows users to easily upload and embed media into text areas. http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml index 966aa1195..aac9c3f6b 100644 --- a/mod/file/manifest.xml +++ b/mod/file/manifest.xml @@ -5,6 +5,7 @@ 1.8 bundled content + widget File browser plugin http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml index 23223bc44..466e49d61 100644 --- a/mod/garbagecollector/manifest.xml +++ b/mod/garbagecollector/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.5 bundled + admin Perform some database cleanup tasks http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml index c67a5307f..4188aa861 100644 --- a/mod/groups/manifest.xml +++ b/mod/groups/manifest.xml @@ -5,6 +5,7 @@ 1.8 bundled social + widget Provides group support for elgg http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml index ba8978814..0c48bbd28 100644 --- a/mod/htmlawed/manifest.xml +++ b/mod/htmlawed/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.5 bundled + security Provides security filtering. Disabling this plugin is extremely insecure. DO NOT DISABLE. http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml index e54513d01..d445c5025 100644 --- a/mod/invitefriends/manifest.xml +++ b/mod/invitefriends/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.8 bundled + social Invite friends via email invites. http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml index 153dfa921..ab6250ac0 100644 --- a/mod/logrotate/manifest.xml +++ b/mod/logrotate/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.5 bundled + admin Rotate the system log at specific intervals http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml index 602c991d2..25c42ee93 100644 --- a/mod/messageboard/manifest.xml +++ b/mod/messageboard/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.8 bundled + widget This plugin allows users to put a message board on their profile for other users to post comments. http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml index e5e23f546..4b5e5c747 100644 --- a/mod/pages/manifest.xml +++ b/mod/pages/manifest.xml @@ -5,6 +5,7 @@ 1.8 bundled content + widget Elgg Pages http://www.elgg.org See COPYRIGHT.txt diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml index 8ca4d10ea..6fcad14e2 100644 --- a/mod/tagcloud/manifest.xml +++ b/mod/tagcloud/manifest.xml @@ -4,6 +4,7 @@ Cash Costello 1.0 bundled + widget Widget-based tag clouds. http://cashcostello.com/ See COPYRIGHT.txt diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml index a3df59e3d..5e69055d8 100644 --- a/mod/tinymce/manifest.xml +++ b/mod/tinymce/manifest.xml @@ -4,7 +4,7 @@ Core developers 1.8 bundled - extension + enhancement TinyMCE plugin. http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml index b198aa0e9..bd7176620 100644 --- a/mod/twitter/manifest.xml +++ b/mod/twitter/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.7 bundled + widget Elgg simple twitter widget http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml index 5fffb0d2b..df0a7cb58 100644 --- a/mod/uservalidationbyemail/manifest.xml +++ b/mod/uservalidationbyemail/manifest.xml @@ -4,6 +4,7 @@ Core developers 1.8 bundled + security Simple user account validation via email. http://www.elgg.org/ See COPYRIGHT.txt diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml index 3b2dc47e8..ecbff85fe 100644 --- a/mod/zaudio/manifest.xml +++ b/mod/zaudio/manifest.xml @@ -4,7 +4,7 @@ Core developers 1.8 bundled - extension + enhancement multimedia This simple plugin lets users play mp3's in the page. http://www.elgg.org/ -- cgit v1.2.3 From 5c1f26521ed42546d23f3968226fcb30e9f0a7db Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 13:12:14 +0000 Subject: Refs #3407 adds a footer for forms git-svn-id: http://code.elgg.org/elgg/trunk@9167 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/forms/blog/save.php | 12 +++++++----- mod/groups/actions/groups/delete.php | 7 ++++++- mod/groups/views/default/forms/groups/delete.php | 17 ----------------- mod/groups/views/default/forms/groups/edit.php | 12 +++++++++++- mod/groups/views/default/forms/groups/invite.php | 2 ++ mod/groups/views/default/groups/edit.php | 6 ------ .../views/default/forms/invitefriends/invite.php | 2 ++ .../notifications/subscriptions/forminternals.php | 2 +- views/default/css/elements/forms.php | 9 +++++++++ views/default/forms/avatar/crop.php | 6 +++--- views/default/forms/avatar/upload.php | 5 +++-- views/default/forms/comments/add.php | 14 +++++++++----- views/default/forms/usersettings/save.php | 2 +- 13 files changed, 54 insertions(+), 42 deletions(-) delete mode 100644 mod/groups/views/default/forms/groups/delete.php (limited to 'mod/groups') diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index b2d20579f..cf5a4032e 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -135,13 +135,15 @@ $body_input $categories_input -
+
+
$save_status $saved -
+
-$guid_input -$container_guid_input + $guid_input + $container_guid_input -$action_buttons + $action_buttons +
___HTML; diff --git a/mod/groups/actions/groups/delete.php b/mod/groups/actions/groups/delete.php index 932d03355..2ff6c339c 100644 --- a/mod/groups/actions/groups/delete.php +++ b/mod/groups/actions/groups/delete.php @@ -3,7 +3,12 @@ * Delete a group */ -$guid = (int) get_input('group_guid'); +$guid = (int) get_input('guid'); +if (!$guid) { + // backward compatible + elgg_deprecated_notice("Use 'guid' for group delete action", 1.8); + $guid = (int)get_input('group_guid'); +} $entity = get_entity($guid); if (!$entity->canEdit()) { diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php deleted file mode 100644 index 28c2eb9bf..000000000 --- a/mod/groups/views/default/forms/groups/delete.php +++ /dev/null @@ -1,17 +0,0 @@ - 'group_guid', - 'value' => $vars['entity']->getGUID(), -)); - -echo elgg_view('input/submit', array( - 'class' => "elgg-button elgg-button-delete right", - 'value' => elgg_echo('groups:delete'), - 'onclick' => "return confirm('$warning');", -)); diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index 1a4e95513..b67134c63 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -126,7 +126,7 @@ if ($tools) { } } ?> -
+
elgg_echo('save'))); + +if (isset($vars['entity'])) { + $delete_url = 'action/groups/delete?guid=' . $vars['entity']->getGUID(); + echo elgg_view('output/confirmlink', array( + 'text' => elgg_echo('groups:delete'), + 'href' => $delete_url, + 'confirm' => elgg_echo('groups:deletewarning'), + 'class' => 'elgg-button elgg-button-delete float-alt', + )); +} ?>
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index a49bbe2fb..83139c2ee 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -12,9 +12,11 @@ $friends = elgg_get_logged_in_user_entity()->getFriends('', 0); if ($friends) { echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all')); + echo '
'; echo elgg_view('input/hidden', array('name' => 'forward_url', 'value' => $forward_url)); echo elgg_view('input/hidden', array('name' => 'group_guid', 'value' => $group->guid)); echo elgg_view('input/submit', array('value' => elgg_echo('invite'))); + echo '
'; } else { echo elgg_echo('groups:nofriendsatall'); } \ No newline at end of file diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php index 2434bd14f..5076cc49a 100644 --- a/mod/groups/views/default/groups/edit.php +++ b/mod/groups/views/default/groups/edit.php @@ -10,9 +10,3 @@ $entity = elgg_extract('entity', $vars, null); $form_vars = array('enctype' => 'multipart/form-data'); $body_vars = array('entity' => $entity); echo elgg_view_form('groups/edit', $form_vars, $body_vars); - -if ($entity) { - echo '
'; - echo elgg_view_form('groups/delete', array(), array('entity' => $entity)); - echo '
'; -} diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php index 2597598de..5af8b5da0 100644 --- a/mod/invitefriends/views/default/forms/invitefriends/invite.php +++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php @@ -27,7 +27,9 @@ if (elgg_get_config('allow_registration')) {
HTML; + echo '
'; echo elgg_view('input/submit', array('value' => elgg_echo('send'))); + echo '
'; } else { echo elgg_echo('invitefriends:registration_disabled'); } diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index d286d37a3..b059db487 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -325,7 +325,7 @@ if (!isset($vars['replacement'])) { ?> -
+
elgg_echo('save'), diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 0230cbc54..4e302dff1 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -16,6 +16,12 @@ fieldset > div { fieldset > div:last-child { margin-bottom: 0; } +.elgg-form-footer { +} +.elgg-form-footer-alt { + border-top: 1px solid #CCC; + padding: 10px 0; +} label { font-weight: bold; @@ -76,6 +82,9 @@ input[type="radio"] { /* *************************************** FRIENDS PICKER *************************************** */ +.friends-picker-main-wrapper { + margin-bottom: 15px; +} .friends-picker-container h3 { font-size:4em !important; text-align: left; diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index 857a54e1f..3deec66bd 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -8,11 +8,10 @@ $master_image = $vars['entity']->getIcon('master'); ?> -
+
<?php echo elgg_echo('avatar'); ?>
- -
+
'guid', 'value' => $vars['entity' echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create'))); ?> +
diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php index 08db1f7e0..b099b8c4c 100644 --- a/views/default/forms/avatar/upload.php +++ b/views/default/forms/avatar/upload.php @@ -5,11 +5,12 @@ * @uses $vars['entity'] */ -echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?>

'avatar')); ?> -
+
+
+ 'guid', 'value' => $vars['entity']->guid)); ?> elgg_echo('upload'))); ?>
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php index 6d674838a..40e574338 100644 --- a/views/default/forms/comments/add.php +++ b/views/default/forms/comments/add.php @@ -18,16 +18,20 @@ if (isset($vars['entity']) && elgg_is_logged_in()) { echo elgg_view('input/submit', array('value' => elgg_echo('comment'))); } else { ?> -
- - 'generic_comment')); ?> -
+
+ + 'generic_comment')); ?> +
+
elgg_echo("generic_comments:post"))); +?> +
+ 'entity_guid', 'value' => $vars['entity']->getGUID() )); -} \ No newline at end of file +} diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php index 62593e699..35871144b 100644 --- a/views/default/forms/usersettings/save.php +++ b/views/default/forms/usersettings/save.php @@ -1,7 +1,7 @@ '; +$form_body .= '
'; $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); $form_body .= '
'; -- cgit v1.2.3 From d720eac96fda5415f4becf64d6ba49716aa14f6c Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 15:25:34 +0000 Subject: Fixes #3096 added user and group summery views an updated plugins to use the new view locations git-svn-id: http://code.elgg.org/elgg/trunk@9174 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/object/blog.php | 4 ++-- mod/bookmarks/views/default/object/bookmarks.php | 4 ++-- mod/embed/views/default/embed/item/list.php | 2 +- mod/file/views/default/object/file.php | 4 ++-- mod/groups/views/default/group/default.php | 2 +- mod/groups/views/default/object/groupforumtopic.php | 4 ++-- mod/pages/views/default/object/page_top.php | 4 ++-- mod/thewire/views/default/object/thewire.php | 2 +- views/default/group/elements/summary.php | 13 +++++++++++++ views/default/object/default.php | 2 +- views/default/user/default.php | 2 +- views/default/user/elements/summary.php | 13 +++++++++++++ 12 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 views/default/group/elements/summary.php create mode 100644 views/default/user/elements/summary.php (limited to 'mod/groups') diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 048a68a1a..8456829fe 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -74,7 +74,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $blog_info = elgg_view_image_block($owner_icon, $list_body); @@ -94,7 +94,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $list_body); } diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index ab00e23c6..38b0a721a 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -65,7 +65,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $bookmark_info = elgg_view_image_block($owner_icon, $list_body); $bookmark_icon = elgg_view_icon('push-pin-alt'); @@ -119,6 +119,6 @@ HTML; 'content' => $content, ); - $body = elgg_view('page/components/summary', $params); + $body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $body); } \ No newline at end of file diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php index 232f0558b..89a2ffb63 100644 --- a/mod/embed/views/default/embed/item/list.php +++ b/mod/embed/views/default/embed/item/list.php @@ -54,7 +54,7 @@ $params = array( 'subtitle' => $subtitle, 'tags' => FALSE, ); -$list_body = elgg_view('page/components/summary', $params); +$list_body = elgg_view('object/elements/summary', $params); // @todo JS 1.8: is this approach better than inline js? echo "
getGUID()}\">" . elgg_view_image_block($item_icon, $list_body) . '
'; diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php index 0b58ca76f..93a21c8e6 100644 --- a/mod/file/views/default/object/file.php +++ b/mod/file/views/default/object/file.php @@ -82,7 +82,7 @@ if ($full && !elgg_in_context('gallery')) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $file_info = elgg_view_image_block($file_icon, $list_body); @@ -112,7 +112,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($file_icon, $list_body); } diff --git a/mod/groups/views/default/group/default.php b/mod/groups/views/default/group/default.php index 1f1035a38..2aa377813 100644 --- a/mod/groups/views/default/group/default.php +++ b/mod/groups/views/default/group/default.php @@ -31,7 +31,7 @@ if ($vars['full_view']) { 'metadata' => $metadata, 'subtitle' => $group->briefdescription, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('group/elements/summary', $params); echo elgg_view_image_block($icon, $list_body); } diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 9589d1fb8..3a4decbe4 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -67,7 +67,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $info = elgg_view_image_block($poster_icon, $list_body); @@ -90,7 +90,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($poster_icon, $list_body); } diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 0ad377c7e..2ad44e38c 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -82,7 +82,7 @@ if ($full) { 'subtitle' => $subtitle, 'tags' => $tags, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); $info = elgg_view_image_block($page_icon, $list_body); @@ -103,7 +103,7 @@ HTML; 'tags' => $tags, 'content' => $excerpt, ); - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($page_icon, $list_body); } diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php index 7beb197ee..3ae347711 100644 --- a/mod/thewire/views/default/object/thewire.php +++ b/mod/thewire/views/default/object/thewire.php @@ -51,7 +51,7 @@ $params = array( 'content' => thewire_filter($post->description), 'tags' => false, ); -$list_body = elgg_view('page/components/summary', $params); +$list_body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($owner_icon, $list_body); diff --git a/views/default/group/elements/summary.php b/views/default/group/elements/summary.php new file mode 100644 index 000000000..395ed5292 --- /dev/null +++ b/views/default/group/elements/summary.php @@ -0,0 +1,13 @@ + $subtitle, 'tags' => $vars['entity']->tags, ); -$body = elgg_view('page/components/summary', $params); +$body = elgg_view('object/elements/summary', $params); echo elgg_view_image_block($icon, $body); diff --git a/views/default/user/default.php b/views/default/user/default.php index 501949306..c0c18f85f 100644 --- a/views/default/user/default.php +++ b/views/default/user/default.php @@ -51,7 +51,7 @@ if (elgg_get_context() == 'gallery') { ); } - $list_body = elgg_view('page/components/summary', $params); + $list_body = elgg_view('user/elements/summary', $params); echo elgg_view_image_block($icon, $list_body); } diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php new file mode 100644 index 000000000..46d11c14c --- /dev/null +++ b/views/default/user/elements/summary.php @@ -0,0 +1,13 @@ + Date: Sun, 12 Jun 2011 01:33:23 +0000 Subject: using divs for group profile fields to work around html validation issues with the out/tags view using a div git-svn-id: http://code.elgg.org/elgg/trunk@9188 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/views/default/groups/css.php | 4 ++++ mod/groups/views/default/groups/profile/fields.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index 06b86d1ee..37fc5dc10 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -32,6 +32,10 @@ margin-bottom: 7px; } +.groups-profile-fields .elgg-output { + margin: 0; +} + #groups-tools > .elgg-module { float: left; margin-bottom: 40px; diff --git a/mod/groups/views/default/groups/profile/fields.php b/mod/groups/views/default/groups/profile/fields.php index 5cd06025f..14827f11a 100644 --- a/mod/groups/views/default/groups/profile/fields.php +++ b/mod/groups/views/default/groups/profile/fields.php @@ -26,12 +26,12 @@ if (is_array($profile_fields) && count($profile_fields) > 0) { $options['tag_names'] = $key; } - echo "

"; + echo "

"; echo ""; echo elgg_echo("groups:$key"); echo ": "; echo elgg_view("output/$valtype", $options); - echo "

"; + echo "
"; $even_odd = ($even_odd == 'even') ? 'odd' : 'even'; } -- cgit v1.2.3