Merge branch 'master' into school-server

components/ahttpd/styles/alterator.css.in

@@ -78,32 +78,7 @@ textarea, select, input.text {
     border: 1px solid #@DARK_COLOR_HEX@;;
 }
 
-.disabled {
-       color: #c3c7cb;
-       background-color: #@LIGHT_COLOR_HEX@;
-}
-
-.btn.disabled {
-	color: #@MIDDLE_LABELS_HEX@;
-	background-color: #@MIDDLE_COLOR_HEX@;
-}
-
-.btn.disabled:hover {
-	background-color: #@MIDDLE_COLOR_HEX@;
-}
 
-.alterator-progress {
-	border: 1px solid #@MIDDLE_LABELS_HEX@;
-	height: 20px;
-	width: 200px;
-	padding: 2px;
-	background-color: #@LIGHT_LABELS_HEX@;
-}
-
-.alterator-progress div {
-	background-color: #@MIDDLE_LABELS_HEX@;
-	height: 20px;
-}
 
 .next-page-button,.prev-page-button,.first-page-button,.last-page-button {
     width: 25px;
@@ -357,6 +332,33 @@ table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead
 	background-color: #@LIGHT_COLOR_HEX@;
 }
 
+/* states */
+
+.ui-state-disabled {
+	cursor: default !important;
+	color: #c3c7cb;
+	background-color: #@LIGHT_COLOR_HEX@;
+}
+
+.btn.ui-state-disabled {
+	color: #@MIDDLE_LABELS_HEX@;
+	background-color: #@MIDDLE_COLOR_HEX@;
+}
+
+.btn.ui-state-disabled:hover {
+	background-color: #@MIDDLE_COLOR_HEX@;
+}
+
+/* progressbar */
+
+.ui-progressbar {
+    height:20px;
+    text-align: left;
+}
+.ui-progressbar .ui-progressbar-value {
+    height:100%;
+}
+
 /* accordion */
 
 div.alterator-accordion h3 {