Skip to content

Commit cf0c746

Browse files
huangqunhuangqun
committed
Merge branch 'dev' of github.com:appirio-tech/admin-app into dev
2 parents ea14af8 + 82b326b commit cf0c746

File tree

3 files changed

+27
-30
lines changed

3 files changed

+27
-30
lines changed

‎src/app/work/work.html

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="row wrapper border-bottom white-bg page-heading">
22
<div class="col-lg-10">
3-
<h2>Project Items</h2>
3+
<h2>Project Detail</h2>
44
</div>
55
<div class="col-lg-2">
66
</div>
@@ -21,7 +21,7 @@ <h2>Project Items</h2>
2121
</div>
2222
<div class="col-md-4 no-padding-left">
2323
<button ng-click="findwork()" ng-disabled="workSearch.isLoading" type="submit" class="btn btn-sm btn-warning pull-left">
24-
<strong>Find Project Item(s)</strong>
24+
<strong>Lookup</strong>
2525
</button>
2626
</div>
2727
</div>
@@ -31,47 +31,46 @@ <h2>Project Items</h2>
3131
<!-- work Details -->
3232
<dl class="dl-horizontal">
3333
<hr>
34-
<dt><u>Project Item Summary</u></dt>
34+
<dt><u>Summary</u></dt>
3535
<dd>
3636
<dt>Name </dt>
3737
<dd><a ng-href="{{ workObj.id | tcConnectLink }}">{{workObj.name}}</a></dd>
3838
<dt>Project Type</dt>
3939
<dd>{{workObj.projectType}}</dd>
4040
<dt>Status</dt>
4141
<dd>{{workObj.status}} {{workObj.statusNotes ? '(' + workObj.statusNotes + ')' : '' }}</dd>
42-
43-
</dd>
44-
<hr>
45-
<dt><u>Pricing Details</u></dt>
46-
<dd>
47-
<dt>Price</dt>
48-
<dd>{{workObj.price}} {{workObj.priceCurrency}}</dd>
49-
<dt>Estimate</dt>
50-
<dd>{{workObj.costEstimate.low}} - {{workObj.costEstimate.high}} {{workObj.priceCurrency}}</dd>
51-
<dt>Quoted Amount</dt>
52-
<dd>{{workObj.quotedAmount}}</dd>
42+
<dt>Notes</dt>
43+
<dd>{{workObj.brief}}</dd>
5344
</dd>
5445
<hr>
55-
<dt><u>Owner Details</u></dt>
46+
<dt><u>Resources</u></dt>
5647
<dd>
57-
<dt>Qwner</dt>
48+
<dt>Owner</dt>
5849
<dd>
5950
<a data-ng-if="workObj.ownerId" ng-href="{{ workObj.ownerId | tcProfileLink}}">
6051
{{workObj.ownerId }}
6152
</a>
6253
</dd>
63-
<dt>Copilot Id</dt>
54+
<dt>Copilot</dt>
6455
<dd>
6556
<a data-ng-if="workObj.copilotId && workObj.copilotId !== 'unassigned'" ng-href="{{ workObj.copilotId | tcProfileLink}}">
6657
{{workObj.copilotId}}
6758
</a>
6859
{{ workObj.copilotId === 'unassigned' ? 'unassigned' : ''}}
6960
</dd>
70-
<dt>Notes</dt>
71-
<dd>{{workObj.brief}}</dd>
7261
</dd>
7362
<hr>
74-
<dt><u>Design Notes</u></dt>
63+
<dt><u>Estimate</u></dt>
64+
<dd>
65+
<dt>Price</dt>
66+
<dd>{{workObj.price}} {{workObj.priceCurrency}}</dd>
67+
<dt>Estimate</dt>
68+
<dd>{{workObj.costEstimate.low}} - {{workObj.costEstimate.high}} {{workObj.priceCurrency}}</dd>
69+
<dt>Quoted Amount</dt>
70+
<dd>{{workObj.quotedAmount}}</dd>
71+
</dd>
72+
<hr>
73+
<dt><u>Design Requirements</u></dt>
7574
<dd>
7675
<dt>Design Url(s)</dt>
7776
<dd>{{workObj.designUrls.length > 0 ? workObj.designUrls.join(', ') : '-'}}</dd>
@@ -81,7 +80,7 @@ <h2>Project Items</h2>
8180
<hr>
8281
<dt><u>Misc</u></dt>
8382
<dd>
84-
<dt>TCDirect Id</dt>
83+
<dt>TCDirect Project</dt>
8584
<dd>
8685
<a href="{{workObj.tcDirectId | tcDirectLink}}">
8786
{{workObj.tcDirectId}}
@@ -95,18 +94,16 @@ <h2>Project Items</h2>
9594
<table class="table">
9695
<thead>
9796
<tr>
98-
<td><b>Id</b></td>
9997
<td>Category</td>
10098
<td>Title</td>
101-
<td>Custom ?</td>
102-
<td>File Id(s)</td>
99+
<td>Custom</td>
100+
<td>Files</td>
103101
<td>Description</td>
104102
<td>Notes</td>
105103
</tr>
106104
</thead>
107105
<tbody>
108106
<tr ng-repeat="p in workObj.features">
109-
<td>{{p.id}}</td>
110107
<td>{{p.category}}</td>
111108
<td>{{p.title}}</td>
112109
<td>{{p.custom}}</td>

‎src/app/work/work.list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="form-group col-md-12">
44
<div class="row">
55
<div class="col-md-8">
6-
<h2>Steps for Project item # {{workObj.id}}</h2>
6+
<h2>Project Phases</h2>
77
</div>
88
<div class="col-md-4">
99
<button ng-click="reloadWork()" type="submit" class="btn btn-sm btn-info pull-rigth">
@@ -49,7 +49,7 @@ <h2>Steps for Project item # {{workObj.id}}</h2>
4949
<a href="javascript:;;"
5050
class="btn btn-sm btn-success"
5151
ui-sref="index.workStepEdit({ id: workObj.id, stepId: step.id })">
52-
<strong>Edit Step</strong>
52+
<strong>Edit Phase</strong>
5353
</a>
5454
</td>
5555
</tr>

‎src/components/common/navigation.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
</li>
2222

2323
<li ui-sref-active="active">
24-
<a href="#/index/projects" ng-click="forceStateProjects()"><i class="fa fa-male"></i> <span class="nav-label">Work</span>
24+
<a href="#/index/projects" ng-click="forceStateProjects()"><i class="fa fa-male"></i> <span class="nav-label">Connect Projects</span>
2525
<span class="fa arrow"></span></a>
2626
<ul class="nav nav-second-level collapse">
27-
<li ng-class="{active: $state.includes('index.projects')}"><a ui-sref="index.projects">Projects</a></li>
28-
<li><a href="#/index/work/list/" ui-sref="index.work.list">Project</a></li>
27+
<li><a ui-sref="index.projects">Browse</a></li>
28+
<li><a href="#/index/work/list/" ui-sref="index.work.list">Lookup</a></li>
2929
</ul>
3030
</li>
3131

0 commit comments

Comments
 (0)