Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-06-26 19:31:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into p3

Browse Source
This commit is contained in:
Usman Nasir
2019-12-30 15:38:58 +05:00
parent 24e0ae39f3 3d14b16b9f
commit 2e4e628c2c
8 changed files with 111 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
websiteFunctions/static/websiteFunctions/websiteFunctions.js
View File

@@ -3141,6 +3141,9 @@ app.controller('manageCronController', function ($scope, $http) {
app.controller('manageAliasController', function ($scope, $http, $timeout, $window) {
$('form').submit(function (e) {
e.preventDefault();
});
var masterDomain = "";
@@ -3153,6 +3156,14 @@ app.controller('manageAliasController', function ($scope, $http, $timeout, $wind
$scope.manageAliasLoading = true;
$scope.operationSuccess = true;
$scope.createAliasEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.manageAliasLoading = false;
$scope.addAliasFunc();
}
};
$scope.showAliasForm = function (domainName) {
$scope.domainAliasForm = false;
@@ -5268,11 +5279,23 @@ app.controller('sshAccess', function ($scope, $http, $timeout) {
/* Java script code to cloneWebsite */
app.controller('cloneWebsite', function ($scope, $http, $timeout, $window) {
$('form').submit(function (e) {
e.preventDefault();
});
$scope.cyberpanelLoading = true;
$scope.installationDetailsForm = false;
$scope.installationProgress = true;
$scope.goBackDisable = true;
$scope.cloneEnter = function ($event) {
var keyCode = $event.which || $event.keyCode;
if (keyCode === 13) {
$scope.cyberpanelLoading = false;
$scope.startCloning();
}
};
var statusFile;
$scope.startCloning = function () {

2
websiteFunctions/templates/websiteFunctions/domainAlias.html
View File

@@ -78,7 +78,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Alias Domain" %}</label>
<div class="col-sm-6">
<input type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="aliasDomain" required="">
<input ng-keypress="createAliasEnter($event)" type="text" class="form-control ng-pristine ng-untouched ng-not-empty ng-valid ng-valid-required" ng-model="aliasDomain" required="">
</div>
</div>

2
websiteFunctions/templates/websiteFunctions/setupStaging.html
View File

@@ -36,7 +36,7 @@
<div ng-hide="installationDetailsForm" class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain" %}</label>
<div class="col-sm-6">
<input type="text" class="form-control" ng-model="domain" required>
<input ng-keypress="cloneEnter($event)" type="text" class="form-control" ng-model="domain" required>
</div>
</div>