Merge branch 'v2.0.5-dev' into v2.1.1

This commit is contained in:
Usman Nasir
2021-03-27 14:47:13 +05:00
5 changed files with 44 additions and 36 deletions

View File

@@ -10,7 +10,9 @@
<div class="container">
<div id="page-title">
<h2>{% trans "List Databases" %}</h2>
<h2>{% trans "List Databases" %}
<a class="pull-right btn btn-primary" href="{% url "createDatabase" %}">{% trans "Create Database" %}</a>
</h2>
<p>{% trans "List Databases or change their passwords." %}</p>
</div>
<div ng-controller="listDBs" class="panel">

View File

@@ -10,7 +10,9 @@
<div class="container">
<div id="page-title">
<h2>{% trans "List Email Accounts" %}</h2>
<h2>{% trans "List Email Accounts" %}
<a class="pull-right btn btn-primary" href="{% url "createEmailAccount" %}">{% trans "Create Email" %}</a>
</h2>
<p>{% trans "List Emails Accounts. Change their passwords or delete them." %}</p>
</div>
<div ng-controller="listEmails" class="panel">

View File

@@ -10,7 +10,9 @@
<div class="container">
<div id="page-title">
<h2>{% trans "List Users" %}</h2>
<h2>{% trans "List Users" %}
<a class="pull-right btn btn-primary" href="{% url "createUser" %}">{% trans "Create User" %}</a>
</h2>
<p>{% trans "List Users that you own." %}</p>
</div>
<div ng-controller="listTableUsers" class="panel">

View File

@@ -16,8 +16,10 @@
<div ng-controller="listWebsites" class="container">
<div id="page-title">
<h2 id="domainNamePage">{% trans "List Websites" %}</h2> <img ng-hide="cyberPanelLoading"
src="{% static 'images/loading.gif' %}">
<h2 id="domainNamePage">{% trans "List Websites" %}
<a class="pull-right btn btn-primary" href="{% url "createWebsite" %}">{% trans "Create Website" %}</a>
</h2>
<img ng-hide="cyberPanelLoading" src="{% static 'images/loading.gif' %}">
<p>{% trans "On this page you can launch, list, modify and delete websites from your server." %}</p>
</div>
@@ -48,7 +50,7 @@
background-repeat: no-repeat;
background-size: cover;
position: relative;"
class="col-lg-3 col-md-12">
class="col-lg-3 col-md-12">
</div>
<div class="col-lg-9" style="text-transform: none">
<div style="border-bottom: 1px solid #888888" class="col-md-12">
@@ -56,11 +58,11 @@
<a href="http://{$ web.domain $}" target="_blank" title="Visit Site">
<h2 style="display: inline; color: #414C59;" ng-bind="web.domain"></h2>
</a>
<a target="_blank" href="/filemanager/{$ web.domain $}" title="Open File Manager"> --
<a target="_self" href="/filemanager/{$ web.domain $}" title="Open File Manager"> --
File Manager</a>
</div>
<div class="col-md-2 content-box-header" style="text-transform: none;">
<a href="/websites/{$ web.domain $}" target="_blank" title="Manage Website">
<a href="/websites/{$ web.domain $}" target="_self" title="Manage Website">
<i class="p fa fa-external-link btn-icon">&emsp;</i>
<span>Manage</span>
</a>

View File

@@ -261,22 +261,22 @@
</div>
<div class="col-md-3 panel-body">
<a href="{$ domainAliasURL $}" target="_blank" title="{% trans 'Domain Alias' %}"
<a href="{$ domainAliasURL $}" target="_self" title="{% trans 'Domain Alias' %}"
href="" title="{% trans 'Domain Alias' %}">
<img src="{% static 'images/icons/web-domain.png' %}" width="65" class="mr-10">
</a>
<a href="{$ domainAliasURL $}" target="_blank" title="{% trans 'Domain Alias' %}"
<a href="{$ domainAliasURL $}" target="_self" title="{% trans 'Domain Alias' %}"
href="" title="{% trans 'Domain Alias' %}">
<span class="h4">{% trans "Domain Alias" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a href="{% url 'listCron' %}?domain={{ domain }}" target="_blank" title="{% trans 'Add new Cron Job' %}"
<a href="{% url 'listCron' %}?domain={{ domain }}" target="_self" title="{% trans 'Add new Cron Job' %}"
href="" title="{% trans 'List Domains' %}">
<img src="{% static 'images/icons/repeat.png' %}" width="65" class="mr-10">
</a>
<a href="{% url 'listCron' %}?domain={{ domain }}" target="_blank" title="{% trans 'Add new Cron Job' %}"
<a href="{% url 'listCron' %}?domain={{ domain }}" target="_self" title="{% trans 'Add new Cron Job' %}"
title="{% trans 'Add new Cron Job' %}">
<span class="h4">{% trans "Cron Jobs" %}</span>
</a>
@@ -810,10 +810,10 @@
<div class="content-box-wrapper">
<div class="row mx-10">
<div class="col-md-3 panel-body">
<a href="{$ fileManagerURL $}" target="_blank" title="{% trans 'File Manager' %}">
<a href="{$ fileManagerURL $}" target="_self" title="{% trans 'File Manager' %}">
<img src="{% static 'images/icons/office-material.png' %}" width="65" class="mr-10">
</a>
<a href="{$ fileManagerURL $}" target="_blank" title="{% trans 'File Manager' %}">
<a href="{$ fileManagerURL $}" target="_self" title="{% trans 'File Manager' %}">
<span class="h4">{% trans "File Manager" %}</span>
</a>
</div>
@@ -925,52 +925,52 @@
<div class="content-box-wrapper">
<div class="row mx-10">
<div class="col-md-3 panel-body">
<a id="emailLists" target="_blank" title="{% trans 'Create Lists' %}">
<a id="emailLists" target="_self" title="{% trans 'Create Lists' %}">
<img src="{% static 'emailMarketing/mailing.png' %}" width="65"
class="mr-10">
</a>
<a id="emailListsChild" target="_blank" title="{% trans 'Create Lists' %}">
<a id="emailListsChild" target="_self" title="{% trans 'Create Lists' %}">
<span class="h4">{% trans "Create Lists" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a id="manageLists" target="_blank" title="{% trans 'Manage Lists' %}">
<a id="manageLists" target="_self" title="{% trans 'Manage Lists' %}">
<img src="{% static 'emailMarketing/checklist.png' %}" width="65"
class="mr-10">
</a>
<a id="manageListsChild" target="_blank" title="{% trans 'Manage Lists' %}">
<a id="manageListsChild" target="_self" title="{% trans 'Manage Lists' %}">
<span class="h4">{% trans "Manage Lists" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a id="manageSMTPHosts" target="_blank" title="{% trans 'SMTP Hosts' %}">
<a id="manageSMTPHosts" target="_self" title="{% trans 'SMTP Hosts' %}">
<img src="{% static 'emailMarketing/post-office.png' %}" width="65"
class="mr-10">
</a>
<a id="manageSMTPHostsChild" target="_blank" title="{% trans 'SMTP Hosts' %}">
<a id="manageSMTPHostsChild" target="_self" title="{% trans 'SMTP Hosts' %}">
<span class="h4">{% trans "SMTP Hosts" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a id="composeEmails" target="_blank" title="{% trans 'Compose Message' %}">
<a id="composeEmails" target="_self" title="{% trans 'Compose Message' %}">
<img src="{% static 'emailMarketing/compose.png' %}" width="65"
class="mr-10">
</a>
<a id="composeEmailsChild" target="_blank"
<a id="composeEmailsChild" target="_self"
title="{% trans 'Compose Message' %}">
<span class="h4">{% trans "Compose" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a id="sendEmailsPage" target="_blank" title="{% trans 'Send Emails' %}">
<a id="sendEmailsPage" target="_self" title="{% trans 'Send Emails' %}">
<img src="{% static 'emailMarketing/paper-plane.png' %}" width="65"
class="mr-10">
</a>
<a id="sendEmailsPageChild" target="_blank" title="{% trans 'Send Emails' %}">
<a id="sendEmailsPageChild" target="_self" title="{% trans 'Send Emails' %}">
<span class="h4">{% trans "Send Emails" %}</span>
</a>
</div>
@@ -994,66 +994,66 @@
<div class="content-box-wrapper">
<div class="row mx-10">
<div class="col-md-3 panel-body">
<a href="{$ wordPressInstallURL $}" target="_blank"
<a href="{$ wordPressInstallURL $}" target="_self"
title="{% trans 'Install wordpress with LSCache' %}">
<img src="{% static 'images/icons/wordpress.png' %}" width="65" class="mr-10">
</a>
<a href="{$ wordPressInstallURL $}" target="_blank"
<a href="{$ wordPressInstallURL $}" target="_self"
title="{% trans 'Install wordpress with LSCache' %}">
<span class="h4">{% trans "WP + LSCache" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a href="{$ joomlaInstallURL $}" target="_blank"
<a href="{$ joomlaInstallURL $}" target="_self"
title="{% trans 'Install Joomla with LSCache' %}">
<img src="{% static 'images/icons/joomla-logo.png' %}" width="65" class="mr-10">
</a>
<a href="{$ joomlaInstallURL $}" target="_blank"
<a href="{$ joomlaInstallURL $}" target="_self"
title="{% trans 'Install Joomla with LSCache' %}">
<span class="h4">{% trans "Joomla" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a href="/websites/{{ domain }}/manageGIT" target="_blank"
<a href="/websites/{{ domain }}/manageGIT" target="_self"
title="{% trans 'Attach Git with this website!' %}">
<img src="{% static 'images/icons/git-logo.png' %}" width="65" class="mr-10">
</a>
<a href="/websites/{{ domain }}/manageGIT" target="_blank"
<a href="/websites/{{ domain }}/manageGIT" target="_self"
title="{% trans 'Attach Git with this website!' %}">
<span class="h4">{% trans "Git" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a href="{$ installPrestaURL $}" target="_blank"
<a href="{$ installPrestaURL $}" target="_self"
title="{% trans 'Install Prestashop' %}">
<img src="{% static 'images/icons/prestashop.png' %}" width="65" class="mr-10">
</a>
<a href="{$ installPrestaURL $}" target="_blank"
<a href="{$ installPrestaURL $}" target="_self"
title="{% trans 'Install Prestashop' %}">
<span class="h4">{% trans "Prestashop" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a href="{$ installMagentoURL $}" target="_blank"
<a href="{$ installMagentoURL $}" target="_self"
title="{% trans 'Install Magento' %}">
<img src="{% static 'images/icons/magento.png' %}" width="65" class="mr-10">
</a>
<a href="{$ installMagentoURL $}" target="_blank"
<a href="{$ installMagentoURL $}" target="_self"
title="{% trans 'Install Magento' %}">
<span class="h4">{% trans "Magento" %}</span>
</a>
</div>
<div class="col-md-3 panel-body">
<a href="{$ installMauticURL $}" target="_blank"
<a href="{$ installMauticURL $}" target="_self"
title="{% trans 'Install Mautic' %}">
<img src="{% static 'images/icons/mautic.png' %}" width="65" class="mr-10">
</a>
<a href="{$ installMauticURL $}" target="_blank"
<a href="{$ installMauticURL $}" target="_self"
title="{% trans 'Install Mautic' %}">
<span class="h4">{% trans "Mautic" %}</span>
</a>