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.

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

merged 2 commits into from
Nov 11, 2016

Conversation

sharique
Copy link
Contributor

@sharique sharique commented Nov 5, 2016

I'm new to Civicrm, starting with a small patch.

----------------------------------------
* CRM-19606: Provide help text in installer to provide mysql port, if mysql is running on different port
  https://issues.civicrm.org/jira/browse/CRM-19606
@civicrm-builder
Copy link

Can one of the admins verify this patch?

@totten
Copy link
Member

totten commented Nov 7, 2016

jenkins, ok to test

@jitendrapurohit
Copy link
Contributor

jitendrapurohit commented Nov 9, 2016

This seems to be creating a little mess on the installation page.

Can we add testResult class to this span so that it gets displayed similar to the seedLanguage help text displayed above ?

@@ -98,6 +98,7 @@
<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

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.

----------------------------------------
* CRM-19606: Provide help text in installer to provide mysql port, if mysql is running on different port
  https://issues.civicrm.org/jira/browse/CRM-19606
@jitendrapurohit
Copy link
Contributor

Tested the PR. Installation page looks like -

final

@monishdeb monishdeb merged commit 54ee12d into civicrm:master Nov 11, 2016
@monishdeb
Copy link
Member

Congrats @sharique for your first PR :)

@civicrm-builder
Copy link

Can one of the admins verify this patch?

@sharique
Copy link
Contributor Author

@monishdeb Thanks. Hopefully more to come.

@sharique sharique deleted the CRM-19606 branch November 12, 2016 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants