Merge branch 'master' into school-server

components/ahttpd/styles/alterator.css.in

@@ -47,7 +47,7 @@ textarea, select, input.text {
 	padding: 1px 3px;
 }
 
-.btn {
+.btn, button {
 	background-color: #@DARK_COLOR_HEX@;
 	color: #@LIGHT_LABELS_HEX@;
 	border: 1px solid #@LIGHT_COLOR_HEX@;
@@ -62,7 +62,7 @@ textarea, select, input.text {
 	padding: 2px 6px;
 }
 
-.btn:hover {
+.btn:hover, button:hover {
 	background-color: #@MIDDLE_LABELS_HEX@;
 }
 
@@ -76,11 +76,6 @@ textarea, select, input.text {
 
     background-color: #@LIGHT_COLOR_HEX@;
     border: 1px solid #@DARK_COLOR_HEX@;;
-
-    -moz-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -khtml-border-radius: 0.5em;
-    border-radius: 0.5em;
 }
 
 .disabled {
@@ -241,11 +236,6 @@ canvas.alterator-clock {
 
 	background-color: #@LIGHT_COLOR_HEX@;
 	border: 1px solid #@DARK_COLOR_HEX@;;
-
-	-moz-border-radius: 0.5em;
-	-webkit-border-radius: 0.5em;
-	-khtml-border-radius: 0.5em;
-	border-radius: 0.5em;
 }
 
 #main-td {
@@ -291,11 +281,6 @@ canvas.alterator-clock {
 	padding-left: 13px;
 	margin-top: 10px;
 	margin-bottom: 10px;
-
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	-khtml-border-radius: 4px;
-	border-radius: 4px;
 }
 
 /* tables */
@@ -388,11 +373,6 @@ div.alterator-accordion h3 {
 	background-repeat: no-repeat;
 	background-position: center left;
 	cursor: pointer;
-
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	-khtml-border-radius: 4px;
-	border-radius: 4px;
 }
 
 div.alterator-accordion h3.ui-state-active {
@@ -414,6 +394,147 @@ div.alterator-accordion h3.ui-state-active {
 	background-color: #@DARK_COLOR_HEX@;
 }
 
+
+/* corner radius */
+
+.ui-corner-tl {
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-top-left-radius: 4px;
+}
+
+.ui-corner-tr {
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-right-radius: 4px;
+}
+
+.ui-corner-bl {
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+}
+
+.ui-corner-br {
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+.ui-corner-top {
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-right-radius: 4px;
+}
+
+.ui-corner-bottom {
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+.ui-corner-right {
+	-moz-border-radius-topright: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+.ui-corner-left {
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+}
+
+.ui-corner-all {
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+}
+
+/* overlays */
+
+.ui-widget-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: #aaaaaa;
+	opacity: .3;
+	filter:Alpha(Opacity=30);
+}
+
+/* dialog */
+
+.ui-widget-content {
+	background-color: #@LIGHT_COLOR_HEX@;
+	border: 1px solid #@DARK_COLOR_HEX@;;
+}
+
+.ui-widget-header {
+	color: #@LIGHT_LABELS_HEX@;
+	background-color: #@DARK_COLOR_HEX@;
+	font-weight: bold;
+}
+
+.ui-dialog .ui-dialog-title {
+    float: left;
+    margin: .1em 0 .2em;
+}
+
+.ui-dialog .ui-dialog-titlebar {
+    padding: .5em .3em .3em 1em;
+}
+
+
+.ui-dialog .ui-dialog-titlebar-close {
+    float:right;
+}
+
+.ui-dialog .ui-dialog-titlebar-close span {
+    display: block;
+    margin: 1px;
+}
+
+.ui-dialog .ui-dialog-content {
+    border: 0;
+    padding: .5em 1em;
+    background: none;
+    overflow: auto;
+}
+
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin: .5em 0 0 0;
+	padding: .3em 1em .5em .4em;
+}
+
+.ui-dialog .ui-dialog-buttonpane button {
+	float: right;
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+	width:auto;
+	overflow:visible;
+}
+
+.ui-icon-closethick {
+    width: 22px;
+    height: 22px;
+    text-indent: -99999px;
+    overflow: hidden;
+    background: url(/design/images/close-dialog-button.png) no-repeat;
+}
+
+/* layout helpers */
+
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+
 /* help button */
 
 .ui-help-button {
@@ -441,10 +562,6 @@ div.alterator-accordion h3.ui-state-active {
 
 	padding: 0.25em;
 	margin-bottom: 10px;
-	-moz-border-radius: 0.5em;
-	-webkit-border-radius: 0.5em;
-	-khtml-border-radius: 0.5em;
-	border-radius: 0.5em;
 }
 
 #product-logo {