5 files changed, 14 insertions, 13 deletions
diff --git a/views/default/admin/components/invalid_plugin.php b/views/default/admin/components/invalid_plugin.php
index 91c073fac..516e2db6c 100644
--- a/views/default/admin/components/invalid_plugin.php
+++ b/views/default/admin/components/invalid_plugin.php
@@ -17,7 +17,7 @@ $message = elgg_echo('admin:plugins:warning:invalid', array($id));
 
 ?>
 
-<div class="plugin_details not_active">
-	<p class="plugin-cannot-activate"><?php echo $message; ?></p>
+<div class="elgg-plugin elgg-state-inactive elgg-state-error">
+	<p><?php echo $message; ?></p>
 	<p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p>
 </div>
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 5cf4f169d..87d13db90 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -20,7 +20,7 @@ $actions_base = '/action/admin/plugins/';
 
 $ts = time();
 $token = generate_action_token($ts);
-$active_class = ($active && $can_activate) ? 'active' : 'not_active';
+$active_class = ($active && $can_activate) ? 'elgg-state-active' : 'elgg-state-inactive';
 
 // build reordering links
 $links = '';
@@ -152,7 +152,7 @@ $license = elgg_view('output/text', array('value' => $plugin->manifest->getLicen
 
 ?>
 
-<div id="elgg-plugin-<?php echo $plugin->guid; ?>" class="elgg-state-draggable plugin_details <?php echo $active_class ?>">
+<div id="elgg-plugin-<?php echo $plugin->guid; ?>" class="elgg-state-draggable elgg-plugin <?php echo $active_class ?>">
 	<div class="admin_plugin_reorder">
 	<?php echo "$links"; ?>
 	</div><div class="clearfloat"></div>
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index e854616eb..f00e0253e 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -988,17 +988,17 @@ ul.admin_plugins {
 	padding-left:0;
 	list-style: none;
 }
-.plugin_details {
+.elgg-plugin {
 	margin:0 0 5px 0;
 	padding:0 7px 4px 10px;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 }
-.plugin_details p {
+.elgg-plugin p {
 	margin:0;
 	padding:0;
 }
-.plugin_details h3 {
+.elgg-plugin h3 {
 	margin-top:-13px;
 	color:black;
 	padding-bottom: 10px;
@@ -1044,7 +1044,7 @@ p.elgg-dependency-suggests {
 	border:1px solid #999999;
 	background:white;
 }
-.not_active {
+.elgg-state-inactive {
 	border:1px solid #999999;
 	background:#dedede;
 }
diff --git a/views/default/forms/admin/plugins/simple_update_states.php b/views/default/forms/admin/plugins/simple_update_states.php
index ac8a103fd..57231d4ef 100644
--- a/views/default/forms/admin/plugins/simple_update_states.php
+++ b/views/default/forms/admin/plugins/simple_update_states.php
@@ -43,10 +43,10 @@ foreach ($plugin_list as $name => $plugin) {
 	$description = $plugin->manifest->getDescription();
 
 	if ($active) {
-		$active_class = 'active';
+		$active_class = 'elgg-state-active';
 		$checked = 'checked="checked"';
 	} else {
-		$active_class = 'not_active';
+		$active_class = 'elgg-state-inactive';
 		$checked = '';
 	}
 
@@ -79,7 +79,7 @@ foreach ($plugin_list as $name => $plugin) {
 	}
 
 	echo <<<___END
-	<tr class="plugin_details $active_class">
+	<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>
diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index ca690c876..603d0f066 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -9,8 +9,9 @@ elgg.provide('elgg.admin');
 
 elgg.admin.init = function () {
 	// display manifest info
+	<?php //@todo Use elgg-toggler pattern ?>
 	$('a.manifest_details.link').click(function() {
-		elgg_slide_toggle($(this), '.plugin_details', '.manifest_file');
+		elgg_slide_toggle($(this), '.elgg-plugin', '.manifest_file');
 	});
 
 	// plugin screenshot modal
@@ -53,7 +54,7 @@ elgg.admin.init = function () {
  */
 elgg.admin.movePlugin = function(e, ui) {
 	// get guid from id like elgg-plugin-<guid>
-	var pluginGuid = ui.item.closest('.plugin_details').attr('id');
+	var pluginGuid = ui.item.closest('.elgg-plugin').attr('id');
 	pluginGuid = pluginGuid.replace('elgg-plugin-', '');
 
 	elgg.action('admin/plugins/set_priority', {