From eeee0af1c4bb14b8438e2bfcb62dc14eb8f8fa5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 17 Mar 2009 02:47:14 +0000 Subject: [PATCH] Installation page=welcome rewritten to use div --- DOCS/en/SECURITY.txt | 4 +- inc/functions.php | 8 +-- inc/install-inc.php | 4 +- inc/language/install_de.php | 2 - inc/modules/admin/what-theme_import.php | 2 +- inc/stylesheet.php | 14 ++-- templates/de/html/copyright.tpl | 25 +++---- templates/de/html/copyright_backlink.tpl | 29 ++++---- .../de/html/install/install_fatal_errors.tpl | 10 +-- templates/de/html/install/install_footer.tpl | 3 - templates/de/html/install/install_header.tpl | 16 ++--- templates/de/html/install/install_page1.tpl | 4 +- templates/de/html/install/install_page2.tpl | 2 +- templates/de/html/install/install_page3.tpl | 2 +- templates/de/html/install/install_welcome.tpl | 62 ++++++++-------- theme/business/css/general.css | 54 +++++++------- theme/business/css/install.css | 51 +++++++------ theme/business/css/register.css | 6 +- theme/default/css/general.css | 48 ++++++------- theme/default/css/install.css | 61 ++++++++-------- theme/default/css/register.css | 42 ++++++----- theme/desert/css/general.css | 71 +++++++++---------- theme/desert/css/install.css | 53 +++++++------- theme/desert/css/register.css | 36 +++++----- 24 files changed, 294 insertions(+), 315 deletions(-) diff --git a/DOCS/en/SECURITY.txt b/DOCS/en/SECURITY.txt index 3bee3cc7e2..0c5d27118c 100644 --- a/DOCS/en/SECURITY.txt +++ b/DOCS/en/SECURITY.txt @@ -135,8 +135,8 @@ XSS-Attacken vereiteln soll (und bis jetzt auch gut getan hat). Was weniger mit der direkten Sicherheit des Scriptes zu tun hat, sondern eher Ihren Mailtausch von Betruegern schuetzen soll, ist die Moeglichkeit, eine zeitgesteuerte URL-Sperre einzurichten. Die selbe URL kann somit fuer eine -einstellbare Zeit nicht mehr beworben werden. Wir empfehlen hier dabei -mindestens 1 Tag, wenn nicht sogar eher 2 Tage. +einstellbare Zeit nicht mehr beworben werden. Das Entwickler-Team empfiehlt +hier dabei mindestens 1 Tag, wenn nicht sogar eher 2 Tage. Leider ist diese Sperre mit dynamischen URLs leicht umrundbar. Es haelt jedoch die Anfaenger fern. diff --git a/inc/functions.php b/inc/functions.php index 12d38f394d..8c8d7e15bd 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -2370,14 +2370,14 @@ function GET_CURR_THEME() { // Fix it to default $ret = "default"; } // END - if - } elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET(('theme'))) || (REQUEST_ISSET_POST(('theme'))))) { + } elseif ((!isInstalled()) && ((isInstalling()) || ($GLOBALS['output_mode'] == true)) && ((REQUEST_ISSET_GET('theme')) || (REQUEST_ISSET_POST('theme')))) { // Prepare FQFN for checking - $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET(('theme'))); + $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), REQUEST_GET('theme')); // Installation mode active - if ((REQUEST_ISSET_GET(('theme'))) && (FILE_READABLE($theme))) { + if ((REQUEST_ISSET_GET('theme')) && (FILE_READABLE($theme))) { // Set cookie from URL data - set_session('mxchange_theme', REQUEST_GET(('theme'))); + set_session('mxchange_theme', REQUEST_GET('theme')); } elseif (FILE_READABLE(sprintf("%stheme/%s/theme.php", constant('PATH'), SQL_ESCAPE(REQUEST_POST('theme'))))) { // Set cookie from posted data set_session('mxchange_theme', SQL_ESCAPE(REQUEST_POST('theme'))); diff --git a/inc/install-inc.php b/inc/install-inc.php index 9b3814ae09..6994276a42 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -182,7 +182,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) define('__SMTP_USER' , REQUEST_POST('smtp_user')); define('__SMTP_PASS' , REQUEST_POST('smtp_pass1')); OUTPUT_HTML("
- +
- diff --git a/inc/language/install_de.php b/inc/language/install_de.php index d89c2e8327..c3b6b5057b 100644 --- a/inc/language/install_de.php +++ b/inc/language/install_de.php @@ -47,8 +47,6 @@ define('INSTALLATION_OF_MXCHANGE', "Installation von MXChange-{!MT_WORD!}-Script define('INSTALL_MISSING_DUMPS', "Die SQL-Dumps wurden nicht gefunden! Diese sollten auch mit hochgeladen werden und lesbar sein (CHMOD 644)."); define('INSTALL_ENABLE_BACKLINK', "Backlink (=Rückverlinkung zu mxchange.org setzen?) rel="external" ist gesetzt. Bitte nicht den Backlink einbauen, und nofollow verwenden! Das schadet allen."); define('WRONG_PAGE', "Sie oder dieses Script haben eine falsche Seite ausgewählt!"); -define('WELCOME_TEXT', "Willkommen zum Installationsscript von MXChange-{!MT_WORD!}, dem kostenlosen {!MT_WORD!} Powered by MXChange-Community!"); -define('INTRO_TEXT', "Dieses Script wird den {!MT_WORD!} für Sie soweit installieren, die Datenbank einrichten und vorkonfigurieren.
Sie werden während der Installation Schritt-Für-Schritt durch die Installation gebracht! Bitte halten Sie die MySQL-Daten von Ihrem Hoster bereit!
Nach erfolgreicher Installation sollten Sie als nächstes das erste Administrator-Login einrichten. Anschliessend können Sie sich einloggen und weitere Einstellungen verfeinern.
Wir empfehlen dann alle Installationsdateien von Ihrem Server zu löschen."); define('NEXT_PAGE', "Weiter zur nächsten Seite..."); define('HEADER_TEXT_PAGE1', "Server-Pfad, Basis-URL und Webseitentitel"); define('HEADER_TEXT_PAGE2', "MySQL-Daten: Hostname, Login und Passwort"); diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index 0817993d28..b3a1c95e2d 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -52,7 +52,7 @@ ADD_DESCR('admin', __FILE__); $GLOBALS['theme_mode'] = 'test'; // Import selected theme if not present -if (REQUEST_ISSET_POST(('theme'))) { +if (REQUEST_ISSET_POST('theme')) { // Check if theme is there if (!THEME_CHECK_EXIST(REQUEST_POST('theme'))) { // Import theme diff --git a/inc/stylesheet.php b/inc/stylesheet.php index 42d018ed4b..d08d66b07b 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -68,7 +68,7 @@ if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) { if ((FILE_READABLE($FQFN)) && (filesize($FQFN) > 0)) { switch (getConfig('css_php')) { case 'DIRECT': - OUTPUT_HTML(""); + OUTPUT_HTML(''); break; case 'FILE': @@ -79,15 +79,15 @@ if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) { } // END - foreach } else { // Now we load all CSS files from css.php! - OUTPUT_HTML(""); + OUTPUT_HTML('" />'); } // diff --git a/templates/de/html/copyright.tpl b/templates/de/html/copyright.tpl index 4ebd42f278..d1a91d7c0f 100644 --- a/templates/de/html/copyright.tpl +++ b/templates/de/html/copyright.tpl @@ -1,12 +1,13 @@ -
{--HEADER_TEXT_PAGE5--} @@ -190,7 +190,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 
+ {--TEXT_PAGE_5--}
- - - - -
- {!TITLE!} v{!FULL_VERSION!} R{!CURR_SVN_REVISION!}
- Copyright © 2003 - 2008 by Roland Häder - 		This - website's engine is free software which is released under the - GNU GPL either version 2 of the License. -
+
+
+
+ {!TITLE!} v{!FULL_VERSION!} R{!CURR_SVN_REVISION!}
+ {!COPY!} +
+ +
+ This website's engine is free software which is released under the GNU + GPL either version 2 of the License. +
+
+
diff --git a/templates/de/html/copyright_backlink.tpl b/templates/de/html/copyright_backlink.tpl index 68f9d8982c..e02e39610c 100644 --- a/templates/de/html/copyright_backlink.tpl +++ b/templates/de/html/copyright_backlink.tpl @@ -1,14 +1,15 @@ - - - - - -
- [{!TITLE!}] - v{!FULL_VERSION!} R{!CURR_SVN_REVISION!}
- {!COPY!} - 		- This website's engine is free software which is released under - the [GNU] GPL either version 2 of the License. -
+
+
+
+ [{!TITLE!}] + v{!FULL_VERSION!} R{!CURR_SVN_REVISION!}
+ {!COPY!} +
+ +
+ This website's engine is free software which is released under the + [GNU] GPL either version 2 of the License. +
+
+
diff --git a/templates/de/html/install/install_fatal_errors.tpl b/templates/de/html/install/install_fatal_errors.tpl index ea99ba6e5c..6cd9c08f77 100644 --- a/templates/de/html/install/install_fatal_errors.tpl +++ b/templates/de/html/install/install_fatal_errors.tpl @@ -1,14 +1,14 @@ - +
- @@ -20,7 +20,7 @@ - +
-
{!HEADER_MYSQL_ERRORS!}
+
{--HEADER_MYSQL_ERRORS--}
 
- {!TEXT_MYSQL_ERRORS!} +
+ {--TEXT_MYSQL_ERRORS--}
diff --git a/templates/de/html/install/install_footer.tpl b/templates/de/html/install/install_footer.tpl index 62a0e12357..04f5b84499 100644 --- a/templates/de/html/install/install_footer.tpl +++ b/templates/de/html/install/install_footer.tpl @@ -1,4 +1 @@ - - - \ No newline at end of file diff --git a/templates/de/html/install/install_header.tpl b/templates/de/html/install/install_header.tpl index c0c4b55f96..a106cbdbd8 100644 --- a/templates/de/html/install/install_header.tpl +++ b/templates/de/html/install/install_header.tpl @@ -1,11 +1,5 @@ - - - - - - - - -
: : : - {--INSTALLATION--} : : :
 
-
\ No newline at end of file +
+ : : : {--INSTALLATION--} : : : +
+ +
diff --git a/templates/de/html/install/install_page1.tpl b/templates/de/html/install/install_page1.tpl index cb1cfd17a3..e63d604af8 100644 --- a/templates/de/html/install/install_page1.tpl +++ b/templates/de/html/install/install_page1.tpl @@ -1,5 +1,5 @@ - +
- diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl index 0a8d44c597..b1c5e2dd47 100644 --- a/templates/de/html/install/install_page2.tpl +++ b/templates/de/html/install/install_page2.tpl @@ -9,7 +9,7 @@ - diff --git a/templates/de/html/install/install_page3.tpl b/templates/de/html/install/install_page3.tpl index 22db10f0d6..9253498819 100644 --- a/templates/de/html/install/install_page3.tpl +++ b/templates/de/html/install/install_page3.tpl @@ -9,7 +9,7 @@ - diff --git a/templates/de/html/install/install_welcome.tpl b/templates/de/html/install/install_welcome.tpl index 6d5692f0ac..2723146df9 100644 --- a/templates/de/html/install/install_welcome.tpl +++ b/templates/de/html/install/install_welcome.tpl @@ -1,28 +1,34 @@ -
{--HEADER_TEXT_PAGE1--}
@@ -10,7 +10,7 @@
+ {--TEXT_PAGE_1--}
 
+ {--TEXT_PAGE_2--}
 
+ {--TEXT_PAGE_3--}
- - - - - - - - - - - - - - - - - - - -
-
{--WELCOME_TEXT--}
-
 
 {--INTRO_TEXT--}
 
- - - - -
 
+
+ Willkommen zum Installationsscript von MXChange-{!MT_WORD!}, dem + freien {!MT_WORD!} powered by MXChange-Community! +
+ +
+ Dieses Script wird Ihnen dabei helfen, den {!MT_WORD!} zu installieren, die + Datenbank einzurichten und den {!MT_WORD!} vorzukonfigurieren. +
+ +
+ Sie werden während der Installation Schritt-Für-Schritt durch die + einzelnen Installationsschritte gebracht. Sie brauchen dazu weder + Programmiererkenntnisse noch ein abgschlossenes Informatikstudium. Bitte + halten Sie die MySQL-Daten von Ihrem Hoster bereit. +
+ +
+ Nach erfolgreicher Installation sollten Sie als nächstes das erste + Administrator-Login einrichten. Anschliessend können Sie sich einloggen + und weitere Einstellungen verfeinern. +
+ +
+ Das Entwickler-Team empfiehlt Ihnen, dann alle Installationsdateien von Ihrem + Server zu löschen. +
+ +
+
+ + +
+
diff --git a/theme/business/css/general.css b/theme/business/css/general.css index 230e55d8b1..314f578f3b 100644 --- a/theme/business/css/general.css +++ b/theme/business/css/general.css @@ -20,7 +20,6 @@ table { A { font-style : normal; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; text-decoration : none; } @@ -76,7 +75,6 @@ ul, ol { .runtime_fatal, .runtime_fatalcontent { color : #000000; background-color : #FFFFFF; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .runtime_fatal { @@ -91,7 +89,6 @@ ul, ol { .admin { color : #000000; background-color : #FFFFFF; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .admin_note { @@ -126,8 +123,7 @@ DIV.admin_note { } .admin_select, .guest_select, .member_select { - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; background-color : #EEEEFF; } @@ -242,8 +238,7 @@ DIV.admin_note { .admin_normal, .guest_normal, .member_normal { border-style : solid; - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; background-color : #EEEEFF; } @@ -354,17 +349,23 @@ DIV.admin_note { } .footer_lines { - vertical-align : bottom; - font-size : 10px; + vertical-align : bottom; + font-size : 10px; width : 380px; vertical-align : middle; background-color : #FFFFFF; - height : 40px; + height : 30px; + padding-top : 5px; + padding-bottom : 5px; +} + +.footer_box { + text-align : center; + width : 760px; } .dashed { - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; } .switch_sw1, .switch_mem1 { @@ -583,8 +584,7 @@ DIV.admin_note { } .mini_select { - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; background-color : #EEEEFF; font-size : 10px; } @@ -640,32 +640,30 @@ DIV.admin_note { } #show_timings_block { - margin-top : 5px; + margin-top : 5px; tex-align : center; - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; background-color : #EEEEFF; font-size : 10px; vertical-align : middle; - width : 465px; - height : 22px; - z-index : 0; + width : 465px; + height : 22px; + z-index : 0; } .show_timings_column { - z-index : 10; - top : 3px; + z-index : 10; + top : 3px; background-color : #FFFFFF; position : relative; - margin : 0px; - width : 150px; - display : block; - border : solid 1px; - border-color : #000000; + margin : 0px; + width : 150px; + display : block; + border : solid 1px #000000; } .show_timings_data { - font-weight : bold; + font-weight : bold; } diff --git a/theme/business/css/install.css b/theme/business/css/install.css index f4bb44ea0a..f3b71388c5 100644 --- a/theme/business/css/install.css +++ b/theme/business/css/install.css @@ -1,17 +1,15 @@ .install_fatal { - text-align : left; - color : #000000; + text-align : left; + color : #000000; } .install_select { - border : dashed 1px; - border-color : #000000; + border : dashed 1px #000000; background-color : #EEEEFF; } .install_normal { border-style : solid; - border : dashed 1px; - border-color : #000000; + border : dashed 1px #000000; } .install_submit { @@ -22,49 +20,50 @@ } .install_main { - color : #000000; + color : #000000; background-color : #FFFFFF; - font-family : Arial, Geneva, Helvetica, sans-serif; - height : 30px; - text-decoration : none; + text-decoration : none; } .install_header { - color : #000000; + color : #000000; background-color : #EEEEFF; font-size : 20px; - text-decoration : underline; - heigth : 40px; + text-decoration : underline; + heigth : 30px; vertical-align : middle; -} - -.install_content { - height : 99%; - min-height : 90%; - max-height : 99%; + padding-top : 5px; + padding-bottom : 5px; } .install_fatal { background-color : #FFFFFF; - color : #000000; + color : #000000; } .install_fatalcontent { - text-align : left; + text-align : left; background-color : #FFFFFF; } .install_error, .install_finished { font-size : 20px; - color : #000000; + color : #000000; } -.install_security, .install_welcome, .install_intro { - color : #000000; +.install_security, .install_welcome, .install_text { + color : #000000; +} + +.install_text { + padding-bottom : 10px; + text-align : left; + margin-left : 20px; + margin-right : 20px; } .install_security { - width : 350px; - padding-top : 10px; + width : 350px; + padding-top : 10px; padding-bottom : 10px; } diff --git a/theme/business/css/register.css b/theme/business/css/register.css index 7b72f08e69..a999a92eef 100644 --- a/theme/business/css/register.css +++ b/theme/business/css/register.css @@ -13,8 +13,7 @@ } .register_select { - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; background-color : #EEEEFF; } @@ -28,8 +27,7 @@ .register_normal { border-style : solid; - border : solid 1px; - border-color : #000000; + border : solid 1px #000000; padding-right : 5px; } diff --git a/theme/default/css/general.css b/theme/default/css/general.css index f3c2ff173e..c50b8c4f61 100644 --- a/theme/default/css/general.css +++ b/theme/default/css/general.css @@ -29,7 +29,6 @@ table { A { font-style : normal; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; text-decoration : none; } @@ -95,7 +94,6 @@ ul, ol { width : 700px; color : #118811; background-color : #DDEEDD; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .runtime_fatal { @@ -110,7 +108,6 @@ ul, ol { .admin { color : #118811; background-color : #DDEEDD; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .admin_note { @@ -145,8 +142,7 @@ DIV.admin_note { } .admin_select, .guest_select, .member_select { - border : solid 1px; - border-color : #009900; + border : solid 1px #009900; background-color : #EEFFEE; } @@ -252,8 +248,7 @@ DIV.admin_note { .admin_normal, .guest_normal, .member_normal { border-style : solid; - border : solid 1px; - border-color : #009900; + border : solid 1px #009900; } .member_stats { @@ -357,18 +352,22 @@ DIV.admin_note { } .footer_lines { - font-size : 10px; + font-size : 10px; width : 380px; - height : 40px; + height : 30px; vertical-align : middle; background-color : #E5EFE5; - margin-top : 5px; - margin-bottom : 5px; + padding-top : 5px; + padding-bottom : 5px; +} + +.footer_box { + text-align : center; + width : 760px; } .dashed { - border : solid 1px; - border-color : #AA0044; + border : solid 1px #AA0044; } .switch_sw1, .switch_mem1 { @@ -613,18 +612,17 @@ DIV.admin_note { } .mini_select { - border : dotted 1px; - border-color : #009900; - background-color : #EEFFEE; - font-size : 10px; + border : dotted 1px #009900; + background-color : #EEFFEE; + font-size : 10px; } .theme_box { - border : 1px dotted #AA0044; - border-top : 0px; + border : 1px dotted #AA0044; + border-top : 0px; width : 100%; height : 70px; - background-color : #eeffbc; + background-color : #eeffbc; } .theme_note { @@ -669,10 +667,9 @@ DIV.admin_note { #show_timings_block { margin-top : 5px; tex-align : center; - border : solid 1px; - border-color : #AA0044; - background-color : #ddeedd; - font-size : 10px; + border : solid 1px #AA0044; + background-color : #ddeedd; + font-size : 10px; vertical-align : middle; width : 465px; height : 22px; @@ -687,8 +684,7 @@ DIV.admin_note { margin : 0px; width : 150px; display : block; - border : solid 1px; - border-color : #009900; + border : solid 1px #009900; } .show_timings_data { diff --git a/theme/default/css/install.css b/theme/default/css/install.css index b08a472945..e0f1e6727d 100644 --- a/theme/default/css/install.css +++ b/theme/default/css/install.css @@ -1,17 +1,15 @@ .install_fatal { - text-align : left; - color : #00AA00; + text-align : left; + color : #00AA00; } .install_select { - border : dashed 1px; - border-color : #00AA00; + border : dashed 1px #00AA00; background-color : #F0F0F5; } .install_normal { border-style : solid; - border : dashed 1px; - border-color : #00AA00; + border : dashed 1px #00AA00; } .install_submit { @@ -22,59 +20,62 @@ } .install_main { - color : #111188; + color : #111188; background-color : #DDEEDD; - font-family : Arial, Geneva, Helvetica, sans-serif; - height : 30px; - text-decoration : none; + text-decoration : none; } .install_header { - color : #F76300; + color : #F76300; background-color : #CCDDCC; font-size : 20px; - text-decoration : underline; - height : 40px; - vertical-align : middle; -} - -.install_content { - height : 99%; - min-height : 90%; - max-height : 99%; + text-decoration : underline; + height : 30px; + padding-top : 5px; + padding-bottom : 5px; } .install_fatal { background-color : #DDEEDD; - color : #AA0000; + color : #AA0000; } .install_fatalcontent { - text-align : left; + text-align : left; background-color : #DDEEDD; } .install_error { font-size : 20px; - color : #AA0000; + color : #AA0000; } .install_finished { font-size : 20px; - color : #00AA00; + color : #00AA00; } .install_security { - color : #AA0000; - width : 350px; - padding-top : 10px; + color : #AA0000; + width : 350px; + padding-top : 10px; padding-bottom : 10px; } .install_welcome { - color : #0000CC; + color : #0000CC; + padding-bottom : 10px; + font-size : 16px; } -.install_intro { - color : #000000; +.install_text { + color : #000000; + padding-bottom : 10px; + text-align : left; + margin-left : 20px; + margin-right : 20px; +} + +.install_footer { + padding-bottom : 10px; } diff --git a/theme/default/css/register.css b/theme/default/css/register.css index 8eb855deda..3bb9dbe9d7 100644 --- a/theme/default/css/register.css +++ b/theme/default/css/register.css @@ -4,22 +4,21 @@ .register_reset { border-style : groove; - border : solid 1px #009900; - color : #AA0044; + border : solid 1px #009900; + color : #AA0044; } .register_submit { - color : #AA0044; + color : #AA0044; border-color : #009900; } .register_select { - border : dotted 1px; - border-color : #009900; + border : dotted 1px #009900; background-color : #EEFFEE; } .register_failed { - color : #00AA00; + color : #00AA00; } .register_snote { @@ -28,37 +27,36 @@ .register_normal { border-style : solid; - border : dotted 1px; - border-color : #009900; + border : dotted 1px #009900; } .register_main { background-color : #DDEEDD; - width : 540px; + width : 540px; } .register_done2 { - height : 40px; - color : #009900; + height : 40px; + color : #009900; background-color : #eeffbc; - width : 500px; + width : 500px; } .register_title { - text-align : center; + text-align : center; font-size : 18px; } .register_seperator { - height : 7px; + height : 7px; font-size : 1px; } .register_left { - text-align : right; + text-align : right; margin-right : 2px; - color : #0000AA; - font-weight : bold; + color : #0000AA; + font-weight : bold; font-size : 14px; } @@ -66,13 +64,13 @@ } .register_header { - text-align : center; + text-align : center; background-color : #eeffbc; - color : #0000AA; - font-weight : bold; - border-top : 1px dotted #AA0044; + color : #0000AA; + font-weight : bold; + border-top : 1px dotted #AA0044; border-bottom : 1px dotted #AA0044; - height : 25px; + height : 25px; } .register_term { diff --git a/theme/desert/css/general.css b/theme/desert/css/general.css index 15d6e60447..3fd5f2ec9a 100644 --- a/theme/desert/css/general.css +++ b/theme/desert/css/general.css @@ -20,7 +20,6 @@ table { A { font-style : normal; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; text-decoration : none; } @@ -76,7 +75,6 @@ ul, ol { .runtime_fatal, .runtime_fatalcontent { color : #880000; background-color : #FFFFCC; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .runtime_fatal { @@ -91,7 +89,6 @@ ul, ol { .admin { color : #880000; background-color : #FFFFCC; - font-family : Verdana, Arial, Geneva, Helvetica, sans-serif; } .admin_note { @@ -126,8 +123,7 @@ DIV.admin_note { } .admin_select, .guest_select, .member_select { - border : solid 1px; - border-color : #880000; + border : solid 1px #880000; background-color : #DDDDAA; } @@ -315,29 +311,33 @@ DIV.admin_note { } #master { - width : 100%; - height : 100%; - min-height : 90%; - max-height : 100%; + width : 100%; + height : 100%; + min-height : 90%; + max-height : 100%; vertical-align : top; } .masterbox { - text-align : center; + text-align : center; } .footer_lines { - vertical-align : bottom; - font-size : 10px; - width : 380px; + vertical-align : bottom; + font-size : 10px; + width : 380px; vertical-align : middle; background-color : #FFFFCC; - height : 40px; + height : 40px; +} + +.footer_box { + text-align : center; + width : 760px; } .dashed { - border : solid 1px; - border-color : #880000; + border : solid 1px #880000; } .switch_sw1, .switch_mem1 { @@ -350,10 +350,10 @@ DIV.admin_note { .impressum { font-size : 12px; - width : 320px; + width : 320px; vertical-align : middle; background-color : #FFFFCC; - height : 70px; + height : 70px; } .mediadata { @@ -362,16 +362,16 @@ DIV.admin_note { .media_header, .impressum_header { background-color : #DDDDAA; - text-align : center; - color : #880000; - height : 26px; - font-weight : bold; + text-align : center; + color : #880000; + height : 26px; + font-weight : bold; font-size : 20px; } .media_left { font-size : 14px; - width : 200px; + width : 200px; } .media_right { @@ -573,18 +573,17 @@ DIV.admin_note { } .mini_select { - border : solid 1px; - border-color : #880000; - background-color : #DDDDAA; - font-size : 10px; + border : solid 1px #880000; + background-color : #DDDDAA; + font-size : 10px; } .theme_box { - border : 1px solid #880000; - border-top : 0px; + border : 1px solid #880000; + border-top : 0px; width : 100%; height : 70px; - background-color : #FFFFCC; + background-color : #FFFFCC; } .theme_note { @@ -637,10 +636,9 @@ DIV.admin_note { #show_timings_block { margin-top : 5px; tex-align : center; - border : solid 1px; - border-color : #880000; - background-color : #DDDDAA; - font-size : 10px; + border : solid 1px #880000; + background-color : #DDDDAA; + font-size : 10px; vertical-align : middle; width : 465px; height : 22px; @@ -650,13 +648,12 @@ DIV.admin_note { .show_timings_column { z-index : 10; top : 3px; - background-color : #FFFFCC; + background-color : #FFFFCC; position : relative; margin : 0px; width : 150px; display : block; - border : solid 1px; - border-color : #880000; + border : solid 1px #880000; } .show_timings_data { diff --git a/theme/desert/css/install.css b/theme/desert/css/install.css index 472126f37a..02bf34b659 100644 --- a/theme/desert/css/install.css +++ b/theme/desert/css/install.css @@ -3,23 +3,21 @@ } .install_msg { - color : #880000; + color : #880000; background-color : #EDEDBA; } .install_fatal { - color : #880000; + color : #880000; } .install_select { - border : dashed 1px; - border-color : #880000; + border : dashed 1px #880000; background-color : #DDDDAA; } .install_normal { border-style : solid; - border : dashed 1px; - border-color : #880000; + border : dashed 1px #880000; } .install_submit { @@ -27,51 +25,50 @@ } .install_main { - color : #880000; + color : #880000; background-color : #FFFFCC; - font-family : Arial, Geneva, Helvetica, sans-serif; - height : 30px; - text-decoration : none; + text-decoration : none; } .install_header { - color : #880000; + color : #880000; background-color : #DDDDAA; - width : 400px; - height : 30px; + width : 400px; + height : 30px; font-size : 20px; - text-decoration : underline; - padding-top : 5px; + text-decoration : underline; + padding-top : 5px; padding-bottom : 5px; } -.install_content { - height : 99%; - min-height : 90%; - max-height : 99%; -} - .install_fatal { background-color : #FFFFCC; - color : #880000; + color : #880000; } .install_fatalcontent { - text-align : left; + text-align : left; background-color : #FFFFCC; } .install_error, .install_finished { font-size : 20px; - color : #880000; + color : #880000; } -.install_security, .install_welcome, .install_intro { - color : #880000; +.install_security, .install_welcome, .install_text { + color : #880000; +} + +.install_text { + padding-bottom : 10px; + text-align : left; + margin-left : 20px; + margin-right : 20px; } .install_security { - width : 350px; - padding-top : 10px; + width : 350px; + padding-top : 10px; padding-bottom : 10px; } diff --git a/theme/desert/css/register.css b/theme/desert/css/register.css index 6769f615d7..0c8428ab15 100644 --- a/theme/desert/css/register.css +++ b/theme/desert/css/register.css @@ -8,13 +8,12 @@ color : #880000; } .register_submit { - color : #880000; + color : #880000; border-color : #880000; } .register_select { - border : solid 1px; - border-color : #880000; + border : solid 1px #880000; background-color : #DDDDAA; } @@ -28,41 +27,40 @@ .register_normal { border-style : solid; - border : solid 1px; - border-color : #880000; + border : solid 1px #880000; padding-right : 5px; } .register_main { background-color : #FFFFCC; - width : 540px; + width : 540px; } .register_done2 { - height : 40px; - color : #880000; + height : 40px; + color : #880000; background-color : #FFFFCC; - width : 500px; + width : 500px; } .register_title { background-color : #DDDDAA; - text-align : center; + text-align : center; font-size : 18px; padding-left : 5px; padding-right : 5px; } .register_seperator { - height : 7px; + height : 7px; font-size : 1px; } .register_left { - text-align : right; + text-align : right; margin-right : 2px; - color : #880000; - font-weight : bold; + color : #880000; + font-weight : bold; font-size : 14px; padding-left : 5px; } @@ -72,13 +70,13 @@ } .register_header { - text-align : center; + text-align : center; background-color : #DDDDAA; - color : #880000; - font-weight : bold; - border-top : 1px solid #880000; + color : #880000; + font-weight : bold; + border-top : 1px solid #880000; border-bottom : 1px solid #880000; - height : 25px; + height : 25px; } A:hover.register_term { -- 2.39.5