Fixes #3236 finishes admin theme - open new tickets for new issues

7 files changed, 135 insertions, 182 deletions

diff --git a/mod/twitter_api/views/default/settings/twitter_api/edit.php b/mod/twitter_api/views/default/settings/twitter_api/edit.php
index 4e52a5c9d..0b9afd4cf 100644
--- a/mod/twitter_api/views/default/settings/twitter_api/edit.php
+++ b/mod/twitter_api/views/default/settings/twitter_api/edit.php
@@ -9,14 +9,14 @@ $consumer_key_string = elgg_echo('twitter_api:consumer_key');
 $consumer_key_view = elgg_view('input/text', array(
 	'name' => 'params[consumer_key]',
 	'value' => $vars['entity']->consumer_key,
-	'class' => 'text_input',
+	'class' => 'elgg-input-thin',
 ));
 
 $consumer_secret_string = elgg_echo('twitter_api:consumer_secret');
 $consumer_secret_view = elgg_view('input/text', array(
 	'name' => 'params[consumer_secret]',
 	'value' => $vars['entity']->consumer_secret,
-	'class' => 'text_input twitter-secret',
+	'class' => 'elgg-input-thin',
 ));
 
 $sign_on_with_twitter_string = elgg_echo('twitter_api:login');
@@ -40,7 +40,7 @@ $new_users_with_twitter_view = elgg_view('input/dropdown', array(
 ));
 
 $settings = <<<__HTML
-<div class="elgg-instructs mtm"><p>$instructions</p></div>
+<div class="elgg-content-thin mtm"><p>$instructions</p></div>
 <div><label>$consumer_key_string</label><br /> $consumer_key_view</div>
 <div><label>$consumer_secret_string</label><br /> $consumer_secret_view</div>
 <div>$sign_on_with_twitter_string $sign_on_with_twitter_view</div>
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 8993ec66d..eda6bc193 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -38,26 +38,26 @@ html, body {
 	margin-bottom: 1px;
 }
 img {
-	border-width:0;
-	border-color:transparent;
+	border-width: 0;
+	border-color: transparent;
 }
 :focus {
-	outline:0 none;
+	outline: 0 none;
 }
 ol, ul {
 	list-style: none;
 }
 em, i {
-	font-style:italic;
+	font-style: italic;
 }
 ins {
-	text-decoration:none;
+	text-decoration: none;
 }
 del {
 	text-decoration:line-through;
 }
 strong, b {
-	font-weight:bold;
+	font-weight: bold;
 }
 table {
 	border-collapse: collapse;
@@ -79,7 +79,6 @@ blockquote, q {
 /* ***************************************
 	BASICS
 *************************************** */
-
 body {
 	background-color: #eee;
 	font-size: 80%;
@@ -116,15 +115,8 @@ p {
 	margin-bottom: 15px;
 }
 
-.elgg-output dt { font-weight: bold }
-.elgg-output dd { margin: 0 0 1em 2em }
-
-table.mceLayout {
-	width:100% !important;
-}
-
 .clearfloat {
-	clear:both;
+	clear: both;
 }
 
 /* Clearfix! */
@@ -150,10 +142,10 @@ table.mceLayout {
 	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
 }
 .hidden {
-	display:none;
+	display: none;
 }
 .centered {
-	margin:0 auto;
+	margin: 0 auto;
 }
 .center {
 	text-align: center;
@@ -164,6 +156,9 @@ table.mceLayout {
 .float-alt {
 	float: right;
 }
+.elgg-toggle {
+	cursor: pointer;
+}
 
 /* ***************************************
 	PAGE WRAPPER
@@ -211,7 +206,7 @@ table.mceLayout {
 .elgg-menu-user li {
 	display: inline;
 }
-.elgg-menu-user li:after{
+.elgg-menu-user li:after {
 	content: "|";
 	display: inline-block;
 	font-weight: normal;
@@ -222,6 +217,9 @@ table.mceLayout {
 	content: "";
 }
 
+/* ***************************************
+	MESSAGES
+*************************************** */
 .elgg-page-messages {
 	padding: 20px 0 0;
 	width: 500px;
@@ -248,13 +246,35 @@ table.mceLayout {
 	border-color: #c6d880;
 }
 
+.elgg-admin-notices {
+	padding-bottom: 15px;
+}
+.elgg-admin-notices p {
+	background-color: #BDE5F8;
+	color: black;
+	border: 1px solid blue;
+	font-weight: bold;
+	padding: 3px 0px 3px 10px;
+
+	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.elgg-admin-notices a {
+	float: right;
+}
+
 /* ***************************************
 	BODY
 *************************************** */
 .elgg-page-body {
 	padding: 20px 0;
 }
-.elgg-main  {
+.elgg-main {
 	background-color: #fff;
 	border: 1px solid #ccc;
 	padding: 20px;
@@ -384,31 +404,19 @@ table.mceLayout {
 	float: right;
 	margin-left: 5px;
 }
-
 .elgg-item {
 	margin: 3px;
 }
-.elgg-menu-metadata {
-	float: right;
-	margin-left: 15px;
-	font-size: 90%;
-}
-.elgg-menu-metadata > li {
-	float: left;
-	margin-left: 15px;
-}
-.elgg-menu-metadata, .elgg-menu-metadata a {
-	color: #aaa;
-}
 .elgg-simple-list li {
 	margin-bottom: 5px;
 }
+
 /* ***************************************
 	FORMS AND INPUT
 *************************************** */
 label {
 	font-weight: bold;
-	color:#333333;
+	color: #333333;
 	font-size: 110%;
 }
 fieldset > div {
@@ -421,7 +429,7 @@ input {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #ccc;
-	color:#666;
+	color: #666;
 	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
@@ -432,11 +440,14 @@ input {
 .elgg-input-tags,
 .elgg-input-url,
 .elgg-input-plaintext {
-	width:98%;
+	width: 98%;
 }
 textarea {
 	height: 100px;
 }
+.elgg-input-thin {
+	width: 400px;
+}
 input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	font-size: 14px;
 	font-weight: bold;
@@ -476,6 +487,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-button-action.elgg-state-disabled {
 	background-color: #aaa;
 }
+
 /* **************************************
      DATE PICKER
 *************************************** */
@@ -546,6 +558,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
     color: #333;
 	background: #ddd;
 }
+
 /* ***************************************
 	PAGINATION
 *************************************** */
@@ -571,7 +584,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	color: white;
 	text-decoration: none;
 }
-
 .elgg-pagination .elgg-state-disabled {
 	color: #CCC;
 	border-color: #CCC;
@@ -636,7 +648,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 }
-
 .elgg-admin-sidebar-menu a:hover {
 	text-decoration: none;
 	background: black;
@@ -646,12 +657,10 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-admin-sidebar-menu li.elgg-state-selected > a {
 	background-color: #BBB;
 }
-
 .elgg-admin-sidebar-menu .elgg-menu-closed:before {
 	content: "\25B8";
 	padding-right: 4px;
 }
-
 .elgg-admin-sidebar-menu .elgg-menu-opened:before {
 	content: "\25BE";
 	padding-right: 4px;
@@ -676,7 +685,6 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-title {
 	float: right;
 }
-
 .elgg-menu-title > li {
 	display: inline-block;
 	margin-left: 4px;
@@ -685,12 +693,13 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 /* ***************************************
 	FOOTER MENU
 *************************************** */
-.elgg-menu-footer {color:gray}
-
+.elgg-menu-footer {
+	color: gray;
+}
 .elgg-menu-footer li {
 	float: left;
 }
-.elgg-menu-footer li:after{
+.elgg-menu-footer li:after {
 	content: "\007C";
 	display: inline-block;
 	padding: 0 4px 0 4px;
@@ -750,8 +759,8 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-hz > li,
 .elgg-menu-hz > li:after,
 .elgg-menu-hz > li > a {
-	display:inline-block;
-	vertical-align:middle;
+	display: inline-block;
+	vertical-align: middle;
 }
 /* Allow inline image blocks in horizontal menus */
 .elgg-menu-hz .elgg-body:after {
@@ -766,6 +775,19 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-longtext {
 	float: right;
 }
+.elgg-menu-metadata {
+	list-style-type: none;
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+}
+.elgg-menu-metadata > li {
+	float: left;
+	margin-left: 15px;
+}
+.elgg-menu-metadata, .elgg-menu-metadata a {
+	color: #aaa;
+}
 
 /* ***************************************
 	WIDGETS
@@ -926,23 +948,8 @@ a.elgg-widget-collapsed:before {
 	width: 83.33%;
 }
 
-
-.elgg-subtext {
-	color: #666;
-	font-size: 85%;
-	line-height: 1.2em;
-	font-style: italic;
-	margin-bottom: 5px;
-}
-
-.elgg-longtext-control {
-	margin-left: 14px;
-	font-size: 80%;
-	cursor: pointer;
-}
-
 /* ***************************************
-	Spacing (from OOCSS)
+	SPACING (from OOCSS)
 *************************************** */
 .pan{padding:0}
 .pas{padding:5px}
@@ -1156,94 +1163,32 @@ a.elgg-widget-collapsed:before {
 	height: 200px;
 }
 
-
-.elgg-menu-metadata {
-	list-style-type: none;
-	float: right;
-	margin-left: 15px;
-	font-size: 90%;
-}
-.elgg-menu-metadata > li {
-	float: left;
-	margin-left: 15px;
-}
-
-.right {float:right}
-.elgg-toggle {cursor:pointer}
-
-<?php //@todo elgg-drag-handle instead? ?>
-.elgg-state-draggable .elgg-head {
-	cursor: move;
-}
-
 /* ***************************************
-	ADMIN MISC
-*************************************** */
-
-.elgg-instructs {
-	max-width: 600px;
-}
-
-.manifest_file {
-	background-color:#eee;
-
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	border-radius: 8px;
-
-	padding:5px 10px;
-	margin:4px 0;
-}
-
-
-.plugin_controls {
-	padding: 3px 3px 3px 0;
-	font-weight: bold;
-	float: left;
-	width: 150px;
-}
-form.admin_plugins_simpleview .elgg-button-submit {
-	margin-right:20px;
-}
-.plugin_info {
-	margin: 3px;
-	padding-left: 150px;
-	display: block;
-}
-.plugin_metadata {
-	display:block;
-	color:#999;
-}
-.plugin_name input[type="checkbox"] {
-	margin-right: 10px;
-}
-ul.admin_plugins {
-	margin-bottom: 0;
-	padding-left: 0;
-	list-style: none;
-}
+	PLUGINS
+**************************************** */
 .elgg-plugin {
-	border:1px solid #999;
-	margin:0 0 5px;
-	padding:0 7px 4px 10px;
+	border: 1px solid #999;
+	margin: 0 0 5px;
+	padding: 0 7px 4px 10px;
 
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 }
-
+.elgg-plugin.elgg-state-draggable > .elgg-image-block .elgg-head {
+	cursor: move;
+}
 .elgg-plugin p {
-	margin:0;
-	padding:0;
+	margin: 0;
 }
 .elgg-plugin h3 {
-	color:black;
+	color: black;
 	padding-bottom: 10px;
 }
-.plugin_settings {
+.elgg-plugin-settings {
 	font-weight: normal;
+	font-size: 0.9em;
 }
-
 .elgg-plugin-screenshot {
 	display: inline;
 }
@@ -1263,64 +1208,43 @@ ul.admin_plugins {
 	border-radius: 8px;
 }
 .elgg-plugin-screenshot-lightbox h2 {
-	color:black;
+	color: black;
 }
-
 .elgg-plugin.elgg-state-active {
 	background: white;
 }
 .elgg-plugin.elgg-state-inactive {
 	background: #dedede;
 }
-
-.elgg-state-error {
+.elgg-plugin .elgg-state-error {
 	background: #fbe3e4;
 	color: #8a1f11;
 	border-color: #fbc2c4;
 	font-weight: bold;
 }
-.elgg-state-warning {
+.elgg-plugin .elgg-state-warning {
 	background: #fbedb5;
 	color: #000000;
 	border-color: #fbe58b;
 	font-weight: bold;
 }
+.elgg-plugin-more {
+	background-color: #eee;
 
-.admin_notices {
-	padding-bottom: 15px;
-}
-.admin_notices p {
-	background-color:#BDE5F8;
-	color: black;
-	border: 1px solid blue;
-	font-weight: bold;
-	padding: 3px 0px 3px 10px;
-
-	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
-
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-}
-
-.admin_notices a {
-	float: right;
-}
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
 
-.add-user form {
-	width:300px;
+	padding: 5px 10px;
+	margin: 4px 0;
 }
 
 /****************************************
-	Markdown Text
+	MARKDOWN
 ****************************************/
-
 .elgg-markdown {
 	margin: 15px;
 }
-
 .elgg-markdown h1,
 .elgg-markdown h2,
 .elgg-markdown h3,
@@ -1330,17 +1254,46 @@ ul.admin_plugins {
 	margin: 1em 0 1em -15px;
 	color: #333;
 }
-
 .elgg-markdown ol {
 	list-style: decimal;
 	padding-left: 2em;
 }
-
 .elgg-markdown ul {
 	list-style: disc;
 	padding-left: 2em;
 }
-
 .elgg-markdown p {
 	margin: 15px 0;
-}
\ No newline at end of file
+}
+
+/* ***************************************
+	MISC
+*************************************** */
+.elgg-content-thin {
+	max-width: 600px;
+}
+
+.elgg-subtext {
+	color: #666;
+	font-size: 85%;
+	line-height: 1.2em;
+	font-style: italic;
+	margin-bottom: 5px;
+}
+
+.elgg-longtext-control {
+	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
+}
+
+table.mceLayout {
+	width:100% !important;
+}
+
+.elgg-output dt {
+	font-weight: bold;
+}
+.elgg-output dd {
+	margin: 0 0 1em 2em;
+}
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 08da89c01..5f54dd614 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -207,7 +207,7 @@ $settings_view_old = 'settings/' . $plugin->getID() . '/edit';
 $settings_view_new = 'plugins/' . $plugin->getID() . '/settings';
 if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)) {
 	$link = elgg_get_site_url() . "admin/plugin_settings/" . $plugin->getID();
-	$settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
+	$settings_link = "<a class='elgg-plugin-settings' href='$link'>[" . elgg_echo('settings') . "]</a>";
 }
 ?>
 			<div class="elgg-head">
@@ -233,8 +233,8 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 			}
 			?>
 	
-			<div class="plugin_description"><?php echo $description; ?></div>
-			<p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
+			<div><?php echo $description; ?></div>
+			<p><?php echo $author . ' - ' . $website; ?></p>
 			<?php echo $docs; ?>
 	
 			<div class="pts">
@@ -248,7 +248,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 			</div>
 		</div>
 	</div>
-	<div class="hidden manifest_file" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
+	<div class="elgg-plugin-more hidden" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
 
 		<?php
 		if ($screenshots_html) {
diff --git a/views/default/object/plugin/elements/dependencies.php b/views/default/object/plugin/elements/dependencies.php
index 5f4aa4392..8abd61692 100644
--- a/views/default/object/plugin/elements/dependencies.php
+++ b/views/default/object/plugin/elements/dependencies.php
@@ -13,7 +13,7 @@ $deps = $plugin->getPackage()->checkDependencies(true);
 
 $columns = array('type', 'name', 'expected_value', 'local_value', 'comment');
 
-echo '<table class="elgg-plugins-dependencies styled"><tr>';
+echo '<table class="elgg-plugin-dependencies styled"><tr>';
 
 foreach ($columns as $column) {
 	$column = elgg_echo("admin:plugins:dependencies:$column");
diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php
index f29ee8d12..bb518cd53 100644
--- a/views/default/object/plugin/invalid.php
+++ b/views/default/object/plugin/invalid.php
@@ -34,7 +34,7 @@ $error = $plugin->getError();
 			?>
 		</div>
 
-		<div class="hidden manifest_file" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
+		<div class="hidden elgg-plugin-more" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
 			<p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p>
 			<p><?php echo $error; ?></p>
 		</div>
diff --git a/views/default/object/plugin/simple.php b/views/default/object/plugin/simple.php
index 5f5b08f10..f4cc944f4 100644
--- a/views/default/object/plugin/simple.php
+++ b/views/default/object/plugin/simple.php
@@ -57,7 +57,7 @@ foreach ($files as $file => $path) {
 
 if (elgg_view_exists("settings/$plugin_id/edit")) {
 	$settings_href = elgg_get_site_url() . "admin/plugin_settings/$plugin_id";
-	$plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
+	$plugin_footer .= "<li><a class='elgg-plugin-settings' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
 }
 
 $plugin_footer .= "</ul>";
diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index 2b2ec9e4a..cd03541d5 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -22,7 +22,7 @@ if ($notices) {
 		$notices_html .= elgg_view_entity($notice);
 	}
 
-	$notices_html = "<div class=\"admin_notices\">$notices_html</div>";
+	$notices_html = "<div class=\"elgg-admin-notices\">$notices_html</div>";
 }
 
 ?>