From 76db86d5cb2ee459365a9a760187eb75cd528c77 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 11 Mar 2010 23:02:22 +0000 Subject: [PATCH] ENHANCEMENT Added help text for "locale" setting in installer MINOR Changed
hierarchy in config-form.html to allow right-aligned help texts which horizontically align with their respective field sets on the left. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100940 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- dev/install/config-form.html | 294 ++++++++++++++++++----------------- dev/install/install.css | 36 +++-- 2 files changed, 177 insertions(+), 153 deletions(-) diff --git a/dev/install/config-form.html b/dev/install/config-form.html index 886f9fdb3..c4ac837d9 100644 --- a/dev/install/config-form.html +++ b/dev/install/config-form.html @@ -140,166 +140,180 @@

Database

- -
- onclick="toggleDisabledFields(this);"> - -
- +

+ SilverStripe stores its content in a relational SQL database. Please provide the username and password to connect to the server here. + If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a + database that already exists.

+ Other databases:
+ Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies. +

+
+ +
+ onclick="toggleDisabledFields(this);"> + +
+ -
- -
    - $details) { - $checked = ($databaseConfig['type'] == $class) ? ' checked="checked"' : ''; - $disabled = $help = ''; - if($usingEnv) { - // All are disabled by default when environment is used - $disabled = 'disabled="disabled"'; - // If SS_DATABASE_CLASS is specified, check the database in the list - if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) { - $checked = ' checked="checked"'; - } - } else { - $disabled = !$details['supported'] || !$details['hasModule'] ? 'notavailable="true"' : ''; - if ($disabled) { - if (!$details['supported'] && !$details['hasModule']) { - $help = 'PHP does not have the required extension, and SilverStripe does not have the correct module installed'; - $helpText = '
  • '.$details['missingExtensionText'].'
    • '; - $helpText .= '
  • '.$details['missingModuleText'].'
    • '; - } else if ($details['supported'] && !$details['hasModule']) { - $help = 'PHP has the required extension, but SilverStripe is missing the module'; - $helpText = '
  • '.$details['missingModuleText'].'
    • '; - } else if (!$details['supported'] && $details['hasModule']) { - $help = 'SilverStripe has the module installed, but PHP is missing the required extension'; - $helpText = '
  • '.$details['missingExtensionText'].'
    • '; +
    + +
      + $details) { + $checked = ($databaseConfig['type'] == $class) ? ' checked="checked"' : ''; + $disabled = $help = ''; + if($usingEnv) { + // All are disabled by default when environment is used + $disabled = 'disabled="disabled"'; + // If SS_DATABASE_CLASS is specified, check the database in the list + if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) { + $checked = ' checked="checked"'; + } + } else { + $disabled = !$details['supported'] || !$details['hasModule'] ? 'notavailable="true"' : ''; + if ($disabled) { + if (!$details['supported'] && !$details['hasModule']) { + $help = 'PHP does not have the required extension, and SilverStripe does not have the correct module installed'; + $helpText = '
    • '.$details['missingExtensionText'].'
      • '; + $helpText .= '
    • '.$details['missingModuleText'].'
      • '; + } else if ($details['supported'] && !$details['hasModule']) { + $help = 'PHP has the required extension, but SilverStripe is missing the module'; + $helpText = '
    • '.$details['missingModuleText'].'
      • '; + } else if (!$details['supported'] && $details['hasModule']) { + $help = 'SilverStripe has the module installed, but PHP is missing the required extension'; + $helpText = '
    • '.$details['missingExtensionText'].'
      • '; + } + $help .= "
        $helpText
      "; } - $help .= "
        $helpText
      "; } + echo "
    • "; + echo ""; + echo ""; + if ($help) { + echo '
      '.$help.'
      '; + } + echo "
      • "; } - echo "
    • "; - echo ""; - echo ""; - if ($help) { - echo '
      '.$help.'
      '; - } - echo "
      • "; - } - ?> -
    -
    -
    - - - > - -
    -
    - - - > - -
    -
    - - - > - -
    -
    - - - - -
    -
    - + ?> +
+
+
+ + + > + +
+
+ + + > + +
+
+ + + > + +
+
+ + + + +
+
+ +
-

- SilverStripe stores its content in a relational SQL database. Please provide the username and password to connect to the server here. - If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a - database that already exists.

- Other databases:
- Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies. -

-
showTable("Database Configuration"); ?>

SilverStripe Administration Account

-
- - - > - -
-
- - - > - -
-
- - - - -
-
- - - - -
-
- +

+ We will set up 1 administrator account for you automatically. Enter the email address and password. If you'd rather log-in with a username instead of an email address, enter that instead. +

+
+
+ + + > + +
+
+ + + > + +
+
+ + + + +
+
+ + + + +
+
+ +
-

- We will set up 1 administrator account for you automatically. Enter the email address and password. If you'd - rather log-in with a username instead of an email address, enter that instead. -

-

Server configuration

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

+ SilverStripe allows you to run a site in development mode. + This shows all error messages in the web browser instead of emailing them to the administrator, and allows + the database to be built without logging in as administrator. Please enter the host/domain names for servers + you will be using for development. +

-

- SilverStripe allows you to run a site in development mode. - This shows all error messages in the web browser instead of emailing them to the administrator, and allows - the database to be built without logging in as administrator. Please enter the host/domain names for servers - you will be using for development. -

- +
+
+
+ + + + +
+
+

+ Determines the default "locale" settings (for dates, currencies, etc.), + as well as setting the default language of the CMS interface. + This can be customized for any CMS user. +
+ Caution: Not all aspects of the interface might be localized yet. +

+
+

Requirements

showTable(); ?> diff --git a/dev/install/install.css b/dev/install/install.css index 0e7fa1ff6..70233e203 100644 --- a/dev/install/install.css +++ b/dev/install/install.css @@ -103,7 +103,8 @@ table.testResults { clear: both; } #adminAcc, -#devHelp { +#devHelp, +#localeHelp { padding-top: 20px; } @@ -111,14 +112,29 @@ table.testResults { float: right; padding-right: 40px; width: 290px; + margin-bottom: 0; } -div.section { - width: 330px; +.section { float: left; overflow: hidden; } +.fields { + float: left; + margin-right: 20px; +} + +#localeHelp, +#localeSection { + height: 15em; +} + +#devHelp, +#devSection { + height: 18em; +} + #Layout input.action { text-align: center; font-size: 13px; @@ -139,34 +155,28 @@ div.section { #database_credentials { margin: 0; line-height: 1; - width: 400px; } #database_selection { - width: 400px; overflow: hidden; margin: 0; margin-top: 15px; } #database_selection li { - float: left; - width: 430px; } #database_selection li input { - float: left; + margin-right: 5px;; } #database_selection li label { - float: left; - margin: 0 6px 0 0; - margin-left: 5px; + display: inline; font-weight: bold; } .databaseError { clear:both; overflow: hidden; - width: 350px; - margin: 25px; + width: 250px; + margin: 10px; margin-bottom: 0; display: none; } \ No newline at end of file