diff --git a/resources/assets/less/yuuno/base.less b/resources/assets/less/yuuno/base.less index 0aca65b..1135ee5 100644 --- a/resources/assets/less/yuuno/base.less +++ b/resources/assets/less/yuuno/base.less @@ -72,16 +72,6 @@ img { visibility: hidden !important; } -@keyframes spin { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} - @keyframes fadeOut { 0% { opacity: 1; diff --git a/resources/assets/less/yuuno/bem/content.less b/resources/assets/less/yuuno/bem/content.less index a9d298e..93fc4bb 100644 --- a/resources/assets/less/yuuno/bem/content.less +++ b/resources/assets/less/yuuno/bem/content.less @@ -55,6 +55,5 @@ &--alt { background: #C2AEEE; - margin: 5px 10px; } } diff --git a/resources/assets/less/yuuno/bem/forum-list.less b/resources/assets/less/yuuno/bem/forum-list.less new file mode 100644 index 0000000..101d05a --- /dev/null +++ b/resources/assets/less/yuuno/bem/forum-list.less @@ -0,0 +1,16 @@ +.forum-list { + display: flex; + flex-flow: column; + + &__category { + background: #C2AFFE; + font-weight: 700; + font-size: 17px; + padding: 4px; + color: inherit; + + &-link { + color: inherit !important; + } + } +} diff --git a/resources/assets/less/yuuno/bem/forum.less b/resources/assets/less/yuuno/bem/forum.less new file mode 100644 index 0000000..c9612c0 --- /dev/null +++ b/resources/assets/less/yuuno/bem/forum.less @@ -0,0 +1,87 @@ +.forum { + display: flex; + min-height: 50px; + align-items: center; + + &__icon { + text-align: center; + width: 50px; + line-height: 50px; + flex-shrink: 0; + color: #444; + text-shadow: 0 0 5px #444; + + &--unread { + color: #6C5D7B; + text-shadow: 0 0 5px #9475B2; + } + } + + &__info { + flex-grow: 1; + flex-shrink: 1; + } + + &__name { + font-size: 1.2em; + } + + &__description { + font-size: 0.8em; + line-height: 1em; + } + + &__subforums { + font-style: italic; + padding-top: 5px; + } + + &__subforum--unread { + font-weight: bold; + } + + &__stats { + width: 70px; + text-align: center; + flex-shrink: 0; + } + + &__stat { + font-size: 0.8em; + line-height: 1.2em; + color: #555; + + &--big { + font-size: 1.5em; + color: #111; + } + } + + &__recent { + width: 250px; + font-size: 0.9em; + line-height: 1.4em; + flex-shrink: 0; + + @media (max-width: 768px) { + display: none; + } + } + + &__preview { + display: flex; + align-items: center; + + &-avatar { + width: 30px; + height: 30px; + flex-shrink: 0; + } + + &-info { + text-align: right; + flex-grow: 1; + padding: 0 4px; + } + } +} diff --git a/resources/assets/less/yuuno/bem/friend-box.less b/resources/assets/less/yuuno/bem/friend-box.less index 81c64ff..0104534 100644 --- a/resources/assets/less/yuuno/bem/friend-box.less +++ b/resources/assets/less/yuuno/bem/friend-box.less @@ -11,6 +11,20 @@ text-decoration: none !important; transition: background .2s, box-shadow .2s; + &__container { + display: block; + text-decoration: none !important; + color: #000; + margin: 5px auto; + background-color: transparent; + border: 0; + + &:active { + color: inherit; + } + } + + &--active, &:hover { background: #C2AFFE; box-shadow: inset 0 0 2px #9475B2; @@ -31,4 +45,49 @@ height: 150px; display: inline-block; } + + &__actions { + display: flex; + background: linear-gradient(0deg, #9475B2, transparent) transparent; + } + + &__action { + flex-grow: 1; + color: #222; + font-size: 2em; + line-height: 1em; + text-decoration: none !important; + padding: 5px 0; + background-color: transparent; + border: 0; + transition: color .2s; + + &:hover { + color: #333; + } + + &:active { + color: #111; + } + + &--green { + &:hover { + color: #0d0; + } + + &:active { + color: #0a0; + } + } + + &--red { + &:hover { + color: #d00; + } + + &:active { + color: #a00; + } + } + } } diff --git a/resources/assets/less/yuuno/bem/topic.less b/resources/assets/less/yuuno/bem/topic.less new file mode 100644 index 0000000..91d1324 --- /dev/null +++ b/resources/assets/less/yuuno/bem/topic.less @@ -0,0 +1,73 @@ +.topic { + display: flex; + min-height: 40px; + align-items: center; + + &--highlight { + background-color: #C2AFFE; + } + + &__icon { + width: 40px; + line-height: 40px; + color: #444; + text-shadow: 0 0 5px #444; + text-align: center; + flex-shrink: 0; + + &--unread { + color: #6C5D7B; + text-shadow: 0 0 5px #9475B2; + } + } + + &__info { + flex-grow: 1; + flex-shrink: 1; + } + + &__author { + font-size: 0.8em; + line-height: 1em; + } + + &__stats { + text-align: center; + } + + &__stat { + font-size: 0.8em; + color: #555; + line-height: 1em; + padding: 0 10px; + + &--big { + font-size: 1.3em; + color: #111; + } + } + + &__recent { + display: flex; + width: 250px; + align-items: center; + + &-avatar { + width: 20px; + height: 20px; + flex-shrink: 0; + } + + &-info { + text-align: right; + flex-grow: 1; + padding: 0 4px; + font-size: 0.9em; + line-height: 1.4em; + } + + @media (max-width: 768px) { + display: none; + } + } +} diff --git a/resources/assets/less/yuuno/legacy.less b/resources/assets/less/yuuno/legacy.less index 882030c..e35689d 100644 --- a/resources/assets/less/yuuno/legacy.less +++ b/resources/assets/less/yuuno/legacy.less @@ -1,370 +1,6 @@ -/* - * Settings page styling - */ -.settings .friends-list { - text-align: center; -} - -.settings .friends-list button { - background: transparent; - border: 0; - cursor: pointer; - display: block; - box-sizing: border-box; - width: 100%; -} - -.settings .friends-list > div:not(:last-child), -.settings .friends-list > form { - display: inline-block; - border: 1px solid #9475B2; - text-align: center; - width: 220px; - margin: 0 2px 40px; - border-radius: 3px; - box-shadow: inset 0 0 1px #9475B2; - background: #E4CFFF; - transition: background .2s, box-shadow .2s; -} - -.settings .friends-list > div:not(:last-child):hover, -.settings .friends-list > form:hover { - margin-bottom: 6px; - background: #C2AFFE; - box-shadow: inset 0 0 2px #9475B2; -} - -.settings .friends-list > form:hover { - margin-bottom: 4px; -} - -.settings .friends-list > .active { - background: #C2AFFE; - box-shadow: inset 0 0 2px #9475B2; -} - -.settings .friends-list > div > .friends-list-data, -.settings .friends-list > form > .friends-list-data { - display: block; -} - -.settings .friends-list > div > .friends-list-data > .friends-list-name, -.settings .friends-list > form > .friends-list-data > .friends-list-name { - font-size: 1.2em; - line-height: 1.5em; - padding-bottom: 4px; -} - -.settings .friends-list > div > .friends-list-actions, -.settings .friends-list > form > .friends-list-actions { - display: none; - background: linear-gradient(0deg, #9475B2, transparent) transparent; -} - -.settings .friends-list > div > .friends-list-actions > a, -.settings .friends-list > form > .friends-list-actions > button { - color: #222; - font-size: 2em; - line-height: 1em; - text-decoration: none; - transition: .2s; - padding: 5px 0; - float: left; -} - -.settings .friends-list > div:hover > .friends-list-actions, -.settings .friends-list > form:hover > .friends-list-actions { - display: block; -} - -.settings .friends-list > div > .friends-list-actions > .remove:hover, -.settings .friends-list > form > .friends-list-actions > .remove:hover { - color: #D00; -} - -.settings .friends-list > div > .friends-list-actions > .remove:active, -.settings .friends-list > form > .friends-list-actions > .remove:active { - color: #A00; -} - -.settings .friends-list > div > .friends-list-actions > .add:hover, -.settings .friends-list > form > .friends-list-actions > .add:hover { - color: #0D0; -} - -.settings .friends-list > div > .friends-list-actions > .add:active, -.settings .friends-list > form > .friends-list-actions > .add:active { - color: #0A0; -} - -.settings .friends-list > div > .friends-list-actions > a, -.settings .friends-list > form > .friends-list-actions > button { - width: 50%; -} - -.settings .friends-list > div > .friends-list-actions > .fill, -.settings .friends-list > form > .friends-list-actions > .fill { - width: 100%; -} - -@media (max-width: 1064px) { - .settings .friends-list > div:not(:last-child) { - margin-bottom: 6px; - } - - .settings .friends-list > form { - margin-bottom: 4px; - } - - .settings .friends-list .friends-list-actions { - display: block; - } -} - -/* - * Support page Styling - */ -.support .sectionHeader { - margin: -1px -2px; - background: linear-gradient(270deg, rgba(148, 117, 178, .7), rgba(148, 117, 178, 0), rgba(148, 117, 178, .7)) #C2AFFE; - padding: 2px; - font-weight: 700; - font-size: 15px; - color: #306; -} - -.support .featureParent { - width: 100%; - padding: 10px 0; - overflow: hidden; - text-align: center; -} - -.support .featureBox { - background: linear-gradient(180deg, #C2AFFE, #B19EED) no-repeat scroll left top / cover #C2AFFE; - margin: 7px; - border-radius: 5px; - text-align: center; - box-shadow: 0 0 .5em #000; - text-shadow: 0 0 .5em #9475B2; - display: inline-block; - vertical-align: top; - transition: .2s; - width: 400px; - height: 50px; - cursor: default; - color: #503170; -} - -@media (min-width: 1064px) { - .support .featureBox.final { - width: 818px; - } - - .support .featureBox.final .featureBoxDesc { - font-size: 1.3em; - } -} - -@media (max-width: 840px) { - .support .featureBox, - .support .featureBox.final { - width: 380px; - } - - .support .featureBox.final .featureBoxDesc { - line-height: 25px; - } - - .support .featureBox .right { - display: none; - } -} - -.support .featureBoxIcon.right { - float: right; -} - -.support .featureBox:hover { - box-shadow: 0 0 1.5em #609; - text-shadow: 0 0 .7em #9475B2; -} - -.support .featureBoxIcon { - float: left; - line-height: 50px; - width: 60px; - text-align: center; - font-size: 2.8em; -} - -.support .featureBoxDesc { - display: block; - line-height: 50px; -} - -.support .paymentOptions { - float: right; - font-size: 2em; - margin-left: 6px; -} - -.support .paymentOptions div { - float: left; - margin: 0 1px; -} - /* * Forum Styling */ -.forum .forumList { - display: flex; - flex-flow: column; -} - -.forum .forumList .forumCategory { - background: #C2AFFE; - font-weight: 700; - font-size: 17px; - padding: 4px; - color: inherit; - text-decoration: none; -} - -.forum .forumList .forumForum { - display: inline-flex; - min-height: 50px; -} - -.forum .forumList .forumForum > div { - display: inline-flex; - flex-flow: column; - justify-content: center; -} - -.forum .forumList .forumForum .forumIcon { - text-align: center; - width: 50px; - line-height: 50px; - flex-shrink: 0; - color: #444; - text-shadow: 0 0 5px #444; -} - -.forum .forumList .forumForum .forumIcon.unread { - color: #6C5D7B; - text-shadow: 0 0 5px #9475B2; -} - -.forum .forumList .forumForum .forumTitle { - flex-grow: 1; - flex-shrink: 1; -} - -.forum .forumList .forumForum .forumTitle .name { - font-size: 1.2em; - line-height: 1.7em; -} - -.forum .forumList .forumForum .forumTitle .desc { - font-size: .8em; - line-height: 1em; -} - -.forum .forumList .forumForum .forumTitle .desc .subforums { - font-weight: bold; - padding-top: 5px; -} - -.forum .forumList .forumForum .forumCount { - width: 70px; - text-align: center; - flex-shrink: 0; -} - -.forum .forumList .forumForum .forumCount .topics { - font-size: 1.5em; - color: #111; -} - -.forum .forumList .forumForum .forumCount .posts { - font-size: .8em; - line-height: 1.2em; - color: #555; -} - -.forum .forumList .forumForum .forumLastPost { - width: 250px; - font-size: .9em; - line-height: 1.4em; - flex-shrink: 0; -} - -@media (max-width: 768px) { - .forum .forumList .forumForum .forumLastPost { - display: none; - } -} - -.forum .topicList { - width: 100%; - border-spacing: 0; - margin-top: 2px; -} - -.forum .topicList thead, -.forum .topicList tfoot { - background: #C2AFFE; - font-weight: 700; -} - -.forum .topicList tbody td { - height: 40px; - word-wrap: break-word; -} - -.forum .topicList tbody .topicAnnouncement { - background: #C2AFFE; -} - -.forum .topicList tbody .topicIcon { - width: 40px; - text-align: center; - color: #444; - text-shadow: 0 0 5px #444; -} - -.forum .topicList tbody .topicIcon.unread { - color: #6C5D7B; - text-shadow: 0 0 5px #9475B2; -} - -.forum .topicList tbody .topicAuthor { - width: 150px; - text-align: center; -} - -.forum .topicList tbody .topicCounts { - text-align: center; -} - -.forum .topicList tbody .topicCounts .replies { - font-size: 1.3em; - color: #111; - line-height: 1.3em; -} - -.forum .topicList tbody .topicCounts .views { - font-size: .8em; - color: #555; - line-height: 1em; -} - -.forum .topicList tbody .topicLast { - width: 250px; - text-align: center; -} - .forum.viewtopic .posts { width: 100%; border-spacing: 0; diff --git a/resources/assets/less/yuuno/main.less b/resources/assets/less/yuuno/main.less index 0d36317..67d03bf 100644 --- a/resources/assets/less/yuuno/main.less +++ b/resources/assets/less/yuuno/main.less @@ -17,6 +17,8 @@ @import "bem/dialogue"; @import "bem/dropdown"; @import "bem/footer"; +@import "bem/forum"; +@import "bem/forum-list"; @import "bem/friend-box"; @import "bem/header"; @import "bem/header-login"; @@ -27,7 +29,6 @@ @import "bem/profile"; @import "bem/settings"; @import "bem/sidepanel-table"; +@import "bem/topic"; @import "bem/uploader"; @import "bem/user"; - -@import "legacy"; diff --git a/resources/assets/typescript/Yuuno/Main.ts b/resources/assets/typescript/Yuuno/Main.ts index 66ad22f..a05ce6e 100644 --- a/resources/assets/typescript/Yuuno/Main.ts +++ b/resources/assets/typescript/Yuuno/Main.ts @@ -10,10 +10,6 @@ namespace Yuuno Sakura.Friend.Init(); Notifications.Init(); Busy.Init(); - - if (window.location.pathname === '/' || window.location.pathname === '/forum' || window.location.pathname === '/forum/') { - Ybabstat.Initiate(); - } } } } diff --git a/resources/assets/typescript/Yuuno/Ybabstat.ts b/resources/assets/typescript/Yuuno/Ybabstat.ts deleted file mode 100644 index bde2cd1..0000000 --- a/resources/assets/typescript/Yuuno/Ybabstat.ts +++ /dev/null @@ -1,80 +0,0 @@ -namespace Yuuno -{ - export class Ybabstat - { - private static Illuminati: number[] = []; - private static FreeMason: number = Date.now(); - - public static Initiate(): void - { - document.addEventListener('keydown', Ybabstat.HideYourMind); - } - - private static TwoThousandSixteenIsTheYearWePhysicallyMergeWithCats(): void - { - var diff: number = Date.now() - Ybabstat.FreeMason, - vals: number[] = [ - -7 / Math.cos((diff / 500) * (.85 * Math.PI)), - -7 * Math.tan((diff / 250) * (.85 * Math.PI)) - ]; - - document.body.style.position = 'absolute'; - document.body.style.left = vals[0] + 'px'; - document.body.style.top = vals[1] + 'px'; - document.body.style.fontSize = vals[0] + 'px'; - } - - private static HideYourMind(conflictions: KeyboardEvent): void - { - var twoThousandTwelveIsTheYearWeAscendToSpaceRobots: number = conflictions.keyCode; - - Ybabstat.Illuminati.push(twoThousandTwelveIsTheYearWeAscendToSpaceRobots); - - if (Ybabstat.Illuminati[0] === 68 && Ybabstat.Illuminati[1] === 73 && Ybabstat.Illuminati[2] === 67 && Ybabstat.Illuminati[3] === 75 && Ybabstat.Illuminati[4] === 83) { - var dicksAreForMy: HTMLAudioElement = Sakura.DOM.Create('audio'), - friendsWhenThey: HTMLSourceElement = Sakura.DOM.Create('source'), - comeToMyHouse: HTMLSourceElement = Sakura.DOM.Create('source'); - - friendsWhenThey.type = 'audio/mp3'; - comeToMyHouse.type = 'audio/ogg'; - - friendsWhenThey.src = 'https://data.flashii.net/assets/sounds/dicks.mp3'; - comeToMyHouse.src = 'https://data.flashii.net/assets/sounds/dicks.ogg'; - - Sakura.DOM.Append(dicksAreForMy, friendsWhenThey); - Sakura.DOM.Append(dicksAreForMy, comeToMyHouse); - - dicksAreForMy.play(); - - Ybabstat.Illuminati = []; - } - - if (Ybabstat.Illuminati[0] === 77 && Ybabstat.Illuminati[1] === 69 && Ybabstat.Illuminati[2] === 87 && Ybabstat.Illuminati[3] === 79 && Ybabstat.Illuminati[4] === 87) { - var noklz: HTMLAudioElement = Sakura.DOM.Create('audio'), - von: HTMLSourceElement = Sakura.DOM.Create('source'), - schnitzel: HTMLSourceElement = Sakura.DOM.Create('source'); - - von.type = 'audio/mp3'; - schnitzel.type = 'audio/ogg'; - - von.src = 'https://data.flashii.net/assets/sounds/mewow.mp3'; - schnitzel.src = 'https://data.flashii.net/assets/sounds/mewow.ogg'; - - Sakura.DOM.Append(noklz, von); - Sakura.DOM.Append(noklz, schnitzel); - - noklz.play(); - - document.body.style.animation = 'spin 5s infinite linear'; - - Ybabstat.Illuminati = []; - } - - if (Ybabstat.Illuminati[0] == 83 && Ybabstat.Illuminati[1] == 79 && Ybabstat.Illuminati[2] == 67 && Ybabstat.Illuminati[3] == 75 && Ybabstat.Illuminati[4] == 67 && Ybabstat.Illuminati[5] == 72 && Ybabstat.Illuminati[6] == 65 && Ybabstat.Illuminati[7] == 84) { - setInterval(Ybabstat.TwoThousandSixteenIsTheYearWePhysicallyMergeWithCats, 20); - - Ybabstat.Illuminati = []; - } - } - } -} diff --git a/resources/views/yuuno/forum/elements/forumBase.twig b/resources/views/yuuno/forum/elements/forumBase.twig index c389199..6b8fe5d 100644 --- a/resources/views/yuuno/forum/elements/forumBase.twig +++ b/resources/views/yuuno/forum/elements/forumBase.twig @@ -1,10 +1,16 @@
{{ title }}
-
+
{% for forum in forum.forums %} {% if forum.type == 1 %} {% if forum.forums|length and forum.perms.view %} -
- {% if forum.type != 1 %}Subforums{% else %}{{ forum.name }}{% endif %} +
+ {% if forum.type != 1 %} + Subforums + {% else %} + + {{ forum.name }} + + {% endif %}
{% for forum in forum.forums %} {% include 'forum/elements/forumEntry.twig' %} @@ -22,34 +28,14 @@ {% set paginationUrl %}{{ route('forums.forum', forum.id) }}{% endset %} {% include 'forum/elements/forumBtns.twig' %} + {% if forum.topics %} - - - - - - - - - - - - - - - - - - - - - {% for topic in topics[get.page|default(1) - 1] %} - {% include 'forum/elements/topicEntry.twig' %} - {% endfor %} - -
TopicAuthorLast post
TopicAuthorLast post
+ {% for topic in topics[get.page|default(1) - 1] %} + {% include 'forum/elements/topicEntry.twig' %} + {% endfor %} {% else %}

There are no posts in this forum!

{% endif %} + {% include 'forum/elements/forumBtns.twig' %} {% endif %} diff --git a/resources/views/yuuno/forum/elements/forumEntry.twig b/resources/views/yuuno/forum/elements/forumEntry.twig index bd98e14..a655e0c 100644 --- a/resources/views/yuuno/forum/elements/forumEntry.twig +++ b/resources/views/yuuno/forum/elements/forumEntry.twig @@ -1,35 +1,58 @@ {% if forum.perms.view %} -
-
-
-
{{ forum.name }}
-
+
+
+
+ + {{ forum.name }} + +
{{ forum.description }} {% if forum.forums|length %} -
+
Subforums: {% for forum in forum.forums %} - {% if forum.unread(user.id) %}[!]{% endif %} {{ forum.name }} + + {{ forum.name }} + {% endfor %}
{% endif %}
{% if forum.type != 2 %} -
-
{{ forum.topicCount }}
-
{{ forum.postCount }}
-
-
-
+
+
+ {{ forum.topicCount }} +
+
+ {{ forum.postCount }} +
+
+
{% if forum.lastPost.id %} - {{ forum.lastPost.subject|slice(0, 30) }}{% if forum.lastPost.subject|length > 30 %}...{% endif %}
- by {% if forum.lastPost.poster.id %}{{ forum.lastPost.poster.username }}{% else %}[deleted user]{% endif %} +
+
+
+
+ + {{ forum.lastPost.subject|slice(0, 30)|trim }}{% if forum.lastPost.subject|length > 30 %}...{% endif %} + +
+
+ + by + + {{ forum.lastPost.poster.username }} + +
+
+
{% else %} - There are no posts in this forum.
  + There are no posts in this forum. {% endif %}
-
{% endif %}
{% endif %} diff --git a/resources/views/yuuno/forum/elements/topicEntry.twig b/resources/views/yuuno/forum/elements/topicEntry.twig index e4a0946..1b7e3ba 100644 --- a/resources/views/yuuno/forum/elements/topicEntry.twig +++ b/resources/views/yuuno/forum/elements/topicEntry.twig @@ -1,27 +1,48 @@ - - -
- - - {{ topic.title }} - - +
+
+
+ + {{ topic.title }} + {% if topic.firstPost.poster.id %} - {{ topic.firstPost.poster.username }} - {% else %} - [deleted user] +
+ by + + {{ topic.firstPost.poster.username }} + +
{% endif %} - - -
{{ topic.replyCount }}
-
{{ topic.views }}
- - - {% if topic.lastPost.poster.id %} - {{ topic.lastPost.poster.username }} - {% else %} - [deleted user] - {% endif %}
- - - +
+
+
+ {{ topic.replyCount }} +
+
+ {{ topic.views }} +
+
+
+
+
+
+ Last reply + by + {% if topic.lastPost.poster.id %} + {{ topic.lastPost.poster.username }} + {% else %} + [deleted user] + {% endif %} +
+
+ +
+
+
+
diff --git a/resources/views/yuuno/forum/forum.twig b/resources/views/yuuno/forum/forum.twig index f51cda6..4fae375 100644 --- a/resources/views/yuuno/forum/forum.twig +++ b/resources/views/yuuno/forum/forum.twig @@ -1,13 +1,12 @@ {% extends 'master.twig' %} -{% set title %}Forums / {{ forum.name }}{% endset %} - -{% set forumBackLink %}{{ route('forums.index') }}{% endset %} -{% set forumNewLink %}{{ route('forums.new', forum.id) }}{% endset %} -{% set forumMarkRead %}{{ route('forums.mark', forum.id) }}?s={{ session_id() }}{% endset %} +{% set title = 'Forums / ' ~ forum.name %} +{% set forumBackLink = route('forums.index') %} +{% set forumNewLink = route('forums.new', forum.id) %} +{% set forumMarkRead = route('forums.mark', forum.id) ~ '?s=' ~ session_id() %} {% block content %} -
+
{% include 'forum/elements/forumBase.twig' %}
{% endblock %} diff --git a/resources/views/yuuno/forum/index.twig b/resources/views/yuuno/forum/index.twig index 64a7af5..7cbce61 100644 --- a/resources/views/yuuno/forum/index.twig +++ b/resources/views/yuuno/forum/index.twig @@ -3,7 +3,7 @@ {% set title = 'Forums' %} {% block content %} -
+
Popular topics
diff --git a/resources/views/yuuno/forum/topic.twig b/resources/views/yuuno/forum/topic.twig index 8598292..1626e5e 100644 --- a/resources/views/yuuno/forum/topic.twig +++ b/resources/views/yuuno/forum/topic.twig @@ -1,8 +1,7 @@ {% extends 'master.twig' %} -{% set forumBackLink %}{{ route('forums.forum', forum.id) }}{% endset %} - -{% set title %}{% if topic is defined %}{{ topic.title }}{% else %}Creating topic in {{ forum.name }}{% endif %}{% endset %} +{% set forumBackLink = route('forums.forum', forum.id) %} +{% set title = topic is defined ? topic.title : 'Creating topic in ' ~ forum.name %} {% if topic is defined %} {% if forum.perms.reply @@ -48,11 +47,11 @@ {% set posts = topic.posts|batch(10) %} {% set paginationPages = posts %} - {% set paginationUrl %}{{ route('forums.topic', topic.id) }}{% endset %} + {% set paginationUrl = route('forums.topic', topic.id) %} {% endif %} {% block css %} - + {% endblock %} {% block js %} @@ -90,11 +89,18 @@ {% endblock %} {% block content %} -
-
{{ forum.name }} / {{ topic.title|default(null) }}
+
+
+ {{ forum.name }} / + {{ topic.title|default(null) }} + +
+ {% include 'forum/elements/forumBtns.twig' %} + {% if topic is defined %} + {% set textCache = session.replyText['t' ~ topic.id]|default(null) %} {% set postingAction = route('forums.topic.reply', topic.id) %} @@ -149,11 +155,15 @@ {% endfor %} + {% else %} + {% set titleCache = session.replyText['f' ~ forum.id].title|default('') %} {% set textCache = session.replyText['f' ~ forum.id].text|default('') %} {% set postingAction = route('forums.new', forum.id) %} + {% endif %} + {% if forumReplyLink is defined or topic is not defined %} {% endif %}
+ {% if forumReplyLink is defined or topic is not defined %} {% include 'forum/elements/replyForm.twig' %} {% endif %} + {% include 'forum/elements/forumBtns.twig' %}
{% endblock %} diff --git a/resources/views/yuuno/premium/index.twig b/resources/views/yuuno/premium/index.twig index 21626e2..954a44e 100644 --- a/resources/views/yuuno/premium/index.twig +++ b/resources/views/yuuno/premium/index.twig @@ -14,6 +14,7 @@ {% block content %}
Support {{ config('general.name') }}
+

redo this entirely

To keep the site and everything surrounding it running I need money to pay the bills, however instead of just having a donate button I decided on adding a premium system to the site which gives you a few extras. The premium rank is indentified on the site by Tenshi. More stuff that literally doesn't exist yet will be added to the list of featuring down the line but in order, the stuff that already exist can be seen further down on this page. With your help we can keep adding new stuff, get new hardware and keep the site awesome!

@@ -23,14 +24,15 @@

Your Tenshi tag is valid till {{ user.premiumInfo.expire|date(config('general.date_format')) }}.

- + {# the progress bar is completely broken, not fixing it until i completely reviewed the premium system #} + {##}
{% endif %}
Why should I get Tenshi?
- {% for k,v in features %} + {% for k, v in features %}
{{ v|raw }}
@@ -48,14 +50,6 @@ Payment Options
Our transactions are handled through PayPal. -
-
-
-
-
-
-
-
{% if user.isActive and user.verified %} diff --git a/resources/views/yuuno/settings/account/ranks.twig b/resources/views/yuuno/settings/account/ranks.twig index f4a96e9..79f79ad 100644 --- a/resources/views/yuuno/settings/account/ranks.twig +++ b/resources/views/yuuno/settings/account/ranks.twig @@ -7,17 +7,16 @@ {% endblock %} {% block settingsContent %} -
+
{% for rank in user.ranks %} -
+ - -
- -
+
+
{% endfor %} diff --git a/resources/views/yuuno/settings/friends/listing.twig b/resources/views/yuuno/settings/friends/listing.twig index b4465b3..406b983 100644 --- a/resources/views/yuuno/settings/friends/listing.twig +++ b/resources/views/yuuno/settings/friends/listing.twig @@ -13,16 +13,15 @@ {% block settingsContent %} {% if friends|length %} -
+
{% for friend in friends[get.page|default(1) - 1] %} -
- - {{ friend.username }} -
{{ friend.username }}
+
+ +
+
{{ friend.username }}
 -
- -
+
+
{% endfor %} diff --git a/resources/views/yuuno/settings/friends/requests.twig b/resources/views/yuuno/settings/friends/requests.twig index e1397a0..6b44a95 100644 --- a/resources/views/yuuno/settings/friends/requests.twig +++ b/resources/views/yuuno/settings/friends/requests.twig @@ -13,17 +13,16 @@ {% block settingsContent %} {% if friends|length %} -
+
{% for friend in friends[get.page|default(1) - 1] %} -