aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/blog/views/default/blog/group_module.php2
-rw-r--r--mod/bookmarks/views/default/bookmarks/group_module.php2
-rw-r--r--mod/file/views/default/file/group_module.php2
-rw-r--r--mod/groups/views/default/discussion/group_module.php2
-rw-r--r--mod/groups/views/default/forms/groups/delete.php2
-rw-r--r--mod/groups/views/default/groups/css.php181
-rw-r--r--mod/groups/views/default/groups/group_sort_menu.php4
-rw-r--r--mod/groups/views/default/groups/profile/activity_module.php2
-rw-r--r--mod/groups/views/default/groups/profile/profile_block.php10
-rw-r--r--mod/groups/views/default/groups/profile/widgets.php8
-rw-r--r--mod/pages/views/default/pages/group_module.php2
11 files changed, 42 insertions, 175 deletions
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
index 8c3fc373f..312c89c0c 100644
--- a/mod/blog/views/default/blog/group_module.php
+++ b/mod/blog/views/default/blog/group_module.php
@@ -14,7 +14,7 @@ $all_link = elgg_view('output/url', array(
'text' => elgg_echo('link:view:all'),
));
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
$header .= '<h3>' . elgg_echo('blog:group') . '</h3>';
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
index 94204d7e8..202f87783 100644
--- a/mod/bookmarks/views/default/bookmarks/group_module.php
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -16,7 +16,7 @@ $all_link = elgg_view('output/url', array(
'text' => elgg_echo('link:view:all'),
));
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
$header .= '<h3>' . elgg_echo('bookmarks:group') . '</h3>';
elgg_push_context('widgets');
diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php
index 8c80f297c..c3ca5cf9e 100644
--- a/mod/file/views/default/file/group_module.php
+++ b/mod/file/views/default/file/group_module.php
@@ -14,7 +14,7 @@ $all_link = elgg_view('output/url', array(
'text' => elgg_echo('link:view:all'),
));
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
$header .= '<h3>' . elgg_echo('file:group') . '</h3>';
diff --git a/mod/groups/views/default/discussion/group_module.php b/mod/groups/views/default/discussion/group_module.php
index afe47ab68..b606579cb 100644
--- a/mod/groups/views/default/discussion/group_module.php
+++ b/mod/groups/views/default/discussion/group_module.php
@@ -17,7 +17,7 @@ $all_link = elgg_view('output/url', array(
'text' => elgg_echo('link:view:all'),
));
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
$header .= '<h3>' . elgg_echo('discussion:group') . '</h3>';
diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php
index 85379a342..28c2eb9bf 100644
--- a/mod/groups/views/default/forms/groups/delete.php
+++ b/mod/groups/views/default/forms/groups/delete.php
@@ -11,7 +11,7 @@ echo elgg_view('input/hidden', array(
));
echo elgg_view('input/submit', array(
- 'class' => "elgg-button elgg-button-delete",
+ 'class' => "elgg-button elgg-button-delete right",
'value' => elgg_echo('groups:delete'),
'onclick' => "return confirm('$warning');",
));
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 545f9c9b3..23579fb90 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -6,178 +6,43 @@
*/
?>
-#group_tools_latest > .elgg-module {
- float: left;
- margin-bottom: 40px;
- min-height: 200px;
- width: 350px;
-}
-
-#group_tools_latest > .elgg-module:nth-child(odd) {
- margin-right: 30px;
+.groups-profile > .elgg-image {
+ margin-right: 10px;
}
-.group-widget-viewall {
- float: right;
- font-size: 85%;
-}
-
-.groups-latest-reply {
- float: right;
-}
-
-
-/* group listings */
-.group_count {
- float:right;
-}
-.group_listings {
- /* wraps group lists on
- latest discussion, newest, popular */
-}
-.entity-subtext.groups {
- float:right;
- width:300px;
- text-align: right;
- margin-left: 10px;
-}
-.topic_post.maintopic {
- margin:10px 0 0 0;
- padding-bottom:40px;
- border-bottom:1px solid #CCCCCC;
-}
-.elgg-image-block.topic .topic_post p {
- margin:10px 0 5px 0;
-}
-.elgg-image-block.topic:hover {
- background-color: white;
-}
-
-
-/* group invitations */
-.group_invitations a.elgg-button-action,
-.group_invitations a.elgg-button-submit {
- float:right;
- margin:0 0 0 14px;
-}
-
-
-/* GROUPS SIDEBAR ELEMENTS */
-#groupsearchform .search-input {
- width:196px;
-}
-.featured_group {
- margin-bottom:15px;
-}
-.featured_group .elgg-user-icon {
- float:left;
- margin-right:10px;
-}
-.featured_group p.entity-title {
- margin-bottom:0;
-}
-.member_icon {
- margin:6px 6px 0 0;
- float:left;
-}
-
-
-/* GROUP PROFILE PAGE (individual group homepage) */
-.group_profile_column {
- float:left;
- margin-top:10px;
-}
-.group_profile_column.icon {
- width:200px;
-}
-.group_profile_column.info {
- width:510px;
- margin-left:20px;
-}
-.group_profile_icon {
- width:200px;
- height:200px;
-}
-.group_stats {
+.groups-stats {
background: #eeeeee;
- padding:5px;
- margin-top:10px;
- -webkit-border-radius: 5px;
+ padding: 5px;
+ margin-top: 10px;
+ -webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
-.group_stats p {
- margin:0;
-}
-.group_profile_column .odd,
-.group_profile_column .even {
- background:#f4f4f4;
- -webkit-border-radius: 4px;
+
+.groups-profile-fields .odd,
+.groups-profile-fields .even {
+ background: #f4f4f4;
+ -webkit-border-radius: 4px;
-moz-border-radius: 4px;
- padding:2px 4px;
- margin:0 0 7px;
+ padding: 2px 4px;
+ margin-bottom: 7px;
}
-/* tool content boxes on group profile page */
-#group_tools_latest {
- min-height: 300px;
- margin-top:20px;
-}
-.group_tool_widget {
- float:left;
- margin-right:30px;
- margin-bottom:40px;
- min-height:200px;
- width:350px;
-}
-.group_tool_widget.odd {
- margin-right:0;
-}
-.group_tool_widget h3 {
- 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;
+#groups-tools > .elgg-module {
+ float: left;
+ margin-bottom: 40px;
+ min-height: 200px;
+ width: 350px;
}
-/* 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;
-}
-.group_tool_widget.activity .river_item .entity-subtext {
- padding:0;
+#groups-tools > .elgg-module:nth-child(odd) {
+ margin-right: 30px;
}
-/* override default elgg-body width */
-.group_tool_widget .elgg-body {
- width:315px;
-}
-.group_widget_link {
- float:right;
- margin:4px 6px 0 0;
+.groups-widget-viewall {
+ float: right;
font-size: 85%;
}
-/* edit group page */
-.delete_group {
+.groups-latest-reply {
float: right;
- margin-top:-44px;
}
-
-/* edit forum posts
- - force tinyMCE to correct width */
-.edit_comment .defaultSkin table.mceLayout {
- width: 694px !important;
-} \ No newline at end of file
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index ef99a21a8..2ba0e5f0e 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -13,7 +13,9 @@ $url = elgg_get_site_url() . "pg/groups/all/";
?>
<div class="elgg-tabs mtm">
-<div class="group_count"><?php echo $group_count . " " . elgg_echo("groups:count"); ?></div>
+ <div class="right">
+ <?php echo $group_count . " " . elgg_echo("groups:count"); ?>
+ </div>
<ul>
<li <?php if($selected == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
<li <?php if($selected == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('groups:popular'); ?></a></li>
diff --git a/mod/groups/views/default/groups/profile/activity_module.php b/mod/groups/views/default/groups/profile/activity_module.php
index 78eae9cec..9955b598f 100644
--- a/mod/groups/views/default/groups/profile/activity_module.php
+++ b/mod/groups/views/default/groups/profile/activity_module.php
@@ -21,7 +21,7 @@ $all_link = elgg_view('output/url', array(
'text' => elgg_echo('link:view:all'),
));
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
$header .= '<h3>' . elgg_echo('groups:activity') . '</h3>';
diff --git a/mod/groups/views/default/groups/profile/profile_block.php b/mod/groups/views/default/groups/profile/profile_block.php
index aec8fc6cd..2f384b4bf 100644
--- a/mod/groups/views/default/groups/profile/profile_block.php
+++ b/mod/groups/views/default/groups/profile/profile_block.php
@@ -18,12 +18,12 @@ $owner = $group->getOwnerEntity();
$profile_fields = elgg_get_config('group');
?>
-<div class="group_profile clearfix elgg-image-block">
- <div class="group_profile_column elgg-image">
- <div class="group_profile_icon">
+<div class="groups-profile clearfix elgg-image-block">
+ <div class="elgg-image">
+ <div class="groups-profile-icon">
<?php echo elgg_view_entity_icon($group, 'large', array('href' => '')); ?>
</div>
- <div class="group_stats">
+ <div class="groups-stats">
<p>
<b><?php echo elgg_echo("groups:owner"); ?>: </b>
<?php
@@ -41,7 +41,7 @@ $profile_fields = elgg_get_config('group');
</div>
</div>
- <div class="group_profile_column elgg-body">
+ <div class="groups-profile-fields 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 08cbf1dae..027503560 100644
--- a/mod/groups/views/default/groups/profile/widgets.php
+++ b/mod/groups/views/default/groups/profile/widgets.php
@@ -6,10 +6,10 @@
*/
// tools widget area
-echo "<div id='group_tools_latest' class='clearfix'>";
+echo '<div id="groups-tools" class="mtl clearfix">';
- // enable tools to extend this area
- echo elgg_view("groups/tool_latest", array('entity' => $vars['entity']));
+// enable tools to extend this area
+echo elgg_view("groups/tool_latest", array('entity' => $vars['entity']));
echo "</div>";
?>
@@ -17,6 +17,6 @@ echo "</div>";
<?php //@todo JS 1.8: no ?>
<script type="text/javascript">
$(function () { // subclass every other group tool widget
- $('#group_tools_latest').find('.group_tool_widget:odd').addClass('odd');
+ $('#groups-tools').find('.elgg-module:odd').addClass('odd');
});
</script>
diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php
index c41de043d..9d2f863dd 100644
--- a/mod/pages/views/default/pages/group_module.php
+++ b/mod/pages/views/default/pages/group_module.php
@@ -17,7 +17,7 @@ $all_link = elgg_view('output/url', array(
'text' => elgg_echo('link:view:all'),
));
-$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header = "<span class=\"groups-widget-viewall\">$all_link</span>";
$header .= '<h3>' . elgg_echo('pages:group') . '</h3>';