FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

don't update if blog finished · devhttps/frontend@9f6704a · GitHub

Commit 9f6704a

Browse files
Darren Hurley
committed
don't update if blog finished
1 parent fa3fb4c commit 9f6704a

2 files changed

Lines changed: 55 additions & 13 deletions

File tree

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
@(article: Article)(implicit request: RequestHeader)
2+
3+
<article id="article" class="article @if(article.isLive){is-live}"
4+
itemprop="mainContentOfPage" itemscope itemtype="@article.schemaType" role="main">
5+
6+
<header class="article-head">
7+
@fragments.dateline(article.webPublicationDate, article.isLive)
8+
9+
@fragments.headline(article.headline)
10+
11+
@fragments.standfirst(article)
12+
</header>
13+
14+
@if(!article.isLive && !article.hasVideoAtTop) {
15+
@article.mainPicture.map{ mainPicture =>
16+
@article.mainPicture(width=220).map{ smallCrop =>
17+
@fragments.img(mainPicture, smallCrop)
18+
}
19+
}
20+
}
21+
22+
@fragments.byline(article.byline, article)
23+
24+
@if(article.isLive) {
25+
@fragments.autoUpdate()
26+
}
27+
28+
<div class="article-body from-content-api @if(article.isLive) {live-blog}"
29+
itemprop="@if(article.isReview){reviewBody} else {articleBody}">
30+
@* <!-- ordering of cleaners is important --> *@
31+
@withJsoup(BulletCleaner(article.body))(
32+
PictureCleaner(article),
33+
InBodyLinkCleaner("in body link"),
34+
BlockNumberCleaner,
35+
TweetCleaner,
36+
WitnessCleaner,
37+
VideoPosterCleaner(article.videoAssets)
38+
)
39+
</div>
40+
41+
</article>

‎event/app/views/fragments/storyBody.scala.html‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,47 @@
55
<div class="story-container">
66
<h1 class="story-title story-storyline">@story.title</h1>
77
</div>
8-
8+
99
<div class="tabs-container story-tabs-container">
10-
10+
1111
@if(story.hasLiveContent) {
1212
<ol class="tabs js-tabs">
1313
<li class="tabs-selected"><a href="#story" data-link-name="story">The story so far</a></li>
1414
<li><a href="#live" data-link-name="live">Live</a></li>
1515
</ol>
1616
}
17-
17+
1818
<div class="tabs-content">
1919
<div class="tabs-pane" id="story">
2020
<div class="story-container">
2121
@fragments.latest(story, page, 3)
2222
@fragments.explainer(story)
23-
23+
2424
<div class="story-content">
2525
@fragments.reaction(story)
2626
@fragments.quote(story, 0)
2727
@fragments.agents(story)
2828
@fragments.quote(story, 1)
2929
</div>
30-
30+
3131
@fragments.pictures(story)
3232
@fragments.places(story)
3333
@fragments.timeline(story)
3434
@fragments.feedback()
3535

3636
</div>
3737
</div>
38-
39-
@if(story.hasLiveContent) {
40-
<div class="tabs-pane js-hidden" id="live" data-source="@story.liveBlogs.head.url">
41-
@fragments.autoUpdate()
42-
<div class="story-live"> </div>
43-
</div>
38+
39+
@story.liveBlogs.headOption.map{
40+
case liveBlog: Article => {
41+
<div class="tabs-pane js-hidden" id="live" data-source="@liveBlog.url">
42+
<div class="story-live">@fragments.liveBlog(liveBlog)</div>
43+
</div>
44+
}
4445
}
45-
46+
4647
</div>
47-
48+
4849
</div>
4950
<div class="js-popular" role="complementary"></div>
5051
}

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL