diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-23 13:42:30 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-23 13:42:30 +0200 |
| commit | 505a74ad1de7cf2cd3605e793233365501f03d87 (patch) | |
| tree | 41206132200aa9390e11d600ad2b84ffa23242e4 /themes/default/view.twig | |
| parent | a818ff2000c721c6f078c206c3f5214c558a5546 (diff) | |
| parent | ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff) | |
| download | wallabag-505a74ad1de7cf2cd3605e793233365501f03d87.tar.gz wallabag-505a74ad1de7cf2cd3605e793233365501f03d87.tar.zst wallabag-505a74ad1de7cf2cd3605e793233365501f03d87.zip | |
Merge branch 'dev' into refactor
Conflicts:
check_setup.php
index.php
Diffstat (limited to 'themes/default/view.twig')
| -rwxr-xr-x | themes/default/view.twig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/themes/default/view.twig b/themes/default/view.twig index 90b11839..dbbbde3c 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | {% extends "layout.twig" %} | 1 | {% extends "layout.twig" %} |
| 2 | {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} | 2 | {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} |
| 3 | {% block content %} | 3 | {% block content %} |
| 4 | {% include '_highlight.twig' %} | ||
| 4 | {% include '_pocheit-form.twig' %} | 5 | {% include '_pocheit-form.twig' %} |
| 5 | <div id="article_toolbar"> | 6 | <div id="article_toolbar"> |
| 6 | <ul> | 7 | <ul> |