diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index a2439c477..17aa3a262 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -1647,7 +1647,7 @@ $parameters = array( import json tempStatusPath = self.data['tempStatusPath'] statusFile = open(tempStatusPath, 'w') - statusFile.writelines('Creating Website...') + statusFile.writelines('Creating Website...,10') statusFile.close() @@ -1677,7 +1677,7 @@ $parameters = array( break elif lastLine.find('[404]') > -1: statusFile = open(currentTemp, 'w') - statusFile.writelines('Failed to Create Website: error: %s[404]' % lastLine) + statusFile.writelines('Failed to Create Website: error: %s. [404]' % lastLine) statusFile.close() return 0 else: @@ -1687,7 +1687,7 @@ $parameters = array( time.sleep(2) statusFile = open(tempStatusPath, 'w') - statusFile.writelines('Installing WordPress....') + statusFile.writelines('Installing WordPress....,30') statusFile.close() ## Install WordPress diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index 7e090f7ba..65e373f92 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -310,12 +310,14 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $ getCreationStatus(); } else { - - // $scope.errorMessage = response.data.error_message; - alert("Status not = 1: Error..." + response.data.error_message) + $scope.goBackDisable = false; + new PNotify({ + title: 'Operation Failed!', + text: response.data.error_message, + type: 'error' + }); } - } function cantLoadInitialDatas(response) { diff --git a/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html b/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html index 48560847b..8ef3a1a19 100644 --- a/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html +++ b/websiteFunctions/templates/websiteFunctions/WPConfigurePlugins.html @@ -10,70 +10,88 @@
{% trans "You can configure list of plugins that will automatically get installed while deploying WordPress." %}
| ID - | -File name - | +Action - | + + +
|---|
| ID + | +File name + | + +Action + | -||
|---|---|---|---|---|
|
- {{ sub.id }} + | ||||
|
+ {{ sub.id }} - |
-
- {{ sub.Name }} - |
-
-
-
- Edit
-
-
-
+ |
+
+ {{ sub.Name }} + |
+
+
+
+ Edit
+
+
+
-
+
-
- |
+
+
-