//get a group count
$group_count = elgg_get_entities(array('types' => 'group', 'limit' => 10, 'count' => TRUE));
-
- //find groups
- $area1 = elgg_view("groups/find");
//menu options
- $area1 .= elgg_view("groups/side_menu");
+ $area2 = elgg_view("groups/side_menu");
+
+ //find groups
+ $area2 .= elgg_view("groups/find");
//featured groups
$featured_groups = elgg_get_entities_from_metadata(array('metadata_name' => 'featured_group', 'metadata_value' => 'yes', 'types' => 'group', 'limit' => 10));
- $area1 .= elgg_view("groups/featured", array("featured" => $featured_groups));
-
+ $area2 .= elgg_view("groups/featured", array("featured" => $featured_groups));
set_context($context);
+ $objects = "<div class='group_listings'>".$objects."</div>";
+
$title = sprintf(elgg_echo("groups:all"),page_owner_entity()->name);
- $area2 = elgg_view_title($title);
- $area2 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects;
- $body = elgg_view_layout('one_column_with_sidebar', $area2, $area1);
+ $area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups'));
+ $area1 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects;
+ $body = elgg_view_layout('one_column_with_sidebar', $area1, $area2);
// Finally draw the page
page_draw($title, $body);
group_gatekeeper();
// Display them
- $area2 = elgg_view_title(elgg_echo("groups:latestdiscussion"));
+ $area1 = elgg_view_title(elgg_echo("groups:latestdiscussion"));
set_context('search');
- $area2 .= list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
+ $area1 .= list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
set_context('groups');
- $body = elgg_view_layout("one_column_with_sidebar", $area2);
+ $body = elgg_view_layout("one_column_with_sidebar", $area1);
// Display page
page_draw(elgg_echo('groups:latestdiscussion'),$body);
//get any forum topics
$topics = list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 20, 0, get_input('group_guid'), false, false, false);
set_context('search');
- $area2 = elgg_view("forum/topics", array('topics' => $topics));
+
+ //set up breadcrumbs
+ $area1 = elgg_view('page_elements/breadcrumbs', array(
+ 'breadcrumb_root_url' => '',
+ 'breadcrumb_root_text' => 'Parent Group Name',
+ 'breadcrumb_currentpage' => elgg_echo('item:object:groupforumtopic')
+ ));
+
+
+ $area1 .= elgg_view("forum/topics", array('topics' => $topics));
set_context('groups');
- $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+ $body = elgg_view_layout('one_column_with_sidebar', $area1);
$title = elgg_echo('item:object:groupforumtopic');
if (!$groupaccess)
$view_all = false;
-
- $area2 = elgg_view_title($title);
$area2 .= elgg_view('group/group', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true));
if ($view_all) {
//group members
$area3 = elgg_view('groups/members',array('entity' => $group));
- }
- else
- {
+ } else {
$area2 .= elgg_view('groups/closedmembership', array('entity' => $group, 'user' => $_SESSION['user'], 'full' => true));
-
}
$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
$title = elgg_echo('groups:notfound');
$area2 = elgg_view_title($title);
- $area2 .= elgg_echo('groups:notfound:details');
+ $area2 .= "<p class='margin_top'>".elgg_echo('groups:notfound:details')."</p>";
$body = elgg_view_layout('one_column_with_sidebar', $area2);
}
$title = elgg_echo("groups:owned");
// Get objects
- $area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups'));
+ $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups'));
set_context('search');
$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => page_owner(), 'limit' => $limit, 'full_view' => FALSE));
set_context('groups');
- $area2 .= $objects;
- $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
+ $area1 .= $objects;
+ $body = elgg_view_layout('one_column_with_sidebar', $area1);
// Finally draw the page
page_draw($title, $body);
* Menu items and titles
*/
- 'groups' => "My groups",
+ 'groups' => "Groups",
'groups:owned' => "Groups I own",
'groups:yours' => "My groups",
'groups:user' => "%s's groups",
'groups:requests:none' => 'There are no outstanding membership requests at this time.',
- 'groups:invitations:none' => 'There are no oustanding invitations at this time.',
+ 'groups:invitations:none' => 'There are no outstanding invitations at this time.',
'item:object:groupforumtopic' => "Discussion topics",
// Set up the menu for logged in users
if (isloggedin()) {
- add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/member/");
+ add_menu(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/member/");
}
// Register a page handler, so we can have nice URLs
if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
if (isloggedin()) {
if ($page_owner->canEdit()) {
- add_submenu_item(elgg_echo('groups:edit'),$CONFIG->wwwroot . "mod/groups/edit.php?group_guid=" . $page_owner->getGUID(), '1groupsactions');
add_submenu_item(elgg_echo('groups:invite'),$CONFIG->wwwroot . "mod/groups/invite.php?group_guid={$page_owner->getGUID()}", '1groupsactions');
if (!$page_owner->isPublicMembership())
add_submenu_item(elgg_echo('groups:membershiprequests'),$CONFIG->wwwroot . "mod/groups/membershipreq.php?group_guid={$page_owner->getGUID()}", '1groupsactions');
*/
?>
- <form action="<?php echo $vars['url']; ?>action/groups/addpost" method="post">
- <p class="longtext_editarea">
- <label><?php echo elgg_echo("groups:reply"); ?><br />
- <?php
-
- echo elgg_view("input/longtext",array(
- "internalname" => "topic_post",
- "value" => $body,
- ));
- ?>
- </label>
- </p>
- <p>
- <!-- pass across the topic guid -->
- <input type="hidden" name="topic_guid" value="<?php echo $vars['entity']->guid; ?>" />
- <input type="hidden" name="group_guid" value="<?php echo $vars['entity']->container_guid; ?>" />
-
-<?php
- echo elgg_view('input/securitytoken');
-?>
- <!-- display the save button -->
- <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
- </p>
+<form action="<?php echo $vars['url']; ?>action/groups/addpost" method="post" class="margin_top">
+ <label><?php echo elgg_echo("groups:reply"); ?><br />
+ <?php
- </form>
\ No newline at end of file
+ echo elgg_view("input/longtext",array(
+ "internalname" => "topic_post",
+ "value" => $body,
+ ));
+ ?>
+ </label>
+
+ <!-- pass across the topic guid -->
+ <input type="hidden" name="topic_guid" value="<?php echo $vars['entity']->guid; ?>" />
+ <input type="hidden" name="group_guid" value="<?php echo $vars['entity']->container_guid; ?>" />
+
+ <?php echo elgg_view('input/securitytoken'); ?>
+ <!-- display the save button -->
+ <input type="submit" class="submit_button" value="<?php echo elgg_echo('post'); ?>" />
+</form>
\ No newline at end of file
<?php
-
- /**
- * Elgg Groups topic edit/add page
- *
- * @package ElggGroups
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- *
- * @uses $vars['object'] Optionally, the topic to edit
- */
+/**
+ * Elgg Groups topic edit/add page
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ *
+ * @uses $vars['object'] Optionally, the topic to edit
+ */
// Set title, form destination
- $title = elgg_echo("groups:addtopic");
- $action = "groups/addtopic";
- $tags = "";
- $title = "";
- $message = "";
- $message_id = "";
- $status = "";
- $access_id = ACCESS_DEFAULT;
+ $title = elgg_echo("groups:addtopic");
+ $action = "groups/addtopic";
+ $tags = "";
+ $title = "";
+ $message = "";
+ $message_id = "";
+ $status = "";
+ $access_id = ACCESS_DEFAULT;
// get the group guid
- $group_guid = (int) get_input('group_guid');
+ $group_guid = (int) get_input('group_guid');
+
+ // set breadcrumbs
+ echo elgg_view('page_elements/breadcrumbs', array(
+ 'breadcrumb_root_url' => '',
+ 'breadcrumb_root_text' => 'Parent Group Name',
+ 'breadcrumb_level1_url' => '#',
+ 'breadcrumb_level1_text' => elgg_echo('item:object:groupforumtopic'),
+ 'breadcrumb_currentpage' => elgg_echo("groups:addtopic")
+ ));
// set the title
- echo elgg_view_title(elgg_echo("groups:addtopic"));
+ echo elgg_view_title(elgg_echo("groups:addtopic"));
?>
<!-- display the input form -->
?>
- <div class="topic_post"><!-- start the topic_post -->
+<div class="entity_listing topic clearfloat">
+<a name="<?php echo $vars['entity']->id; ?>"></a>
+ <?php
+ // get infomation about the owner of the comment
+ if ($post_owner = get_user($vars['entity']->owner_guid)) {
+ // display the user icon
+ echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";
+ // display the user name
+ echo "<div class='entity_listing_info'>";
+ // if comment owner, group owner, or site admin - display edit and delete options
+ if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+ echo "<div class='entity_metadata'>";
+ echo "<div class='delete_button'>".elgg_view("output/confirmlink",array(
+ 'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm')
+ ))."</div>";
+ echo "<a class='link' onclick=\"elgg_slide_toggle(this,'.topic','.edit_comment');\">".elgg_echo('edit')."</a>";
+ echo "</div>";
+
+ }
+
+ echo "<p class='entity_title'>" . $post_owner->name . "</p>";
+ } else {
+ echo "<div class='entity_listing_icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";
+ echo "<div class='entity_listing_info'><p class='entity_title'>" . elgg_echo('profile:deleteduser') . "</p>";
+ }
- <table width="100%">
- <tr>
- <td>
- <a name="<?php echo $vars['entity']->id; ?>"></a>
- <?php
- //get infomation about the owner of the comment
- if ($post_owner = get_user($vars['entity']->owner_guid)) {
-
- //display the user icon
- echo "<div class=\"post_icon\">" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'small')) . "</div>";
-
- //display the user name
- echo "<p><b>" . $post_owner->name . "</b><br />";
-
- } else {
- echo "<div class=\"post_icon\"><img src=\"" . elgg_view('icon/user/default/small') . "\" /></div>";
- echo "<p><b>" . elgg_echo('profile:deleteduser') . "</b><br />";
- }
-
- //display the date of the comment
- echo "<small>" . friendly_time($vars['entity']->time_created) . "</small></p>";
- ?>
- </td>
- <td width="70%">
- <?php
- //display the actual message posted
- echo parse_urls(elgg_view("output/longtext",array("value" => $vars['entity']->value)));
- ?>
- </td>
- </tr>
- </table>
- <?php
+ //display the date of the comment
+ echo "<p class='entity_subtext'>" . friendly_time($vars['entity']->time_created) . "</p>";
- //if the comment owner is looking at it, or admin, or group owner they can edit
- if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
- ?>
- <p class="topic-post-menu">
- <?php
-
- echo elgg_view("output/confirmlink",array(
- 'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
- 'text' => elgg_echo('delete'),
- 'confirm' => elgg_echo('deleteconfirm'),
- ));
-
- //display an edit link that will open up an edit area
- echo " <a class=\"collapsibleboxlink\">".elgg_echo('edit')."</a>";
- echo "<div class=\"collapsible_box\">";
- //get the edit form and details
- $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
- $text_textarea = elgg_view('input/longtext', array('internalname' => 'postComment'.$vars['entity']->id, 'value' => $vars['entity']->value));
- $post = elgg_view('input/hidden', array('internalname' => 'post', 'value' => $vars['entity']->id));
- $field = elgg_view('input/hidden', array('internalname' => 'field_num', 'value' => $vars['entity']->id));
- $topic = elgg_view('input/hidden', array('internalname' => 'topic', 'value' => get_input('topic')));
- $group = elgg_view('input/hidden', array('internalname' => 'group', 'value' => get_input('group_guid')));
-
- $form_body = <<<EOT
-
- <div class='edit_forum_comments'>
- <p class='longtext_editarea'>
- $text_textarea
- </p>
- $post
- $topic
- $group
- $field
- <p>
- $submit_input
- </p>
-
- </div>
-
-EOT;
-
-?>
+ //display the actual message posted
+ echo parse_urls(elgg_view("output/longtext",array("value" => $vars['entity']->value)));
- <?php
- echo elgg_view('input/form', array('action' => "{$vars['url']}action/groups/editpost", 'body' => $form_body, 'internalid' => 'editforumpostForm'));
- ?>
- </div>
- </p>
+ // if comment owner, group owner, or site admin - display edit-form
+ if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+ //get the edit form and details
+ $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+ $text_textarea = elgg_view('input/longtext', array('internalname' => 'postComment'.$vars['entity']->id, 'value' => $vars['entity']->value));
+ $post = elgg_view('input/hidden', array('internalname' => 'post', 'value' => $vars['entity']->id));
+ $field = elgg_view('input/hidden', array('internalname' => 'field_num', 'value' => $vars['entity']->id));
+ $topic = elgg_view('input/hidden', array('internalname' => 'topic', 'value' => get_input('topic')));
+ $group = elgg_view('input/hidden', array('internalname' => 'group', 'value' => get_input('group_guid')));
+
+ $form_body = <<<EOT
- <?php
- }
- ?>
+ <p class='longtext_editarea'>$text_textarea</p>
+ $post
+ $topic
+ $group
+ $field
+ $submit_input
+EOT;
+ echo "<div class='edit_comment margin_top hidden'>";
+ echo elgg_view('input/form', array('action' => "{$vars['url']}action/groups/editpost", 'body' => $form_body, 'internalid' => 'editforumpostForm'));
+ echo "</div>";
+ }
+ echo "</div>"; // close entity_listing_info
+?>
- </div><!-- end the topic_post -->
\ No newline at end of file
+</div>
\ No newline at end of file
*/
?>
-
-<h2><?php echo elgg_echo("groups:forum"); ?></h2>
-
-<?php
- //only show the add link if the user is a member
- if(page_owner_entity()->isMember($vars['user'])){
-
-?>
- <!-- display the add a topic link -->
- <div class="add_topic"><a href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>" class="add_topic_button"><?php echo elgg_echo("groups:addtopic"); ?></a></div>
-
-<?php
- }
-?>
+<div id="content_header" class="clearfloat">
+ <div class="content_header_title">
+ <h2><?php echo elgg_echo("groups:forum"); ?></h2>
+ </div>
+ <?php // only show the add topic button if the user is a member
+ if(page_owner_entity()->isMember($vars['user'])) {
+ ?>
+ <div class="content_header_options">
+ <a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo get_input('group_guid'); ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>
+ </div>
+ <?php
+ }
+ ?>
+</div>
<?php
if($vars['topics'])
echo $vars['topics'];
else
- echo "<div class='contentWrapper'>". elgg_echo("grouptopic:notcreated") . "</div>";
+ echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
?>
\ No newline at end of file
?>
-<div id="topic_posts"><!-- open the topic_posts div -->
-<div id="pages_breadcrumbs"><b><a href="<?php echo $vars['url']; ?>pg/groups/forum/<?php echo $vars['entity']->container_guid; ?>/"><?php echo elgg_echo("groups:forum"); ?></a></b> > <?php echo $vars['entity']->title; ?></div>
-
<?php
+ echo elgg_view('page_elements/breadcrumbs', array(
+ 'breadcrumb_root_url' => '',
+ 'breadcrumb_root_text' => 'Parent Group Name',
+ 'breadcrumb_level1_url' => '#',
+ 'breadcrumb_level1_text' => elgg_echo('item:object:groupforumtopic'),
+ 'breadcrumb_currentpage' => $vars['entity']->title
+ ));
+
+
+
//display follow up comments
$count = $vars['entity']->countAnnotations('group_topic_post');
$offset = (int) get_input('offset',0);
}
?>
-</div>
\ No newline at end of file
<?php
- /**
- * Elgg groups profile display
- *
- * @package ElggGroups
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
+/**
+ * Elgg groups profile display
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
- if ($vars['full']) {
- echo elgg_view("groups/groupprofile",$vars);
- } else {
- if (get_input('search_viewtype') == "gallery") {
- echo elgg_view('groups/groupgallery',$vars);
- } else {
- echo elgg_view("groups/grouplisting",$vars);
- }
- }
+if ($vars['full']) {
+ echo elgg_view("groups/groupprofile",$vars);
+} else {
+ echo elgg_view("groups/grouplisting",$vars);
+}
?>
\ No newline at end of file
*/
?>
-<div id="groups_closed_membership">
- <p><?php echo elgg_echo('groups:closedgroup'); ?></p>
-</div>
\ No newline at end of file
+<p class="margin_top"><?php echo elgg_echo('groups:closedgroup'); ?></p>
*/
?>
-
-/*
-#content_area_group_title h2 {
- color:#0054A7;
- font-size:1.35em;
- line-height:1.2em;
- margin:0 0 0 8px;
- padding:5px;
-}
-#topic_posts #content_area_group_title h2 {
- margin:0 0 0 0;
-}
-*/
-
-#two_column_left_sidebar_maincontent #owner_block_content {
- margin:0 0 10px 0 !important;
-}
-
-#groups_info_column_left {
- width:435px;
- margin-left:230px;
- margin-right:10px;
-}
-
-#groups_info_column_left .odd {
- background:#E9E9E9;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-#groups_info_column_left .even {
- background:#E9E9E9;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-#groups_info_column_left p {
- margin:0 0 7px 0;
- padding:2px 4px;
-}
-
-#groups_info_column_right {
- float:left;
- width:230px;
- margin:0 0 0 10px;
-}
-#groups_info_wide p {
- text-align: right;
- padding-right:10px;
-}
-#group_stats {
- width:190px;
- background: #e9e9e9;
- padding:5px;
- margin:10px 0 20px 0;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-#group_stats p {
- margin:0;
+/* group listings */
+.group_count {
+ float:right;
}
-#group_members {
- margin:10px 0;
+.group_listings {
+ /* wraps group lists on
+ latest discussion, newest, popular */
}
-
-#right_column {
- clear:left;
+.entity_subtext.groups {
float:right;
- width:340px;
- margin:0 10px 0 0;
+ width:300px;
+ text-align: right;
+ margin-left: 10px;
}
-#left_column {
- width:340px;
- float:left;
- margin:0 10px 0 10px;
-
+.entity_listing.topic:hover {
+ background-color: white;
}
-.member_icon {
- margin:6px 6px 0 0;
- float:left;
+/* group invitations */
+.group_invitations a.action_button,
+.group_invitations a.submit_button {
+ float:right;
+ margin:0 0 0 14px;
}
-/* all browsers - force tinyMCE on edit comments to be full-width */
-.edit_forum_comments .defaultSkin table.mceLayout {
- width: 636px !important;
-}
-/* topics overview page */
-#forum_topics {
- padding:10px;
- margin:0 10px 0 10px;
- background:white;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-/* topics individual view page */
-#topic_posts {
- margin:0 10px 5px 10px;
-}
-#topic_posts #pages_breadcrumbs {
- margin:2px 0 0 0px;
-}
-#topic_posts form {
- padding:10px;
- margin:30px 0 0 0;
- background:white;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-.topic_post {
- padding:10px;
- margin:0 0 5px 0;
- background:white;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-.topic_post .post_icon {
- float:left;
- margin:0 8px 4px 0;
+/* GROUPS SIDEBAR ELEMENTS */
+#groupsearchform .search_input {
+ width:196px;
}
-.topic_post h2 {
- margin-bottom:20px;
+.featured_group {
+ margin-bottom:15px;
}
-.topic_post p.topic-post-menu {
- margin:0;
+.featured_group .usericon {
+ float:left;
+ margin-right:10px;
}
-.topic_post p.topic-post-menu a.collapsibleboxlink {
- padding-left:10px;
+.featured_group p.entity_title {
+ margin-bottom:0;
}
-.topic_post table, .topic_post td {
- border:none;
+.member_icon {
+ margin:6px 6px 0 0;
+ float:left;
}
-/* group latest discussions widget */
-#latest_discussion_widget {
- margin:0 0 20px 0;
- background:white;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-/* group files widget */
-#filerepo_widget_layout {
- margin:0 0 20px 0;
- padding: 0 0 5px 0;
- background:white;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-/* group pages widget */
-#group_pages_widget {
- margin:0 0 20px 0;
- padding: 0 0 5px 0;
- background:white;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-#group_pages_widget .search_listing {
- border: 2px solid #cccccc;
-}
-#right_column .filerepo_widget_singleitem {
- background: #dedede !important;
- margin:0 10px 5px 10px;
-}
-#left_column .filerepo_widget_singleitem {
- background: #dedede !important;
- margin:0 10px 5px 10px;
-}
-.forum_latest {
- margin:5px 0 5px 0;
- background: #dedede;
- padding:5px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
-}
-.forum_latest:hover {
-}
-.forum_latest .topic_owner_icon {
+/* GROUP PROFILE PAGE (a groups homepage) */
+.group_profile_column {
float:left;
+ margin-top:10px;
}
-.forum_latest .topic_title {
- margin-left:35px;
+.group_profile_column.icon {
+ width:200px;
}
-.forum_latest .topic_title p {
- line-height: 1.0em;
- padding:0;
- margin:0;
- font-weight: bold;
+.group_profile_column.info {
+ width:510px;
+ margin-left:20px;
}
-.forum_latest p.topic_replies {
- padding:3px 0 0 0;
- margin:0;
- color:#666666;
+.group_profile_icon {
+ width:200px;
+ height:200px;
}
-.add_topic {
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- background:white;
- margin:5px 10px;
- padding:10px 10px 10px 6px;
-}
-
-a.add_topic_button {
- font: 12px/100% Arial, Helvetica, sans-serif;
- font-weight: bold;
- color: white;
- background:#4690d6;
- border:none;
+.group_stats {
+ background: #eeeeee;
+ padding:5px;
+ margin-top:10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
- width: auto;
- height: auto;
- padding: 3px 6px 3px 6px;
- margin:0;
- cursor: pointer;
-}
-a.add_topic_button:hover {
- background: #0054a7;
- color:white;
- text-decoration: none;
-}
-
-
-
-/* latest discussion listing */
-.latest_discussion_info {
- float:right;
- width:300px;
- text-align: right;
- margin-left: 10px;
-}
-.groups .search_listing br {
- height:0;
- line-height:0;
}
-span.timestamp {
- color:#666666;
- font-size: 90%;
-}
-.latest_discussion_info .timestamp {
- font-size: 0.85em;
-}
-/* new groups page */
-.groups .search_listing {
- border:2px solid #cccccc;
- margin:0 0 5px 0;
-}
-.groups .search_listing:hover {
- background:#dedede;
-}
-.groups .group_count {
- font-weight: bold;
- color: #666666;
- margin:0 0 5px 4px;
-}
-.groups .search_listing_info {
- color:#666666;
-}
-.groupdetails {
- float:right;
-}
-.groupdetails p {
+.group_stats p {
margin:0;
- padding:0;
- line-height: 1.1em;
- text-align: right;
-}
-#groups_closed_membership {
- margin:0 10px 20px 10px;
- padding: 3px 5px 5px 5px;
- background:#bbdaf7;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-}
-#groups_closed_membership p {
- margin:0;
-}
-
-/* groups membership widget */
-.groupmembershipwidget .contentWrapper {
- margin:0 10px 5px 10px;
}
-.groupmembershipwidget .contentWrapper .groupicon {
- float:left;
- margin:0 10px 0 0;
+.group_profile_column .odd,
+.group_profile_column .even {
+ background:#f4f4f4;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ padding:2px 4px;
+ margin:0 0 7px;
}
-.groupmembershipwidget .search_listing_info p {
- color: #666666;
+.group_profile.forum_latest {
+ margin-top:20px;
}
-.groupmembershipwidget .search_listing_info span {
- font-weight: bold;
+.group_profile.forum_latest h3 {
+ border-bottom:1px solid #CCCCCC;
+ padding-bottom:5px;
}
-
-/* groups sidebar */
-.featuredgroups .contentWrapper {
- margin:0 0 10px 0;
+.group_profile_column.right {
+ float:right;
+ width:350px;
+ margin-top:20px;
}
-.featuredgroups .contentWrapper .groupicon {
+.group_profile_column.left {
+ width:350px;
float:left;
- margin:0 10px 0 0;
-}
-.featuredgroups .contentWrapper p {
- margin: 0;
- line-height: 1.2em;
- color:#666666;
-}
-.featuredgroups .contentWrapper span {
- font-weight: bold;
-}
-#groupssearchform {
- border-bottom: 1px solid #cccccc;
- margin-bottom: 10px;
-}
-#groupssearchform input[type="submit"] {
- padding:2px;
- height:auto;
- margin:4px 0 5px 0;
-}
-.sidebarBox #owner_block_submenu {
- margin:5px 0 0 0;
+ margin-top:20px;
}
-/* delete post */
-.delete_discussion {
-
-}
-.delete_discussion a {
- display:block;
- float:right;
- cursor: pointer;
- width:14px;
- height:14px;
- margin:0;
- background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat 0 0;
-}
-.delete_discussion a:hover {
- background-position: 0 -16px;
- text-decoration: none;
-}
-/* IE6 */
-* html .delete_discussion a { font-size: 1px; }
-/* IE7 */
-*:first-child+html .delete_discussion a { font-size: 1px; }
-/* delete group button */
-#delete_group_option input[type="submit"] {
- background:#dedede;
- border-color:#dedede;
- color:#333333;
- margin:0;
- float:right;
- clear:both;
+/* Group forum */
+.topic .link {
+ color:#aaaaaa;
+ margin-right:10px;
}
-#delete_group_option input[type="submit"]:hover {
- background:red;
- border-color:red;
- color:white;
+.topic .entity_metadata .delete_button {
+ margin-top:3px;
}
-#groupsearchform .search_input {
- width:176px;
-}
?>
-<div class="sidebarBox featuredgroups">
<h3><?php echo elgg_echo("groups:featured"); ?></h3>
<?php
foreach($vars['featured'] as $group){
$icon = elgg_view(
"groups/icon", array(
- 'entity' => $group,
- 'size' => 'small',
- )
- );
+ 'entity' => $group,
+ 'size' => 'tiny',
+ ));
- echo "<div class=\"contentWrapper\">" . $icon . " <p><span>" . $group->name . "</span><br />";
- echo $group->briefdescription . "</p><div class=\"clearfloat\"></div></div>";
-
+ echo "<div class='featured_group'>".$icon."<p class='entity_title clearfloat'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+ echo "<p class='entity_subtext'>" . $group->briefdescription . "</p></div>";
}
}
?>
-</div>
\ No newline at end of file
$tag_string = elgg_echo('groups:search:tags');
?>
-<div class="sidebarBox">
<h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
<input type="hidden" name="tagtype" value="" />
<input type="hidden" name="owner_guid" value="0" />
<input type="submit" value="<?php echo elgg_echo('go'); ?>" />
-</form>
-</div>
\ No newline at end of file
+</form>
\ No newline at end of file
<?php
- // Latest forum discussion for the group home page
-
- //check to make sure this group forum has been activated
- if($vars['entity']->forum_enable != 'no'){
+// Latest forum discussion for the group home page
+//check to make sure this group forum has been activated
+if($vars['entity']->forum_enable != 'no'){
?>
-
-<div class="contentWrapper">
-<h2><?php echo elgg_echo('groups:latestdiscussion'); ?></h2>
+<h3><?php echo elgg_echo('groups:latestdiscussion'); ?></h3>
<?php
$forum = elgg_get_entities_from_annotations(array('types' => 'object', 'subtypes' => 'groupforumtopic', 'annotation_names' => 'group_topic_post', 'container_guid' => $vars['entity']->guid, 'limit' => 4, 'order_by' => 'maxtime desc'));
$count_annotations = $f->countAnnotations("group_topic_post");
- echo "<div class=\"forum_latest\">";
- echo "<div class=\"topic_owner_icon\">" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny', 'override' => true)) . "</div>";
- echo "<div class=\"topic_title\"><p><a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p> <p class=\"topic_replies\"><small>".elgg_echo('groups:posts').": " . $count_annotations . "</small></p></div>";
-
+ echo "<div class='entity_listing clearfloat'>";
+ echo "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny', 'override' => true)) . "</div>";
+ echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
+ echo "<p class='entity_subtext'>".elgg_echo('groups:posts').": " . $count_annotations . "</p></div>";
echo "</div>";
}
} else {
- echo "<div class=\"forum_latest\">";
- echo elgg_echo("grouptopic:notcreated");
- echo "</div>";
+ echo "<p class='margin_top'>".elgg_echo("grouptopic:notcreated")."</p>";
}
-?>
-<div class="clearfloat" /></div>
-</div>
-<?php
- }//end of forum active check
+
+}//end of forum active check
?>
\ No newline at end of file
?>
<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="group_count"><?php echo $num_groups . " " . elgg_echo("groups:count"); ?></div>
<ul>
<li <?php if($filter == "active") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=active"><?php echo elgg_echo('groups:latestdiscussion'); ?></a></li>
<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
<li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('groups:popular'); ?></a></li>
</ul>
</div>
-<div class="group_count">
- <?php
- echo $num_groups . " " . elgg_echo("groups:count");
- ?>
-</div>
\ No newline at end of file
+++ /dev/null
-<?php
- /**
- * Elgg groups plugin gallery view
- *
- * @package ElggGroups
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
-
- $icon = elgg_view(
- "groups/icon", array(
- 'entity' => $vars['entity'],
- 'size' => 'large',
- )
- );
-
- $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></b></p>";
-
- // num users, last activity, owner etc
-
-
- echo elgg_view('search/gallery_listing',array('icon' => $icon, 'info' => $info));
-?>
\ No newline at end of file
<?php
- /**
- * Elgg user display (small)
- *
- * @package ElggGroups
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- *
- * @uses $vars['entity'] The user entity
- */
+/**
+ * Elgg user display (small)
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ *
+ * @uses $vars['entity'] The user entity
+ */
- $icon = elgg_view(
- "groups/icon", array(
- 'entity' => $vars['entity'],
- 'size' => 'small',
- )
- );
+$icon = elgg_view(
+ "groups/icon", array(
+ 'entity' => $vars['entity'],
+ 'size' => 'tiny',
+));
- //get the membership type
- $membership = $vars['entity']->membership;
- if($membership == 2)
- $mem = elgg_echo("groups:open");
- else
- $mem = elgg_echo("groups:closed");
+//get the membership type
+$membership = $vars['entity']->membership;
+if($membership == 2) {
+ $mem = elgg_echo("groups:open");
+} else {
+ $mem = elgg_echo("groups:closed");
+}
- //for admins display the feature or unfeature option
+$info .= "<p class='entity_subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
+
+//for admins only - display the feature or unfeature option
+if(isadminloggedin()) {
if($vars['entity']->featured_group == "yes"){
$url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action=unfeature");
$wording = elgg_echo("groups:makeunfeatured");
$url = elgg_add_action_tokens_to_url($vars['url'] . "action/groups/featured?group_guid=" . $vars['entity']->guid . "&action=feature");
$wording = elgg_echo("groups:makefeatured");
}
+ // display 'make featured' option
+ $info .= "<br /><a href=\"{$url}\">{$wording}</a>";
+}
- $info .= "<div class=\"groupdetails\"><p>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member") . "</p>";
- //if admin, show make featured option
- if(isadminloggedin())
- $info .= "<p><a href=\"{$url}\">{$wording}</a></p>";
- $info .= "</div>";
- $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></b></p>";
- $info .= "<p class=\"owner_timestamp\">" . $vars['entity']->briefdescription . "</p>";
-
- // num users, last activity, owner etc
+$info .= "</p>";
+$info .= "<p class='entity_title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
+$info .= "<p class='entity_subtext'>" . $vars['entity']->briefdescription . "</p>";
- echo elgg_view_listing($icon, $info);
+echo elgg_view_listing($icon, $info);
?>
<?php
- /**
- * Elgg groups plugin full profile view.
- *
- * @package ElggGroups
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
-
- if ($vars['full'] == true) {
- $iconsize = "large";
- } else {
- $iconsize = "medium";
- }
-
+/**
+ * Elgg groups plugin full profile view.
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
?>
+<div id="content_header" class="clearfloat">
+ <div class="content_header_title">
+ <h2><?php echo $vars['entity']->name; ?></h2>
+ </div>
+ <?php
+ if ($vars['entity']->canEdit()) {
+ ?>
+ <div class="content_header_options">
+ <a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:edit"); ?></a>
+ </div>
+ <?php
+ }
+ ?>
+</div>
-<div id="groups_info_column_right"><!-- start of groups_info_column_right -->
- <div id="groups_icon_wrapper" class="margin_top"><!-- start of groups_icon_wrapper -->
-
+<div class="group_profile clearfloat">
+ <div class="group_profile_column icon">
+ <div class="group_profile_icon">
<?php
- echo elgg_view(
- "groups/icon", array(
- 'entity' => $vars['entity'],
- //'align' => "left",
- 'size' => $iconsize,
- )
- );
+ echo elgg_view(
+ "groups/icon", array(
+ 'entity' => $vars['entity'],
+ 'size' => 'large',
+ ));
?>
-
- </div><!-- end of groups_icon_wrapper -->
- <div id="group_stats"><!-- start of group_stats -->
+ </div>
+
+ <div class="group_stats">
+ <?php
+ echo "<p><b>" . elgg_echo("groups:owner") . ": </b><a href=\"" . get_user($vars['entity']->owner_guid)->getURL() . "\">" . get_user($vars['entity']->owner_guid)->name . "</a></p>";
+ ?>
+ <p><?php echo elgg_echo('groups:members') . ": " . get_entities_from_relationship('member', $vars['entity']->guid, true, 'user', '', 0, '', 9999, 0, true); ?></p>
+ </div>
+ </div>
+
+ <div class="group_profile_column info">
<?php
-
- echo "<p><b>" . elgg_echo("groups:owner") . ": </b><a href=\"" . get_user($vars['entity']->owner_guid)->getURL() . "\">" . get_user($vars['entity']->owner_guid)->name . "</a></p>";
-
- ?>
- <p><?php echo elgg_echo('groups:members') . ": " . get_entities_from_relationship('member', $vars['entity']->guid, true, 'user', '', 0, '', 9999, 0, true); ?></p>
- </div><!-- end of group_stats -->
-</div><!-- end of groups_info_column_right -->
-
-<div id="groups_info_column_left" class="margin_top"><!-- start of groups_info_column_left -->
- <?php
- if ($vars['full'] == true) {
- if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0){
-
- foreach($vars['config']->group as $shortname => $valtype) {
- if ($shortname != "name") {
- $value = $vars['entity']->$shortname;
-
- if (!empty($value)) {
- //This function controls the alternating class
- $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
- }
-
- echo "<p class=\"{$even_odd}\">";
- echo "<b>";
- echo elgg_echo("groups:{$shortname}");
- echo ": </b>";
-
- $options = array(
- 'value' => $vars['entity']->$shortname
- );
-
- if ($valtype == 'tags') {
- $options['tag_names'] = $shortname;
+ if ($vars['full'] == true) {
+ if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0){
+
+ foreach($vars['config']->group as $shortname => $valtype) {
+ if ($shortname != "name") {
+ $value = $vars['entity']->$shortname;
+
+ if (!empty($value)) {
+ //This function controls the alternating class
+ $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+ }
+
+ echo "<p class=\"{$even_odd}\">";
+ echo "<b>";
+ echo elgg_echo("groups:{$shortname}");
+ echo ": </b>";
+
+ $options = array(
+ 'value' => $vars['entity']->$shortname
+ );
+
+ if ($valtype == 'tags') {
+ $options['tag_names'] = $shortname;
+ }
+
+ echo elgg_view("output/{$valtype}", $options);
+
+ echo "</p>";
}
-
- echo elgg_view("output/{$valtype}", $options);
-
- echo "</p>";
}
}
}
- }
- ?>
-</div><!-- end of groups_info_column_left -->
-
-<div id="groups_info_wide">
-
- <p class="groups_info_edit_buttons">
-
-<?php
- if ($vars['entity']->canEdit())
- {
-
-?>
-
- <a href="<?php echo $vars['url']; ?>mod/groups/edit.php?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a>
-
-
-<?php
+ ?>
+ </div>
+</div>
- }
-?>
-
- </p>
-</div>
-<div class="clearfloat"></div>
\ No newline at end of file
// Get size
if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar')))
- $vars['size'] = "medium";
+ $vars['size'] = "tiny";
// Get any align and js
if (!empty($vars['align'])) {
?>
-<div class="groupicon">
+<div class="usericon">
<a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" ><img src="<?php echo $vars['entity']->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a>
</div>
-<div class="contentWrapper">
-
<?php
- if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
- $user = get_loggedin_user();
- foreach($vars['invitations'] as $group)
- if ($group instanceof ElggGroup) {
-
-?>
- <div class="reportedcontent_content active_report">
- <div class="groups_membershiprequest_buttons">
+if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
+ $user = get_loggedin_user();
+ foreach($vars['invitations'] as $group)
+ if ($group instanceof ElggGroup) {
+
+ ?>
+ <div class="entity_listing group_invitations clearfloat">
<?php
- echo "<div class=\"member_icon\"><a href=\"" . $group->getURL() . "\">";
+ echo "<div class='entity_listing_icon'>";
echo elgg_view("profile/icon", array(
'entity' => $group,
- 'size' => 'small',
+ 'size' => 'tiny',
'override' => 'true'
- ));
- echo "</a></div>{$group->name}<br />";
+ ))."</div>";
- echo str_replace('<a', '<a class="delete_report_button" ', elgg_view('output/confirmlink',array(
+ $url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
+ ?>
+ <div class="entity_listing_info">
+ <a href="<?php echo $url; ?>" class="submit_button"><?php echo elgg_echo('accept'); ?></a>
+ <?php
+ echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array(
'href' => $vars['url'] . "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}",
'confirm' => elgg_echo('groups:joinrequest:remove:check'),
'text' => elgg_echo('delete'),
)));
- $url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
- ?>
- <a href="<?php echo $url; ?>" class="archive_report_button"><?php echo elgg_echo('accept'); ?></a>
- <br /><br />
- </div>
- </div>
-<?php
+
+ echo "<p class='entity_title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+ echo "<p class='entity_subtext'>" . $group->briefdescription . "</p>";
- }
+ ?>
+ </div></div>
+ <?php
+ }
} else {
-
- echo "<p>" . elgg_echo('groups:invitations:none') . "</p>";
-
- }
-
-?>
-</div>
+ echo "<p class='margin_top'>" . elgg_echo('groups:invitations:none') . "</p>";
+}
+?>
\ No newline at end of file
//var_export($vars['entity']);
?>
-<div id="group_members">
-<h2><?php echo elgg_echo("groups:members"); ?></h2>
+<div id="group_members" class="clearfloat">
+<h3><?php echo elgg_echo("groups:members"); ?></h3>
<?php
-
$members = $vars['entity']->getMembers(10);
foreach($members as $mem){
-
- echo "<div class=\"member_icon\"><a href=\"".$mem->getURL()."\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny', 'override' => 'true')) . "</a></div>";
-
+ echo "<div class='member_icon'><a href=\"".$mem->getURL()."\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny', 'override' => 'true')) . "</a></div>";
}
-
?>
-<div class="clearfloat" /></div>
</div>
\ No newline at end of file
-<div class="contentWrapper">
-
<?php
if (!empty($vars['requests']) && is_array($vars['requests'])) {
foreach($vars['requests'] as $request)
- if ($request instanceof ElggUser) {
-
-?>
- <div class="reportedcontent_content active_report">
- <div class="groups_membershiprequest_buttons">
- <?php
- echo "<div class=\"member_icon\"><a href=\"" . $request->getURL() . "\">";
- echo elgg_view("profile/icon", array(
- 'entity' => $request,
- 'size' => 'small',
- 'override' => 'true'
- ));
- echo "</a></div>{$request->name}<br />";
-
- echo str_replace('<a', '<a class="delete_report_button" ', elgg_view('output/confirmlink',array(
- 'href' => $vars['url'] . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid,
- 'confirm' => elgg_echo('groups:joinrequest:remove:check'),
- 'text' => elgg_echo('delete'),
- )));
- $url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
- ?>
- <a href="<?php echo $url; ?>" class="archive_report_button"><?php echo elgg_echo('accept'); ?></a>
- <br /><br />
+ if ($request instanceof ElggUser) {
+
+ ?>
+ <div class="entity_listing group_invitations clearfloat">
+ <?php
+ echo "<div class='entity_listing_icon'>";
+ echo elgg_view("profile/icon", array(
+ 'entity' => $request,
+ 'size' => 'small',
+ 'override' => 'true'
+ ));
+ echo "</div>";
+
+ $url = elgg_add_action_tokens_to_url("{$vars['url']}action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
+ ?>
+ <div class="entity_listing_info">
+ <a href="<?php echo $url; ?>" class="submit_button"><?php echo elgg_echo('accept'); ?></a>
+ <?php
+ echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array(
+ 'href' => $vars['url'] . 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid,
+ 'confirm' => elgg_echo('groups:joinrequest:remove:check'),
+ 'text' => elgg_echo('delete'),
+ )));
+ echo "<p class='entity_title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
+ echo "<p class='entity_subtext'>" . $request->briefdescription . "</p>";
+ ?>
+ </div>
</div>
- </div>
-<?php
-
- }
-
+ <?php
+ }
} else {
-
echo "<p>" . elgg_echo('groups:requests:none') . "</p>";
-
}
-?>
-</div>
+?>
\ No newline at end of file
*/
//forum
- echo "<div class=\"clearfloat\"></div><div id=\"fullcolumn\">";
+ echo "<div class='group_profile forum_latest clearfloat'>";
echo elgg_view("groups/forum_latest",array('entity' => $vars['entity']));
echo "</div>";
//right column
- echo "<div id=\"right_column\">";
+ echo "<div class='group_profile_column right'>";
echo elgg_view("groups/right_column",array('entity' => $vars['entity']));
echo "</div>";
//left column
- echo "<div id=\"left_column\">";
+ echo "<div class='group_profile_column left'>";
echo elgg_view("groups/left_column",array('entity' => $vars['entity']));
echo "</div>";
//get the time and user
if ($last_post) {
- foreach($last_post as $last)
- {
+ foreach($last_post as $last) {
$last_time = $last->time_created;
$last_user = $last->owner_guid;
}
//select the correct output depending on where you are
if(get_context() == "search"){
- $info = "<p class=\"latest_discussion_info\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "<br /><span class=\"timestamp\">";
+ $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "<br />";
if (($last_time) && ($u)) $info.= sprintf(elgg_echo('groups:lastupdated'), friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>");
- $info .= '</span></p>';
+ $info .= '</p>';
//get the group avatar
- $icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'small'));
+ $icon = elgg_view("profile/icon",array('entity' => $group, 'size' => 'tiny'));
//get the group and topic title
- if ($group instanceof ElggGroup)
- $info .= "<p>" . elgg_echo('group') . ": <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
-
- $info .= "<p>" . elgg_echo('topic') . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
- //get the forum description
- //$info .= $description;
+ if ($group instanceof ElggGroup) {
+ $info .= "<p class='entity_title'>" . elgg_echo('group') . ": <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
+ }
+ $info .= "<p class='entity_subtext'>" . elgg_echo('topic') . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
}else{
- $info = "<span class=\"latest_discussion_info\"><span class=\"timestamp\">" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</span>";
- if (($last_time) && ($u)) $info.= "<br /><span class='timestamp'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></span>";
+ $info = "<p class='entity_subtext groups'>" . sprintf(elgg_echo('group:created'), $forum_created, $counter) . "</p>";
+ $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
- if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
-
- // display the delete link to those allowed to delete
- $info .= "<br /><span class=\"delete_discussion\">" . elgg_view("output/confirmlink", array(
- 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
- 'text' => " ",
- 'confirm' => elgg_echo('deleteconfirm'),
- )) . "</span>";
-
- }
-
- $info .= "</span>";
-
+ if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+ // display the delete link to those allowed to delete
+ $info .= "<div class='delete_button'>" . elgg_view("output/confirmlink", array(
+ 'href' => $vars['url'] . "action/groups/deletetopic?topic=" . $vars['entity']->guid . "&group=" . $vars['entity']->container_guid,
+ 'text' => " ",
+ 'confirm' => elgg_echo('deleteconfirm'),
+ )) . "</div>";
+
+ }
+
+ if (($last_time) && ($u)) {
+ $info.= "<p class='entity_subtext'>" . elgg_echo('groups:updated') . " " . friendly_time($last_time) . " by <a href=\"" . $u->getURL() . "\">" . $u->name . "</a></p>";
+ }
//get the user avatar
- $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'small'));
- $info .= "<p>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
- $info .= "<div class='clearfloat'></div>";
-
+ $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
}
//display
//right column
if ($forae = elgg_get_entities(array('types' => 'object', 'owner_guid' => $vars['entity']->guid))) {
- //if ($forae = get_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 0, $vars['entity']->guid, 20, 0, "desc", false)) {
foreach($forae as $forum)
echo elgg_view_entity($forum);
}
projects / lorea / elgg.git / commitdiff