Skip to content

Commit 36cee9a

Browse files
arvindsvarvindsv
committed
Small improvements to settings UI
* Changes to messages * Allow checkboxes to work properly (especially when there is no previous value)
1 parent d3b92f1 commit 36cee9a

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<div class="form_item_block">
3434
<label>Go Server URL (this is passed to the agents, so don't use <code>localhost</code>):<span
35-
class='asterix'>*</span></label>
35+
class='asterix'> *</span></label>
3636
<input type="text" ng-model="go_server_url" ng-required="true" placeholder="https://ipaddress:8154/go"/>
3737
<span class="form_error" ng-show="GOINPUTNAME[go_server_url].$error.server">{{GOINPUTNAME[go_server_url].$error.server}}</span>
3838
</div>
@@ -49,28 +49,28 @@
4949
</div>
5050

5151
<div class="form_item_block">
52-
<label>Agent auto-register Timeout (in minutes):<span class='asterix'>*</span></label>
52+
<label>Agent auto-register Timeout (in minutes):<span class='asterix'> *</span></label>
5353
<input type="text" ng-model="auto_register_timeout" ng-required="true"/>
5454
<span class="form_error" ng-show="GOINPUTNAME[auto_register_timeout].$error.server">{{GOINPUTNAME[auto_register_timeout].$error.server}}</span>
5555
</div>
5656

5757
<div class="form_item_block">
58-
<label>Maximum docker containers to run at any given point in time:<span class='asterix'>*</span></label>
58+
<label>Maximum docker containers to run at any given point in time:<span class='asterix'> *</span></label>
5959
<input type="text" ng-model="max_docker_containers" ng-required="true"/>
6060
<span class="form_error" ng-show="GOINPUTNAME[max_docker_containers].$error.server">{{GOINPUTNAME[max_docker_containers].$error.server}}</span>
6161
</div>
6262

6363
<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"/>
64+
<input type="checkbox" ng-model="pull_on_container_create" id="pull_on_container_create" ng-init="pull_on_container_create = pull_on_container_create || false" ng-true-value="true" ng-false-value="false"/>
6565
<label for="pull_on_container_create">Always pull image before creating the container</label>
6666
<span class="form_error" ng-show="GOINPUTNAME[pull_on_container_create].$error.server">{{GOINPUTNAME[pull_on_container_create].$error.server}}</span>
6767
</div>
6868
</fieldset>
6969
<fieldset>
7070
<legend>Docker client configuration</legend>
7171
<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"/>
72+
<label>Docker URI:<span class='asterix'> *</span></label>
73+
<input type="text" ng-model="docker_uri" ng-required="true" placeholder="For Docker running locally, try unix:///var/run/docker.sock"/>
7474
<span class="form_error" ng-show="GOINPUTNAME[docker_uri].$error.server">{{GOINPUTNAME[docker_uri].$error.server}}</span>
7575
</div>
7676

@@ -96,7 +96,7 @@
9696
<fieldset>
9797
<legend>Docker registry settings</legend>
9898
<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"/>
99+
<input type="checkbox" ng-model="enable_private_registry_authentication" id="enable_private_registry_authentication" ng-init="enable_private_registry_authentication = enable_private_registry_authentication || false" ng-true-value="true" ng-false-value="false"/>
100100
<label for="enable_private_registry_authentication">Use Private Registry</label>
101101
<span class="form_error" ng-show="GOINPUTNAME[enable_private_registry_authentication].$error.server">{{GOINPUTNAME[enable_private_registry_authentication].$error.server}}</span>
102102
</div>

‎src/main/resources/profile.template.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<div class="form_item_block">
4141
<label ng-class="{'is-invalid-label': GOINPUTNAME[Image].$error.server}">Docker image:<span class='asterix'>*</span></label>
42-
<input ng-class="{'is-invalid-input': GOINPUTNAME[Image].$error.server}" type="text" ng-model="Image" ng-required="true" placeholder="alpine:latest"/>
42+
<input ng-class="{'is-invalid-input': GOINPUTNAME[Image].$error.server}" type="text" ng-model="Image" ng-required="true" placeholder="gocd/gocd-agent-alpine-3.9:v19.3.0"/>
4343
<span class="form_error form-error" ng-class="{'is-visible': GOINPUTNAME[Image].$error.server}" ng-show="GOINPUTNAME[Image].$error.server">{{GOINPUTNAME[Image].$error.server}}</span>
4444
</div>
4545

@@ -53,14 +53,14 @@
5353
</div>
5454

5555
<div class="form_item_block">
56-
<label ng-class="{'is-invalid-label': GOINPUTNAME[Command].$error.server}">Docker Command: <small>(Enter one parameter per line)</small></label>
57-
<textarea ng-class="{'is-invalid-input': GOINPUTNAME[Command].$error.server}" type="text" ng-model="Command" ng-required="true" rows="7" placeholder="ls&#x000A;-al&#x000A;/usr/bin"></textarea>
56+
<label ng-class="{'is-invalid-label': GOINPUTNAME[Command].$error.server}">Docker Command: <small>(Enter one parameter per line. Leave empty to use image's default command)</small></label>
57+
<textarea ng-class="{'is-invalid-input': GOINPUTNAME[Command].$error.server}" type="text" ng-model="Command" ng-required="true" rows="7" placeholder="/docker-entrypoint.sh&#x000A;param1&#x000A;param2"></textarea>
5858
<span class="form_error form-error" ng-class="{'is-visible': GOINPUTNAME[Command].$error.server}" ng-show="GOINPUTNAME[Command].$error.server">{{GOINPUTNAME[Command].$error.server}}</span>
5959
</div>
6060

6161
<div class="form_item_block">
62-
<label ng-class="{'is-invalid-label': GOINPUTNAME[Environment].$error.server}">Environment Variables <small>(Enter one variable per line)</small></label>
63-
<textarea ng-class="{'is-invalid-input': GOINPUTNAME[Environment].$error.server}" type="text" ng-model="Environment" ng-required="true" rows="7" placeholder="JAVA_HOME=/opt/java&#x000A;MAVEN_HOME=/opt/maven"></textarea>
62+
<label ng-class="{'is-invalid-label': GOINPUTNAME[Environment].$error.server}">Extra environment Variables <small>(Enter one variable per line)</small></label>
63+
<textarea ng-class="{'is-invalid-input': GOINPUTNAME[Environment].$error.server}" type="text" ng-model="Environment" ng-required="true" rows="7" placeholder="MY_ENV_VAR1=value1&#x000A;MY_ENV_VAR2=value2"></textarea>
6464
<span class="form_error form-error" ng-class="{'is-visible': GOINPUTNAME[Environment].$error.server}" ng-show="GOINPUTNAME[Environment].$error.server">{{GOINPUTNAME[Environment].$error.server}}</span>
6565
</div>
6666

@@ -96,9 +96,7 @@
9696

9797
<div class="row">
9898
<div class="columns end">
99-
<label ng-class="{'is-invalid-label': GOINPUTNAME[Hosts].$error.server}">Host entries
100-
<small>(Enter one host entry per line)</small>
101-
</label>
99+
<label ng-class="{'is-invalid-label': GOINPUTNAME[Hosts].$error.server}">Extra Host entries <small>(Enter one host entry per line)</small></label>
102100
<textarea ng-class="{'is-invalid-input': GOINPUTNAME[Hosts].$error.server}" type="text" ng-model="Hosts" ng-required="true" rows="7"></textarea>
103101
<span class="form_error form-error" ng-class="{'is-visible': GOINPUTNAME[Hosts].$error.server}" ng-show="GOINPUTNAME[Hosts].$error.server">{{GOINPUTNAME[Hosts].$error.server}}</span>
104102
<label class="form-help-content">

0 commit comments

Comments
 (0)