Skip to content

Commit 01d83a6

Browse files
achanachan
committed
Cardify bulletin editor
1 parent d4b62cf commit 01d83a6

File tree

3 files changed

+74
-47
lines changed

3 files changed

+74
-47
lines changed

‎app/styles/announcement-editor.scss‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ $announcement-height: 60px;
5050
}
5151

5252
.url {
53-
width: 100%;
54-
border-style: none;
5553
border-bottom-style: solid;
5654
border-bottom-width: 1px;
5755
border-color: $gray-light;
56+
border-style: none;
57+
display: none;
5858
margin-bottom: $padding-m;
59+
width: 100%;
5960
}
6061

6162
.handle {

‎app/styles/pages/bulletin-form.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@
1313
progress {
1414
margin-top: 6px;
1515
}
16+
17+
.quick-save {
18+
padding-bottom: $padding-m;
19+
}
1620
}

‎app/templates/components/bulletin-editor.hbs‎

Lines changed: 67 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,63 @@
1+
<div class="row quick-save">
2+
<div class="col-md-12">
3+
<button type="submit"
4+
{{action (action this.attrs.onsave bulletin)}}
5+
class="btn btn-primary save-bulletin"
6+
disabled={{disableSaveButton}}
7+
data-auto-id="bulletin-submit">
8+
Save
9+
</button>
10+
</div>
11+
</div>
112
<form action="#">
213
<div class="row">
314
<section class="service-information col-lg-6" data-test-id="bulletin-form">
4-
<h3>Service Information</h3>
5-
6-
<div class="row">
7-
<div class="form-group col-lg-10 {{if errors.bulletin.name "has-error" ""}}"
8-
data-test-id="name">
9-
<label class="control-label">Name {{errors.bulletin.name}}</label>
10-
{{input value=bulletin.name
11-
class="form-control bulletin-name"
12-
data-auto-id="bulletin-name"}}
13-
</div>
14-
</div>
15-
<div class="row">
16-
<div class="form-group col-lg-10 {{if errors.bulletin.publishedAt "has-error" ""}}"
17-
data-test-id="published-at">
18-
<label class="control-label" for="publishedAt">Published at {{errors.bulletin.publishedAt}}</label>
19-
{{bs-datetimepicker class="published-at"
20-
date=bulletin.publishedAt
21-
updateDate=(action (mut bulletin.publishedAt))
22-
data-auto-id="bulletin-published-at"}}
23-
</div>
24-
</div>
25-
<div class="row">
26-
<div class="form-group col-lg-10">
27-
<label for="banner">Banner</label>
28-
<div class="form-control banner">
29-
{{s3-upload url="/api/v1/bulletins/sign"
30-
didupload=(action this.attrs.diduploadbanner)}}
15+
<div class="card">
16+
<h3 class="card-header">Service Information</h3>
17+
<div class="card-block">
18+
<div class="card-text">
19+
<div class="row">
20+
<div class="form-group col-lg-10 {{if errors.bulletin.name "has-error" ""}}"
21+
data-test-id="name">
22+
<label class="control-label">Name {{errors.bulletin.name}}</label>
23+
{{input value=bulletin.name
24+
class="form-control bulletin-name"
25+
data-auto-id="bulletin-name"}}
26+
</div>
27+
</div>
28+
<div class="row">
29+
<div class="form-group col-lg-10 {{if errors.bulletin.publishedAt "has-error" ""}}"
30+
data-test-id="published-at">
31+
<label class="control-label" for="publishedAt">Published at {{errors.bulletin.publishedAt}}</label>
32+
{{bs-datetimepicker class="published-at"
33+
date=bulletin.publishedAt
34+
updateDate=(action (mut bulletin.publishedAt))
35+
data-auto-id="bulletin-published-at"}}
36+
</div>
37+
</div>
38+
<div class="row">
39+
<div class="form-group col-lg-10">
40+
<label for="banner">Banner</label>
41+
<div class="form-control banner">
42+
{{s3-upload url="/api/v1/bulletins/sign"
43+
didupload=(action this.attrs.diduploadbanner)}}
44+
</div>
45+
{{image-preview
46+
clearimage=(action this.attrs.clearbanner)
47+
url=bulletin.bannerUrl
48+
data-auto-id="bulletin-banner-preview"}}
49+
</div>
50+
</div>
51+
<div class="row">
52+
<div class="form-group col-lg-12" data-test-id="service-order">
53+
<label for="serviceOrder">Order</label>
54+
{{textarea value=bulletin.serviceOrder
55+
class="form-control service-order"
56+
data-auto-id="bulletin-service-order"
57+
rows="10"}}
58+
</div>
59+
</div>
3160
</div>
32-
{{image-preview
33-
clearimage=(action this.attrs.clearbanner)
34-
url=bulletin.bannerUrl
35-
data-auto-id="bulletin-banner-preview"}}
36-
</div>
37-
</div>
38-
<div class="row">
39-
<div class="form-group col-lg-12" data-test-id="service-order">
40-
<label for="serviceOrder">Order</label>
41-
{{textarea value=bulletin.serviceOrder
42-
class="form-control service-order"
43-
data-auto-id="bulletin-service-order"
44-
rows="10"}}
4561
</div>
4662
</div>
4763
<div class="card">
@@ -59,11 +75,17 @@
5975
</section>
6076
{{#if this.attrs.appendannouncement}}
6177
<section class="announcements col-lg-6">
62-
<h3>Announcements</h3>
63-
{{announcements-editor announcements=bulletin.sortedAnnouncements
64-
reorder=(action this.attrs.reorderannouncements)
65-
remove=(action this.attrs.removeannouncement)
66-
append=(action this.attrs.appendannouncement)}}
78+
<div class="card">
79+
<h3 class="card-header">Announcements</h3>
80+
<div class="card-block">
81+
<div class="card-text">
82+
{{announcements-editor announcements=bulletin.sortedAnnouncements
83+
reorder=(action this.attrs.reorderannouncements)
84+
remove=(action this.attrs.removeannouncement)
85+
append=(action this.attrs.appendannouncement)}}
86+
</div>
87+
</div>
88+
</div>
6789
</section>
6890
{{/if}}
6991
</div>

0 commit comments

Comments
 (0)