diff --git a/install/install.py b/install/install.py index c6462d140..faf66202c 100755 --- a/install/install.py +++ b/install/install.py @@ -17,10 +17,7 @@ import stat VERSION = '2.1' BUILD = 1 -char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', - 'nums': '0123456789', - 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', - } +char_set = {'small': 'abcdefghijklmnopqrstuvwxyz','nums': '0123456789','big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'} def generate_pass(length=14): diff --git a/websiteFunctions/templates/websiteFunctions/installWordPress.html b/websiteFunctions/templates/websiteFunctions/installWordPress.html index da2efa079..32751a2c3 100755 --- a/websiteFunctions/templates/websiteFunctions/installWordPress.html +++ b/websiteFunctions/templates/websiteFunctions/installWordPress.html @@ -17,7 +17,7 @@

- {{ domainName }} - {% trans "Installation Details" %} + {{ domainName }} - {% trans "Installation Details" %} - Stress Test

@@ -84,19 +84,14 @@
- - -

{% trans "Installation failed. Error message:" %} {$ errorMessage $}

-

{% trans "Installation successful. Visit:" %} {$ installationURL $}

+

{% trans "Installation successful. Visit:" %} {$ installationURL $} or perform stress test.

- -

{% trans "Could not connect to server. Please refresh this page." %}

diff --git a/websiteFunctions/templates/websiteFunctions/launchChild.html b/websiteFunctions/templates/websiteFunctions/launchChild.html index dd057a69e..fe5468d0a 100755 --- a/websiteFunctions/templates/websiteFunctions/launchChild.html +++ b/websiteFunctions/templates/websiteFunctions/launchChild.html @@ -31,6 +31,8 @@ class="btn btn-border btn-alt border-azure btn-link font-azure" href="/websites/{{ domain }}/{{ childDomain }}/syncToMaster" title="">{% trans "Copy/Sync to Master" %} + {% trans "Stress Test" %}
diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html index f908501f7..0802c79f9 100755 --- a/websiteFunctions/templates/websiteFunctions/website.html +++ b/websiteFunctions/templates/websiteFunctions/website.html @@ -32,8 +32,10 @@ {% trans "Clone/Staging" %} - {% trans "Set up SSH Access" %} + {% trans "Stress Test" %}