Merge branch 'v2.3.3-dev' into v2.3.2

This commit is contained in:
usman@cyberpersons.com
2022-11-21 14:30:29 +05:00
8 changed files with 1144 additions and 238 deletions

View File

@@ -74,6 +74,7 @@
<script src="{% static 'baseTemplate/angularjs.1.6.5.js' %}"></script>
<script src="{% static 'baseTemplate/jquery.3.2.1.js' %}"></script>
<!-- HELPERS -->
{% with version="2.3.2.2" %}

View File

@@ -18,6 +18,7 @@ function getCookie(name) {
return cookieValue;
}
var arry = []
function selectpluginJs(val) {
@@ -252,6 +253,28 @@ app.controller('WPAddNewPlugin', function ($scope, $http, $timeout, $window, $co
});
var domain_check = 0;
function checkbox_function() {
var checkBox = document.getElementById("myCheck");
// Get the output text
// If the checkbox is checked, display the output text
if (checkBox.checked == true) {
domain_check = 0;
document.getElementById('Test_Domain').style.display = "block";
document.getElementById('Own_Domain').style.display = "none";
} else {
document.getElementById('Test_Domain').style.display = "none";
document.getElementById('Own_Domain').style.display = "block";
domain_check = 1;
}
// alert(domain_check);
}
app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $window) {
$scope.webSiteCreationLoading = true;
@@ -262,6 +285,7 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
$scope.couldNotConnect = true;
$scope.goBackDisable = true;
var statusFile;
$scope.createWordPresssite = function () {
@@ -280,7 +304,17 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
var package = $scope.packageForWebsite;
var websiteOwner = $scope.websiteOwner;
var WPtitle = $scope.WPtitle;
var domainNameCreate = $scope.domainNameCreate;
if (domain_check == 0) {
var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
var domainNameCreate = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
}
if (domain_check == 1) {
var domainNameCreate = $scope.own_domainNameCreate;
}
var WPUsername = $scope.WPUsername;
var adminEmail = $scope.adminEmail;
var WPPassword = $scope.WPPassword;
@@ -290,7 +324,17 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
var pluginupdates = $scope.pluginupdates;
var themeupdates = $scope.themeupdates;
var path = $scope.installPath;
if (domain_check == 0) {
var path = "";
}
if (domain_check = 1) {
var path = $scope.installPath;
}
var home = "1";
@@ -298,6 +342,7 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
home = "0";
}
//alert(domainNameCreate);
var data = {
title: WPtitle,
@@ -315,6 +360,7 @@ app.controller('createWordpress', function ($scope, $http, $timeout, $compile, $
home: home,
path: path,
}
var config = {
headers: {
'X-CSRFToken': getCookie('csrftoken')
@@ -461,6 +507,29 @@ function DeployToProductionInitial(vall) {
DeploytoProductionID = vall;
}
var create_staging_domain_check = 0;
function create_staging_checkbox_function() {
var checkBox = document.getElementById("Create_Staging_Check");
// Get the output text
// If the checkbox is checked, display the output text
if (checkBox.checked == true) {
create_staging_domain_check = 0;
document.getElementById('Website_Create_Test_Domain').style.display = "block";
document.getElementById('Website_Create_Own_Domain').style.display = "none";
} else {
document.getElementById('Website_Create_Test_Domain').style.display = "none";
document.getElementById('Website_Create_Own_Domain').style.display = "block";
create_staging_domain_check = 1;
}
// alert(domain_check);
}
app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $window) {
var CheckBoxpasssword = 0;
@@ -1141,9 +1210,19 @@ app.controller('WPsiteHome', function ($scope, $http, $timeout, $compile, $windo
$scope.currentStatus = "Starting creation Staging..";
//here enter domain name
if (create_staging_domain_check == 0) {
var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
var domainNameCreate = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
}
if (create_staging_domain_check == 1) {
var domainNameCreate = $scope.own_domainNameCreate;
}
var data = {
StagingName: $('#stagingName').val(),
StagingDomain: $('#stagingDomain').val(),
StagingDomain: domainNameCreate,
WPid: $('#WPid').html(),
}
var url = "/websites/CreateStagingNow";
@@ -2278,6 +2357,30 @@ app.controller('BackupSchedule', function ($scope, $http, $timeout, $window) {
};
});
/* Java script code to create account */
var website_create_domain_check = 0;
function website_create_checkbox_function() {
var checkBox = document.getElementById("myCheck");
// Get the output text
// If the checkbox is checked, display the output text
if (checkBox.checked == true) {
website_create_domain_check = 0;
document.getElementById('Website_Create_Test_Domain').style.display = "block";
document.getElementById('Website_Create_Own_Domain').style.display = "none";
} else {
document.getElementById('Website_Create_Test_Domain').style.display = "none";
document.getElementById('Website_Create_Own_Domain').style.display = "block";
website_create_domain_check = 1;
}
// alert(domain_check);
}
app.controller('createWebsite', function ($scope, $http, $timeout, $window) {
$scope.webSiteCreationLoading = true;
@@ -2332,7 +2435,18 @@ app.controller('createWebsite', function ($scope, $http, $timeout, $window) {
url = "/websites/submitWebsiteCreation";
var package = $scope.packageForWebsite;
var domainName = $scope.domainNameCreate;
if (website_create_domain_check == 0) {
var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
var domainName = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
}
if (website_create_domain_check == 1) {
var domainName = $scope.own_domainNameCreate;
}
// var domainName = $scope.domainNameCreate;
var adminEmail = $scope.adminEmail;
var phpSelection = $scope.phpSelection;
var websiteOwner = $scope.websiteOwner;
@@ -2647,9 +2761,7 @@ app.controller('listWebsites', function ($scope, $http) {
var url = "/websites/ScanWordpressSite";
var data = {
}
var data = {}
var config = {
@@ -3302,6 +3414,28 @@ app.controller('modifyWebsitesController', function ($scope, $http) {
/* Java script code to create account */
var website_child_domain_check = 0;
function website_child_domain_checkbox_function() {
var checkBox = document.getElementById("myCheck");
// Get the output text
// If the checkbox is checked, display the output text
if (checkBox.checked == true) {
website_child_domain_check = 0;
document.getElementById('Website_Create_Test_Domain').style.display = "block";
document.getElementById('Website_Create_Own_Domain').style.display = "none";
} else {
document.getElementById('Website_Create_Test_Domain').style.display = "none";
document.getElementById('Website_Create_Own_Domain').style.display = "block";
website_child_domain_check = 1;
}
// alert(domain_check);
}
app.controller('websitePages', function ($scope, $http, $timeout, $window) {
@@ -4406,6 +4540,16 @@ app.controller('websitePages', function ($scope, $http, $timeout, $window) {
if (typeof path === 'undefined') {
path = "";
}
var package = $scope.packageForWebsite;
if (website_child_domain_check == 0) {
var Part2_domainNameCreate = document.getElementById('Part2_domainNameCreate').value;
var domainName = document.getElementById('TestDomainNameCreate').value + Part2_domainNameCreate;
}
if (website_child_domain_check == 1) {
var domainName = $scope.own_domainNameCreate;
}
var data = {
@@ -5084,7 +5228,7 @@ RewriteRule ^/(xmlrpc|wp-trackback)\.php - [F,L,NC]
$scope.rewriteRules = nonWWWToWWW + $scope.rewriteRules;
} else if ($scope.rewriteTemplate === "Force WWW -> NON-WWW") {
$scope.rewriteRules = WWWToNonWWW + $scope.rewriteRules;
} else if ($scope.rewriteTemplate === "Disable Wordpress XMLRPC & Trackback") {
} else if ($scope.rewriteTemplate === "Disable Wordpress XMLRPC & Trackback") {
$scope.rewriteRules = WordpressProtect + $scope.rewriteRules;
}
};

View File

@@ -6,6 +6,88 @@
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<style>
.switch {
margin-top: 0px;
margin-left: 12px;
position: relative;
display: inline-block;
width: 32px;
height: 19px;
border-radius: 10%;
}
.switch input {
opacity: 0;
width: 0;
height: 0;
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
border-radius: 10%;
}
.slider:before {
position: absolute;
content: "";
height: 11px;
width: 12px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
border-radius: 20%;
}
input:checked + .slider {
background-color: #2196F3;
}
input:focus + .slider {
box-shadow: 0 0 1px #2196F3;
}
input:checked + .slider:before {
-webkit-transform: translateX(12px);
-ms-transform: translateX(12px);
transform: translateX(12px);
}
.help_test_domain {
background-color: black;
padding: 10px;
display: none;
opacity: 0.7;
position: absolute;
z-index: 9;
text-align: justify;
}
#help:hover + .help_test_domain {
display: block;
display: inline-block;
color: white;
font-weight: lighter;
font-size: small;
border-radius: 5px;
width: 200px;
{#height: auto;#}
}
</style>
<div class="container">
<div id="page-title">
@@ -54,40 +136,115 @@
</div>
{# <div ng-hide="installationDetailsForm" class="form-group">#}
{# <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>#}
{# <div class="col-sm-6">#}
{# <input name="dom" type="text" class="form-control" ng-model="domainNameCreate"#}
{# placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>#}
{# </div>#}
{# <div ng-show="websiteCreationForm.dom.$error.pattern"#}
{# class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>#}
{# </div>#}
{# <div ng-hide="installationDetailsForm" class="form-group">#}
{# <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>#}
{# <div class="col-sm-6">#}
{# <input name="dom" type="text" class="form-control" ng-model="domainNameCreate"#}
{# placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>#}
{# </div>#}
{# <div ng-show="websiteCreationForm.dom.$error.pattern"#}
{# class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>#}
{# </div>#}
{# My Work #}
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<label class="col-sm-3 control-label"
style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
<label class="switch">
<input type="checkbox" checked id="myCheck" onclick="checkbox_function()"
style="margin-top: 10px">
<span class="slider"></span>
</label>
<label id="help">
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"
preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
<path fill="currentColor"
d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
<path fill="currentColor"
d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
</svg>
</label>
<label class="help_test_domain">
The test domain allows you to deploy websites without the need to add DNS records, it
allows you to create staging environments, deploy test websites, and much more...
</label>
<br><br>
<div id="Test_Domain" class="tabcontent" style="border: none;margin-left: 10px; position: relative">
<div ng-hide="installationDetailsForm" class="form-group"
ng-if="{{ test_domain_data }} == 1 ">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input ng-model="domainNameCreate" id="touchspin-demo-1" class="form-control"
type="text" value="55"
name="touchspin-demo-1"
style="display: block;" placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
<span class="input-group-addon bootstrap-touchspin-postfix">/</span>
<span style="width: 25%" class="input-group-btn">
<input id="TestDomainNameCreate"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Enter Subdomain Here" %}">
<span style="width: 48%" class="input-group-btn">
<input id="Part2_domainNameCreate" class="form-control"
type="text" name="Part2_domainNameCreate"
style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
placeholder=".{{ Randam_String }}.cyberpanel.website"
value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
<div ng-if="{{ test_domain_data }} == 0 ">
<center>Looks like you have not subscripted to temporary domain feature,<a
href="https://go.cyberpanel.net/TempDomain">click here</a>
for more details.
</center>
</div>
</div>
<div id="Own_Domain" class="tabcontent"
style="border: none;display: none;margin-left: 10px;position: relative">
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input ng-model="own_domainNameCreate" id="touchspin-demo-1"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
<span class="input-group-addon bootstrap-touchspin-postfix">/</span>
<span style="width: 25%" class="input-group-btn">
<input id="touchspin-demo-1" class="form-control"
placeholder="{% trans "Leave empty for default" %}"
type="text" value="Leave empty for default"
name="touchspin-demo-1" ng-model="installPath"
style="display: block;"></span></div>
style="display: block;"></span>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
{# My Work End#}
{# #}
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Username" %}</label>
<div class="col-sm-6">

View File

@@ -7,6 +7,92 @@
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<style>
.switch {
margin-top: 7px;
margin-left: 12px;
position: relative;
display: inline-block;
width: 32px;
height: 19px;
border-radius: 10%;
}
.switch input {
opacity: 0;
width: 0;
height: 0;
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
border-radius: 10%;
}
.slider:before {
position: absolute;
content: "";
height: 11px;
width: 12px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
border-radius: 20%;
}
input:checked + .slider {
background-color: #2196F3;
}
input:focus + .slider {
box-shadow: 0 0 2px #2196F3;
}
input:checked + .slider:before {
-webkit-transform: translateX(12px);
-ms-transform: translateX(12px);
transform: translateX(12px);
}
.help_test_domain {
background-color: black;
padding: 10px;
display: none;
opacity: 0.7;
position: absolute;
z-index: 9;
text-align: justify;
}
#help:hover + .help_test_domain {
display: block;
display: inline-block;
color: white;
font-weight: lighter;
font-size: small;
border-radius: 5px;
width: 200px;
{#height: auto;#}
}
</style>
<div style="display: none" id="wordpresshome"></div>
<div style="display: none" id="WPid">{{ wpsite.id }}</div>
@@ -304,17 +390,107 @@
type="text" class="form-control" id="stagingName">
</div>
</div>
<div ng-hide="stagingDetailsForm" class="form-group mt-5">
<label style="margin-bottom: 2%!important;"
class="col-sm-2 control-label">Domain Name</label>
<div class="col-sm-10">
<input style="margin-bottom: 2%!important;"
type="text" class="form-control" id="stagingDomain">
<div ng-hide="stagingDetailsForm" class="form-group">
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-2 control-label" style="margin-top: 10px"
style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
<label class="switch ">
<input type="checkbox" checked id="Create_Staging_Check"
onclick="create_staging_checkbox_function()"
style="margin-top: 10px">
<span class="slider"></span>
</label>
<label id="help">
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25"
style="padding-top: 10px"
preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
<path fill="currentColor"
d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
<path fill="currentColor"
d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
</svg>
</label>
<label class="help_test_domain">
The test domain allows you to deploy websites without the need to add DNS
records, it
allows you to create staging environments, deploy test websites, and much
more...
</label>
<br><br>
<div id="Website_Create_Test_Domain" class="tabcontent"
style="border: none">
<div ng-hide="installationDetailsForm" class="form-group"
ng-if="{{ test_domain_data }} == 1 ">
<label class="col-sm-2 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-10">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input id="TestDomainNameCreate"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Enter Subdomain Here" %}">
<span style="width: 48%" class="input-group-btn">
<input id="Part2_domainNameCreate" class="form-control"
type="text" name="Part2_domainNameCreate"
style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
placeholder=".{{ Randam_String }}.cyberpanel.website"
value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
<div ng-if="{{ test_domain_data }} == 0 ">
<center>Looks like you have not subscripted to temporary domain feature,
<a
href="https://go.cyberpanel.net/TempDomain">click here</a>
for more details.
</center>
</div>
</div>
<div id="Website_Create_Own_Domain" class="tabcontent"
style="border: none;display: none">
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-2 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-10">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input ng-model="own_domainNameCreate" id="touchspin-demo-1"
class="col-sm-10 form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
<span style="width: 25%" class="input-group-btn">
</span></div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
</div>
</div>
</div>
<div ng-hide="stagingDetailsForm" class="center-div mt-5">
{# end my work#}
<div ng-hide="stagingDetailsForm" class="center-div mt-5 " >
<button ng-click="CreateStagingNow()"
style="margin-bottom: 2%!important;"
style="margin-bottom: 2%!important;margin-top: 50px"
class="btn btn-alt btn-hover btn-blue-alt">
<span>Create Now</span>
<i class="glyph-icon icon-arrow-right"></i>

View File

@@ -7,6 +7,90 @@
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<style>
.switch {
margin-top: 7px;
margin-left: 12px;
position: relative;
display: inline-block;
width: 32px;
height: 19px;
border-radius: 10%;
}
.switch input {
opacity: 0;
width: 0;
height: 0;
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
border-radius: 10%;
}
.slider:before {
position: absolute;
content: "";
height: 11px;
width: 12px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
border-radius: 20%;
}
input:checked + .slider {
background-color: #2196F3;
}
input:focus + .slider {
box-shadow: 0 0 2px #2196F3;
}
input:checked + .slider:before {
-webkit-transform: translateX(12px);
-ms-transform: translateX(12px);
transform: translateX(12px);
}
.help_test_domain {
background-color: black;
padding: 10px;
display: none;
opacity: 0.7;
position: absolute;
z-index: 9;
text-align: justify;
}
#help:hover + .help_test_domain {
display: block;
display: inline-block;
color: white;
font-weight: lighter;
font-size: small;
border-radius: 5px;
width: 200px;
{#height: auto;#}
}
</style>
<div class="container">
<div id="page-title">
<h2>{% trans "Create Child Domain" %}</h2>
@@ -36,16 +120,119 @@
</div>
</div>
<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<input name="dom" type="text" class="form-control"
ng-model="domainNameCreate" required>
</div>
</div>
{# <div ng-hide="DomainCreateForm" class="form-group">#}
{# <label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>#}
{# <div class="col-sm-6">#}
{# <input name="dom" type="text" class="form-control"#}
{# ng-model="domainNameCreate" required>#}
{# </div>#}
{# </div>#}
{##}
{# <div ng-hide="DomainCreateForm" class="form-group">#}
{# <label class="col-sm-3 control-label">{% trans "Path" %}: /home/{$ masterDomain $}/ </label>#}
{# <div class="col-sm-6">#}
{# <input type="text" class="form-control" ng-model="docRootPath" required>#}
{# </div>#}
{# <div ng-show="websiteCreationForm.dom.$error.pattern"#}
{# class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>#}
{# </div>#}
{# My Work . #}
<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Path" %}: /home/{$ masterDomain $}/ </label>
<label class="col-sm-3 control-label"
style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
<label class="switch my-3">
<input type="checkbox" checked id="myCheck"
onclick="website_child_domain_checkbox_function()"
style="margin-top: 10px">
<span class="slider"></span>
</label>
<label id="help">
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"
preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
<path fill="currentColor"
d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
<path fill="currentColor"
d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
</svg>
</label>
<label class="help_test_domain">
The test domain allows you to deploy websites without the need to add DNS records, it
allows you to create staging environments, deploy test websites, and much more...
</label>
<br><br>
<div id="Website_Create_Test_Domain" class="tabcontent"
style="border: none;margin-left: 10px">
<div ng-hide="DomainCreateForm" class="form-group"
ng-if="{{ test_domain_data }} == 1 ">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input id="TestDomainNameCreate"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Enter Subdomain Here" %}">
<span style="width: 48%" class="input-group-btn">
<input id="Part2_domainNameCreate" class="form-control"
type="text" name="Part2_domainNameCreate"
style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
placeholder=".{{ Randam_String }}.cyberpanel.website"
value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
<div ng-if="{{ test_domain_data }} == 0 ">
<center>Looks like you have not subscripted to temporary domain feature, <a
href="https://go.cyberpanel.net/TempDomain">click here</a>
for more details.
</center>
</div>
</div>
<div id="Website_Create_Own_Domain" class="tabcontent"
style="border: none;display: none;margin-left: 10px">
<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input ng-model="own_domainNameCreate" id="touchspin-demo-1"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
<span style="width: 25%" class="input-group-btn">
</span></div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
</div>
</div>
<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Path" %}: /home/{$ masterDomain
$}/ </label>
<div class="col-sm-6">
<input type="text" class="form-control" ng-model="docRootPath" required>
</div>
@@ -53,6 +240,8 @@
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
{# My Work End #}
<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Select PHP" %}</label>
<div class="col-sm-6">

View File

@@ -6,6 +6,89 @@
{% load static %}
{% get_current_language as LANGUAGE_CODE %}
<!-- Current language: {{ LANGUAGE_CODE }} -->
<style>
.switch {
margin-top: 7px;
margin-left: 12px;
position: relative;
display: inline-block;
width: 32px;
height: 19px;
border-radius: 10%;
}
.switch input {
opacity: 0;
width: 0;
height: 0;
}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
border-radius: 10%;
}
.slider:before {
position: absolute;
content: "";
height: 11px;
width: 12px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
border-radius: 20%;
}
input:checked + .slider {
background-color: #2196F3;
}
input:focus + .slider {
box-shadow: 0 0 2px #2196F3;
}
input:checked + .slider:before {
-webkit-transform: translateX(12px);
-ms-transform: translateX(12px);
transform: translateX(12px);
}
.help_test_domain {
background-color: black;
padding: 10px;
display: none;
opacity: 0.7;
position: absolute;
z-index: 9;
text-align: justify;
}
#help:hover + .help_test_domain {
display: block;
display: inline-block;
color: white;
font-weight: lighter;
font-size: small;
border-radius: 5px;
width: 200px;
{#height: auto;#}
}
</style>
<div class="container">
<div id="page-title">
@@ -47,15 +130,98 @@
</div>
</div>
{# My Work #}
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<input name="dom" type="text" class="form-control" ng-model="domainNameCreate"
placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>
<label class="col-sm-3 control-label"
style="margin-bottom: 15px">{% trans "Test Domain" %}</label>
<label class="switch my-3">
<input type="checkbox" checked id="myCheck" onclick="website_create_checkbox_function()"
style="margin-top: 10px">
<span class="slider"></span>
</label>
<label id="help">
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" style="padding-top: 10px"
preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
<path fill="currentColor"
d="M12 6a3.939 3.939 0 0 0-3.934 3.934h2C10.066 8.867 10.934 8 12 8s1.934.867 1.934 1.934c0 .598-.481 1.032-1.216 1.626a9.208 9.208 0 0 0-.691.599c-.998.997-1.027 2.056-1.027 2.174V15h2l-.001-.633c.001-.016.033-.386.441-.793c.15-.15.339-.3.535-.458c.779-.631 1.958-1.584 1.958-3.182A3.937 3.937 0 0 0 12 6zm-1 10h2v2h-2z"/>
<path fill="currentColor"
d="M12 2C6.486 2 2 6.486 2 12s4.486 10 10 10s10-4.486 10-10S17.514 2 12 2zm0 18c-4.411 0-8-3.589-8-8s3.589-8 8-8s8 3.589 8 8s-3.589 8-8 8z"/>
</svg>
</label>
<label class="help_test_domain">
The test domain allows you to deploy websites without the need to add DNS records, it
allows you to create staging environments, deploy test websites, and much more...
</label>
<br><br>
<div id="Website_Create_Test_Domain" class="tabcontent"
style="border: none;margin-left: 10px">
<div ng-hide="installationDetailsForm" class="form-group"
ng-if="{{ test_domain_data }} == 1 ">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input id="TestDomainNameCreate"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Enter Subdomain Here" %}">
<span style="width: 48%" class="input-group-btn">
<input id="Part2_domainNameCreate" class="form-control"
type="text" name="Part2_domainNameCreate"
style="display: block;color: black;font-weight: bold;color: black;opacity: 1"
placeholder=".{{ Randam_String }}.cyberpanel.website"
value=".{{ Randam_String }}.cyberpanel.website" readonly></span>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
<div ng-if="{{ test_domain_data }} == 0 ">
<center>Looks like you have not subscripted to temporary domain feature, <a
href="https://go.cyberpanel.net/TempDomain">click here</a>
for more details.
</center>
</div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
<div id="Website_Create_Own_Domain" class="tabcontent"
style="border: none;display: none;margin-left: 10px">
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<div class="input-group bootstrap-touchspin">
<span
class="input-group-addon bootstrap-touchspin-prefix"
style="display: none;"></span>
<input ng-model="own_domainNameCreate" id="touchspin-demo-1"
class="form-control"
type="text" value=""
name="touchspin-demo-1"
style="display: block;"
placeholder="{% trans "Do not enter WWW, it will be auto created!" %}">
<span style="width: 25%" class="input-group-btn">
</span></div>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern"
class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>
</div>
</div>
{# My Work End#}
{# #}
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Email" %}</label>

View File

@@ -33,7 +33,7 @@ def WPCreate(request):
try:
userID = request.session['userID']
wm = WebsiteManager()
return wm.WPCreate(request, userID)
return wm.WPCreate(request, userID,)
except KeyError:
return redirect(loadLoginPage)

File diff suppressed because it is too large Load Diff