adding elgg-state-* css elements

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

6 files changed, 25 insertions, 34 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 9db1aa9b6..0b0fae692 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -268,7 +268,7 @@ table.mceLayout {
 	color: black;
 	text-decoration: none;
 }
-.elgg-page-menu li.selected > ul {
+.elgg-page-menu li.elgg-state-selected > ul {
 	display: block;
 }
 .elgg-page-menu .elgg-child-menu {
@@ -433,15 +433,11 @@ input[type="submit"]:hover, .elgg-submit-button:hover, .elgg-action-button:hover
 	color: white;
 	text-decoration: none;
 }
-
-<?php //@todo use "disabled" on the li ?>
-.elgg-pagination .inactive {
+.elgg-pagination .elgg-state-disabled {
 	color: #CCCCCC;
 	border-color: #CCCCCC;
 }
-
-<?php //@todo Choose b/w elgg-state-active or elgg-state-selected ?>
-.elgg-pagination .active {
+.elgg-pagination .elgg-state-selected {
 	color: #555555;
 	border-color: #555555;
 }
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index dae6b58be..d5a8208b0 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -33,15 +33,11 @@
 	color: white;
 	text-decoration: none;
 }
-
-<?php //@todo use "disabled" on the li ?>
-.elgg-pagination .inactive {
+.elgg-pagination .elgg-state-disabled {
 	color: #CCCCCC;
 	border-color: #CCCCCC;
 }
-
-<?php //@todo Choose b/w elgg-state-active or elgg-state-selected ?>
-.elgg-pagination .active {
+.elgg-pagination .elgg-state-selected {
 	color: #555555;
 	border-color: #555555;
 }
@@ -49,10 +45,10 @@
 	TABS
 *************************************** */
 .elgg-tabs {
-	margin-bottom:5px;
+	margin-bottom: 5px;
 	border-bottom: 2px solid #cccccc;
-	display:table;
-	width:100%;
+	display: table;
+	width: 100%;
 }
 .elgg-tabs li {
 	float: left;
@@ -60,28 +56,28 @@
 	border-bottom-width: 0;
 	background: #eeeeee;
 	margin: 0 0 0 10px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	-webkit-border-top-left-radius:5px;
-	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+	-webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
 }
 .elgg-tabs a {
 	text-decoration: none;
 	display: block;
-	padding:3px 10px 0 10px;
+	padding: 3px 10px 0 10px;
 	text-align: center;
-	height:21px;
-	color:#999999;
+	height: 21px;
+	color: #999999;
 }
 .elgg-tabs a:hover {
 	background: #dedede;
 	color:#4690D6;
 }
-.elgg-tabs .selected {
+.elgg-tabs .elgg-state-selected {
 	border-color: #cccccc;
 	background: white;
 }
-.elgg-tabs .selected a {
+.elgg-tabs .elgg-state-selected a {
 	position: relative;
 	top: 2px;
 	background: white;
@@ -148,7 +144,7 @@
 .elgg-site-menu a:hover {
 	text-decoration: none;
 }
-.elgg-site-menu li.selected a,
+.elgg-site-menu li.elgg-state-selected a,
 .elgg-site-menu li a:hover,
 .elgg-site-menu .elgg-more:hover a {
 	background: white;
@@ -221,7 +217,7 @@
 	color: white;
 	text-decoration: none;
 }
-.elgg-page-menu li.selected > a {
+.elgg-page-menu li.elgg-state-selected > a {
 	background-color: #4690D6;
 	color: white;
 }
diff --git a/views/default/css/elements/reset.php b/views/default/css/elements/reset.php
index 05682dac1..b5f77675e 100644
--- a/views/default/css/elements/reset.php
+++ b/views/default/css/elements/reset.php
@@ -7,7 +7,6 @@
  */
 ?>
 
-<?php //@todo * { ... }? ?>
 /* ***************************************
 	RESET CSS
 *************************************** */
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php
index 7c88c344c..5a9a8743d 100644
--- a/views/default/navigation/menu/elements/item.php
+++ b/views/default/navigation/menu/elements/item.php
@@ -5,7 +5,7 @@ $item = $vars['item'];
 $class = '';
 $link_class = 'elgg-menu-closed';
 if ($item->getSelected()) {
-	$class = 'class="selected"';
+	$class = 'class="elgg-state-selected"';
 	$link_class = 'elgg-menu-opened';
 }
 
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index b8c576d43..153395c4d 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -94,12 +94,12 @@ if ($pages->prev['href']) {
 	$link = elgg_view('output/url', $pages->prev);
 	echo "<li>$link</li>";
 } else {
-	echo "<li><span class=\"inactive\">{$pages->prev['text']}</span></li>";
+	echo "<li><span class=\"elgg-state-disabled\">{$pages->prev['text']}</span></li>";
 }
 
 foreach ($pages->items as $page) {
 	if ($page == $current_page) {
-		echo "<li><span class=\"active\">$page</span></li>";
+		echo "<li><span class=\"elgg-state-selected\">$page</span></li>";
 	} else {
 		$page_offset = (($page - 1) * $limit);
 		$url = elgg_http_add_url_query_elements($base_url, array($offset_key => $page_offset));
@@ -111,7 +111,7 @@ if ($pages->next['href']) {
 	$link = elgg_view('output/url', $pages->next);
 	echo "<li>$link</li>";
 } else {
-	echo "<li><span class=\"inactive\">{$pages->next['text']}</span></li>";
+	echo "<li><span class=\"elgg-state-disabled\">{$pages->next['text']}</span></li>";
 }
 
 echo '</ul>';
diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php
index 21fae8202..4e9d1ee17 100644
--- a/views/default/navigation/tabs.php
+++ b/views/default/navigation/tabs.php
@@ -2,7 +2,7 @@
 /**
  * Tab navigation
  *
- * @uses string $vars['type'] horizontal || vertical - Defaults to horizontal (vertical TBI)
+ * @uses string $vars['type'] horizontal || vertical - Defaults to horizontal
  * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array(
  * 	'title' => string, // Title of link
  * 	'url' => string, // URL for the link
@@ -31,7 +31,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) {
 		
 		$selected = elgg_get_array_value('selected', $info, FALSE);
 		if ($selected) {
-			$class .= ' selected';
+			$class .= ' elgg-state-selected';
 		}
 
 		$class_str = ($class) ? "class=\"$class\"" : '';