From 5ce101c1939bcea8b3171d3d0cf494b35a9650f3 Mon Sep 17 00:00:00 2001 From: patdenice Date: Wed, 15 Oct 2008 17:55:18 +0000 Subject: Merge from trunk 2747: - Install process now looks like goto/roma. - Move install.tpl to goto template. - add charset utf8 to fatal error function. - Check php version on install and upgrade, and die if < 5. git-svn-id: http://piwigo.org/svn/branches/2.0@2748 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/template/goto/install.tpl | 152 +++++++++++++++++++++++++++++++ admin/template/goto/theme/roma/theme.css | 4 +- 2 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 admin/template/goto/install.tpl (limited to 'admin') diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl new file mode 100644 index 000000000..0fdf9b709 --- /dev/null +++ b/admin/template/goto/install.tpl @@ -0,0 +1,152 @@ +{* $Id$ *} + + + + + + + + + + +{literal} + +{/literal} +Piwigo {$RELEASE} - {'Installation'|@translate} + + + +
{* Dummy block for double background management *} +
+
+ +

Piwigo {$RELEASE} - {'Installation'|@translate}

+ +{if isset($errors)} +
+
    + {foreach from=$errors item=error} +
  • {$error}
    • + {/foreach} +
+
+{/if} + +{if isset($infos)} +
+
    + {foreach from=$infos item=info} +
  • {$info}
    • + {/foreach} +
+
+{/if} + +{if isset($install)} +
+ + + + + + + + + +
{'Initial_config'|@translate}
{'Default_lang'|@translate} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{'step1_title'|@translate}
{'step1_host'|@translate}{'step1_host_info'|@translate}
{'step1_user'|@translate}{'step1_user_info'|@translate}
{'step1_pass'|@translate}{'step1_pass_info'|@translate}
{'step1_database'|@translate}{'step1_database_info'|@translate}
{'step1_prefix'|@translate}{'step1_prefix_info'|@translate}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{'step2_title'|@translate}
{'install_webmaster'|@translate}{'install_webmaster_info'|@translate}
{'step2_pwd'|@translate}{'step2_pwd_info'|@translate}
{'step2_pwd_conf'|@translate}{'step2_pwd_conf_info'|@translate}
{'conf_mail_webmaster'|@translate}{'conf_mail_webmaster_info'|@translate}
+ + + + + +
+ +
+
+{/if} +
{* content *} +
{$L_INSTALL_HELP}
+ + diff --git a/admin/template/goto/theme/roma/theme.css b/admin/template/goto/theme/roma/theme.css index 135b46f54..2cbd6f649 100644 --- a/admin/template/goto/theme/roma/theme.css +++ b/admin/template/goto/theme/roma/theme.css @@ -10,10 +10,10 @@ INPUT[type="submit"], INPUT[type="reset"] { color:#999; border: 1px solid #666; input.rateButton, legend, h3 { color: #666; } #theAdminPage h2 { color: #333; } .content .infos { color: #f70; border:0; background-color: transparent; -padding:5px 0px 0pt 10pt; min-height: 48px; text-align:left; } +padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; } .content .infos li, .content .errors li { list-style-type:none; } .content .errors { color: #f30; border:0; background-color: transparent; -padding:5px 0px 0pt 10pt; min-height: 48px; text-align:left; font-weight:bold; } +padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; font-weight:bold; } #copyright { color:#666; margin:60px auto 0px 240px; text-align:center; padding-bottom: 15px; } .header_notes { background: transparent url(../../icon/note.png) no-repeat right top; -- cgit v1.2.3