activity stream basic style applied, and plugin reorder links adjusted

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

2 files changed, 37 insertions, 19 deletions

diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index b74d9bc25..02d154715 100644
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -23,25 +23,25 @@
 	$ts = time();
 	$token = generate_action_token($ts);
 ?>
-<div class="plugin_details <?php if ($active) echo "active"; else echo "not-active" ?>">

-	<div class="admin_plugin_reorder">

-		<?php

-			if ($vars['order'] > 10) {

-?>

-			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=1&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("top"); ?></a>

-			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['order'] - 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("up"); ?></a>

-<?php

-			}

-		?> 

-		<?php

-			if ($vars['order'] < $vars['maxorder']) {

-?>

-			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['order'] + 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("down"); ?></a>

-			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['maxorder'] + 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("bottom"); ?></a>

-<?php

-			}

-		?> 

-	</div>
+<div class="plugin_details <?php if ($active) echo "active"; else echo "not-active" ?>">
+	<div class="admin_plugin_reorder">
+		<?php
+			if ($vars['order'] > 10) {
+?>
+			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=1&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("top"); ?></a>
+			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['order'] - 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("up"); ?></a>
+<?php
+			}
+		?> 
+		<?php
+			if ($vars['order'] < $vars['maxorder']) {
+?>
+			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['order'] + 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("down"); ?></a>
+			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/reorder?plugin=<?php echo $plugin; ?>&order=<?php echo $vars['maxorder'] + 11; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("bottom"); ?></a>
+<?php
+			}
+		?> 
+	</div><div class="clearfloat"></div>
 	<div class="admin_plugin_enable_disable">
 		<?php if ($active) { ?>
 			<a href="<?php echo $vars['url']; ?>actions/admin/plugins/disable?plugin=<?php echo $plugin; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("disable"); ?></a>
diff --git a/views/default/css.php b/views/default/css.php
index ce8492668..22aa056c4 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1013,6 +1013,16 @@ p.user_menu_friends_of {
 /* ***************************************
 	RIVER
 *************************************** */
+.activity_item p {
+	margin:0;
+	padding:2px 0 0 0;
+	line-height:1.1em;
+	min-height:17px;	
+}
+.activity_item .activity_item_time {
+	font-size:90%;
+	color:#666666;
+}
 #river {
 	border-top:1px solid #dddddd;
 }
@@ -1210,6 +1220,14 @@ table.search_gallery {
 	margin:0 0 10px 0;
 	padding:5px 10px 5px 10px;
 }
+.admin_plugin_reorder {
+	float:right;
+	width:200px;
+	text-align: right;
+}
+.admin_plugin_reorder a {
+	padding-left:10px;
+}
 .active {
 	border:1px solid #00cc00;
     background:#ccffcc;