aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmod/bookmarks/views/default/bookmarks/group_bookmarks.php22
-rw-r--r--mod/file/views/default/file/groupprofile_files.php22
-rw-r--r--mod/groups/languages/en.php2
-rw-r--r--mod/groups/views/default/forum/topicposts.php2
-rw-r--r--mod/groups/views/default/groups/css.php57
-rw-r--r--mod/groups/views/default/groups/forum_latest.php5
-rw-r--r--mod/groups/views/default/groups/profileitems.php56
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper.php2
8 files changed, 84 insertions, 84 deletions
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
index 2f677fb44..e4cdedeac 100755
--- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
+++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
@@ -4,7 +4,7 @@
$bookmarks = elgg_get_entities(array('type' => 'object', 'subtype' => 'bookmarks',
'container_guids' => $vars['entity']->container_guid, 'limit' => 6));
-echo "<div class='group_tool_widget'><h3>".elgg_echo('bookmarks:group')."</h3>";
+echo "<div class='group_tool_widget bookmarks'><h3>".elgg_echo('bookmarks:group')."</h3>";
if($bookmarks){
foreach($bookmarks as $b){
@@ -14,21 +14,25 @@ if($bookmarks){
//get the time
$friendlytime = friendly_time($b->time_created);
+
+ $info = "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
- //get the bookmark title
- $info = "<div class='river_object_bookmarks_create'><p class=\"shares_title\"><a href=\"{$b->address}\">{$b->title}</a></p></div>";
+ //get the bookmark entries body
+ $info .= "<div class='entity_listing_info'><p class='entity_title'><a href=\"{$b->address}\">{$b->title}</a></p>";
//get the user details
- $info .= "<p class=\"shares_timestamp\"><small>{$friendlytime} ";
+ $info .= "<p class='entity_subtext'>{$friendlytime} ";
//get the bookmark description
- if($s->description)
+ // @todo - do we even have a description anymore? or is this the current bookmarks note ?
+ if($s->description) {
$info .= "<a href=\"javascript:void(0);\" class=\"share_more_info\">".elgg_echo('bookmarks:more')."</a></small></p><div class=\"share_desc\"><p>{$s->description}</p></div>";
- else
- $info .= "</small></p>";
-
+ } else {
+ $info .= "</p>";
+ }
+ $info .= "</div>";
//display
- echo "<div class='shares_widget_content'>" . $info . "</div>";
+ echo "<div class='entity_listing clearfloat'>" . $info . "</div>";
}
} else {
echo "<p class='margin_top'>" . elgg_echo("bookmarks:none") . "</p>";
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index 295c99a1e..7902ae91f 100644
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -16,7 +16,7 @@ $(document).ready(function () {
}); /* end document ready function */
</script>
-<div class="group_tool_widget">
+<div class="group_tool_widget files">
<h3><?php echo elgg_echo("file:group"); ?></h3>
<?php
@@ -24,13 +24,13 @@ $(document).ready(function () {
//the number of files to display
$number = (int) $vars['entity']->num_display;
if (!$number)
- $number = 10;
+ $number = 6;
//get the group's files
$files = elgg_get_entities(array('type' => 'object',
'subtype' => 'file',
'container_guid' => $vars['entity']->guid,
- 'limit' => $number,
+ 'limit' => $number
));
//if there are some files, go get them
@@ -40,14 +40,14 @@ $(document).ready(function () {
foreach($files as $f){
$mime = $f->mimetype;
- echo "<div class=\"filerepo_widget_singleitem\">";
- echo "<div class=\"filerepo_listview_icon\"><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
- echo "<div class=\"filerepo_widget_content\">";
- echo "<div class=\"filerepo_listview_title\"><p class=\"filerepo_title\">" . $f->title . "</p></div>";
- echo "<div class=\"filerepo_listview_date\"><p class=\"filerepo_timestamp\"><small>" . friendly_time($f->time_created) . "</small></p></div>";
+ echo "<div class='entity_listing clearfloat'>";
+ echo "<div class='entity_listing_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
+ echo "<div class='entity_listing_info'>";
+ echo "<p class='entity_title'>" . $f->title . "</p>";
+ echo "<p class='entity_subtext'>" . friendly_time($f->time_created) . "</p>";
$description = $f->description;
if (!empty($description)) echo "<a href=\"javascript:void(0);\" class=\"show_file_desc\">". elgg_echo('more') ."</a><br /><div class=\"filerepo_listview_desc\">" . $description . "</div>";
- echo "</div><div class=\"clearfloat\"></div></div>";
+ echo "</div></div>";
}
@@ -55,11 +55,11 @@ $(document).ready(function () {
//get a link to the users files
$users_file_url = $vars['url'] . "pg/file/" . page_owner_entity()->username;
- echo "<div class=\"forum_latest\"><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
+ echo "<p><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></p>";
} else {
- echo "<div class=\"forum_latest\">" . elgg_echo("file:none") . "</div>";
+ echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
}
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index e681e1294..d3f035f5f 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -19,7 +19,7 @@
'groups:owned' => "Groups I own",
'groups:yours' => "My groups",
'groups:user' => "%s's groups",
- 'groups:all' => "All site groups",
+ 'groups:all' => "All groups",
'groups:new' => "Create a new group",
'groups:edit' => "Edit group",
'groups:delete' => 'Delete group',
diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php
index 29ce21358..a6a3f6bf0 100644
--- a/mod/groups/views/default/forum/topicposts.php
+++ b/mod/groups/views/default/forum/topicposts.php
@@ -32,7 +32,7 @@
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm')
))."</span>";
- echo "<a class='link' onclick=\"elgg_slide_toggle(this,'.topic','.edit_comment');\">".elgg_echo('edit')."</a>";
+ echo "<span class='entity_edit'><a class='link' onclick=\"elgg_slide_toggle(this,'.topic','.edit_comment');\">".elgg_echo('edit')."</a></span>";
echo "</div>";
}
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 502c35f52..832692ed9 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -57,7 +57,7 @@
}
-/* GROUP PROFILE PAGE (a groups homepage) */
+/* GROUP PROFILE PAGE (individual group homepage) */
.group_profile_column {
float:left;
margin-top:10px;
@@ -91,14 +91,6 @@
padding:2px 4px;
margin:0 0 7px;
}
-.group_profile.forum_latest {
- margin-top:20px;
-}
-.group_profile.forum_latest h3 {
- border-bottom:1px solid #CCCCCC;
- padding-bottom:5px;
- color:#555555;
-}
/* tool content boxes on group profile page */
#group_tools_latest {
@@ -108,7 +100,7 @@
.group_tool_widget {
float:left;
margin-right:30px;
- margin-bottom:20px;
+ margin-bottom:40px;
min-height:200px;
width:350px;
}
@@ -116,31 +108,42 @@
margin-right:0;
}
.group_tool_widget h3 {
- border-bottom:1px solid #CCCCCC;
- padding-bottom:5px;
- color:#555555;
-}
-/*
-.group_profile_column.right {
- float:right;
- width:350px;
- margin-top:20px;
-}
-.group_profile_column.left {
- width:350px;
- float:left;
- margin-top:20px;
+ border-bottom:1px solid #CCCCCC;
+ background:#e4e4e4;
+ color:#333333;
+ padding:5px 5px 3px 5px;
+ -moz-border-radius-topleft:4px;
+ -moz-border-radius-topright:4px;
+ -webkit-border-top-left-radius:4px;
+ -webkit-border-top-right-radius:4px;
}
+
+/* group activity latest
+ (hide some items used on the full riverdashboard activity)
+ @todo provide a separate view for a groups latest activity
+ - so we can have tiny avatars and not have to manually hide elements
*/
+.group_tool_widget.activity a.river_comment_form_button,
+.group_tool_widget.activity .river_comments_tabs,
+.group_tool_widget.activity .river_content_display,
+.group_tool_widget.activity .river_comments,
+.group_tool_widget.activity .river_link_divider,
+.group_tool_widget.activity .river_user_like_button {
+ display:none;
+}
+/* override default entity_listing_info width */
+.group_tool_widget .entity_listing_info {
+ width:315px;
+}
+
/* edit group page */
.delete_group {
float: right;
margin-top:-44px;
}
-/* Group forum */
-
-/* all browsers - force tinyMCE on edit forum posts to be full-width */
+/* edit forum posts
+ - force tinyMCE to correct width */
.edit_comment .defaultSkin table.mceLayout {
width: 694px !important;
}
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
index d00dc4443..142920cc4 100644
--- a/mod/groups/views/default/groups/forum_latest.php
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -8,7 +8,7 @@ if($vars['entity']->forum_enable != 'no'){
<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'));
+ $forum = elgg_get_entities_from_annotations(array('types' => 'object', 'subtypes' => 'groupforumtopic', 'annotation_names' => 'group_topic_post', 'container_guid' => $vars['entity']->guid, 'limit' => 6, 'order_by' => 'maxtime desc'));
if($forum){
foreach($forum as $f){
@@ -16,11 +16,10 @@ if($vars['entity']->forum_enable != 'no'){
$count_annotations = $f->countAnnotations("group_topic_post");
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_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</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 "<p class='margin_top'>".elgg_echo("grouptopic:notcreated")."</p>";
diff --git a/mod/groups/views/default/groups/profileitems.php b/mod/groups/views/default/groups/profileitems.php
index f3805ed70..f7eebf69c 100644
--- a/mod/groups/views/default/groups/profileitems.php
+++ b/mod/groups/views/default/groups/profileitems.php
@@ -1,37 +1,31 @@
<?php
- /**
- * Elgg groups items view.
- * This is the messageboard, members, pages and latest forums posts. Each plugin will extend the views
- *
- * @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/
- */
-
- //forum
- echo "<div class='group_profile forum_latest clearfloat'>";
- echo elgg_view("groups/forum_latest",array('entity' => $vars['entity']));
- echo "</div>";
-/*
- //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 class='group_profile_column left'>";
- echo elgg_view("groups/left_column",array('entity' => $vars['entity']));
- echo "</div>";
+/**
+* Elgg groups - group homepage (profile) - provide an area for tools to extend with their latest content.
+*
+* @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/
*/
- // tools widget area
- echo "<div id='group_tools_latest' class='clearfloat'>";
- echo "<div class='group_tool_widget'><h3>Dummy Placeholder Group Tool Widget</h3></div>"; //test
- echo elgg_view("groups/tool_latest",array('entity' => $vars['entity']));
- echo "<div class='group_tool_widget'><h3>Another Placeholder for testing</h3></div>"; //test
- echo "</div>";
+// tools widget area
+echo "<div id='group_tools_latest' class='clearfloat'>";
+
+ // activity latest
+ echo "<div class='group_tool_widget activity clearfloat'>";
+ echo elgg_view("groups/activity_latest",array('entity' => $vars['entity']));
+ echo "</div>";
+
+ // forum latest
+ echo "<div class='group_tool_widget forum clearfloat'>";
+ echo elgg_view("groups/forum_latest",array('entity' => $vars['entity']));
+ echo "</div>";
+
+ // enable tools to extend this area
+ echo elgg_view("groups/tool_latest",array('entity' => $vars['entity']));
+
+echo "</div>";
?>
<script type="text/javascript">
$(document).ready(function () { // subclass every other group tool widget
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 16f94e185..f7a2e282f 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -34,7 +34,7 @@ if($comment_count < 3)
else
$num_comments = $comment_count - 3;
?>
-<div class="river_item">
+<div class="river_item riverdashboard">
<span class="river_item_useravatar">
<?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
</span>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 04:16:26 +0000