Skip to content

Commit

Permalink
update: use deck as teasers
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomasz Rondio committed Mar 27, 2014
1 parent 815c134 commit 19312aa
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion _tpl/related_articles.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="col-lg-7 col-md-7">
<div class="excerpt">
{{ $gimme->article->full_text|truncate:100:"..." }}
{{ $gimme->article->deck|truncate:100:"..." }}
</div>
<a href="{{ uri option='article'}}">{{ #more# }}</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _tpl/section_articles.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<div class="col-lg-7 col-md-7">
<div class="excerpt">
{{ $gimme->article->full_text|truncate:100:"..." }}
{{ $gimme->article->deck|truncate:100:"..." }}
</div>
<a href="{{ uri option='article'}}">{{ #more# }}</a>
</div>
Expand Down
14 changes: 7 additions & 7 deletions _tpl/user-articles.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<li class="{{ if $user->isAuthor() }} active {{/if}}">
<a href="#articles-tab" data-toggle="tab">{{ #articles# }}</a>
</li>
</ul>
</ul>

<div id="myTabContent" class="tab-content">
<div class="tab-pane fade {{ if $user->isAuthor() }}{{else}}active in{{/if}}" id="comments-tab">
Expand All @@ -14,7 +14,7 @@
<div class="comment-box">
<a href="{{ $gimme->user_comment->article->url }}#comments">{{ $gimme->user_comment->content|escape|truncate:120 }}</a>
<div class="comment-info">
<time class="timeago" datetime="{{ $gimme->user_comment->submit_date}}">{{ $gimme->user_comment->submit_date }},</time>
<time class="timeago" datetime="{{ $gimme->user_comment->submit_date}}">{{ $gimme->user_comment->submit_date }},</time>
</div>
</div>
{{ /list_user_comments }}
Expand All @@ -35,15 +35,15 @@
<a href="{{ uri options="article" }}">
{{ include file='_tpl/img/img_cinema.tpl'}}
</a>
</figure>
</figure>
</div>
<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">
<h4><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h4>
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{ /if }}
<p class="excerpt">
{{ $gimme->article->full_text|truncate:250:"...":true }}
{{ $gimme->article->deck|truncate:250:"...":true }}
</p>
<a href="{{ uri options="article" }}">{{ #more# }} </a>
</div>
Expand All @@ -52,7 +52,7 @@
{{ /if }}
{{ assign var=lastArticle value=$gimme->article->number }}

{{ if $gimme->current_list->at_end }}
{{ if $gimme->current_list->at_end }}

{{* PAGINATION *}}
{{ $pages=ceil($gimme->current_list->count/5) }}
Expand All @@ -78,7 +78,7 @@
{{ /if }}

{{/list_articles}}

</div>

</div>
Expand Down
10 changes: 5 additions & 5 deletions front.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div class="container">
{{ include "_tpl/header.tpl" }}

<main id="main">
<div class="row">

Expand All @@ -32,7 +32,7 @@
<div class="caption">
<h2><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h2>
<div class="excerpt">
{{ $gimme->article->full_text|truncate:250:"..." }}
{{ $gimme->article->deck|truncate:250:"..." }}
</div>
</div>
</article>
Expand Down Expand Up @@ -63,7 +63,7 @@
{{ /list_sections }}
<div class="clearfix"></div>
</nav>

{{ list_playlist_articles name="Front page" length="6" }}
{{ assign var=articlesConstraints value="`$articlesConstraints` number not `$gimme->article->number`" }}
<article class="article list">
Expand All @@ -79,7 +79,7 @@
<a href="{{ uri options='section' }}" class="section-link">{{ $gimme->article->section->name }}</a>
<h4><a href="{{ uri option='article'}}">{{ $gimme->article->name }}</a></h4>
<div class="excerpt">
{{ $gimme->article->full_text|truncate:200:"..." }}
{{ $gimme->article->deck|truncate:200:"..." }}
</div>
<a href="{{ uri option='article'}}">{{ #more# }}</a>
</div>
Expand All @@ -95,7 +95,7 @@

</div>

</main>
</main>

{{ include "_tpl/footer.tpl" }}
{{ include "_tpl/_html-footer.tpl" }}
22 changes: 11 additions & 11 deletions issue.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
{{ include "_tpl/responsive-menu.tpl"}}

<div id="main-container" class="snap-content overthrow">

<div class="container">
{{ include "_tpl/header.tpl" }}

<main id="main">
<div class="row">

Expand All @@ -17,13 +17,13 @@

<div id="content" class="issue-page">

{{ list_sections }}
{{ list_sections }}
{{ list_articles }}
{{ assign var=articlesConstraints value="`$articlesConstraints` number not `$gimme->article->number`" }}
{{ if $gimme->current_articles_list->at_beginning }}
<h4 class="section-title">{{ $gimme->section->name}}</h4>
{{ /if }}
{{ if $gimme->article->type_name != "poll" }}
{{ if $gimme->article->type_name != "poll" }}
<article class="article list">
{{ if $gimme->section->name != "Dialogue" }}
<div class="row">
Expand All @@ -32,15 +32,15 @@
<a href="{{ uri options="article" }}">
{{ include file='_tpl/img/img_cinema.tpl'}}
</a>
</figure>
</figure>
</div>
<div class="col-lg-8 col-md-7 col-sm7 col-xs-7">
<h4><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h4>
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{ /if }}
<p class="excerpt">
{{ $gimme->article->full_text|truncate:250:"...":true }}
{{ $gimme->article->deck|truncate:250:"...":true }}
</p>
<a href="{{ uri options="article" }}">{{ #more# }} </a>
</div>
Expand All @@ -49,16 +49,16 @@
<h4><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h4>
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{ /if }}
<p class="excerpt">
{{ $gimme->article->teaser}}
</p>
<a href="{{ uri options="article" }}">{{ #more# }} </a>
{{/if}}
</article>
{{ /if }}
{{ /list_articles }}
{{ /list_sections }}
{{ /list_articles }}
{{ /list_sections }}

</div>
<!-- End Content -->
Expand All @@ -68,7 +68,7 @@

</div>

</main>
</main>

{{ include "_tpl/footer.tpl" }}
{{ include "_tpl/_html-footer.tpl" }}
18 changes: 9 additions & 9 deletions search.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
{{ include "_tpl/responsive-menu.tpl"}}

<div id="main-container" class="snap-content overthrow">

<div class="container">
{{ include "_tpl/header.tpl" }}

<main id="main">
<div class="row">

Expand Down Expand Up @@ -36,14 +36,14 @@
<a href="{{ uri options='section'}}" class="section-link">{{ $gimme->article->section->name }}</a>
<h4><a href="{{ uri options='article' }}">{{ $gimme->article->name }}</a></h4>
<div class="excerpt">
{{ $gimme->article->full_text|truncate:200:"..." }}
{{ $gimme->article->deck|truncate:200:"..." }}
</div>
<a href="{{ uri options='article'}}">{{ #more# }}</a>
</div>
</div>
</article>

{{ if $gimme->current_list->at_end }}
{{ if $gimme->current_list->at_end }}
{{* PAGINATION *}}
{{ $pages=ceil($gimme->current_list->count/5) }}
{{ $curpage=intval($gimme->url->get_parameter($gimme->current_list_id())) }}
Expand All @@ -66,12 +66,12 @@
{{ /if }}

{{ /if }}
{{ /list_search_results }}

{{ /list_search_results }}

{{ if $gimme->prev_list_empty }}
<p>{{ #noResultsFound# }} <strong>"{{ $gimme->search_articles_action->search_phrase }}"</strong>.</p>
{{ /if }}
{{ /if }}

</div>
<!-- End Content -->
Expand All @@ -81,7 +81,7 @@

</div>

</main>
</main>

{{ include "_tpl/footer.tpl" }}
{{ include "_tpl/_html-footer.tpl" }}
34 changes: 17 additions & 17 deletions section.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
{{ include "_tpl/responsive-menu.tpl"}}

<div id="main-container" class="snap-content overthrow">

<div class="container">
{{ include "_tpl/header.tpl" }}

<main id="main">
<div class="row">

Expand All @@ -32,25 +32,25 @@
<h4><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h4>
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{ /if }}
<p class="excerpt">
{{ $gimme->article->full_text|truncate:250:"...":true }}
{{ $gimme->article->deck|truncate:250:"...":true }}
</p>
<a href="{{ uri options="article" }}">{{ #more# }} </a>

{{ else }}

<h4><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h4>
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{if $gimme->article->teaser}}
{{ /if }}
{{if $gimme->article->teaser}}
<p class="excerpt">
{{ $gimme->article->teaser}}
</p>
{{else}}
<p class="excerpt">
{{ $gimme->article->full_text|truncate:500:"...":true}}
{{ $gimme->article->deck|truncate:500:"...":true}}
</p>
{{/if}}
<a href="{{ uri options="article" }}">{{ #more# }}</a>
Expand All @@ -66,15 +66,15 @@
<a href="{{ uri options="article" }}">
{{ include file='_tpl/img/img_cinema.tpl'}}
</a>
</figure>
</figure>
</div>
<div class="col-lg-8 col-md-7 col-sm-7 col-xs-7">
<h4><a href="{{ uri options="article" }}">{{ $gimme->article->name }}</a></h4>
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{ /if }}
<p class="excerpt">
{{ $gimme->article->full_text|truncate:250:"...":true }}
{{ $gimme->article->deck|truncate:250:"...":true }}
</p>
<a href="{{ uri options="article" }}">{{ #more# }} </a>
</div>
Expand All @@ -84,22 +84,22 @@
{{ if !$gimme->article->is_public }}
<span class="label label-danger">{{ #premium# }}</span>
{{ /if }}
{{if $gimme->article->teaser}}
{{if $gimme->article->teaser}}
<p class="excerpt">
{{ $gimme->article->teaser}}
</p>
{{else}}
<p class="excerpt">
{{ $gimme->article->full_text|truncate:500:"...":true }}
{{ $gimme->article->deck|truncate:500:"...":true }}
</p>
{{/if}}
<a href="{{ uri options="article" }}">{{ #more# }} </a>
<div class="clearfix"></div>
{{/if}}
</article>
{{/if}}
{{ if $gimme->current_list->at_end }}

{{ if $gimme->current_list->at_end }}
{{* PAGINATION *}}
{{ $pages=ceil($gimme->current_list->count/5) }}
{{ $curpage=intval($gimme->url->get_parameter($gimme->current_list_id())) }}
Expand All @@ -123,7 +123,7 @@

{{ /if }}

{{ /list_articles }}
{{ /list_articles }}

</div>
<!-- End Content -->
Expand All @@ -133,7 +133,7 @@

</div>

</main>
</main>

{{ include "_tpl/footer.tpl" }}
{{ include "_tpl/_html-footer.tpl" }}
Loading

0 comments on commit 19312aa

Please sign in to comment.