From 5f25dbe2aab8c57f820caaf48708bef1dd56f417 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 17 Aug 2010 19:32:18 +0000 Subject: [PATCH] CSS classes cleaned up, templates simplified: - Deprecated CSS classes for ext-register removed (already no longer used) - Duplicate border-style removed - HTML templates for ext-mailid simplified by removing an uneccessary table --- inc/language/de.php | 2 +- inc/libs/register_functions.php | 4 +- inc/template-functions.php | 2 +- .../de/html/guest/guest_receive_table.tpl | 4 +- .../de/html/guest/guest_register_refid.tpl | 2 +- .../de/html/mailid/mailid_confirm_buttom.tpl | 8 +- .../de/html/mailid/mailid_enter_code.tpl | 8 +- .../de/html/mailid/mailid_points_done.tpl | 10 +-- .../de/html/mailid/mailid_points_done2.tpl | 10 +-- templates/de/html/mailid/mailid_timer.tpl | 8 +- .../de/html/member/member_receive_table.tpl | 7 +- theme/business/css/general.css | 10 +-- theme/business/css/install.css | 5 +- theme/business/css/register.css | 75 ----------------- theme/business/css/uberwach.css | 4 +- theme/default/css/general.css | 17 ++-- theme/default/css/install.css | 5 +- theme/default/css/register.css | 70 ---------------- theme/desert/css/general.css | 7 +- theme/desert/css/install.css | 5 +- theme/desert/css/register.css | 75 ----------------- theme/org/css/general.css | 77 +++++++++--------- theme/org/css/install.css | 7 +- theme/org/css/register.css | 80 +------------------ 24 files changed, 89 insertions(+), 413 deletions(-) diff --git a/inc/language/de.php b/inc/language/de.php index 99d0cc0998..a110a51e26 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -207,7 +207,7 @@ addMessages(array( 'REFID_BY' => "Sie wurden geworben von", 'TERMS_OF_USAGE' => "AGBs zustimmen und absenden", 'YOU_FINALIZE' => "Sie haben es gleich geschafft.", - 'AGREE_TO_THIS' => "Stimmen Sie unseren [AGBs] zu?", + 'AGREE_TO_THIS' => "Stimmen Sie unseren [AGBs] zu?", 'SUBMIT_REGISTER' => "Anmeldedaten abschicken", 'HAVE_TO_AGREE' => "Sie müssen unseren AGBs zustimmen, damit Sie an diesem {?mt_word?} teilnehmen können.", 'ENTER_BOTH_PASSWORDS' => "Bitte geben Sie ein Passwort und das selbe Passwort noch einmal ein.", diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 34bec19b53..7e08dcbdf8 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -126,9 +126,9 @@ function registerGenerateCategoryTable ($mode, $return=false) { // Outputs a 'failed message' function registerOutputFailedMessage ($messageId, $extra='') { if (empty($messageId)) { - outputHtml('
' . $extra . '
'); + outputHtml('
' . $extra . '
'); } else { - outputHtml('
{--' . $messageId . '--}' . $extra . '
'); + outputHtml('
{--' . $messageId . '--}' . $extra . '
'); } } diff --git a/inc/template-functions.php b/inc/template-functions.php index 37b557fb74..b838f086a0 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -654,7 +654,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true } // -function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') { +function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'guest_select') { $OUT = ''; if ($type == 'yn') { diff --git a/templates/de/html/guest/guest_receive_table.tpl b/templates/de/html/guest/guest_receive_table.tpl index 08b162dce2..e161b57d4d 100644 --- a/templates/de/html/guest/guest_receive_table.tpl +++ b/templates/de/html/guest/guest_receive_table.tpl @@ -1,11 +1,11 @@
- +
diff --git a/templates/de/html/guest/guest_register_refid.tpl b/templates/de/html/guest/guest_register_refid.tpl index cd03109b74..da2bf81af8 100644 --- a/templates/de/html/guest/guest_register_refid.tpl +++ b/templates/de/html/guest/guest_register_refid.tpl @@ -3,6 +3,6 @@ {--REFID_BY--}: diff --git a/templates/de/html/mailid/mailid_confirm_buttom.tpl b/templates/de/html/mailid/mailid_confirm_buttom.tpl index 931d72d4d1..56da1d97bd 100644 --- a/templates/de/html/mailid/mailid_confirm_buttom.tpl +++ b/templates/de/html/mailid/mailid_confirm_buttom.tpl @@ -9,11 +9,9 @@
{--MAX_PER_DAY--}: - $content - +
- - - - -
$content[banner]
+
+ $content[banner] +
diff --git a/templates/de/html/mailid/mailid_enter_code.tpl b/templates/de/html/mailid/mailid_enter_code.tpl index 5c23ccbc8d..aa76a1a981 100644 --- a/templates/de/html/mailid/mailid_enter_code.tpl +++ b/templates/de/html/mailid/mailid_enter_code.tpl @@ -13,11 +13,9 @@ - - - - -
$content[banner]
+
+ $content[banner] +
diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl index b2e2d1be1d..b71349e52f 100644 --- a/templates/de/html/mailid/mailid_points_done.tpl +++ b/templates/de/html/mailid/mailid_points_done.tpl @@ -6,13 +6,9 @@ {%message,MEMBER_MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%} - - - - -
- $content[banner] -
+
+ $content[banner] +
diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl index adc734da7b..824e2b999c 100644 --- a/templates/de/html/mailid/mailid_points_done2.tpl +++ b/templates/de/html/mailid/mailid_points_done2.tpl @@ -10,13 +10,9 @@
- - - - -
- $content[banner] -
+
+ $content[banner] +
diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl index 99f06f341e..4fad723ad9 100644 --- a/templates/de/html/mailid/mailid_timer.tpl +++ b/templates/de/html/mailid/mailid_timer.tpl @@ -34,11 +34,9 @@ function startCounter() { - - - - -
$content[banner]
+
+ $content[banner] +
diff --git a/templates/de/html/member/member_receive_table.tpl b/templates/de/html/member/member_receive_table.tpl index 95568a116e..82016fec90 100644 --- a/templates/de/html/member/member_receive_table.tpl +++ b/templates/de/html/member/member_receive_table.tpl @@ -1,13 +1,14 @@ - +
+
{--MAX_PER_DAY--}:   - $content
+ diff --git a/theme/business/css/general.css b/theme/business/css/general.css index fd405cb6c3..89d502112c 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -52,8 +52,7 @@ ul,ol { } .admin_reset, .guest_reset, .member_reset { - border-style: groove; - border: solid 1px #000000; + border: groove 1px #000000; color: #000000; cursor: pointer; } @@ -65,9 +64,8 @@ ul,ol { } .admin_submit_reject { - border-style: groove; + border: 1px groove #000000; color: #000000; - border-color: #000000; cursor: pointer; } @@ -225,7 +223,6 @@ a.admin_logout { } .admin_normal, .guest_normal, .member_normal { - border-style: solid; border: solid 1px #000000; background-color: #eeeeff; } @@ -448,8 +445,7 @@ ul.copyright_box { } .admin_delete, .admin_yes { - border-style: groove; - border: solid 1px #000000; + border: groove 1px #000000; background-color: #000000; color: #ffffff; cursor: pointer; diff --git a/theme/business/css/install.css b/theme/business/css/install.css index f3c23b087e..0381cb9406 100644 --- a/theme/business/css/install.css +++ b/theme/business/css/install.css @@ -4,13 +4,12 @@ } .install_select { - border: dashed 1px #000000; + border: groove 1px #000000; background-color: #EEEEFF; } .install_normal { - border-style: solid; - border: dashed 1px #000000; + border: groove 1px #000000; } .install_submit { diff --git a/theme/business/css/register.css b/theme/business/css/register.css index aedcbfa9a1..61ad421910 100644 --- a/theme/business/css/register.css +++ b/theme/business/css/register.css @@ -1,62 +1,3 @@ -.register_submit { - border-style: outset; -} - -.register_reset { - border-style: groove; - border: solid 1px #000000; - color: #000000; -} - -.register_submit { - color: #000000; - border-color: #000000; -} - -.register_select { - border: solid 1px #000000; - background-color: #EEEEFF; -} - -.register_failed { - color: #000000; -} - -.register_snote { - font-size: 12px; -} - -.register_normal { - border-style: solid; - border: solid 1px #000000; - padding-right: 5px; -} - -.register_main { - background-color: #FFFFFF; - width: 540px; -} - -.register_done2 { - height: 40px; - color: #000000; - background-color: #FFFFFF; - width: 500px; -} - -.register_title { - background-color: #EEEEFF; - text-align: center; - font-size: 18px; - padding-left: 5px; - padding-right: 5px; -} - -.register_seperator { - height: 7px; - font-size: 1px; -} - .register_left { text-align: right; margin-right: 2px; @@ -69,19 +10,3 @@ .register_right { padding-right: 5px; } - -.register_header { - text-align: center; - background-color: #EEEEFF; - color: #000000; - font-weight: bold; - border-top: 1px solid #000000; - border-bottom: 1px solid #000000; - height: 25px; -} - -A:hover .register_term { - background-color: #EEEEFF; - border-top: 1px solid #000000; - border-bottom: 1px solid #000000; -} diff --git a/theme/business/css/uberwach.css b/theme/business/css/uberwach.css index 35b79f2c93..d50e5719e1 100644 --- a/theme/business/css/uberwach.css +++ b/theme/business/css/uberwach.css @@ -8,8 +8,8 @@ margin:0; border-left:none; border-right:none; - border-top:1px solid #FFFFFF; - border-bottom:1px solid #ACA899; + border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #ACA899; height:27px; display:block; width:100%; diff --git a/theme/default/css/general.css b/theme/default/css/general.css index ec294ad598..4fe26ebf77 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -50,17 +50,15 @@ A:hover { input, textarea { color: #009900; background-color: #eeffee; - border: 1px solid #00aa44; + border: 1px groove #00aa44; text-decoration: none; - border-style: groove; } select, option { background-color: #eeffee; - border: solid 1px #009900; + border: groove 1px #009900; color: #00aa44; text-decoration: none; - border-style: groove; } input:hover, textarea:hover { @@ -84,8 +82,7 @@ ul,ol { } .admin_reset, .guest_reset, .member_reset { - border-style: groove; - border: solid 1px #009900; + border: groove 1px #009900; color: #00aa44; cursor: pointer; } @@ -155,7 +152,7 @@ DIV.admin_note { } .admin_select, .guest_select, .member_select { - border: solid 1px #009900; + border: groove 1px #009900; background-color: #eeffee; } @@ -270,8 +267,7 @@ a.admin_logout { } .admin_normal, .guest_normal, .member_normal { - border-style: solid; - border: solid 1px #009900; + border: groove 1px #009900; } .member_stats { @@ -485,8 +481,7 @@ ul.copyright_box { } .admin_delete, .admin_yes { - border-style: groove; - border: solid 1px #00aa00; + border: groove 1px #00aa00; background-color: #aa0044; color: #ddeedd; cursor: pointer; diff --git a/theme/default/css/install.css b/theme/default/css/install.css index efe55dee63..5a5230e6b5 100644 --- a/theme/default/css/install.css +++ b/theme/default/css/install.css @@ -4,13 +4,12 @@ } .install_select { - border: dashed 1px #00AA00; + border: groove 1px #00AA00; background-color: #F0F0F5; } .install_normal { - border-style: solid; - border: dashed 1px #00AA00; + border: groove 1px #00AA00; } .install_submit { diff --git a/theme/default/css/register.css b/theme/default/css/register.css index 3a6ea6d0dc..3c00bf89ba 100644 --- a/theme/default/css/register.css +++ b/theme/default/css/register.css @@ -1,58 +1,3 @@ -.register_submit { - border-style: outset; -} - -.register_reset { - border-style: groove; - border: solid 1px #009900; - color: #00aa44; -} - -.register_submit { - color: #00aa44; - border-color: #009900; -} - -.register_select { - border: solid 1px #009900; - background-color: #EEFFEE; -} - -.register_failed { - color: #00AA00; -} - -.register_snote { - font-size: 12px; -} - -.register_normal { - border-style: solid; - border: solid 1px #009900; -} - -.register_main { - background-color: #DDEEDD; - width: 540px; -} - -.register_done2 { - height: 40px; - color: #009900; - background-color: #eeffbc; - width: 500px; -} - -.register_title { - text-align: center; - font-size: 18px; -} - -.register_seperator { - height: 7px; - font-size: 1px; -} - .register_left { text-align: right; margin-right: 2px; @@ -62,19 +7,4 @@ } .register_right { - -} - -.register_header { - text-align: center; - background-color: #eeffbc; - color: #0000AA; - font-weight: bold; - border-top: 1px solid #00aa44; - border-bottom: 1px solid #00aa44; - height: 25px; -} - -.register_term { - background-color: #00aa44; } diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index 4811a58fc4..9cbafe382d 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -52,8 +52,7 @@ ul,ol { } .admin_reset, .guest_reset, .member_reset { - border-style: groove; - border: solid 1px #880000; + border: groove 1px #880000; color: #880000; cursor: pointer; } @@ -225,7 +224,6 @@ a.admin_logout { } .admin_normal, .guest_normal, .member_normal { - border-style: solid; border: solid 1px #880000; background-color: #ddddaa; } @@ -423,8 +421,7 @@ ul.copyright_box { } .admin_delete, .admin_yes { - border-style: groove; - border: solid 1px #880000; + border: groove 1px #880000; background-color: #880000; color: #ffffcc; cursor: pointer; diff --git a/theme/desert/css/install.css b/theme/desert/css/install.css index 9b0a3b8c78..c9fea853cf 100644 --- a/theme/desert/css/install.css +++ b/theme/desert/css/install.css @@ -12,13 +12,12 @@ } .install_select { - border: dashed 1px #880000; + border: groove 1px #880000; background-color: #DDDDAA; } .install_normal { - border-style: solid; - border: dashed 1px #880000; + border: groove 1px #880000; } .install_submit { diff --git a/theme/desert/css/register.css b/theme/desert/css/register.css index 260b9d4da0..c6498bb8a0 100644 --- a/theme/desert/css/register.css +++ b/theme/desert/css/register.css @@ -1,62 +1,3 @@ -.register_submit { - border-style: outset; -} - -.register_reset { - border-style: groove; - border: solid 1px #880000; - color: #880000; -} - -.register_submit { - color: #880000; - border-color: #880000; -} - -.register_select { - border: solid 1px #880000; - background-color: #DDDDAA; -} - -.register_failed { - color: #880000; -} - -.register_snote { - font-size: 12px; -} - -.register_normal { - border-style: solid; - border: solid 1px #880000; - padding-right: 5px; -} - -.register_main { - background-color: #FFFFCC; - width: 540px; -} - -.register_done2 { - height: 40px; - color: #880000; - background-color: #FFFFCC; - width: 500px; -} - -.register_title { - background-color: #DDDDAA; - text-align: center; - font-size: 18px; - padding-left: 5px; - padding-right: 5px; -} - -.register_seperator { - height: 7px; - font-size: 1px; -} - .register_left { text-align: right; margin-right: 2px; @@ -69,19 +10,3 @@ .register_right { padding-right: 5px; } - -.register_header { - text-align: center; - background-color: #DDDDAA; - color: #880000; - font-weight: bold; - border-top: 1px solid #880000; - border-bottom: 1px solid #880000; - height: 25px; -} - -A:hover .register_term { - background-color: #DDDDAA; - border-top: 1px solid #880000; - border-bottom: 1px solid #880000; -} \ No newline at end of file diff --git a/theme/org/css/general.css b/theme/org/css/general.css index 94066ae82e..85e8dafbba 100644 --- a/theme/org/css/general.css +++ b/theme/org/css/general.css @@ -77,36 +77,35 @@ ul, ol { } .admin { - color : #118811; + color : #118811; background-color : #DDEEDD; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; + font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .admin_note { - color : #FF0000; + color : #FF0000; font-size : 11px; } .admin_reset, .guest_reset, .member_reset { - border-style : groove; - border : solid 1px #000000; - color : #0000AA; + border : groove 1px #000000; + color : #0000AA; } .admin_submit, .guest_submit, .member_submit { - color : #0000AA; + color : #0000AA; border-color : #000000; } .admin_submit_reject { border-style : groove; - color : #881111; + color : #881111; border-color : #000000; } .admin_fatal { font-size : 18px; - color : #ddeedd; + color : #ddeedd; } .admin_edit, .member_confirm { @@ -115,17 +114,17 @@ ul, ol { .member_banner { background-color : #ddeedd; - width : 488px; + width : 488px; } .admin_error { background-color : #ddeedd; - color : #ddeedd; + color : #ddeedd; font-size : 11px; } .admin_select, .guest_select, .member_select { - border : solid 1px; + border : solid 1px; border-color : #000000; background-color : #EEFFEE; } @@ -229,8 +228,7 @@ ul, ol { } .admin_normal, .guest_normal, .member_normal { - border-style : solid; - border : solid 1px; + border : solid 1px; border-color : #000000; } @@ -428,10 +426,10 @@ ul, ol { .admin_task_header { background-color : #DDEEDD; - color : #000000; + color : #000000; vertical-align : middle; font-size : 18px; - height : 35px; + height : 35px; } .seperator { @@ -439,61 +437,60 @@ ul, ol { } .tab1 { - text-align : center + text-align : center } .admin_delete, .admin_yes { - border-style : groove; - border : solid 1px #ddeedd; + border : groove 1px #ddeedd; background-color : #0000AA; - color : #DDEEDD; + color : #DDEEDD; } .guest_stats { background-color : #ddeedd; - width : 460px; + width : 460px; } .guest_stats_title { - color : #000000; + color : #000000; vertical-align : middle; background-color : #DDEEDD; - height : 30px; + height : 30px; } .guest_stats_l { - width : 344px; - text-align : right; + width : 344px; + text-align : right; } .guest_stats_m { - width : 2px; + width : 2px; } .guest_stats_r, .guest_stats_lr, .guest_stats_rr { - color : #000000; - width : 28px; - font-weight : bold; - text-align : center; + color : #000000; + width : 28px; + font-weight : bold; + text-align : center; } .guest_stats_ll, .guest_stats_rl { - width : 192px; - text-align : right; + width : 192px; + text-align : right; } .guest_stats_footer { - color : #000000; + color : #000000; vertical-align : middle; background-color : #DDEEDD; - height : 20px; + height : 20px; } .task_pre { - font-weight : bold; - margin-left : 0px; + font-weight : bold; + margin-left : 0px; margin-right : 0px; - margin-top : 11px; + margin-top : 11px; margin-bottom : 11px; } @@ -502,14 +499,14 @@ ul, ol { } .guest_content_align, .member_content_align, .admin_content_align { - text-align : center; + text-align : center; vertical-align : top; } .member_mailidtop { background-color : #DDEEDD; - width : 100%; - height : 100%; + width : 100%; + height : 100%; } .list_categories, .admin_action_header, .admin_main, .admin_menu_main, .admin_menu_sub { diff --git a/theme/org/css/install.css b/theme/org/css/install.css index a85ef52847..d59ec21b5f 100644 --- a/theme/org/css/install.css +++ b/theme/org/css/install.css @@ -4,13 +4,12 @@ } .install_select { - border: dashed 1px #000000; + border: groove 1px #000000; background-color: #EEEEFF; } .install_normal { - border-style: solid; - border: dashed 1px #000000; + border: groove 1px #000000; } .install_submit { @@ -73,4 +72,4 @@ .install_welcome { padding-top: 5px; padding-bottom: 10px; -} \ No newline at end of file +} diff --git a/theme/org/css/register.css b/theme/org/css/register.css index e1714f771a..c600f81e1f 100644 --- a/theme/org/css/register.css +++ b/theme/org/css/register.css @@ -1,82 +1,10 @@ -.register_submit { - border-style : outset; -} - -.register_reset { - border-style : groove; - border : solid 1px #009900; - color : #0000AA; -} -.register_submit { - color : #0000AA; - border-color : #009900; -} - -.register_select { - border : solid 1px; - border-color : #009900; - background-color : #EEFFEE; -} - -.register_failed { - color : #0000AA; -} - -.register_snote { - font-size : 12px; -} - -.register_normal { - border-style : solid; - border : solid 1px; - border-color : #009900; -} - -.register_main { - background-color : #DDEEDD; - width : 540px; -} - -.register_done2 { - height : 40px; - color : #009900; - background-color : #eeffbc; - width : 500px; -} - -.register_title { - text-align : center; - align : center; - font-size : 18px; -} - -.register_seperator { - height : 7px; - font-size : 1px; -} - .register_left { - text-align : right; - align : right; + text-align : right; + align : right; margin-right : 2px; - color : #0000AA; - font-weight : bold; + color : #0000AA; + font-weight : bold; } .register_right { } - -.register_header { - text-align : center; - align : center; - background-color : #eeffbc; - color : #0000AA; - font-weight : bold; - border-top : 1px solid #0000AA; - border-bottom : 1px solid #0000AA; - height : 25px; -} - -.register_term { - background-color : #0000AA; -} -- 2.39.2