diff --git a/plogical/test.py b/plogical/test.py index 0c320adb9..e69de29bb 100644 --- a/plogical/test.py +++ b/plogical/test.py @@ -1,7 +0,0 @@ -import re - -line = "usman.exampl.com" -matchObj = re.match( r'([\da-z\.-]+\.[a-z\.]{2,12}|[\d\.]+)([\/:?=&#]{1}[\da-z\.-]+)*[\/\?]?', line, re.M|re.I) - -if matchObj: - print line \ No newline at end of file diff --git a/static/images/icons/delete-ftp.png b/static/images/icons/delete-ftp.png new file mode 100644 index 000000000..1af1bcb12 Binary files /dev/null and b/static/images/icons/delete-ftp.png differ diff --git a/static/images/icons/domain-registration.png b/static/images/icons/domain-registration.png new file mode 100644 index 000000000..4810b7259 Binary files /dev/null and b/static/images/icons/domain-registration.png differ diff --git a/static/images/icons/domains.png b/static/images/icons/domains.png new file mode 100644 index 000000000..21cebc575 Binary files /dev/null and b/static/images/icons/domains.png differ diff --git a/static/images/icons/file.png b/static/images/icons/file.png new file mode 100644 index 000000000..964214349 Binary files /dev/null and b/static/images/icons/file.png differ diff --git a/static/images/icons/ftp-upload.png b/static/images/icons/ftp-upload.png new file mode 100644 index 000000000..eb3a86453 Binary files /dev/null and b/static/images/icons/ftp-upload.png differ diff --git a/static/images/icons/joomla-logo.png b/static/images/icons/joomla-logo.png new file mode 100644 index 000000000..6eee7e82b Binary files /dev/null and b/static/images/icons/joomla-logo.png differ diff --git a/static/images/icons/laptop.png b/static/images/icons/laptop.png new file mode 100644 index 000000000..7bb3b59c1 Binary files /dev/null and b/static/images/icons/laptop.png differ diff --git a/static/images/icons/locked.png b/static/images/icons/locked.png new file mode 100644 index 000000000..110376bb0 Binary files /dev/null and b/static/images/icons/locked.png differ diff --git a/static/images/icons/log-file-format.png b/static/images/icons/log-file-format.png new file mode 100644 index 000000000..a1b96fd0b Binary files /dev/null and b/static/images/icons/log-file-format.png differ diff --git a/static/images/icons/office-material.png b/static/images/icons/office-material.png new file mode 100644 index 000000000..743e27b08 Binary files /dev/null and b/static/images/icons/office-material.png differ diff --git a/static/images/icons/pencilcase.png b/static/images/icons/pencilcase.png new file mode 100644 index 000000000..6d2c3be36 Binary files /dev/null and b/static/images/icons/pencilcase.png differ diff --git a/static/images/icons/sort.png b/static/images/icons/sort.png new file mode 100644 index 000000000..a53593ae8 Binary files /dev/null and b/static/images/icons/sort.png differ diff --git a/static/images/icons/warning.png b/static/images/icons/warning.png new file mode 100644 index 000000000..e298ba22b Binary files /dev/null and b/static/images/icons/warning.png differ diff --git a/static/images/icons/wordpress.png b/static/images/icons/wordpress.png new file mode 100644 index 000000000..aa162c65e Binary files /dev/null and b/static/images/icons/wordpress.png differ diff --git a/static/websiteFunctions/websiteFunctions.css b/static/websiteFunctions/websiteFunctions.css index 211fcb51d..bc1818f18 100644 --- a/static/websiteFunctions/websiteFunctions.css +++ b/static/websiteFunctions/websiteFunctions.css @@ -4,4 +4,9 @@ font-weight: bold; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; +} + +.website-content-box{ + border-radius: 25px; + border-color:#3498db } \ No newline at end of file diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index 1446b50c5..52da87047 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -114,7 +114,7 @@ app.controller('listWebsites', function($scope,$http) { function ListInitialData(response) { - if (response.data.listWebSiteStatus==1) { + if (response.data.listWebSiteStatus === 1) { var finalData = JSON.parse(response.data.data); $scope.WebSitesList = finalData; diff --git a/websiteFunctions/static/images/icons/delete-ftp.png b/websiteFunctions/static/images/icons/delete-ftp.png new file mode 100644 index 000000000..1af1bcb12 Binary files /dev/null and b/websiteFunctions/static/images/icons/delete-ftp.png differ diff --git a/websiteFunctions/static/images/icons/domain-registration.png b/websiteFunctions/static/images/icons/domain-registration.png new file mode 100644 index 000000000..4810b7259 Binary files /dev/null and b/websiteFunctions/static/images/icons/domain-registration.png differ diff --git a/websiteFunctions/static/images/icons/domains.png b/websiteFunctions/static/images/icons/domains.png new file mode 100644 index 000000000..21cebc575 Binary files /dev/null and b/websiteFunctions/static/images/icons/domains.png differ diff --git a/websiteFunctions/static/images/icons/file.png b/websiteFunctions/static/images/icons/file.png new file mode 100644 index 000000000..964214349 Binary files /dev/null and b/websiteFunctions/static/images/icons/file.png differ diff --git a/websiteFunctions/static/images/icons/ftp-upload.png b/websiteFunctions/static/images/icons/ftp-upload.png new file mode 100644 index 000000000..eb3a86453 Binary files /dev/null and b/websiteFunctions/static/images/icons/ftp-upload.png differ diff --git a/websiteFunctions/static/images/icons/joomla-logo.png b/websiteFunctions/static/images/icons/joomla-logo.png new file mode 100644 index 000000000..6eee7e82b Binary files /dev/null and b/websiteFunctions/static/images/icons/joomla-logo.png differ diff --git a/websiteFunctions/static/images/icons/laptop.png b/websiteFunctions/static/images/icons/laptop.png new file mode 100644 index 000000000..7bb3b59c1 Binary files /dev/null and b/websiteFunctions/static/images/icons/laptop.png differ diff --git a/websiteFunctions/static/images/icons/locked.png b/websiteFunctions/static/images/icons/locked.png new file mode 100644 index 000000000..110376bb0 Binary files /dev/null and b/websiteFunctions/static/images/icons/locked.png differ diff --git a/websiteFunctions/static/images/icons/log-file-format.png b/websiteFunctions/static/images/icons/log-file-format.png new file mode 100644 index 000000000..a1b96fd0b Binary files /dev/null and b/websiteFunctions/static/images/icons/log-file-format.png differ diff --git a/websiteFunctions/static/images/icons/office-material.png b/websiteFunctions/static/images/icons/office-material.png new file mode 100644 index 000000000..743e27b08 Binary files /dev/null and b/websiteFunctions/static/images/icons/office-material.png differ diff --git a/websiteFunctions/static/images/icons/pencilcase.png b/websiteFunctions/static/images/icons/pencilcase.png new file mode 100644 index 000000000..6d2c3be36 Binary files /dev/null and b/websiteFunctions/static/images/icons/pencilcase.png differ diff --git a/websiteFunctions/static/images/icons/sort.png b/websiteFunctions/static/images/icons/sort.png new file mode 100644 index 000000000..a53593ae8 Binary files /dev/null and b/websiteFunctions/static/images/icons/sort.png differ diff --git a/websiteFunctions/static/images/icons/warning.png b/websiteFunctions/static/images/icons/warning.png new file mode 100644 index 000000000..e298ba22b Binary files /dev/null and b/websiteFunctions/static/images/icons/warning.png differ diff --git a/websiteFunctions/static/images/icons/wordpress.png b/websiteFunctions/static/images/icons/wordpress.png new file mode 100644 index 000000000..aa162c65e Binary files /dev/null and b/websiteFunctions/static/images/icons/wordpress.png differ diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.css b/websiteFunctions/static/websiteFunctions/websiteFunctions.css index 211fcb51d..bc1818f18 100644 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.css +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.css @@ -4,4 +4,9 @@ font-weight: bold; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; +} + +.website-content-box{ + border-radius: 25px; + border-color:#3498db } \ No newline at end of file diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html index 07f4d00b8..36adfc55d 100644 --- a/websiteFunctions/templates/websiteFunctions/website.html +++ b/websiteFunctions/templates/websiteFunctions/website.html @@ -101,175 +101,177 @@ -
-
-

- {% trans "Logs" %} -

- -
-
-
- -
- {% trans "Access Logs" %} -
-
- -
- -
-
- -
- {% trans "Error Logs" %} -
-
- -
- -
+
+
+

+ {% trans "Logs" %} +

-
+
+
-
+
+ + + + + {% trans "Access Logs" %} + -
-

{% trans "Logs Fetched" %}

-
- - -
-

{% trans "Could not fetch logs, see the logs file through command line. Error message:" %} {$ errorMessage $}

-
- - -
-

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

-
- - - -
- -
- -
- -
- -
- -
- - -
- -
- -
-
- - - - - - - - - - - - - - - - - - - -
DomainIP AddressTimeResourceSize
-
-
- -
- -
- -
- - -
- -
- -
- -
- -
+
+ + + + + {% trans "Error Logs" %} + +
+
+ + + +
+

{% trans "Logs Fetched" %}

+
+ + +
+

{% trans "Could not fetch logs, see the logs file through command line. Error message:" %} {$ errorMessage $}

+
+ + +
+

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

+
+ + + +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + +
DomainIP AddressTimeResourceSize
+
+
+ + +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+
- + + + +
+ + +
+
+
+
+ + +
+ +
+

+ {% trans "Domains" %} +

+ +
+
+ +
+ + + + + {% trans "Add Domains" %} + +
+
+ + + + + {% trans "List Domains" %} + + +
+
-
-
-
- - -
-
-

- {% trans "Domains" %} -

- -
-
- -
- -
- {% trans "Add Domains" %} -
-
- -
- -
- - -
- -
- {% trans "List Domains" %} -
-
- -
- -
-
@@ -460,303 +462,327 @@ - - +
-
-
-
-
-

- {% trans "Configurations" %} + +
+ +
+

+ {% trans "Configurations" %} +

+ + +
+
+ +
+ + + + + + {% trans "vHost Conf" %} + + +
+ + +
+ + + + + + {% trans "Rewrite Rules" %} + + +
+ + +
+ + + + + + {% trans "Add SSL" %} + + +
+ + +
+ + + + + + {% trans "Change PHP" %} + + +
+ + + +
+ +
+ +
+

{% trans "SSL Saved" %}

+
+ + +
+

{% trans "Could not save SSL. Error message:" %} {$ errorMessage $}

+
+ + +
+

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

+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ + +
+
+ + +
+ + + + + +
+ + + + + +
+ +
+ +
+

{% trans "Current configuration in the file fetched." %}

+
+ + +
+

{% trans "Could not fetch current configuration. Error message:" %} {$ errorMessage $}

+
+ + +
+

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

+
+ +
+

{% trans "Configurations saved." %}

+
+ +
+

{% trans "Could not fetch current configuration. Error message:" %} {$ errorMessage $}

+
+ + +
+
+ +
+
+ +
+
+ +
+ +
+ + +
+
+ + +
+ + + + + +
+ + + +
+ +
+ +
+

{% trans "Current rewrite rules in the file fetched." %}

+
+ + +
+

{% trans "Could not fetch current rewrite rules. Error message:" %} {$ errorMessage $}

+
+ + +
+

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

+
+ +
+

{% trans "Configurations saved." %}

+
+ +
+

{% trans "Could not save rewrite rules. Error message:" %} {$ errorMessage $}

+
+ + +
+
+ +
+
+ +
+
+ +
+ +
+ + +
+
+ + +
+ + + + + +
+ + +
+
+
+
+ + + +
+
+

+ {% trans "Files" %}

-
+
-
- -
- {% trans "Edit vHost Main Configurations" %} -
-
- -
- -
- - -
- -
- {% trans "Add Rewrite Rules (.htaccess)" %} -
-
- -
- -
- - -
- -
- {% trans "Add SSL" %} -
-
- -
- -
- - - -
- -
- -
-

{% trans "SSL Saved" %}

-
- - -
-

{% trans "Could not save SSL. Error message:" %} {$ errorMessage $}

-
- - -
-

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

-
- - -
-
- -
-
- -
-
- -
-
- -
- -
- - -
-
- - -
- - +
+ + + + + {% trans "File Manager" %} +
+
- - -
- -
- -
-

{% trans "Current configuration in the file fetched." %}

-
- - -
-

{% trans "Could not fetch current configuration. Error message:" %} {$ errorMessage $}

-
- - -
-

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

-
- -
-

{% trans "Configurations saved." %}

-
- -
-

{% trans "Could not fetch current configuration. Error message:" %} {$ errorMessage $}

-
- - -
-
- -
-
- -
-
- -
- -
- - -
-
- - -
- - - - + + + + + {% trans "Create FTP Acct" %} +
- -
+
-
+ + + + + {% trans "Delete FTP Acct" %} + -
-

{% trans "Current rewrite rules in the file fetched." %}

-
- - -
-

{% trans "Could not fetch current rewrite rules. Error message:" %} {$ errorMessage $}

-
- - -
-

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

-
- -
-

{% trans "Configurations saved." %}

-
- -
-

{% trans "Could not save rewrite rules. Error message:" %} {$ errorMessage $}

-
- - -
-
- -
-
- -
-
- -
- - -
-
- - -
- - - - - -
-
+
-
-
-

- {% trans "Files" %} -

-
-
+
-
- -
- {% trans "File Manager" %} -
-
- -
- -
+
+

+ {% trans "Application Installer" %} +

+ +
+
+ + +
+ + + + + + {% trans "Wordpress with LSCache" %} + -
- -
- {% trans "Create FTP Account" %} -
-
- -
-
-
- -
- {% trans "Delete FTP Account" %} -
-
- -
- +
+ + + + + + {% trans "Joomla" %} + +
-
-
-
-
- -
-
-

- {% trans "Application Installer" %} -

- -
-
-
- -
- {% trans "Wordpress with LSCache" %} -
-
- -
- -
- -
- -
- {% trans "Joomla" %} -
-
- -
- -
@@ -887,12 +913,10 @@
+
- -
-
-
- +
+
{% else %}