updating the sidebar boxes to use the new module classes

git-svn-id: http://code.elgg.org/elgg/trunk@7809 36083f99-b078-4883-b0ff-0f9b5a30f544

16 files changed, 94 insertions, 82 deletions

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 951210f5a..364f4618e 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1060,7 +1060,12 @@ function elgg_view_latest_comments($owner_guid, $type = 'object', $subtype = '',
 		'pagination' => false,
 		'list_class' => 'elgg-latest-comments',
 	));
-	return elgg_view('layout/objects/module', array('title' => $title, 'body' => $body));
+	$params = array(
+		'title' => $title,
+		'body' => $body,
+		'class' => 'elgg-aside-module',
+	);
+	return elgg_view('layout/objects/module', $params);
 }
 /**
  * Wrapper function for the image block display pattern.
diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php
index 9904be288..f08c7ea7e 100644
--- a/mod/blog/views/default/blog/sidebar/archives.php
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -25,6 +25,10 @@ if ($page_owner && $vars['page'] != 'friends') {
 		}
 		$content .= '</ul>';
 
-		echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $content));
+		echo elgg_view('layout/objects/module', array(
+			'title' => $title,
+			'body' => $content,
+			'class' => 'elgg-aside-module',
+		));
 	}
 }
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
index e3919648b..b6c33fb38 100644
--- a/mod/blog/views/default/blog/sidebar/revisions.php
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -42,14 +42,14 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 				'text' => elgg_echo('blog:status:published')
 			));
 
-			$time = "<span class='entity-subtext'>"
+			$time = "<span class='elgg-subtitle'>"
 				. elgg_view_friendly_time($blog->publish_date) . "</span>";
 
 			$body .= "<li>$load : $time</li>";
 		}
 
 		foreach ($revisions as $revision) {
-			$time = "<span class='entity-subtext'>" 
+			$time = "<span class='elgg-subtitle'>"
 				. elgg_view_friendly_time($revision->time_created) . "</span>";
 
 			if ($revision->name == 'blog_auto_save') {
@@ -72,6 +72,10 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 
 		$body .= '</ul>';
 
-		echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $body));
+		echo elgg_view('layout/objects/module', array(
+			'title' => $title,
+			'body' => $body,
+			'class' => 'elgg-aside-module',
+		));
 	}
 }
\ No newline at end of file
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index 8597c135c..76b474138 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -142,7 +142,7 @@ $body_input
 
 $categories_input
 
-<p class="ptm pbm mbn entity-subtext elgg_hrt">
+<p class="elgg-subtitle ptm pbm mbn elgg_hrt">
 	$save_status <span class="blog-save-status-time">$saved</span>
 </p>
 
diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php
index c6595ab36..724032c38 100644
--- a/mod/embed/views/default/object/file/embedlist.php
+++ b/mod/embed/views/default/object/file/embedlist.php
@@ -3,7 +3,7 @@
 	$friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
 	
 	$info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
-	$info .= "<p class='entity-subtext'>{$friendlytime}";	
+	$info .= "<p class='elgg-subtitle'>{$friendlytime}";
 	$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>";
 ?>
 <div id="embed_entity_<?php echo $file->guid; ?>">
diff --git a/mod/groups/views/default/forms/groups/search.php b/mod/groups/views/default/forms/groups/search.php
new file mode 100644
index 000000000..fbb01513d
--- /dev/null
+++ b/mod/groups/views/default/forms/groups/search.php
@@ -0,0 +1,13 @@
+<?php
+
+$tag_string = elgg_echo('groups:search:tags');
+
+$params = array(
+	'internalname' => 'tag',
+	'class' => 'search-input',
+	'value' => $tag_string,
+	'onclick' => "if (this.value=='$tag_string') { this.value='' }",
+);
+echo elgg_view('input/text', $params);
+
+echo elgg_view('input/submit', array('value' => elgg_echo('search:go')));
diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/featured.php
index 0f9a3bedf..50e473d1c 100644
--- a/mod/groups/views/default/groups/featured.php
+++ b/mod/groups/views/default/groups/featured.php
@@ -1,25 +1,27 @@
 <?php
-
-	/**
-	 * This view will display featured groups - these are set by admin
-	 **/
+/**
+ * Featured groups
+ *
+ * @uses $vars['featured']
+ *
+ * @package ElggGroups
+ */
 	 
+if ($vars['featured']) {
 	
-?>
-<h3><?php echo elgg_echo("groups:featured"); ?></h3>
-
-<?php
-	if($vars['featured']){
-		
-		foreach($vars['featured'] as $group){
-			$icon = elgg_view(
-				"groups/icon", array(
+	$body = '';
+	foreach ($vars['featured'] as $group) {
+		$icon = elgg_view("groups/icon", array(
 				'entity' => $group,
 				'size' => 'tiny',
 			));
-				
-			echo "<div class='featured_group'>".$icon."<p class='entity-title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-			echo "<p class='entity-subtext'>" . $group->briefdescription . "</p></div>";
-		}
+		$body .= "<div class='featured_group'>".$icon."<p class='entity-title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+		$body .= "<p class='entity-subtext'>" . $group->briefdescription . "</p></div>";
 	}
-?>
+
+	echo elgg_view('layout/objects/module', array(
+		'title' => elgg_echo("groups:featured"),
+		'body' => $body,
+		'class' => 'elgg-aside-module',
+	));
+}
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php
index 0ad9f2018..c0c135be2 100644
--- a/mod/groups/views/default/groups/find.php
+++ b/mod/groups/views/default/groups/find.php
@@ -1,14 +1,14 @@
 <?php
+/**
+ * Group search
+ *
+ * @package ElggGroups
+ */
+$url = elgg_get_site_url() . 'pg/groups/world';
+$body = elgg_view_form('groups/search', array('action' => $url, 'method' => 'get'));
 
-	/**
-	 * A simple group search by tag view
-	 **/
-
-$tag_string = elgg_echo('groups:search:tags');
-	 
-?>
-<h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
-<form id="groupsearchform" action="<?php echo elgg_get_site_url(); ?>pg/groups/world/" 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="submit" value="<?php echo elgg_echo('search:go'); ?>" />
-</form>
+echo elgg_view('layout/objects/module', array(
+	'title' => elgg_echo('groups:searchtag'),
+	'body' => $body,
+	'class' => 'elgg-aside-module',
+));
diff --git a/mod/groups/views/default/groups/members.php b/mod/groups/views/default/groups/members.php
index 4738edf28..b4e9199af 100644
--- a/mod/groups/views/default/groups/members.php
+++ b/mod/groups/views/default/groups/members.php
@@ -1,21 +1,18 @@
 <?php
-	/**
-	 * Elgg groups items view.
-	 * This is the messageboard, members, pages and latest forums posts. Each plugin will extend the views
-	 * 
-	 * @package ElggGroups
-	 */
-	 
-	 //var_export($vars['entity']);
-?>
+/**
+ * Group members sidebar
+ *
+ * @package ElggGroups
+ */
 
-<div id="group_members" class="clearfix">
-<h3><?php echo elgg_echo("groups:members"); ?></h3>
+$body = '';
+$members = $vars['entity']->getMembers(10);
+foreach ($members as $mem) {
+	$body .= "<div class='member_icon'><a href=\"" . $mem->getURL() . "\">" . elgg_view("profile/icon", array('entity' => $mem, 'size' => 'tiny', 'override' => 'true')) . "</a></div>";
+}
 
-<?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>";   
-    }
-?>
-</div>
\ No newline at end of file
+echo elgg_view('layout/objects/module', array(
+	'title' => elgg_echo("groups:members"),
+	'body' => $body,
+	'class' => 'elgg-aside-module',
+));
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index a7ab0a956..eeceba344 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -46,7 +46,7 @@ if ($full_view) {
 <p class="mbn">
 	$delete_button
 	$commenter_link
-	<span class="entity-subtext">
+	<span class="elgg-subtitle">
 		$friendlytime
 	</span>
 	$comment_text
@@ -63,8 +63,8 @@ HTML;
 	$on = elgg_echo('on');
 
 	$body = <<<HTML
-<span class="entity-subtext">
-	$commenter_link $on <span class='entity-title'>$entity_link</span> ($friendlytime)
+<span class="elgg-subtitle">
+	$commenter_link $on $entity_link ($friendlytime)
 </span>
 HTML;
 
diff --git a/views/default/core/likes/display.php b/views/default/core/likes/display.php
index bd0a8fa95..db194c04d 100644
--- a/views/default/core/likes/display.php
+++ b/views/default/core/likes/display.php
@@ -52,7 +52,7 @@ if ($num_of_likes) {
 		'class' => 'elgg-like-toggle',
 	);
 	$list = elgg_view('output/url', $params);
-	$list .= "<div class='elgg-likes-list hidden clearfix'>";
+	$list .= "<div class='elgg-popup-module elgg-likes-list hidden clearfix'>";
 	$list .= list_annotations($guid, 'likes', 99);
 	$list .= "</div>";
 }
diff --git a/views/default/core/members/sidebar.php b/views/default/core/members/sidebar.php
index 821547f99..fba0270e5 100644
--- a/views/default/core/members/sidebar.php
+++ b/views/default/core/members/sidebar.php
@@ -14,6 +14,7 @@ $body = elgg_view_form('members/tag_search', $params);
 $params = array(
 	'title' => elgg_echo('members:searchtag'),
 	'body' => $body,
+	'class' => 'elgg-aside-module',
 );
 echo elgg_view('layout/objects/module', $params);
 
@@ -29,5 +30,6 @@ $body = elgg_view_form('members/name_search', $params);
 $params = array(
 	'title' => elgg_echo('members:searchname'),
 	'body' => $body,
+	'class' => 'elgg-aside-module',
 );
 echo elgg_view('layout/objects/module', $params);
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 54feccc31..bbd38ce12 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -653,3 +653,6 @@ ul.admin_plugins {
 	top: 2px;
 	background: white;
 }
+.add-user form {
+	width:300px;
+}
\ No newline at end of file
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 374903c59..597313f0c 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -40,14 +40,14 @@
 	margin-left: 15px;
 	font-size: 90%;
 }
-.elgg-list-metadata li {
+.elgg-list-metadata > li {
 	float: left;
 	margin-left: 15px;
 }
 .elgg-list-metadata, .elgg-list-metadata a {
 	color: #aaaaaa;
 }
-.elgg-list-subtitle {
+.elgg-list-subtitle, .elgg-subtitle {
 	color: #666666;
 	font-size: 85%;
 	line-height: 1.2em;
@@ -106,13 +106,8 @@
 	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
 	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
 }
-.elgg-sidebar .elgg-module {
-	margin-top: 20px;
-}
-.elgg-sidebar .elgg-module .elgg-head {
-	border-bottom: 1px solid #CCCCCC;
-	margin-bottom: 5px;
-	padding-bottom: 5px;
+.elgg-owner-block {
+	margin-bottom: 20px;
 }
 /* ***************************************
 	WIDGETS
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index 73d237b47..f5dd78821 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -9,17 +9,8 @@
 	LIKES
 *************************************** */
 .elgg-likes-list {
-	background-color: white;
-	border:1px solid #cccccc;
 	width: 345px;
-	height: auto;
 	position: absolute;
-	text-align: left;
-	z-index: 9999;
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
 }
 
 /* ***************************************
@@ -272,10 +263,6 @@ table.styled tr:hover {
 	background: #E4E4E4;
 }
 
-.add-user form {
-	width:300px;
-}
-
 /* ***************************************
 	FRIENDS PICKER
 *************************************** */
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index b47b66005..c8d741342 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -66,7 +66,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 		$params = array(
 			'title' => elgg_echo('tagcloud'),
 			'body' => $cloud,
-			'class' => 'elgg-tagcloud',
+			'class' => 'elgg-tagcloud elgg-aside-module',
 		);
 		echo elgg_view('layout/objects/module', $params);
 	} else {