Pulled in the interface changes.

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

3 files changed, 25 insertions, 27 deletions

diff --git a/mod/logbrowser/index.php b/mod/logbrowser/index.php
index d3901726c..f3c9e4d41 100644
--- a/mod/logbrowser/index.php
+++ b/mod/logbrowser/index.php
@@ -55,9 +55,10 @@
 	
 	set_context('search');
 	$result = elgg_view_entity_list($log_entries, $count, $offset, $limit, false, false);
+	$result = "<div class='admin_settings log_browser radius8 clearfloat'>".$result."</div>";
 	set_context('admin');
 		
 // Display main admin menu
-	page_draw(elgg_echo('logbrowser'),elgg_view_layout("two_column_left_sidebar", '', $title . $form . $result));
+	page_draw(elgg_echo('logbrowser'),elgg_view_layout("one_column_with_sidebar", '', $title . $form . $result));
 
 ?>
diff --git a/mod/logbrowser/views/default/logbrowser/css.php b/mod/logbrowser/views/default/logbrowser/css.php
index 960f63c44..653bbce3e 100644
--- a/mod/logbrowser/views/default/logbrowser/css.php
+++ b/mod/logbrowser/views/default/logbrowser/css.php
@@ -9,39 +9,43 @@
 	 */
 
 ?>
-
-#logbrowserSearchform {
+#logbrowser_search_area {
+	margin-top:10px;
+	margin-bottom:10px;
+}
+#log_browser_search_form {
 	padding: 10px;
-	background-color: #dedede;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
+	margin-bottom:10px;
+	background-color: #eeeeee;
+}
+.admin_settings.log_browser {
+	background-color: #eeeeee;
+	padding-top:7px;
+	padding-bottom:7px;
 }
-
 .log_entry {
-	width: 699px;
+	width: 710px;
 	font-size: 80%;
 	background:white;
 	margin:0 10px 5px 10px;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
 	border:1px solid white;
 }
+.log_entry:hover {
+	background-color: #eeeeee;
+	border:1px solid #666666;
+}
 .log_entry td {
 }
-
 .log_entry_user {
 	width: 120px;
 }
-
 .log_entry_time {
 	width: 210px;
 	padding:2px;
 }
-
 .log_entry_item {
 	
 }
-
 .log_entry_action {
 	width: 75px;
 }
\ No newline at end of file
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index 4a1e40d6a..326265643 100644
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -49,18 +49,11 @@
 														'body' => $form,
 														'method' => 'get',
 														'action' => $vars['url'] . "mod/logbrowser/"
-										));
-
-		if ($upperval || $lowerval || $userval) {
-			$hidden = "";
-		} else {
-			$hidden = "style=\"display:none\"";
-		}
-										
+										));										
 ?>
 
-		<div id="logbrowserSearchform" <?php echo $hidden; ?>><?php echo $wrappedform; ?></div>
-		<p>
-			<a href="#" onclick="$('#logbrowserSearchform').toggle()"><?php echo elgg_echo('logbrowser:search'); ?></a>
-		</p>
-	</div>
\ No newline at end of file
+	<div id="log_browser_search_form" class="hidden radius8"><?php echo $wrappedform; ?></div>
+	<p>
+		<a href="#" onclick="elgg_slide_toggle(this,'#logbrowser_search_area','#log_browser_search_form');"><?php echo elgg_echo('logbrowser:search'); ?></a>
+	</p>
+</div>
\ No newline at end of file