Skip to content
This repository has been archived by the owner on Sep 3, 2020. It is now read-only.

BA-1131- Implement design changes to CWU proposal #587

Open
wants to merge 26 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7e75319
BA-1131 - Move CWU create/edit to modal
sutherlanda Mar 26, 2019
c8f0df1
BA-1131 - Proposals autosave on creation to
sutherlanda Mar 27, 2019
4eff49e
BA-1152 // Remove tabs from CWU proposal
mark-a-wilson May 15, 2019
32c412e
BA-1156 // Remove 'Withdraw' option from CWU proposal
mark-a-wilson May 16, 2019
a66a3f3
BA-1157 // Restyle 'Delete proposal' button
mark-a-wilson May 16, 2019
dd594a8
BA-1161 // Remove icons from buttons with text in the CWU proposal
mark-a-wilson May 16, 2019
036f321
BA-1158 // Add way to access CWU proposal after closing deadline
mark-a-wilson May 16, 2019
07aa552
BA-1158: Enable users to view their CWU proposal
kvangorp Jun 10, 2019
4ca3526
BA-1159: Enable download of uploaded attachments
kvangorp Jun 10, 2019
362435e
BA-1160: Save CWU proposal as a draft when closing modal
kvangorp Jun 11, 2019
3939b52
BA-1131 // reinstate border on btn-sm
mark-a-wilson Jun 13, 2019
acb1830
BA-1131 // Style cwu proposal modal
mark-a-wilson Jun 13, 2019
9936ade
BA-1131 // Style cwu proposal attachments section
mark-a-wilson Jun 13, 2019
fd7e16d
BA-1131 // Style cwu proposal terms section
mark-a-wilson Jun 13, 2019
cde02c9
BA-1131 // Minimize and tweak alert messages that appear at top of op…
mark-a-wilson Jun 13, 2019
68a32e9
Merge develop into feature/BA-1131
sutherlanda Jun 18, 2019
bf7504c
BA-1131 - Remove extraneous apply directive
sutherlanda Jun 18, 2019
2b6fbc6
BA-1131 // Further modal styling for cwu proposal edit views
mark-a-wilson Jun 18, 2019
84cd2d6
BA-1131: Ensure accept terms checkbox remains checked
kvangorp Jun 19, 2019
11a82b3
BA-1131: Remove submit button from draft proposals
kvangorp Jun 19, 2019
1434614
BA-1131 // use md rather than lg modal for cwu proposal
mark-a-wilson Jun 19, 2019
63b9439
BA-1131 // nest upload button inside call to action
mark-a-wilson Jun 19, 2019
1c56eac
BA-1131 // hide CTA to accept terms if deadline has passed and tweak …
mark-a-wilson Jun 19, 2019
f16a563
BA-1131 // style modal-cta
mark-a-wilson Jun 19, 2019
31a79aa
BA-1131 // tweaks to appearance of cwu-proposal-edit view
mark-a-wilson Jun 19, 2019
2f58e6a
BA-1131 // hide CTA to upload proposal if no attachments and proposal…
mark-a-wilson Jun 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BA-1131 // nest upload button inside call to action
  • Loading branch information
mark-a-wilson committed Jun 19, 2019
commit 63b9439a0ad14d90543e6c2897fb2c81400dc318
40 changes: 24 additions & 16 deletions modules/proposals/client/views/cwu-proposal-edit-attachments.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<div class="modal-cta" ng-if="!ppp.proposal.attachments.length">Please upload your proposal</div>
<div class="small strong mb-2" ng-if="ppp.proposal.attachments.length">My proposal docs</div>
<table class="table table-sm table-hover">
<tr ng-repeat="file in ppp.proposal.attachments">

<td class="text-left align-middle">
<a href="/api/proposals/{{ppp.proposal._id}}/documents/{{file._id}}" target="_blank">{{file.name}}</i></a>
</td>
<td class="text-right">
<button type="button" class="btn btn-text-only p-0" ng-if="!ppp.isclosed" ng-click="ppp.deleteAttachment(file._id)"><i class="far fa-trash-alt" title="remove"></i></button>
</td>
</tr>
</table>
<div class="modal-cta" ng-if="ppp.proposal.isAcceptedTerms && !ppp.proposal.attachments.length">
<div class="mb-3">Please upload your proposal</div>
<div ng-if="!ppp.isclosed">
<a href class="btn btn-sm btn-default" data-automation-id="button-cwu-proposal-upload-file" ngf-select="ppp.upload($file)"><i class="fas fa-upload"></i> Upload a
file</a> &nbsp; <span class="small text-muted">You may upload multiple files (max 3 MB per file)</span>
</div>
</div>

<div ng-if="!ppp.isclosed">
<a href class="btn btn-sm btn-light" data-automation-id="button-cwu-proposal-upload-file" ngf-select="ppp.upload($file)"><i class="fas fa-upload"></i> Upload a
file</a> &nbsp; <span class="small text-muted">You may upload multiple files (max 3 MB per file)</span>
<div ng-if="ppp.proposal.attachments.length">
<div class="small strong mb-2">My proposal docs</div>
<table class="table table-sm table-hover">
<tr ng-repeat="file in ppp.proposal.attachments">

<td class="text-left align-middle">
<a href="/api/proposals/{{ppp.proposal._id}}/documents/{{file._id}}" target="_blank">{{file.name}}</i></a>
</td>
<td class="text-right">
<button type="button" class="btn btn-text-only p-0" ng-if="!ppp.isclosed" ng-click="ppp.deleteAttachment(file._id)"><i class="far fa-trash-alt" title="remove"></i></button>
</td>
</tr>
</table>
<div ng-if="!ppp.isclosed">
<a href class="btn btn-sm btn-default" data-automation-id="button-cwu-proposal-upload-file" ngf-select="ppp.upload($file)"><i class="fas fa-upload"></i> Upload a
file</a> &nbsp; <span class="small text-muted">You may upload multiple files (max 3 MB per file)</span>
</div>
</div>