Skip to content

Commit 20cb3ad

Browse files
bdpipravabdpiprava
authored
Merge pull request #55 from bdpiparva/ui/fixes
Fixed issue in plugin settings
2 parents 78a4987 + eb23b9f commit 20cb3ad

File tree

3 files changed

+98
-69
lines changed

3 files changed

+98
-69
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 1.0.1 - 2018-07-04
2+
- Fixed broken plugin settings UI.
3+
14
## 1.0.0 - 2018-06-26
25

36
### Added

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ plugins {
2121
apply plugin: 'java'
2222
apply from: 'plugin-common.gradle'
2323

24-
project.ext.pluginVersion = '1.0.0'
24+
project.ext.pluginVersion = '1.0.1'
2525
project.ext.fullVersion = project.distVersion ? "${project.pluginVersion}-${project.distVersion}" : project.pluginVersion
2626

2727
group = 'cd.go.contrib'

‎src/main/resources/plugin-settings.template.html‎

Lines changed: 94 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -14,83 +14,109 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<div class="form_item_block">
18-
<label>Go Server URL (this is passed to the agents, so don't use <code>localhost</code>):<span class='asterix'>*</span></label>
19-
<input type="text" ng-model="go_server_url" ng-required="true" placeholder="https://ipaddress:8154/go"/>
20-
<span class="form_error" ng-show="GOINPUTNAME[go_server_url].$error.server">{{GOINPUTNAME[go_server_url].$error.server}}</span>
21-
</div>
17+
<div data-plugin-style-id="ea-plugin">
18+
<style>
19+
[data-plugin-style-id="ea-plugin"] fieldset {
20+
padding: 20px;
21+
background-color: transparent;
22+
margin-bottom: 20px;
23+
border: 1px solid #ddd;
24+
}
2225

23-
<div class="form_item_block">
24-
<label>Environment Variables <small>(Enter one variable per line)</small></label>
25-
<textarea type="text" ng-model="environment_variables" ng-required="true" rows="7" placeholder="JAVA_HOME=/opt/java&#x000A;MAVEN_HOME=/opt/maven"></textarea>
26-
<span class="form_error" ng-show="GOINPUTNAME[environment_variables].$error.server">{{GOINPUTNAME[environment_variables].$error.server}}</span>
27-
</div>
26+
[data-plugin-style-id="ea-plugin"] fieldset legend {
27+
font-size: 0.875rem;
28+
background-color: #fff;
29+
padding: 5px;
30+
}
31+
</style>
2832

29-
<div class="form_item_block">
30-
<label>Agent auto-register Timeout (in minutes)<span class='asterix'>*</span></label>
31-
<input type="text" ng-model="auto_register_timeout" ng-required="true"/>
32-
<span class="form_error" ng-show="GOINPUTNAME[auto_register_timeout].$error.server">{{GOINPUTNAME[auto_register_timeout].$error.server}}</span>
33-
</div>
33+
<div class="form_item_block">
34+
<label>Go Server URL (this is passed to the agents, so don't use <code>localhost</code>):<span
35+
class='asterix'>*</span></label>
36+
<input type="text" ng-model="go_server_url" ng-required="true" placeholder="https://ipaddress:8154/go"/>
37+
<span class="form_error" ng-show="GOINPUTNAME[go_server_url].$error.server">{{GOINPUTNAME[go_server_url].$error.server}}</span>
38+
</div>
3439

35-
<div class="form_item_block">
36-
<label>Maximum docker containers to run at any given point in time:<span class='asterix'>*</span></label>
37-
<input type="text" ng-model="max_docker_containers" ng-required="true"/>
38-
<span class="form_error" ng-show="GOINPUTNAME[max_docker_containers].$error.server">{{GOINPUTNAME[max_docker_containers].$error.server}}</span>
39-
</div>
40+
<fieldset>
41+
<legend>Container configuration</legend>
42+
<div class="form_item_block">
43+
<label>Environment Variables
44+
<small>(Enter one variable per line)</small>
45+
</label>
46+
<textarea type="text" ng-model="environment_variables" ng-required="true" rows="7"
47+
placeholder="JAVA_HOME=/opt/java&#x000A;MAVEN_HOME=/opt/maven"></textarea>
48+
<span class="form_error" ng-show="GOINPUTNAME[environment_variables].$error.server">{{GOINPUTNAME[environment_variables].$error.server}}</span>
49+
</div>
4050

41-
<div class="form_item_block">
42-
<label>Docker URI:<span class='asterix'>*</span></label>
43-
<input type="text" ng-model="docker_uri" ng-required="true"/>
44-
<span class="form_error" ng-show="GOINPUTNAME[docker_uri].$error.server">{{GOINPUTNAME[docker_uri].$error.server}}</span>
45-
</div>
51+
<div class="form_item_block">
52+
<label>Agent auto-register Timeout (in minutes)<span class='asterix'>*</span></label>
53+
<input type="text" ng-model="auto_register_timeout" ng-required="true"/>
54+
<span class="form_error" ng-show="GOINPUTNAME[auto_register_timeout].$error.server">{{GOINPUTNAME[auto_register_timeout].$error.server}}</span>
55+
</div>
4656

47-
<div class="form_item_block">
48-
<label>Docker CA Certificate:</label>
49-
<textarea type="text" ng-model="docker_ca_cert" rows="7"></textarea>
50-
<span class="form_error" ng-show="GOINPUTNAME[docker_ca_cert].$error.server">{{GOINPUTNAME[docker_ca_cert].$error.server}}</span>
51-
</div>
57+
<div class="form_item_block">
58+
<label>Maximum docker containers to run at any given point in time:<span class='asterix'>*</span></label>
59+
<input type="text" ng-model="max_docker_containers" ng-required="true"/>
60+
<span class="form_error" ng-show="GOINPUTNAME[max_docker_containers].$error.server">{{GOINPUTNAME[max_docker_containers].$error.server}}</span>
61+
</div>
5262

53-
<div class="form_item_block">
54-
<label>Docker Client Key:</label>
55-
<textarea type="text" ng-model="docker_client_key" rows="7"></textarea>
56-
<span class="form_error" ng-show="GOINPUTNAME[docker_client_key].$error.server">{{GOINPUTNAME[docker_client_key].$error.server}}</span>
57-
</div>
63+
<div class="form_item_block">
64+
<input type="checkbox" ng-model="pull_on_container_create" id="pull_on_container_create" ng-true-value="true" ng-false-value="false"/>
65+
<label for="pull_on_container_create">Pull image before creating the container</label>
66+
<span class="form_error" ng-show="GOINPUTNAME[pull_on_container_create].$error.server">{{GOINPUTNAME[pull_on_container_create].$error.server}}</span>
67+
</div>
68+
</fieldset>
69+
<fieldset>
70+
<legend>Docker client configuration</legend>
71+
<div class="form_item_block">
72+
<label>Docker URI:<span class='asterix'>*</span></label>
73+
<input type="text" ng-model="docker_uri" ng-required="true"/>
74+
<span class="form_error" ng-show="GOINPUTNAME[docker_uri].$error.server">{{GOINPUTNAME[docker_uri].$error.server}}</span>
75+
</div>
5876

59-
<div class="form_item_block">
60-
<label>Docker Client Certificate:</label>
61-
<textarea type="text" ng-model="docker_client_cert" rows="7"></textarea>
62-
<span class="form_error" ng-show="GOINPUTNAME[docker_client_cert].$error.server">{{GOINPUTNAME[docker_client_cert].$error.server}}</span>
63-
</div>
77+
<div class="form_item_block">
78+
<label>Docker CA Certificate:</label>
79+
<textarea type="text" ng-model="docker_ca_cert" rows="7"></textarea>
80+
<span class="form_error" ng-show="GOINPUTNAME[docker_ca_cert].$error.server">{{GOINPUTNAME[docker_ca_cert].$error.server}}</span>
81+
</div>
6482

65-
<div class="form_item_block" ng-int="enable_private_registry_authentication = (enable_private_registry_authentication || false)">
66-
<label>Use Private Registry</label>
67-
<input type="radio" ng-model="enable_private_registry_authentication" value="true"/> True
68-
<input type="radio" ng-model="enable_private_registry_authentication" value="false"/> False
69-
<span class="form_error" ng-show="GOINPUTNAME[enable_private_registry_authentication].$error.server">{{GOINPUTNAME[enable_private_registry_authentication].$error.server}}</span>
70-
</div>
83+
<div class="form_item_block">
84+
<label>Docker Client Key:</label>
85+
<textarea type="text" ng-model="docker_client_key" rows="7"></textarea>
86+
<span class="form_error" ng-show="GOINPUTNAME[docker_client_key].$error.server">{{GOINPUTNAME[docker_client_key].$error.server}}</span>
87+
</div>
7188

72-
<div ng-show="enable_private_registry_authentication">
73-
<div class="form_item_block">
74-
<label>Private Registry Server:</label>
75-
<input type="text" ng-model="private_registry_server" ng-required="true"/>
76-
<span class="form_error" ng-show="GOINPUTNAME[private_registry_server].$error.server">{{GOINPUTNAME[private_registry_server].$error.server}}</span>
77-
</div>
78-
<div class="form_item_block">
79-
<label>Private Registry Username:</label>
80-
<input type="text" ng-model="private_registry_username" ng-required="true"/>
81-
<span class="form_error" ng-show="GOINPUTNAME[private_registry_username].$error.server">{{GOINPUTNAME[private_registry_username].$error.server}}</span>
82-
</div>
83-
<div class="form_item_block">
84-
<label>Private Registry Password:</label>
85-
<input type="password" ng-model="private_registry_password" ng-required="true"/>
86-
<span class="form_error" ng-show="GOINPUTNAME[private_registry_password].$error.server">{{GOINPUTNAME[private_registry_password].$error.server}}</span>
87-
</div>
89+
<div class="form_item_block">
90+
<label>Docker Client Certificate:</label>
91+
<textarea type="text" ng-model="docker_client_cert" rows="7"></textarea>
92+
<span class="form_error" ng-show="GOINPUTNAME[docker_client_cert].$error.server">{{GOINPUTNAME[docker_client_cert].$error.server}}</span>
93+
</div>
94+
</fieldset>
8895

89-
<div class="form_item_block" ng-int="pull_on_container_create = (pull_on_container_create || false)">
90-
<label>Pull image before creating the container</label>
91-
<input type="radio" ng-model="pull_on_container_create" value="true"/> True
92-
<input type="radio" ng-model="pull_on_container_create" value="false"/> False
93-
<span class="form_error" ng-show="GOINPUTNAME[pull_on_container_create].$error.server">{{GOINPUTNAME[pull_on_container_create].$error.server}}</span>
94-
</div>
96+
<fieldset>
97+
<legend>Docker registry settings</legend>
98+
<div class="form_item_block">
99+
<input type="checkbox" ng-model="enable_private_registry_authentication" id="enable_private_registry_authentication" ng-true-value="true" ng-false-value="false"/>
100+
<label for="enable_private_registry_authentication">Use Private Registry</label>
101+
<span class="form_error" ng-show="GOINPUTNAME[enable_private_registry_authentication].$error.server">{{GOINPUTNAME[enable_private_registry_authentication].$error.server}}</span>
102+
</div>
95103

104+
<div ng-show="enable_private_registry_authentication">
105+
<div class="form_item_block">
106+
<label>Private Registry Server:</label>
107+
<input type="text" ng-model="private_registry_server" ng-required="true"/>
108+
<span class="form_error" ng-show="GOINPUTNAME[private_registry_server].$error.server">{{GOINPUTNAME[private_registry_server].$error.server}}</span>
109+
</div>
110+
<div class="form_item_block">
111+
<label>Private Registry Username:</label>
112+
<input type="text" ng-model="private_registry_username" ng-required="true"/>
113+
<span class="form_error" ng-show="GOINPUTNAME[private_registry_username].$error.server">{{GOINPUTNAME[private_registry_username].$error.server}}</span>
114+
</div>
115+
<div class="form_item_block">
116+
<label>Private Registry Password:</label>
117+
<input type="password" ng-model="private_registry_password" ng-required="true"/>
118+
<span class="form_error" ng-show="GOINPUTNAME[private_registry_password].$error.server">{{GOINPUTNAME[private_registry_password].$error.server}}</span>
119+
</div>
120+
</div>
121+
</fieldset>
96122
</div>

0 commit comments

Comments
 (0)