Index: installer.css =================================================================== --- installer.css (Revision 4699) +++ installer.css (Arbeitskopie) @@ -16,280 +16,87 @@ $Date$ **********************************************/ -body { - font-family : Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - background : #F7F7F7 ; - color : Black; - margin: 0px; -} +/** + * DEFAULT VALUES + * + * background color: #FFF; + * + * header color: #333; + * header line color: #38ABE1; + * + * content bg color: #EFEFEF; + * + * error bg color: #FF6347; + * success bg color: #7CFC00; + * + */ -h1 -{ - font-size: 24px; - font-weight: normal; - padding: 5px; -} +/* HTML elements */ +* { font-family : "Trebuchet MS", "lucida grande", Verdana, Arial, Helvetica, sans-serif; margin: 0; padding: 0; } +body { background: #FFF; font-size: 12px; color: #000; margin: 0px; } +h1 { font-size: 24px; font-weight: normal; color: #333; } +h2 { font-size: 18px; font-weight: normal; color: #333; } +p { margin: 2px 0px; } +td { font-size: 12px; } +hr { color : #000000; height: 1px; } +a { color: #0033CC; text-decoration: none; } +a:hover { color: #0033CC; text-decoration: underline; } +form { margin-top:0px; margin-bottom:0px; } +fieldset { width: 90ex; margin: 5px auto; } +fieldset form { margin: auto 10px; } -p { - margin: 2px 0px; -} +.input { text-align: center; } +.textinput { border: groove 1px; width: 100%; } +.listbox { border: groove 1px; } +.button { border: groove 1px; } -td { - font-size: 12px; -} +/* header */ +.header { padding: 5px 0 0; border-bottom: 2px solid #38abe1; margin: 10px 0 5px; } -hr { - color : #000000; - height: 1px; -} +/* content */ +.content { background: #EFEFEF; padding: 5px; margin: 0 0 5px; text-align: justify; } +.content table tr td { padding: 2px 1px; } +.form { } -.textinput { - border: groove 1px; - width: 100%; -} +/* notes */ +.note_E { background:#FF6347; color:#FFF; padding: 7px; margin: 10px 0; font-size: 90%; } +.note_OK { background:#7CFC00; color:#000; padding: 7px; margin: 10px 0; font-size: 90%; } -.listbox { - border: groove 1px; -} +/* JS stuff */ +.expandable { cursor: pointer; margin: 5px 0 10px; } -.button { - border: raised 1px; -} - -a { - color: #0033CC; - text-decoration: none; -} - -a:hover { - color: #0033CC; - text-decoration: underline; -} - -.tableh1, h2 { - background : #0E72A4 ; - color : #FFFFFF; - padding-top: 3px; - padding-right: 10px; - padding-bottom: 3px; - padding-left: 10px; - font-weight:bold; -} - -.tableh2 { - background: #D1D7DC ; - color : #000000; - padding-top: 3px; - padding-right: 10px; - padding-bottom: 3px; - padding-left: 2px; - border: 1px black solid; -} - -.tableb { - background: #EFEFEF ; - padding-top: 3px; - padding-right: 10px; - padding-bottom: 3px; - padding-left: 10px; - border: 1px solid #0E72A4; -} - -.tableb_alternate { - background: #E4E4E4; -} - -.tablef { - background: #D1D7DC; - padding-top: 10px; - padding-right: 10px; - padding-bottom: 10px; - padding-left: 10px; - border: 1px solid #0E72A4; -} - -.updatesOK { - font-weight: bold; - color: green; -} - -.updatesFail { -} - -.maintable { - border: 1px solid #0E72A4; - background-color: #efefef; - margin-top: 1px; - margin-bottom: 1px; -} - -.charsetchecktable -{ - -} - -.charsetchecktable td, .charsetchecktable th -{ - padding: 2px; - border: 1px solid gray; -} - -.charsetchecktable td -{ - font-size: 10px; -} - -.charsetchecktable td.check -{ - font-size: 12px; -} - - - - .error, .bigwarning { - color : Red; - font-weight : bold; -} - -h2.error -{ - text-align: center; - background-color: #EFEFEF; -} - -img.logo -{ - background-color: #EFEFEF; - text-align: left; -} - -.bigwarning, .warning, .failed -{ - color: red; -} - -td.warning -{ - background-color: red; - color: white; -} - -p, div.warning -{ - margin: 10px; - padding: 5px; -} - -table.maintable td -{ - padding: 2px; -} - -p.warning, div.warning -{ - color: black; - font-size: 120%; - border: 1px solid black; - background: #fdd; -} - -form { - margin-top:0px; - margin-bottom:0px; -} - -.check -{ - background-color: white; - font-weight: bold; - color: blue; -} - -.nocheck -{ - color: gray; -} - -.done -{ - background-color: green; - color: white; - text-align: center; -} - -.input -{ - text-align: center; -} - -fieldset -{ - width: 90ex; - margin: 5px auto; -} - -fieldset form -{ - margin: auto 10px; -} - /*stepper*/ -.stepper_table -{ - width:100%; - margin-top:-30px; -} +.stepper_table { width:100%; margin-top:-30px; } +.stepper_c, .stepper_d, .stepper_do, .stepper_n { height:21px; width:21px; margin:2px; text-align:center; font-weight: bold; color: #FFF; } +.stepper_c { background: url(images/install/current.gif) no-repeat; } +.stepper_n { background:url(images/install/notyet.gif) no-repeat; } +.stepper_d, .stepper_do { background:url(images/install/done.gif) no-repeat; cursor:pointer; } +.stepper_d { background-position: top left; } +.stepper_do { background-position: 0 -21px; } -.stepper_c, .stepper_d, .stepper_do, .stepper_n -{ - height:21px; - width:17px; - margin:2px; - text-align:center; -} +/** + * really necessary? + * haven't seen those in the html... + */ -.stepper_c -{ - background:url(images/install/current.gif); - background-repeat:no-repeat; -} +.charsetchecktable { } +.charsetchecktable td, .charsetchecktable th { padding: 2px; border: 1px solid gray; } +.charsetchecktable td { font-size: 10px; } +.charsetchecktable td.check { font-size: 12px; } -.stepper_n -{ - background:url(images/install/notyet.gif); - background-repeat:no-repeat; -} +.error, .bigwarning { color : Red; font-weight : bold; } +h2.error { text-align: center; background-color: #EFEFEF; } +.bigwarning, .warning, .failed { color: red; } +td.warning { background-color: red; color: white; } +p, div.warning { margin: 10px; padding: 5px; } +p.warning, div.warning { color: black; font-size: 120%; border: 1px solid black; background: #fdd; } +.maintable { border: 1px solid #0E72A4; background-color: #efefef; margin-top: 1px; margin-bottom: 1px; } +table.maintable td { padding: 2px; } -.stepper_d, .stepper_do -{ - background:url(images/install/done.gif); - background-repeat:no-repeat; - cursor:pointer; -} +.check { background-color: white; font-weight: bold; color: blue; } +.nocheck { color: gray; } +.done { background-color: green; color: white; text-align: center; } -.stepper_d -{ - background-position: top left; -} - -.stepper_do -{ - background-position: 0 -21px; -} - - - - - - - - - - - - - - - +.updatesOK { font-weight: bold; color: green; } +.updatesFail { } \ No newline at end of file Index: images/install/current.gif =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: images/install/notyet.gif =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: images/install/done.gif =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: install.php =================================================================== --- install.php (Revision 4699) +++ install.php (Arbeitskopie) @@ -146,7 +146,7 @@ $install->setTmpConfig('step', '3'); break; - case 3: // Check if the folder permissions are set up properlyµ + case 3: // Check if the folder permissions are set up properly $install->page_title = $install->language['title_dir_check']; if(!$install->checkPermissions()) { // not all permissions were set correctly, or folder doesn't exist @@ -283,6 +283,10 @@ break; case 8: // save db_prefix/_name and finally create the tables + + // TODO: check if tables have REALLY been created + // e.g. wrong prefix, then deleted tables, went back one step, doesn't work anymore... + $install->page_title = $install->language['title_mysql_pop']; // save the db data from previous step if($superCage->post->keyExists('db_name') && !isset($install->config['db_populated'])) { @@ -305,7 +309,7 @@ if($install->error != '') { html_error(); } - $install->temp_data = '


' . $install->language['db_alr_populated'] . '



'; + $install->temp_data = '


' . $install->language['db_alr_populated'] . '



'; html_content($install->language['db_populating']); html_footer(); $install->setTmpConfig('step', '9'); @@ -419,20 +423,50 @@ global $install; ?> - - + + -Coppermine - <?php echo $install->language['installation']; ?> + Coppermine - <?php echo $install->language['installation']; ?> + + + +
-
- - - - -

-
+
+ +
 
- - - - - - - -

page_title; ?>

-
Warning, this installer is still in alpha, you can use the old one by going here

-
+ + + +

page_title; ?>

+ + + +
Warning, this installer is still in alpha, you can use the old one by going here
+ + -
- - - - - - - - - - - - - -

language['installer_locked']; ?>

-
• • • language['error']; ?> • • • -
error; ?> -

-

-
+ +
+

language['installer_locked']; ?>

+ • • • language['error']; ?>

+ error; ?>

+

+
- - - - +
+ language['cpg_info']; ?>. +
error != '') { ?> - - - - - - +
+ • • • language['error']; ?>

+ language['error_need_corr']; ?>

+ error; ?> +
- - - - - - - - - -
language['cpg_info']; ?>. -
• • • language['error']; ?> • • • -
language['error_need_corr']; ?>

error; ?> -
language['select_lang']; ?> -
getLangSelect(); ?> -

-

-
- +
+ language['select_lang']; ?>

+ getLangSelect(); ?> +

+

+
+