Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(NFC) CRM-19606 : provide help text for providing mysql port info #9354

Merged
merged 2 commits into from
Nov 11, 2016
Merged

(NFC) CRM-19606 : provide help text for providing mysql port info #9354

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
155706a
CRM-19606 : provide help text for providing mysql port info
sharique Nov 5, 2016
a234105
CRM-19606 : code review changes, fixing typo
sharique Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions install/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ <h2><?php echo ts('Database Version and Connection Settings'); ?></h2>
<h4><?php echo ts('CiviCRM Database Settings'); ?></h4>
<p style="margin-left: 2em" id="mysql_credentials">
<label for="mysql_server"> <span><?php echo ts('MySQL server:'); ?></span> <input id="mysql_server" type="text" name="mysql[server]" value="<?php echo $databaseConfig['server']; ?>" /></label> <br />
<span><?php echo ts('If your mysql server is running on other port then default 3306, provide server info as server:port (i.e. localhost:1234) ') ?> </span> </br>
Copy link
Contributor

@jitendrapurohit jitendrapurohit Nov 9, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the message should be (If your mysql server is running on a port other than default 3306, provide server info as a server:port (i.e. localhost:1234)). Note the typo then**. Also we need to remove above <br> tag to display this inline to db textbox.

<label for="mysql_username"> <span><?php echo ts('MySQL username:'); ?></span> <input id="mysql_username" type="text" name="mysql[username]" value="<?php echo $databaseConfig['username']; ?>" /></label> <br />
<label for="mysql_password"> <span><?php echo ts('MySQL password:'); ?></span> <input id="mysql_password" type="password" name="mysql[password]" value="<?php echo $databaseConfig['password']; ?>" /></label> <br />
<label for="mysql_database"><span><?php echo ts('MySQL database:'); ?></span> <input id="mysql_database" type="text" name="mysql[database]" value="<?php echo $databaseConfig['database']; ?>" /></label> <br />
Expand All @@ -107,6 +108,7 @@ <h4><?php echo ts('CiviCRM Database Settings'); ?></h4>
<h4><?php echo ts('Drupal Database Settings'); ?></h4>
<p style="margin-left: 2em" id="drupal_credentials" > <!--style="display: none"-->
<label for="drupal_server"> <span><?php echo ts('MySQL server:'); ?></span> <input id="drupal_server" type="text" name="drupal[server]" value="<?php echo $drupalConfig['server']; ?>" /></label> <br />
<span><?php echo ts('If your mysql server is running on other port then default 3306, provide server info as server:port (i.e. localhost:1234) ') ?> </span> </br>
<label for="drupal_username"> <span><?php echo ts('MySQL username:'); ?></span> <input id="drupal_username" type="text" name="drupal[username]" value="<?php echo $drupalConfig['username']; ?>" /></label> <br />
<label for="drupal_password"> <span><?php echo ts('MySQL password:'); ?></span> <input id="drupal_password" type="password" name="drupal[password]" value="<?php echo $drupalConfig['password']; ?>" /></label> <br />
<label for="drupal_database"><span><?php echo ts('MySQL database:'); ?></span> <input id="drupal_database" type="text" name="drupal[database]" value="<?php echo $drupalConfig['database']; ?>" /></label> <br />
Expand All @@ -117,6 +119,7 @@ <h4><?php echo ts('Drupal Database Settings'); ?></h4>
<h4><?php echo ts('Backdrop Database Settings'); ?></h4>
<p style="margin-left: 2em" id="backdrop_credentials" > <!--style="display: none"-->
<label for="backdrop_server"> <span><?php echo ts('MySQL server:'); ?></span> <input id="backdrop_server" type="text" name="backdrop[server]" value="<?php echo $backdropConfig['server'] ?>" /></label> <br />
<span><?php echo ts('If your mysql server is running on other port then default 3306, provide server info as server:port (i.e. localhost:1234) ') ?> </span> </br>
<label for="backdrop_username"> <span><?php echo ts('MySQL username:'); ?></span> <input id="backdrop_username" type="text" name="backdrop[username]" value="<?php echo $backdropConfig['username'] ?>" /></label> <br />
<label for="backdrop_password"> <span><?php echo ts('MySQL password:'); ?></span> <input id="backdrop_password" type="password" name="backdrop[password]" value="<?php echo $backdropConfig['password'] ?>" /></label> <br />
<label for="backdrop_database"><span><?php echo ts('MySQL database:'); ?></span> <input id="backdrop_database" type="text" name="backdrop[database]" value="<?php echo $backdropConfig['database'] ?>" /></label> <br />
Expand Down