diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-22 09:09:24 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-22 09:09:24 +0000 |
| commit | d42771b8a74e665d33d29e7ce3b1612890a596f2 (patch) | |
| tree | c592cc077c2d391d120a344ee17553e249676484 /mod/groups/views/default/groups/profile | |
| parent | f8797c313b9500e5d6af512786412601d7d641f0 (diff) | |
| download | elgg-d42771b8a74e665d33d29e7ce3b1612890a596f2.tar.gz elgg-d42771b8a74e665d33d29e7ce3b1612890a596f2.tar.bz2 | |
Touch ups of groups plugin
git-svn-id: http://code.elgg.org/elgg/trunk@8426 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/views/default/groups/profile')
4 files changed, 16 insertions, 6 deletions
diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php index 58bf25095..60a8e025c 100644 --- a/mod/groups/views/default/groups/profile/activity_module.php +++ b/mod/groups/views/default/groups/profile/activity_module.php @@ -40,7 +40,14 @@ echo elgg_view_module('info', '', $content, array('header' => $header)); return true; ?> -<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span> +<span class="group_widget_link"> +<?php + echo elgg_view('output/url', array( + 'href' => "pg/groups/activity/" . elgg_get_page_owner_guid(), + 'text' => elgg_echo('link:view:all'), + )); +?> +</span> <h3><?php echo elgg_echo("activity"); ?></h3> <?php $owner = elgg_get_page_owner_entity(); @@ -54,6 +61,7 @@ return true; $offset = (int) $offset; $group_guid = (int) $group_guid; + //@todo Holy cow, this really needs to be a function! $sql = "SELECT {$CONFIG->dbprefix}river.id, {$CONFIG->dbprefix}river.type, {$CONFIG->dbprefix}river.subtype, {$CONFIG->dbprefix}river.action_type, {$CONFIG->dbprefix}river.access_id, {$CONFIG->dbprefix}river.view, {$CONFIG->dbprefix}river.subject_guid, {$CONFIG->dbprefix}river.object_guid, {$CONFIG->dbprefix}river.posted FROM {$CONFIG->dbprefix}river INNER JOIN {$CONFIG->dbprefix}entities AS entities1 ON {$CONFIG->dbprefix}river.object_guid = entities1.guid INNER JOIN {$CONFIG->dbprefix}entities AS entities2 ON entities1.container_guid = entities2.guid WHERE entities2.guid = $group_guid OR {$CONFIG->dbprefix}river.object_guid = $group_guid ORDER BY posted DESC limit {$offset},{$limit}"; $items = get_data($sql); diff --git a/mod/groups/views/default/groups/profile/buttons.php b/mod/groups/views/default/groups/profile/buttons.php index 31df7a5b5..0aef3920b 100644 --- a/mod/groups/views/default/groups/profile/buttons.php +++ b/mod/groups/views/default/groups/profile/buttons.php @@ -3,6 +3,8 @@ * Content header action buttons * * @uses $vars['entity'] + * + * @todo This should be done by registering menu items with the page actions menu */ if (!elgg_is_logged_in()) { @@ -47,7 +49,7 @@ if ($actions) { echo elgg_view('output/url', array( 'text' => $action, 'href' => $url, - 'class' => 'elgg-button-action', + 'class' => 'elgg-button elgg-button-action', )); } } diff --git a/mod/groups/views/default/groups/profile/profile_block.php b/mod/groups/views/default/groups/profile/profile_block.php index a0d41ba14..aec8fc6cd 100644 --- a/mod/groups/views/default/groups/profile/profile_block.php +++ b/mod/groups/views/default/groups/profile/profile_block.php @@ -18,8 +18,8 @@ $owner = $group->getOwnerEntity(); $profile_fields = elgg_get_config('group'); ?> -<div class="group_profile clearfix"> - <div class="group_profile_column icon"> +<div class="group_profile clearfix elgg-image-block"> + <div class="group_profile_column elgg-image"> <div class="group_profile_icon"> <?php echo elgg_view_entity_icon($group, 'large', array('href' => '')); ?> </div> @@ -41,7 +41,7 @@ $profile_fields = elgg_get_config('group'); </div> </div> - <div class="group_profile_column info"> + <div class="group_profile_column elgg-body"> <?php if (is_array($profile_fields) && count($profile_fields) > 0) { diff --git a/mod/groups/views/default/groups/profile/widgets.php b/mod/groups/views/default/groups/profile/widgets.php index 76fa08647..08cbf1dae 100644 --- a/mod/groups/views/default/groups/profile/widgets.php +++ b/mod/groups/views/default/groups/profile/widgets.php @@ -16,7 +16,7 @@ echo "</div>"; <?php //@todo JS 1.8: no ?> <script type="text/javascript"> -$(document).ready(function () { // subclass every other group tool widget +$(function () { // subclass every other group tool widget $('#group_tools_latest').find('.group_tool_widget:odd').addClass('odd'); }); </script> |