Cleanup of basic plugins area

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

2 files changed, 99 insertions, 65 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index f00e0253e..a90b97a5b 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -119,6 +119,7 @@ table.mceLayout {
 }
 
 /* Clearfix! */
+.elgg-grid:after,
 .clearfix:after {
 	content: ".";
 	display: block;
@@ -216,17 +217,6 @@ table.mceLayout {
 	border: 2px solid #dddddd;
 }
 
-.elgg-state-error {
-	background: #fbe3e4;
-	color: #8a1f11;
-	border-color: #fbc2c4;
-}
-
-.elgg-state-success {
-	background: #e6efc2;
-	color: #264409;
-	border-color: #c6d880;
-}
 
 /* ***************************************
 	BODY
@@ -443,6 +433,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	color: white;
 	text-decoration: none;
 }
+
 .elgg-pagination .elgg-state-disabled {
 	color: #CCCCCC;
 	border-color: #CCCCCC;
@@ -488,16 +479,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-widgets-add-panel li a {
 	display: block;
 }
-.elgg-state-available {
-	color: #333333;
-	cursor: pointer;
-}
-.elgg-state-available:hover {
-	border-color: #aaaaaa;
-}
-.elgg-state-unavailable {
-	color: #888888;
-}
+
 .elgg-module-widget {
 	background-color: #dedede;
 	padding: 1px;
@@ -526,9 +508,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	height: 18px;
 	border: 1px solid transparent;
 }
-.elgg-state-draggable > .elgg-head {
-	cursor: move;
-}
+
 a.elgg-widget-collapse-button {
 	left: 5px;
 	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
@@ -989,6 +969,7 @@ ul.admin_plugins {
 	list-style: none;
 }
 .elgg-plugin {
+	border:1px solid #999999;
 	margin:0 0 5px 0;
 	padding:0 7px 4px 10px;
 	-webkit-border-radius: 5px;
@@ -1008,16 +989,9 @@ ul.admin_plugins {
 }
 
 
-.elgg-state-error {
-	font-weight: bold;
-}
 .elgg-dependency-suggests {
 	font-weight: normal;
 }
-p.elgg-state-error {
-	padding: 5px 0;
-	font-weight: bold;
-}
 p.elgg-dependency-suggests {
 	font-weight: normal;
 }
@@ -1040,14 +1014,7 @@ p.elgg-dependency-suggests {
 .elgg-plugin-screenshot-lightbox h2 {
 	color:black;
 }
-.active {
-	border:1px solid #999999;
-	background:white;
-}
-.elgg-state-inactive {
-	border:1px solid #999999;
-	background:#dedede;
-}
+
 .configure_menuitems {
 	margin-bottom:30px;
 }
@@ -1145,8 +1112,7 @@ p.elgg-dependency-suggests {
 /* ***************************************
 	GRID
 *************************************** */
-.elgg-grid {
-}
+.elgg-grid {}
 .elgg-col {
 	float: left;
 }
@@ -1254,4 +1220,73 @@ p.elgg-dependency-suggests {
 	background-position: -302px -186px;
 	width: 21px;
 	height: 21px;
-}
\ No newline at end of file
+}
+
+/* ***************************************
+	FOOTER
+*************************************** */
+.elgg-menu-footer {color:gray}
+
+.elgg-menu-footer li {
+	float: left;
+}
+.elgg-menu-footer li:after{
+	content: "\007C";
+	display: inline-block;
+	padding: 0 4px 0 4px;
+	font-weight: normal;
+}
+.elgg-menu-footer li:last-child:after {
+	content: "";
+}
+
+/* ***************************************
+	STATES
+*************************************** */
+
+.elgg-state-active {
+	background:white;
+}
+
+.elgg-state-inactive {
+	background:#dedede;
+}
+
+.elgg-state-available {
+	color: #333333;
+	cursor: pointer;
+}
+
+.elgg-state-available:hover {
+	border-color: #aaaaaa;
+}
+
+.elgg-state-unavailable {
+	color: #888888;
+}
+
+.elgg-state-success {
+	background: #e6efc2;
+	color: #264409;
+	border-color: #c6d880;
+}
+
+.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+
+p.elgg-state-error {
+	padding: 5px;
+}
+
+<?php //@todo elgg-drag-handle instead? ?>
+.elgg-state-draggable > .elgg-head {
+	cursor: move;
+}
+
+<?php //What to do with states that don't have default styles? ?>
+.elgg-state-selected {}
+.elgg-state-disabled {}
diff --git a/views/default/forms/admin/plugins/simple_update_states.php b/views/default/forms/admin/plugins/simple_update_states.php
index 57231d4ef..bf9f4e4c1 100644
--- a/views/default/forms/admin/plugins/simple_update_states.php
+++ b/views/default/forms/admin/plugins/simple_update_states.php
@@ -25,7 +25,7 @@ foreach ($installed_plugins as $plugin) {
 ksort($plugin_list);
 
 echo <<<___END
-	<table class="admin_plugins"><tbody>
+	<ul>
 ___END;
 
 $actions_base = '/action/admin/plugins/';
@@ -59,44 +59,43 @@ foreach ($plugin_list as $name => $plugin) {
 
 	$description = elgg_view('output/longtext', array('value' => $description));
 
-	$author_html = $link_html = $version_html = $settings_html = '';
-
+	$plugin_footer = '<ul class="elgg-menu elgg-menu-footer">';
+	
 	if ($author) {
-		$author_html = elgg_echo('admin:plugins:author', array($author));
+		$plugin_footer .= '<li>' . elgg_echo('admin:plugins:author', array($author)) . '</li>';
 	}
 
 	if ($version) {
-		$version_html = ' | ' . elgg_echo('admin:plugins:version', array($version));
+		$plugin_footer .= '<li>' . elgg_echo('admin:plugins:version', array($version)) . '</li>';
 	}
 
 	if ($website) {
-		$link_html = " | <a href=\"$website\">" . elgg_echo('admin:plugins:plugin_website') . '</a>';
+		$plugin_footer .= "<li><a href=\"$website\">" . elgg_echo('admin:plugins:plugin_website') . '</a></li>';
 	}
 
 	if (elgg_view_exists("settings/$plugin_id/edit")) {
 		$settings_href = elgg_get_site_url() . "pg/admin/plugin_settings/$plugin_id";
-		$settings_html = " | <a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a>";
+		$plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
 	}
+	
+	$plugin_footer .= "</ul>";
 
 	echo <<<___END
-	<tr class="elgg-plugin $active_class">
-		<th class="plugin_controls">
-			<input type="checkbox" id="$plugin_guid" class="plugin_enabled" $checked $disabled name="active_plugin_guids[]" value="$plugin_guid"/>
-			<label for="$plugin_guid">$name</label>
-		</th>
-		<td class="plugin_info">
-			$description
-			<span class="plugin_metadata small">
-				$author_html
-				$version_html
-				$link_html
-				$settings_html
-			</span>
-		</td>
-	</tr>
+	<li class="elgg-plugin $active_class">
+		<div class="elgg-grid">
+			<div class="elgg-col elgg-col-1of5">
+				<input type="checkbox" id="$plugin_guid" $checked $disabled name="active_plugin_guids[]" value="$plugin_guid"/>
+				<label for="$plugin_guid">$name</label>
+			</div>
+			<div class="elgg-col elgg-col-4of5">
+				$description
+				$plugin_footer
+			</div>
+		</div>
+	</li>
 ___END;
 }
 
-echo '</tbody></table>';
+echo '</ul>';
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 echo elgg_view('input/reset', array('value' => elgg_echo('reset')));