Skip to content

Commit 45c9d2b

Browse files
author
Ilya Radchenko
committed
Change manual layout/wording
1 parent e68637c commit 45c9d2b

File tree

1 file changed

+51
-16
lines changed

1 file changed

+51
-16
lines changed

lib/views/projects.html

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,27 +151,28 @@ <h3>Projects</h3>
151151
</ul>
152152
</div>
153153
</div>
154+
154155
<div class="tab-pane" id="manual-setup">
155156
{% for item in manual %}
156157
<div id="manual-{{ loop.key }}" ng-controller="ManualController">
157158
<form name="create{{ loop.key }}">
158159
<h3>{{ item.provider.title }}</h3>
159160
<div class="general">
160161
<p>
161-
<small>Public projects are visible to unauthenticated users.</small>
162-
<div ng-model="public" class="btn public-btn" btn-checkbox>Public</div>
162+
<small>Public projects are visible to unauthenticated users.</small>
163+
<div ng-model="public" class="btn public-btn" btn-checkbox>Public</div>
163164
</p>
164165

165166
<p>
166-
<small>Provides a link in the UI if you put a url there, so you can easily jump to viewing the repo on github or wherever</small>
167-
<br/>
168-
<input type="text" ng-model="display_url" placeholder="Display Url">
167+
<label for="manual-display-url" class="bold-label">Link To Repository</label>
168+
<input id="manual-display-url" type="text" ng-model="display_url" placeholder="Display Url">
169+
<small>Provides a link in the UI so you can easily jump to viewing the project's repository wherever it's hosted.</small>
169170
</p>
170171

171172
<p>
172-
<small>A github-style namespace/name combination for the project. e.g. Strider-CD/strider</small>
173-
<br/>
174-
<input type="text" required ng-pattern="/[\w-]\/[\w-]/" ng-model="display_name" placeholder="Name">
173+
<label for="manual-namespace" class="bold-label">Project Namespace (required)</label>
174+
<input id="manual-namespace" type="text" required ng-pattern="/[\w-]\/[\w-]/" ng-model="display_name" placeholder="Name">
175+
<small>A Github-style namespace/name combination for the project. e.g. Strider-CD/strider</small>
175176
</p>
176177
</div>
177178

@@ -186,16 +187,50 @@ <h3>{{ item.provider.title }}</h3>
186187
<a ng-show="project.display_url" href="[[ project.display_url ]]" target="_blank" class="hosted-url">
187188
<i class="fa fa-globe"></i>
188189
</a>
190+
189191
<a class="view-jobs" href="/[[ project.name ]]/">[[ project.display_name ]]</a>
190-
<div class="pull-right">
191-
<button ng-show="project.really_remove" class="btn btn-danger" ng-click="remove(project)" ng-disabled="project.really_remove === 'removing'">
192-
<i class="fa fa-refresh fa-spin" ng-show="project.really_remove === 'removing'"></i>
193-
Really remove
194-
</button>
195-
<a href="/[[ project.name ]]/config" data-toggle="tooltip" title="Configure"><i class="fa fa-wrench"></i></a>
196-
<button class="btn btn-danger" ng-click="project.really_remove = true" ng-disabled="project.really_remove">Remove</button>
197-
<button ng-disabled="repo.adding" class="btn btn-primary" ng-click="repo.adding = 'pick-type'">Add</button>
192+
193+
<div class="pull-right">
194+
<button ng-show="project.really_remove" class="btn btn-danger" ng-click="remove(project)" ng-disabled="project.really_remove === 'removing'">
195+
<i class="fa fa-refresh fa-spin" ng-show="project.really_remove === 'removing'"></i>
196+
Really remove
197+
</button>
198+
<a href="/[[ project.name ]]/config" data-toggle="tooltip" title="Configure"><i class="fa fa-wrench"></i></a>
199+
<button class="btn btn-danger" ng-click="project.really_remove = true" ng-disabled="project.really_remove">Remove</button>
200+
<button ng-disabled="repo.adding" class="btn btn-primary" ng-click="repo.adding = 'pick-type'">Add</button>
201+
</div>
202+
<!--
203+
<div class="adding-repo pull-right" ng-show="repo.adding" ng-switch="repo.adding">
204+
<div class="pick-type" ng-switch-when="pick-type">
205+
<span class="text">What type of project?</span>
206+
{% for type in project_types %}
207+
<div data-toggle="tooltip"
208+
data-placement="bottom"
209+
title="{{ type.description }}"
210+
class="project-type btn"
211+
ng-click="repo.adding = 'loading'; setupProject(account, repo, '{{ loop.key }}', group)">
212+
{{ loop.key }}
213+
</div>
214+
{% endfor %}
215+
</div>
216+
<div ng-switch-when="loading" class="setting-up">
217+
<span class="text">
218+
Setting up
219+
<i class="fa fa-refresh fa-spin"></i>
220+
</span>
221+
</div>
222+
<div ng-switch-when="done">
223+
<button type="button" class="close" ng-click="repo.adding=false">&times;</button>
224+
<span class="text">Complete!</span>
225+
<div class="btn btn-success" ng-click="startTest(repo)">
226+
Start the first test
227+
</div>
228+
<a class="btn" href="/[[ repo.project.name ]]/config">
229+
Configure
230+
</a>
231+
</div>
198232
</div>
233+
-->
199234
</div>
200235
</li>
201236
</ul>

0 commit comments

Comments
 (0)