From 8e922dbfc64bd2ab07d54d0de5a065901f4b20c7 Mon Sep 17 00:00:00 2001
From: William <william.conquest@portainer.io>
Date: Wed, 11 Sep 2019 07:24:29 +1200
Subject: [PATCH] fix(endpoint-creation): clarify docker endpoint (#3148)
* fix(endpoint-creation): clarify docker endpoint
* fix(endpoint-creation): change default order
---
.../create/createEndpointController.js | 2 +-
.../endpoints/create/createendpoint.html | 20 +++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js
index b2fe0dcee..1cdf54409 100644
--- a/app/portainer/views/endpoints/create/createEndpointController.js
+++ b/app/portainer/views/endpoints/create/createEndpointController.js
@@ -5,7 +5,7 @@ angular.module('portainer.app')
function ($q, $scope, $state, $filter, clipboard, EndpointService, GroupService, TagService, Notifications) {
$scope.state = {
- EnvironmentType: 'docker',
+ EnvironmentType: 'agent',
actionInProgress: false
};
diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html
index a011472ea..b930e2518 100644
--- a/app/portainer/views/endpoints/create/createendpoint.html
+++ b/app/portainer/views/endpoints/create/createendpoint.html
@@ -16,16 +16,6 @@
<div class="form-group"></div>
<div class="form-group" style="margin-bottom: 0">
<div class="boxselector_wrapper">
- <div ng-click="resetEndpointURL()">
- <input type="radio" id="docker_endpoint" ng-model="state.EnvironmentType" value="docker">
- <label for="docker_endpoint">
- <div class="boxselector_header">
- <i class="fab fa-docker" aria-hidden="true" style="margin-right: 2px;"></i>
- Docker
- </div>
- <p>Docker environment</p>
- </label>
- </div>
<div ng-click="resetEndpointURL()">
<input type="radio" id="agent_endpoint" ng-model="state.EnvironmentType" value="agent">
<label for="agent_endpoint">
@@ -46,6 +36,16 @@
<p>Portainer Edge agent</p>
</label>
</div>
+ <div ng-click="resetEndpointURL()">
+ <input type="radio" id="docker_endpoint" ng-model="state.EnvironmentType" value="docker">
+ <label for="docker_endpoint">
+ <div class="boxselector_header">
+ <i class="fab fa-docker" aria-hidden="true" style="margin-right: 2px;"></i>
+ Docker
+ </div>
+ <p>Directly connect to the Docker API</p>
+ </label>
+ </div>
<div>
<input type="radio" id="azure_endpoint" ng-model="state.EnvironmentType" value="azure">
<label for="azure_endpoint">