Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Widgets refactor #367

Merged
merged 3 commits into from Jul 10, 2017
Merged

Widgets refactor #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9e7306
widgets refactor
barisusakli Jul 7, 2017
1cb584c
Merge remote-tracking branch 'refs/remotes/origin/master' into widget…
barisusakli Jul 10, 2017
3c6682d
remove col-sm-12
barisusakli Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 16 additions & 4 deletions templates/categories.tpl
View file
Open in desktop
@@ -1,14 +1,26 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div widget-area="header"></div>
<div widget-area="header">
<!-- BEGIN widgets.header -->
{{widgets.header.html}}
<!-- END widgets.header -->
</div>
<div class="row">
<div class="col-lg-12 col-sm-12" has-widget-class="col-lg-9 col-sm-12" has-widget-target="sidebar">
<div class="<!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
<h1 class="categories-title">[[pages:categories]]</h1>
<ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
<!-- BEGIN categories -->
<!-- IMPORT partials/categories/item.tpl -->
<!-- END categories -->
</ul>
</div>
<div widget-area="sidebar" class="col-lg-3 col-sm-12 hidden"></div>
<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
<!-- BEGIN widgets.sidebar -->
{{widgets.sidebar.html}}
<!-- END widgets.sidebar -->
</div>
</div>
<div widget-area="footer">
<!-- BEGIN widgets.footer -->
{{widgets.footer.html}}
<!-- END widgets.footer -->
</div>
<div widget-area="footer"></div>
20 changes: 16 additions & 4 deletions templates/category.tpl
View file
Open in desktop
@@ -1,7 +1,11 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div widget-area="header"></div>
<div widget-area="header">
<!-- BEGIN widgets.header -->
{{widgets.header.html}}
<!-- END widgets.header -->
</div>
<div class="row">
<div class="category col-lg-12 col-sm-12" has-widget-class="category col-lg-9 col-sm-12" has-widget-target="sidebar">
<div class="category <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
<!-- IMPORT partials/category/subcategory.tpl -->

<!-- IF children.length --><hr class="hidden-xs"/><!-- ENDIF children.length -->
Expand Down Expand Up @@ -38,9 +42,17 @@
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
<div widget-area="sidebar" class="col-lg-3 col-sm-12 hidden"></div>
<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
<!-- BEGIN widgets.sidebar -->
{{widgets.sidebar.html}}
<!-- END widgets.sidebar -->
</div>
</div>
<div widget-area="footer">
<!-- BEGIN widgets.footer -->
{{widgets.footer.html}}
<!-- END widgets.footer -->
</div>
<div widget-area="footer"></div>

<!-- IMPORT partials/move_thread_modal.tpl -->

Expand Down
20 changes: 16 additions & 4 deletions templates/topic.tpl
View file
Open in desktop
@@ -1,7 +1,11 @@
<!-- IMPORT partials/breadcrumbs.tpl -->
<div widget-area="header"></div>
<div widget-area="header">
<!-- BEGIN widgets.header -->
{{widgets.header.html}}
<!-- END widgets.header -->
</div>
<div class="row">
<div class="topic col-lg-12 col-sm-12" has-widget-class="topic col-lg-9 col-sm-12" has-widget-target="sidebar">
<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">

<h1 component="post/header" class="hidden-xs" itemprop="name">

Expand Down Expand Up @@ -66,9 +70,17 @@
</div>
</div>
</div>
<div widget-area="sidebar" class="col-lg-3 col-sm-12 hidden"></div>
<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
<!-- BEGIN widgets.sidebar -->
{{widgets.sidebar.html}}
<!-- END widgets.sidebar -->
</div>
</div>
<div widget-area="footer">
<!-- BEGIN widgets.footer -->
{{widgets.footer.html}}
<!-- END widgets.footer -->
</div>
<div widget-area="footer"></div>

<!-- IF !config.usePagination -->
<noscript>
Expand Down