X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=install%2Ftemplate.html;h=d63821166cd08148b3835dea78526b71adc4e727;hb=4c056b9b0286d90f890bd795a9f6d54bf2e27397;hp=d9ace3f94def6627d4528d84efc7b370073b5e30;hpb=b830793758190aabf57cb213713e6cca0b1f2b82;p=civicrm-core.git diff --git a/install/template.html b/install/template.html index d9ace3f94d..d63821166c 100644 --- a/install/template.html +++ b/install/template.html @@ -9,7 +9,7 @@
-
Version
+
"{$civicrm_version['version']} {$civicrm_version['cms']}")); ?>
/>
@@ -18,12 +18,12 @@
- +

see below for details.'); ?>

- hasWarnings()) { ?> + hasWarnings()) { ?>

- hasErrors()) { ?> + hasErrors()) { ?>

@@ -51,7 +51,7 @@ window.location = location; } else { - window.location += '?seedLanguage=' + language; + window.location += (location.indexOf('?') < 0 ? '?' : '&') + 'seedLanguage=' + language; } } @@ -78,20 +78,21 @@

-

+

-hasErrors()) { ?> +hasErrors()) { ?>

Database Details below for specific errors.", array(1 => '#dbDetails')); ?>

-

+

+




@@ -116,19 +117,22 @@ Check this box to pre-populate CiviCRM with sample English contact records, online contribution pages, profile forms, etc. These examples can help you learn about CiviCRM features.

-

+

-

CiviCRM Database Details

-showTable("MySQL CiviCRM Configuration"); ?> + +' . ts('CiviCRM Database Details') . ''; + $dbReq->showTable(ts("MySQL %1 Configuration", array(1 => 'CiviCRM'))); +?> Drupal Database Details"; -$dbReq->showTable("MySQL Drupal Configuration"); +echo "

" . ts('Drupal Database Details') . "

"; +$dbReq->showTable(ts("MySQL %1 Configuration", array(1 => 'Drupal'))); }?>
-

Requirements

+

showTable(); ?>