[Joomla-commits] r18747 - in development/trunk/installation: . language/en-GB language/en-US models/forms views/database/tmpl
eddi...@jcode001.directrouter.com
Date: 2010-09-01 01:38:11 -0500 (Wed, 01 Sep 2010)
New Revision: 18747
Modified:
development/trunk/installation/CHANGELOG
development/trunk/installation/language/en-GB/en-GB.ini
development/trunk/installation/language/en-US/en-US.ini
development/trunk/installation/models/forms/database.xml
development/trunk/installation/views/database/tmpl/default.php
Log:
Fixed issue [#21880] Relocate Database Prefix Portion of Database Configuration Installer Screen (Matt Thomas).
Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2010-09-01 05:37:48 UTC (rev 18746)
+++ development/trunk/installation/CHANGELOG 2010-09-01 06:38:11 UTC (rev 18747)
@@ -33,6 +33,7 @@
# Fixed issue [#21862] Backend menu components are not ordered alphabetically (Hannes Papenberg).
# Fixed issue [#21879] Speed improvement for Beez tempalte's use of html5.js (Rouven Weßling).
# Fixed issue [#22037] Module manager - varies only (Brian Teeman, Bill Richardson).
+ # Fixed issue [#21880] Relocate Database Prefix Portion of Database Configuration Installer Screen (Matt Thomas).
31-Aug-2010 Jean-Marie Simonet
# [#22150] hathor menu type - unable to select type. Thanks Bill.
Modified: development/trunk/installation/language/en-GB/en-GB.ini
===================================================================
--- development/trunk/installation/language/en-GB/en-GB.ini 2010-09-01 05:37:48 UTC (rev 18746)
+++ development/trunk/installation/language/en-GB/en-GB.ini 2010-09-01 06:38:11 UTC (rev 18747)
@@ -41,7 +41,7 @@
INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process"
INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the mysql account is mandatory"
INSTL_DATABASE_PASSWORD_LABEL="Password"
-INSTL_DATABASE_PREFIX_DESC="Dont use "bak_" since this is used for backup tables"
+INSTL_DATABASE_PREFIX_DESC="Choose a database prefix. Ideally, three or four characters long, contain only alphanumeric characters, and MUST end in an underscore. Do not use "bak_" since this is used for backup tables."
INSTL_DATABASE_PREFIX_LABEL="Table Prefix"
INSTL_DATABASE_TYPE_DESC="This is probably "mysql""
INSTL_DATABASE_TYPE_LABEL="Database Type"
Modified: development/trunk/installation/language/en-US/en-US.ini
===================================================================
--- development/trunk/installation/language/en-US/en-US.ini 2010-09-01 05:37:48 UTC (rev 18746)
+++ development/trunk/installation/language/en-US/en-US.ini 2010-09-01 06:38:11 UTC (rev 18747)
@@ -41,7 +41,7 @@
INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process"
INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the mysql account is mandatory"
INSTL_DATABASE_PASSWORD_LABEL="Password"
-INSTL_DATABASE_PREFIX_DESC="Dont use "bak_" since this is used for backup tables"
+INSTL_DATABASE_PREFIX_DESC="Choose a database prefix. Ideally, three or four characters long, contain only alphanumeric characters, and MUST end in an underscore. Do not use "bak_" since this is used for backup tables."
INSTL_DATABASE_PREFIX_LABEL="Table Prefix"
INSTL_DATABASE_TYPE_DESC="This is probably "mysql""
INSTL_DATABASE_TYPE_LABEL="Database Type"
Modified: development/trunk/installation/models/forms/database.xml
===================================================================
--- development/trunk/installation/models/forms/database.xml 2010-09-01 05:37:48 UTC (rev 18746)
+++ development/trunk/installation/models/forms/database.xml 2010-09-01 06:38:11 UTC (rev 18747)
@@ -36,8 +36,8 @@
default="backup"
required="true"
>
+ <option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
- <option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
</field>
<field name="db_prefix" type="text" id="db_prefix" class="inputbox"
label="INSTL_DATABASE_PREFIX_LABEL"
Modified: development/trunk/installation/views/database/tmpl/default.php
===================================================================
--- development/trunk/installation/views/database/tmpl/default.php 2010-09-01 05:37:48 UTC (rev 18746)
+++ development/trunk/installation/views/database/tmpl/default.php 2010-09-01 06:38:11 UTC (rev 18747)
@@ -150,44 +150,30 @@
</em>
</td>
</tr>
- </table>
- <br /><br />
- </div>
-
- <h3 class="title-smenu moofx-toggler" title="<?php echo JText::_('JADVANCED'); ?>">
- <?php echo JText::_('INSTL_ADVANCED_SETTINGS'); ?>
- </h3>
- <div class="section-smenu moofx-slider">
- <table class="content2">
<tr>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- <tr>
<td colspan="2">
- <?php echo $this->form->getLabel('db_old'); ?>
+ <?php echo $this->form->getLabel('db_prefix'); ?>
<br />
- <?php echo $this->form->getInput('db_old'); ?>
+ <?php echo $this->form->getInput('db_prefix'); ?>
</td>
<td>
<em>
- <?php echo JText::_('INSTL_DATABASE_OLD_PROCESS_DESC'); ?>
+ <?php echo JText::_('INSTL_DATABASE_PREFIX_DESC'); ?>
</em>
</td>
</tr>
<tr>
<td colspan="2">
- <?php echo $this->form->getLabel('db_prefix'); ?>
+ <?php echo $this->form->getLabel('db_old'); ?>
<br />
- <?php echo $this->form->getInput('db_prefix'); ?>
+ <?php echo $this->form->getInput('db_old'); ?>
</td>
<td>
<em>
- <?php echo JText::_('INSTL_DATABASE_PREFIX_DESC'); ?>
+ <?php echo JText::_('INSTL_DATABASE_OLD_PROCESS_DESC'); ?>
</em>
</td>
- </tr>
+ </tr>
</table>
</div>
<div class="clr"></div>
_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits