diff --git a/admin/award_awards.php b/admin/award_awards.php index 2817fc4..441de99 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -577,7 +577,7 @@ $(document).ready(function() {
- +
@@ -606,27 +606,26 @@ $(document).ready(function() { } ?> - +
:
:
:

Options

- - - - - - - - - -
-
-
-
-
+ + + + + + + + + + + + +
@@ -637,7 +636,7 @@ $(document).ready(function() {
- +
: - +
@@ -708,12 +707,12 @@ $(document).ready(function() { - +
: ($):
:: - + @@ -741,7 +740,7 @@ $(document).ready(function() {

-
+
diff --git a/admin/award_upload.php b/admin/award_upload.php index 8942a17..4e65025 100644 --- a/admin/award_upload.php +++ b/admin/award_upload.php @@ -419,7 +419,7 @@ $(document).ready(function() {


-
:
+


-
+
-
+
$d) { @@ -101,7 +101,9 @@ function stats_save() ?>
+
+ - + diff --git a/fair_info.php b/fair_info.php index 0583bf9..3c14bf9 100644 --- a/fair_info.php +++ b/fair_info.php @@ -137,19 +137,19 @@ function fairinfo_save() echo "
\n"; echo "\n"; - echo "\n"; - echo '
'.i18n('Fair Type').':'; + echo "\n"; + echo '"; - echo ''; @@ -157,28 +157,28 @@ function fairinfo_save() /* All upstream stuff */ echo '
'; - echo "
'.i18n('Fair Type').':'; echo "
'.i18n('Fair Name').':'; + echo '
'.i18n('Fair Name').':'; echo ""; - echo '
'.i18n('Fair Abbreviation').':'; + echo '
'.i18n('Fair Abbreviation').':'; echo ""; - echo '
'.i18n('Fair Website').':'; + echo '
'.i18n('Fair Website').':'; if($f['website'] == '') $f['website'] = 'http://'; echo ""; echo '
\n"; - echo '
'.i18n('Upstream URL').':'; + echo "\n"; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; /* End upstream stuff */ diff --git a/judge_expertise.php b/judge_expertise.php index 2e228fd..987307b 100644 --- a/judge_expertise.php +++ b/judge_expertise.php @@ -120,10 +120,10 @@ echo "\n"; $q=mysql_query("SELECT * FROM projectcategories WHERE year='{$config['FAIRYEAR']}' ORDER BY mingrade"); echo "

".i18n("Age Category Preferences")."


"; - echo "
'.i18n('Upstream URL').':'; if($f['url'] == '') $f['url'] = 'http://'; echo ""; echo '
'; + echo '
'; echo i18n(($f['type'] == 'ysc') ? 'YSC Region ID' : 'Upstream Username'); echo ':'; echo ""; echo '
'; + echo '
'; echo i18n(($f['type'] == 'ysc') ? 'YSC Region Password' : 'Upstream Password'); echo ':'; echo ""; echo '
'.i18n('Enable stats upload').':'; + echo '
'.i18n('Enable stats upload').':'; yesno('enable_stats', $f['enable_stats']); echo '
'.i18n('Enable awards download').':'; + echo '
'.i18n('Enable awards download').':'; yesno('enable_awards', $f['enable_awards']); echo '
'.i18n('Enable winners upload').':'; + echo '
'.i18n('Enable winners upload').':'; yesno('enable_winners', $f['enable_winners']); echo '
"; + echo "
"; while($r=mysql_fetch_object($q)) { - echo ""; echo "
"; + echo "
"; echo i18n("%1 (Grades %2-%3)",array(i18n($r->category),$r->mingrade,$r->maxgrade)); echo ":"; diff --git a/judge_other.php b/judge_other.php index 8102bcb..e9ff491 100644 --- a/judge_other.php +++ b/judge_other.php @@ -100,9 +100,9 @@ if($_SESSION['embed'] != true) { - +
- +
:

- ( + ()
- +
diff --git a/sfiab.js b/sfiab.js index 373e5cd..cd9e3fc 100644 --- a/sfiab.js +++ b/sfiab.js @@ -65,9 +65,13 @@ function notice_(str) /* Stuff to do after the document loads */ $(document).ready(function() { - /* Do left/right on all tableedits */ - $(".tableedit tr td:even").addClass('left'); - $(".tableedit tr td:odd").addClass('right'); + /* Do label/input styles on all edit tables */ + $(".editor tr td:first-child").addClass('label'); + $(".editor tr td:nth-child(2)").addClass('input'); + + /* Stripe tableviews */ + $(".tableview tr:even").addClass('even'); + $(".tableview tr:odd").addClass('odd'); }); diff --git a/tableeditor.css b/tableeditor.css index 883924f..d1a93d2 100644 --- a/tableeditor.css +++ b/tableeditor.css @@ -78,23 +78,48 @@ input { vertical-align: middle; } +.tableedit th { + font-weight: bold; + text-align: left; + color: #FFFFFF; + background-color: #5C6F90; + padding: 1px; + vertical-align: top; +} + +/* Replacement for tableedit */ +.editor { + color: black; + margin-left: 20px; + margin-right: 20px; + font-size: 0.8em; + border: 0px; + border-collapse: collapse; +/* width: 100%;*/ +} + +.editor td { + padding: 2px; +} + /* vertical align top, then use top padding to bring it down * so that the text is in the middle of the first line compared * to an input box */ -.tableedit td.left { +.editor td.label { width: 25%; - vertical-align: top; text-align: right; - padding-right: 5px; - padding-top: 5px; -} -.tableedit td.right { - width: 75%; - vertical-align: middle; - text-align: left; +/* padding-right: 5px; + padding-top: 5px;*/ + vertical-align: top; } -.tableedit th { +.editor td.input { + width: 75%; + text-align: left; + vertical-align: middle; +} + +.editor th { font-weight: bold; text-align: left; color: #FFFFFF; @@ -106,3 +131,4 @@ input { +