aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-08 17:43:01 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-08 17:43:01 +0000
commitb893e1f3876a071c46f4053aab67f4f4da8f19f9 (patch)
treeaa7602e063f212480b8a58921cdef79162e74ed6
parent30033877087a010608089b33def4869b71413f20 (diff)
downloadelgg-b893e1f3876a071c46f4053aab67f4f4da8f19f9.tar.gz
elgg-b893e1f3876a071c46f4053aab67f4f4da8f19f9.tar.bz2
Beginnings of the refreshed groups interface
git-svn-id: http://code.elgg.org/elgg/trunk@5307 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/groups/addtopic.php2
-rw-r--r--mod/groups/all.php2
-rw-r--r--mod/groups/discussions.php2
-rw-r--r--mod/groups/edit.php2
-rw-r--r--mod/groups/edittopic.php2
-rw-r--r--mod/groups/forum.php2
-rw-r--r--mod/groups/groupprofile.php4
-rw-r--r--mod/groups/index.php6
-rw-r--r--mod/groups/invitations.php2
-rw-r--r--mod/groups/invite.php2
-rw-r--r--mod/groups/languages/en.php6
-rw-r--r--mod/groups/manifest.xml2
-rw-r--r--mod/groups/membership.php7
-rw-r--r--mod/groups/membershipreq.php2
-rw-r--r--mod/groups/new.php2
-rw-r--r--mod/groups/start.php19
-rw-r--r--mod/groups/topicposts.php2
-rw-r--r--mod/groups/views/default/forms/forums/addtopic.php128
-rw-r--r--mod/groups/views/default/forum/topics.php2
-rw-r--r--mod/groups/views/default/forum/viewposts.php4
-rw-r--r--mod/groups/views/default/groups/css.php54
-rw-r--r--mod/groups/views/default/groups/group_sort_menu.php2
-rw-r--r--mod/groups/views/default/groups/groupprofile.php4
-rw-r--r--mod/groups/views/default/groups/side_menu.php6
24 files changed, 115 insertions, 151 deletions
diff --git a/mod/groups/addtopic.php b/mod/groups/addtopic.php
index 39ef62eec..04a040745 100644
--- a/mod/groups/addtopic.php
+++ b/mod/groups/addtopic.php
@@ -21,7 +21,7 @@
// sort the display
$area2 = elgg_view("forms/forums/addtopic");
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar','',$area1.$area2);
// Display page
page_draw(elgg_echo('groups:addtopic'),$body);
diff --git a/mod/groups/all.php b/mod/groups/all.php
index fd60ce90a..685fb0811 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -61,7 +61,7 @@
$title = sprintf(elgg_echo("groups:all"),page_owner_entity()->name);
$area2 = elgg_view_title($title);
$area2 .= elgg_view('groups/contentwrapper', array('body' => elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects));
- $body = elgg_view_layout('sidebar_boxes',$area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar',$area1,$area2);
// Finally draw the page
page_draw($title, $body);
diff --git a/mod/groups/discussions.php b/mod/groups/discussions.php
index 64b73cd2b..31dd2b7ef 100644
--- a/mod/groups/discussions.php
+++ b/mod/groups/discussions.php
@@ -23,7 +23,7 @@
$area2 .= list_entities_from_annotations("object", "groupforumtopic", "group_topic_post", "", 40, 0, 0, false, true);
set_context('groups');
- $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
+ $body = elgg_view_layout("one_column_with_sidebar", '', $area2);
// Display page
page_draw(elgg_echo('groups:latestdiscussion'),$body);
diff --git a/mod/groups/edit.php b/mod/groups/edit.php
index 2e99b578c..140f8c3f8 100644
--- a/mod/groups/edit.php
+++ b/mod/groups/edit.php
@@ -27,7 +27,7 @@
$body .= elgg_view('groups/contentwrapper',array('body' => elgg_echo('groups:noaccess')));
}
- $body = elgg_view_layout('two_column_left_sidebar', '', $body);
+ $body = elgg_view_layout('one_column_with_sidebar', '', $body);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php
index 494c94ab9..2f8f14a02 100644
--- a/mod/groups/edittopic.php
+++ b/mod/groups/edittopic.php
@@ -28,7 +28,7 @@
// sort the display
$area2 = elgg_view("forms/forums/edittopic", array('entity' => $topic));
- $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+ $body = elgg_view_layout('one_column_with_sidebar', '', $area2);
// Display page
page_draw(elgg_echo('groups:edittopic'),$body);
diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index 91a592373..f9c5131cc 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -23,7 +23,7 @@
$area2 = elgg_view("forum/topics", array('topics' => $topics));
set_context('groups');
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar','', $area1.$area2);
$title = elgg_echo('item:object:groupforumtopic');
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index 80cbd41ee..b279d88ab 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -45,14 +45,14 @@
}
- $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2, $area3);
+ $body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
} else {
$title = elgg_echo('groups:notfound');
$area2 = elgg_view_title($title);
$area2 .= elgg_view('groups/contentwrapper',array('body' => elgg_echo('groups:notfound:details')));
- $body = elgg_view_layout('two_column_left_sidebar', "", $area2,"");
+ $body = elgg_view_layout('one_column_with_sidebar', '', $area2);
}
// Finally draw the page
diff --git a/mod/groups/index.php b/mod/groups/index.php
index b21d5962b..36137033d 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -14,17 +14,17 @@
$limit = get_input("limit", 10);
$offset = get_input("offset", 0);
- $title = sprintf(elgg_echo("groups:owned"),page_owner_entity()->name);
+ $title = elgg_echo("groups:owned");
// Get objects
- $area2 = elgg_view_title($title);
+ $area2 = 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('two_column_left_sidebar',$area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar','', $area1.$area2);
// Finally draw the page
page_draw($title, $body);
diff --git a/mod/groups/invitations.php b/mod/groups/invitations.php
index fa2156b35..e9b8f1cf1 100644
--- a/mod/groups/invitations.php
+++ b/mod/groups/invitations.php
@@ -28,6 +28,6 @@ if ($user) {
$area2 .= elgg_echo("groups:noaccess");
}
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+$body = elgg_view_layout('one_column_with_sidebar', '', $area2);
page_draw($title, $body); \ No newline at end of file
diff --git a/mod/groups/invite.php b/mod/groups/invite.php
index 3791b9b50..1ce9fd863 100644
--- a/mod/groups/invite.php
+++ b/mod/groups/invite.php
@@ -28,7 +28,7 @@
$area2 .= elgg_echo("groups:noaccess");
}
- $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar', '', $area1.$area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 6c0d8ef26..264b6fb7f 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -15,9 +15,9 @@
* Menu items and titles
*/
- 'groups' => "Groups",
- 'groups:owned' => "Groups you own",
- 'groups:yours' => "Your groups",
+ 'groups' => "My groups",
+ 'groups:owned' => "Groups I own",
+ 'groups:yours' => "My groups",
'groups:user' => "%s's groups",
'groups:all' => "All site groups",
'groups:new' => "Create a new group",
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index e2c36f92f..86a7dfa1d 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin_manifest>
<field key="author" value="Curverider ltd" />
- <field key="version" value="1.7" />
+ <field key="version" value="1.8" />
<field key="description" value="Provides group support for elgg" />
<field key="website" value="http://www.elgg.org/" />
<field key="copyright" value="(C) Curverider 2008-2010" />
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 9226a56d5..66cd5ed16 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -20,18 +20,17 @@
if (page_owner() == $_SESSION['user']->guid) {
$title = elgg_echo("groups:yours");
- } else $title = sprintf(elgg_echo("groups:owned"),page_owner_entity()->name);
+ } else $title = elgg_echo("groups:owned");
// Get objects
- $area2 = elgg_view_title($title);
+ $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'groups'));
set_context('search');
- //$objects = list_entities("group", "", page_owner(), $limit, false);
$objects = list_entities_from_relationship('member',page_owner(),false,'group','',0, $limit,false, false);
set_context('groups');
$area2 .= $objects;
- $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar','',$area1.$area2);
// Finally draw the page
page_draw($title, $body);
diff --git a/mod/groups/membershipreq.php b/mod/groups/membershipreq.php
index 368057711..a812a213c 100644
--- a/mod/groups/membershipreq.php
+++ b/mod/groups/membershipreq.php
@@ -30,7 +30,7 @@
$area2 .= elgg_echo("groups:noaccess");
}
- $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar', '',$area1.$area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/mod/groups/new.php b/mod/groups/new.php
index b2a24f80f..3459c3f4a 100644
--- a/mod/groups/new.php
+++ b/mod/groups/new.php
@@ -16,7 +16,7 @@
$area2 = elgg_view_title($title);
$area2 .= elgg_view("forms/groups/edit");
- $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+ $body = elgg_view_layout('one_column_with_sidebar', '',$area1.$area2);
page_draw($title, $body);
?> \ No newline at end of file
diff --git a/mod/groups/start.php b/mod/groups/start.php
index b9dde5d10..d43f33162 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -13,20 +13,13 @@
* Initialise the groups plugin.
* Register actions, set up menus
*/
- function groups_init()
- {
+ function groups_init() {
global $CONFIG;
// Set up the menu for logged in users
- if (isloggedin())
- {
- add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/world/");
- //add_menu(elgg_echo('groups:alldiscussion'),$CONFIG->wwwroot."mod/groups/discussions.php");
- }
- else
- {
- add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/world/");
+ if (isloggedin()) {
+ add_menu(elgg_echo('groups'), $CONFIG->wwwroot . "pg/groups/member/");
}
// Register a page handler, so we can have nice URLs
@@ -242,12 +235,14 @@
// Add submenu options
if (get_context() == 'groups' && !($page_owner instanceof ElggGroup)) {
if (isloggedin()) {
- add_submenu_item(elgg_echo('groups:new'), $CONFIG->wwwroot."pg/groups/new/", '1groupslinks');
add_submenu_item(elgg_echo('groups:owned'), $CONFIG->wwwroot . "pg/groups/owned/" . $_SESSION['user']->username, '1groupslinks');
add_submenu_item(elgg_echo('groups:yours'), $CONFIG->wwwroot . "pg/groups/member/" . $_SESSION['user']->username, '1groupslinks');
- add_submenu_item(elgg_echo('groups:invitations'), $CONFIG->wwwroot . "pg/groups/invitations/" . $_SESSION['user']->username, '1groupslinks');
}
add_submenu_item(elgg_echo('groups:all'), $CONFIG->wwwroot . "pg/groups/world/", '1groupslinks');
+
+ if (isloggedin()) {
+ add_submenu_item(elgg_echo('groups:invitations'), $CONFIG->wwwroot . "pg/groups/invitations/" . $_SESSION['user']->username, '1groupslinks');
+ }
}
}
diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php
index bd2d3b1ed..70d3c199b 100644
--- a/mod/groups/topicposts.php
+++ b/mod/groups/topicposts.php
@@ -29,7 +29,7 @@
// Display them
$area2 = elgg_view("forum/viewposts", array('entity' => $topic));
- $body = elgg_view_layout("two_column_left_sidebar", '' , $area2);
+ $body = elgg_view_layout("one_column_with_sidebar", '', $area2);
// Display page
page_draw($topic->title,$body);
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index d002b110a..e9fbb7109 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -29,73 +29,71 @@
echo elgg_view_title(elgg_echo("groups:addtopic"));
?>
-<div class="contentWrapper">
- <!-- display the input form -->
- <form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post">
- <?php echo elgg_view('input/securitytoken'); ?>
+<!-- display the input form -->
+<form action="<?php echo $vars['url']; ?>action/<?php echo $action; ?>" method="post" class="margin_top">
+<?php echo elgg_view('input/securitytoken'); ?>
+
+ <p>
+ <label><?php echo elgg_echo("title"); ?><br />
+ <?php
+ //display the topic title input
+ echo elgg_view("input/text", array(
+ "internalname" => "topictitle",
+ "value" => $title,
+ ));
+ ?>
+ </label>
+ </p>
- <p>
- <label><?php echo elgg_echo("title"); ?><br />
- <?php
- //display the topic title input
- echo elgg_view("input/text", array(
- "internalname" => "topictitle",
- "value" => $title,
- ));
- ?>
- </label>
- </p>
-
- <!-- display the tag input -->
- <p>
- <label><?php echo elgg_echo("tags"); ?><br />
- <?php
+ <!-- display the tag input -->
+ <p>
+ <label><?php echo elgg_echo("tags"); ?><br />
+ <?php
- echo elgg_view("input/tags", array(
- "internalname" => "topictags",
- "value" => $tags,
- ));
-
- ?>
- </label>
- </p>
+ echo elgg_view("input/tags", array(
+ "internalname" => "topictags",
+ "value" => $tags,
+ ));
- <!-- topic message input -->
- <p class="longtext_editarea">
- <label><?php echo elgg_echo("groups:topicmessage"); ?><br />
- <?php
+ ?>
+ </label>
+ </p>
+
+ <!-- topic message input -->
+ <p class="longtext_editarea">
+ <label><?php echo elgg_echo("groups:topicmessage"); ?><br />
+ <?php
- echo elgg_view("input/longtext",array(
- "internalname" => "topicmessage",
- "value" => $message,
- ));
- ?>
- </label>
- </p>
-
- <!-- set the topic status -->
- <p>
- <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
- <select name="status">
- <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
- <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
- </select>
- </label>
- </p>
-
- <!-- access -->
- <p>
- <label>
- <?php echo elgg_echo('access'); ?><br />
- <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
- </label>
- </p>
-
- <!-- required hidden info and submit button -->
- <p>
- <input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
- <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
- </p>
+ echo elgg_view("input/longtext",array(
+ "internalname" => "topicmessage",
+ "value" => $message,
+ ));
+ ?>
+ </label>
+ </p>
+
+ <!-- set the topic status -->
+ <p>
+ <label><?php echo elgg_echo("groups:topicstatus"); ?><br />
+ <select name="status">
+ <option value="open" <?php if($status == "") echo "SELECTED";?>><?php echo elgg_echo('groups:topicopen'); ?></option>
+ <option value="closed" <?php if($status == "closed") echo "SELECTED";?>><?php echo elgg_echo('groups:topicclosed'); ?></option>
+ </select>
+ </label>
+ </p>
- </form>
-</div>
+ <!-- access -->
+ <p>
+ <label>
+ <?php echo elgg_echo('access'); ?><br />
+ <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?>
+ </label>
+ </p>
+
+ <!-- required hidden info and submit button -->
+ <p>
+ <input type="hidden" name="group_guid" value="<?php echo $group_guid; ?>" />
+ <input type="submit" class="submit_button" value="<?php echo elgg_echo('save'); ?>" />
+ </p>
+
+</form>
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index c4cd9becf..fdeffa564 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -11,7 +11,7 @@
?>
-<div id="content_area_group_title"><h2><?php echo elgg_echo("groups:forum"); ?></h2></div>
+<h2><?php echo elgg_echo("groups:forum"); ?></h2>
<?php
//only show the add link if the user is a member
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
index e7e194691..f2599f861 100644
--- a/mod/groups/views/default/forum/viewposts.php
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -29,8 +29,8 @@
));
?>
- <!-- grab the topic title -->
- <div id="content_area_group_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+<!-- grab the topic title -->
+<h2><?php echo $vars['entity']->title; ?></h2>
<?php
foreach($vars['entity']->getAnnotations('group_topic_post', 50, $offset, "asc") as $post) {
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index bc8d2bfc0..77568b0be 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -1,17 +1,17 @@
<?php
-
- /**
- * Elgg Groups css
- *
- * @package groups
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.com/
- */
+/**
+ * Elgg Groups css
+ *
+ * @package groups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
?>
+/*
#content_area_group_title h2 {
color:#0054A7;
font-size:1.35em;
@@ -22,6 +22,7 @@
#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;
@@ -69,10 +70,7 @@
margin:0;
}
#group_members {
- margin:10px;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- background: white;
+ margin:10px 0;
}
#right_column {
@@ -87,37 +85,13 @@
margin:0 10px 0 10px;
}
-/* IE 6 fixes */
-* html #left_column {
- margin:0 0 0 5px;
-}
-* html #right_column {
- margin:0 5px 0 0;
-}
-#group_members h2,
-#right_column h2,
-#left_column h2,
-#fullcolumn h2 {
- margin:0 0 10px 0;
- padding:5px;
- color:#0054A7;
- font-size:1.25em;
- line-height:1.2em;
-}
-#fullcolumn .contentWrapper {
- margin:0 10px 20px 10px;
- padding:0 0 5px;
-}
.member_icon {
- margin:0 0 6px 6px;
+ margin:6px 6px 0 0;
float:left;
}
-/* IE6 */
-* html #topic_post_tbl { width:676px !important;}
-
/* all browsers - force tinyMCE on edit comments to be full-width */
.edit_forum_comments .defaultSkin table.mceLayout {
width: 636px !important;
@@ -204,7 +178,7 @@
margin:0 10px 5px 10px;
}
.forum_latest {
- margin:0 10px 5px 10px;
+ margin:5px 0 5px 0;
background: #dedede;
padding:5px;
-webkit-border-radius: 4px;
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index 7314507e0..6c7ec3359 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -14,7 +14,7 @@
$url = $vars['url'] . "pg/groups/world/";
?>
-<div id="elgg_horizontal_tabbed_nav">
+<div class="elgg_horizontal_tabbed_nav margin_top">
<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>
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 1c989c9a8..426eaeae6 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -18,7 +18,7 @@
?>
<div id="groups_info_column_right"><!-- start of groups_info_column_right -->
- <div id="groups_icon_wrapper"><!-- start of groups_icon_wrapper -->
+ <div id="groups_icon_wrapper" class="margin_top"><!-- start of groups_icon_wrapper -->
<?php
echo elgg_view(
@@ -41,7 +41,7 @@
</div><!-- end of group_stats -->
</div><!-- end of groups_info_column_right -->
-<div id="groups_info_column_left"><!-- start of groups_info_column_left -->
+<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){
diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
index 7de921ed0..67cea1634 100644
--- a/mod/groups/views/default/groups/side_menu.php
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -1,10 +1,8 @@
-<div class="sidebarBox">
-<div id="owner_block_submenu"><ul>
+<div class="submenu page_navigation"><ul>
<?php
if(isloggedin()){
echo "<li><a href=\"{$vars['url']}pg/groups/member/{$_SESSION['user']->username}\">". elgg_echo('groups:yours') ."</a></li>";
echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{$_SESSION['user']->username}\">". elgg_echo('groups:invitations') ."</a></li>";
- echo "<li><a href=\"{$vars['url']}pg/groups/new/\">". elgg_echo('groups:new') ."</a></li>";
}
?>
-</ul></div></div> \ No newline at end of file
+</ul></div> \ No newline at end of file