flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

explicit template includes

Browse source
This commit is contained in:
flash 2017-03-23 16:01:53 +01:00
parent 25f38a480e
commit e82f082ada
51 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/nova/meta/index.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@nova/master.twig' %}
{% set banner_classes = user.isActive ? "banner--large" : "banner--insane landing__banner" %}
{% set banner = user.isActive ? route('user.header', user.id) : "https://i.flash.moe/7131467636550.jpg" %}

2
resources/views/nova/status/index.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@nova/master.twig' %}
{% set title = 'Status' %}
{% set banner = '/images/status-banner.png' %}

2
resources/views/yuuno/auth/activate.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Request activation' %}

2
resources/views/yuuno/auth/activate_failed.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Activation failed' %}

2
resources/views/yuuno/auth/register.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Register' %}

2
resources/views/yuuno/auth/resetpassword.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Reset password' %}
{% set verified = get.u is defined and get.k is defined %}

2
resources/views/yuuno/elements/comment.twig
View file

@ -29,7 +29,7 @@
<ul class="comment__replies">
{% set comment_depth = comment_depth + 1 %}
{% for comment in comment.replies %}
{% include 'elements/comment.twig' %}
{% include '@yuuno/elements/comment.twig' %}
{% endfor %}
</ul>
</li>

2
resources/views/yuuno/elements/comments.twig
View file

@ -27,7 +27,7 @@
{% if comments %}
{% for comment in comments %}
{% set comment_depth = 0 %}
{% include 'elements/comment.twig' %}
{% include '@yuuno/elements/comment.twig' %}
{% endfor %}
{% else %}
<h1 class="comments__placeholder">There are no comments yet!</h1>

2
resources/views/yuuno/errors/403.twig
View file

@ -1 +1 @@
{% include 'errors/404.twig' %}
{% include '@yuuno/errors/404.twig' %}

10
resources/views/yuuno/forum/elements/forumBase.twig
View file

@ -13,11 +13,11 @@
{% endif %}
</div>
{% for forum in forum.forums %}
{% include 'forum/elements/forumEntry.twig' %}
{% include '@yuuno/forum/elements/forumEntry.twig' %}
{% endfor %}
{% endif %}
{% else %}
{% include 'forum/elements/forumEntry.twig' %}
{% include '@yuuno/forum/elements/forumEntry.twig' %}
{% endif %}
{% endfor %}
</div>
@ -27,15 +27,15 @@
{% set pagination_pages = topics %}
{% set pagination_url %}{{ route('forums.forum', forum.id) }}{% endset %}
{% include 'forum/elements/forumBtns.twig' %}
{% include '@yuuno/forum/elements/forumBtns.twig' %}
{% if forum.topics %}
{% for topic in topics[get.page|default(1) - 1] %}
{% include 'forum/elements/topicEntry.twig' %}
{% include '@yuuno/forum/elements/topicEntry.twig' %}
{% endfor %}
{% else %}
<h1 class="forum-list__empty">There are no posts in this forum!</h1>
{% endif %}
{% include 'forum/elements/forumBtns.twig' %}
{% include '@yuuno/forum/elements/forumBtns.twig' %}
{% endif %}

4
resources/views/yuuno/forum/elements/forumBtns.twig
View file

@ -1,4 +1,4 @@
{% from 'macros.twig' import pagination %}
{% from '@yuuno/macros.twig' import pagination %}
<div class="forum-list__buttons">
<div>
@ -15,7 +15,7 @@
<a href="{{ forumMarkRead }}" class="input__button"><span class="fa fa-check-square-o"></span> Mark as Read</a>
{% endif %}
{% if topic.id is defined and showMod is defined %}
{% include 'forum/elements/forumMod.twig' %}
{% include '@yuuno/forum/elements/forumMod.twig' %}
{% endif %}
</div>
{% if pagination_url is defined %}

4
resources/views/yuuno/forum/forum.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Forums / ' ~ forum.name %}
{% set forumBackLink = route('forums.index') %}
@ -7,6 +7,6 @@
{% block content %}
<div class="content">
{% include 'forum/elements/forumBase.twig' %}
{% include '@yuuno/forum/elements/forumBase.twig' %}
</div>
{% endblock %}

4
resources/views/yuuno/forum/index.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Forums' %}
@ -63,7 +63,7 @@
</div>
</div>
<div class="content--left">
{% include 'forum/elements/forumBase.twig' %}
{% include '@yuuno/forum/elements/forumBase.twig' %}
</div>
<div class="clear"></div>
</div>

8
resources/views/yuuno/forum/topic.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set forumBackLink = route('forums.forum', forum.id) %}
{% set title = topic is defined ? topic.title : 'Creating topic in ' ~ forum.name %}
@ -158,7 +158,7 @@
</span>
</div>
{% include 'forum/elements/forumBtns.twig' %}
{% include '@yuuno/forum/elements/forumBtns.twig' %}
<div class="posts">
@ -280,9 +280,9 @@
</div>
{% if forumReplyLink is defined or topic is not defined %}
{% include 'forum/elements/replyForm.twig' %}
{% include '@yuuno/forum/elements/replyForm.twig' %}
{% endif %}
{% include 'forum/elements/forumBtns.twig' %}
{% include '@yuuno/forum/elements/forumBtns.twig' %}
</div>
{% endblock %}

4
resources/views/yuuno/home/index.twig
View file

@ -1,5 +1,5 @@
{% extends 'master.twig' %}
{% from 'macros.twig' import news_post %}
{% extends '@yuuno/master.twig' %}
{% from '@yuuno/macros.twig' import news_post %}
{% block content %}
<div class="content">

2
resources/views/yuuno/info/contact.twig
View file

@ -1,4 +1,4 @@
{% extends 'info/master.twig' %}
{% extends '@yuuno/info/master.twig' %}
{% set title = 'Contact' %}

2
resources/views/yuuno/info/master.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% block content %}
<div class="content content--alt bbcode">

2
resources/views/yuuno/info/privacy.twig
View file

@ -1,4 +1,4 @@
{% extends 'info/master.twig' %}
{% extends '@yuuno/info/master.twig' %}
{% set title = 'Privacy Policy' %}

2
resources/views/yuuno/info/rules.twig
View file

@ -1,4 +1,4 @@
{% extends 'info/master.twig' %}
{% extends '@yuuno/info/master.twig' %}
{% set title = 'Rules' %}

2
resources/views/yuuno/info/terms.twig
View file

@ -1,4 +1,4 @@
{% extends 'info/master.twig' %}
{% extends '@yuuno/info/master.twig' %}
{% set title = 'Terms of Service' %}

2
resources/views/yuuno/info/welcome.twig
View file

@ -1,4 +1,4 @@
{% extends 'info/master.twig' %}
{% extends '@yuuno/info/master.twig' %}
{% set title = 'Welcome!' %}

2
resources/views/yuuno/manage/master.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = category ~ ' / ' ~ mode %}

2
resources/views/yuuno/manage/overview/index.twig
View file

@ -1,4 +1,4 @@
{% extends 'manage/overview/master.twig' %}
{% extends '@yuuno/manage/overview/master.twig' %}
{% set mode = 'Index' %}

2
resources/views/yuuno/manage/overview/master.twig
View file

@ -1,3 +1,3 @@
{% extends 'manage/master.twig' %}
{% extends '@yuuno/manage/master.twig' %}
{% set category = 'Overview' %}

4
resources/views/yuuno/master.twig
View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
{% include '_layout/metadata.twig' %}
{% include '@yuuno/_layout/metadata.twig' %}
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
@ -59,7 +59,7 @@
</div>
</div>
{% include 'auth/header_auth.twig' %}
{% include '@yuuno/auth/header_auth.twig' %}
<div id="contentwrapper" class="container__content">
<div id="notifications" class="alerts"></div>

4
resources/views/yuuno/news/category.twig
View file

@ -1,5 +1,5 @@
{% extends 'master.twig' %}
{% from 'macros.twig' import news_post, pagination %}
{% extends '@yuuno/master.twig' %}
{% from '@yuuno/macros.twig' import news_post, pagination %}
{% set title = 'News' %}
{% set posts = category.posts|batch(3) %}

4
resources/views/yuuno/news/index.twig
View file

@ -1,5 +1,5 @@
{% extends 'master.twig' %}
{% from 'macros.twig' import news_post %}
{% extends '@yuuno/master.twig' %}
{% from '@yuuno/macros.twig' import news_post %}
{% block content %}
<div class="content">

6
resources/views/yuuno/news/post.twig
View file

@ -1,5 +1,5 @@
{% extends 'master.twig' %}
{% from 'macros.twig' import news_post %}
{% extends '@yuuno/master.twig' %}
{% from '@yuuno/macros.twig' import news_post %}
{% set title = post.title %}
@ -11,7 +11,7 @@
<div class="content__header">{{ post.title }}</div>
{{ news_post(post) }}
<a href="{{ route('news.category', post.category.id) }}" class="input__button"><span class="fa fa-backward"></span> Back</a>
{% include 'elements/comments.twig' %}
{% include '@yuuno/elements/comments.twig' %}
</div>
{% endblock %}

2
resources/views/yuuno/premium/complete.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Purchase complete!' %}

2
resources/views/yuuno/premium/error.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Something went wrong!' %}

2
resources/views/yuuno/premium/index.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title %}Support {{ config('general.name') }}{% endset %}

2
resources/views/yuuno/profile/comments.twig
View file

@ -3,4 +3,4 @@
<div class="new-profile-mode-title">
<h1>Comments</h1>
</div>
{% include 'elements/comments.twig' %}
{% include '@yuuno/elements/comments.twig' %}

2
resources/views/yuuno/profile/friends.twig
View file

@ -1,4 +1,4 @@
{% from 'macros.twig' import pagination %}
{% from '@yuuno/macros.twig' import pagination %}
{% set friends = profile.friends(2)|batch(12) %}

2
resources/views/yuuno/settings/account/details.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/account/master.twig' %}
{% extends '@yuuno/settings/account/master.twig' %}
{% set mode = 'Details' %}

2
resources/views/yuuno/settings/account/master.twig
View file

@ -1,3 +1,3 @@
{% extends 'settings/master.twig' %}
{% extends '@yuuno/settings/master.twig' %}
{% set category = 'Account' %}

2
resources/views/yuuno/settings/account/profile.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/account/master.twig' %}
{% extends '@yuuno/settings/account/master.twig' %}
{% set mode = 'Profile' %}

2
resources/views/yuuno/settings/account/ranks.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/account/master.twig' %}
{% extends '@yuuno/settings/account/master.twig' %}
{% set mode = 'Ranks' %}

4
resources/views/yuuno/settings/account/signature.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/account/master.twig' %}
{% extends '@yuuno/settings/account/master.twig' %}
{% set mode = 'Signature' %}
@ -18,5 +18,5 @@
<button type="reset" class="input__button">Reset</button>
<button type="button" class="input__button" onclick="settingsPreview()">Preview</button>
</form>
{% include 'settings/account/_preview.twig' %}
{% include '@yuuno/settings/account/_preview.twig' %}
{% endblock %}

4
resources/views/yuuno/settings/account/userpage.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/account/master.twig' %}
{% extends '@yuuno/settings/account/master.twig' %}
{% set mode = 'Userpage' %}
@ -18,5 +18,5 @@
<button type="reset" class="input__button">Reset</button>
<button type="button" class="input__button" onclick="settingsPreview()">Preview</button>
</form>
{% include 'settings/account/_preview.twig' %}
{% include '@yuuno/settings/account/_preview.twig' %}
{% endblock %}

2
resources/views/yuuno/settings/advanced/deactivate.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/advanced/master.twig' %}
{% extends '@yuuno/settings/advanced/master.twig' %}
{% set mode = 'Deactivate' %}

2
resources/views/yuuno/settings/advanced/master.twig
View file

@ -1,3 +1,3 @@
{% extends 'settings/master.twig' %}
{% extends '@yuuno/settings/master.twig' %}
{% set category = 'Advanced' %}

2
resources/views/yuuno/settings/advanced/sessions.twig
View file

@ -1,4 +1,4 @@
{% extends 'settings/advanced/master.twig' %}
{% extends '@yuuno/settings/advanced/master.twig' %}
{% set mode = 'Sessions' %}

4
resources/views/yuuno/settings/friends/listing.twig
View file

@ -1,5 +1,5 @@
{% extends 'settings/friends/master.twig' %}
{% from 'macros.twig' import pagination %}
{% extends '@yuuno/settings/friends/master.twig' %}
{% from '@yuuno/macros.twig' import pagination %}
{% set friends = user.friends(1)|batch(12) %}

2
resources/views/yuuno/settings/friends/master.twig
View file

@ -1,3 +1,3 @@
{% extends 'settings/master.twig' %}
{% extends '@yuuno/settings/master.twig' %}
{% set category = 'Friends' %}

4
resources/views/yuuno/settings/friends/requests.twig
View file

@ -1,5 +1,5 @@
{% extends 'settings/friends/master.twig' %}
{% from 'macros.twig' import pagination %}
{% extends '@yuuno/settings/friends/master.twig' %}
{% from '@yuuno/macros.twig' import pagination %}
{% set friends = user.friends(-1)|batch(12) %}

2
resources/views/yuuno/settings/master.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = category ~ ' / ' ~ mode %}

2
resources/views/yuuno/status/index.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% set title = 'Status' %}

4
resources/views/yuuno/user/members.twig
View file

@ -1,5 +1,5 @@
{% extends 'master.twig' %}
{% from 'macros.twig' import pagination %}
{% extends '@yuuno/master.twig' %}
{% from '@yuuno/macros.twig' import pagination %}
{% set sorts = ['boxes', 'rectangles', 'list'] %}
{% set sort = get is defined and get.sort is defined and get.sort in sorts ? get.sort : sorts[0] %}

8
resources/views/yuuno/user/profile.twig
View file

@ -1,6 +1,6 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% from 'user/profile_macros.twig' import profile_image_changer %}
{% from '@yuuno/user/profile_macros.twig' import profile_image_changer %}
{% set title = 'Profile of ' ~ profile.username %}
{% set description = 'Everything you ever wanted to know about ' ~ profile.username ~ '!' %}
@ -112,7 +112,7 @@
<div class="content profile">
<div class="profile__container">
{% include 'user/profile_header.twig' %}
{% include '@yuuno/user/profile_header.twig' %}
<div class="profile__content">
<div class="profile__mode">
{% if profile.lastfm %}
@ -131,7 +131,7 @@
<noscript><h1 style="text-align: center;">Please enable Javascript!</h1></noscript>
{% for name, data in sections %}
<div id="profile-mode-{{ name }}" class="hidden">
{% include 'profile/' ~ name ~ '.twig' %}
{% include '@yuuno/profile/' ~ name ~ '.twig' %}
</div>
{% endfor %}
</div>

2
resources/views/yuuno/user/profile_header.twig
View file

@ -1,4 +1,4 @@
{% from 'user/profile_macros.twig' import profile_image_changer %}
{% from '@yuuno/user/profile_macros.twig' import profile_image_changer %}
<div class="profile__header" style="background-image: url({{ route('user.header', profile.id) }});">
<div class="profile__info">

2
resources/views/yuuno/user/report.twig
View file

@ -1,4 +1,4 @@
{% extends 'master.twig' %}
{% extends '@yuuno/master.twig' %}
{% block content %}
<h1 style="text-align: center; margin: 2em auto;">I'll actually make reporting a thing, someday...</h1>