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

r20150902

Browse source
This commit is contained in:
Pachira 2015-09-02 19:51:03 +02:00
parent 949c39b597
commit e4289ff652
7 changed files with 96 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
_sakura/changelog.json
View file

@ -54,7 +54,8 @@
"20150828", "20150828",
"20150829", "20150829",
"20150830", "20150830",
"20150831" "20150831",
"20150902"
] ]
@ -2343,6 +2344,31 @@
"user": "Flashwave" "user": "Flashwave"
} }
],
"20150902": [
{
"type": "REM",
"change": "Removed dodgy old mobile view.",
"user": "Flashwave"
},
{
"type": "FIX",
"change": "Fixed menu width on smaller monitors.",
"user": "Flashwave"
},
{
"type": "FIX",
"change": "Made the dropdowns in the memberlist usable on phones.",
"user": "Flashwave"
},
{
"type": "REM",
"change": "Removed special styling on support us button.",
"user": "Flashwave"
}
] ]
} }

7
_sakura/components/Users.php
View file

@ -1473,4 +1473,11 @@ class Users {
} }
// Update donation tracker
public static function updatePremiumTracker($id, $amount, $comment) {
}
} }

9
_sakura/sakura.php
View file

@ -8,7 +8,7 @@
namespace Sakura; namespace Sakura;
// Define Sakura version // Define Sakura version
define('SAKURA_VERSION', '20150831'); define('SAKURA_VERSION', '20150902');
define('SAKURA_VLABEL', 'Eminence'); define('SAKURA_VLABEL', 'Eminence');
define('SAKURA_COLOUR', '#6C3082'); define('SAKURA_COLOUR', '#6C3082');
define('SAKURA_STABLE', false); define('SAKURA_STABLE', false);
@ -88,6 +88,13 @@ if(!defined('SAKURA_NO_TPL')) {
// Set base page rendering data // Set base page rendering data
$renderData = [ $renderData = [
/*
* Idea for flexibility in templates and to reduce redundancy;
* Attempt to use a class instead of an assoc. array for the
* template variables since twig supports this to make accessing
* certain functions, like the time elapsed function easier.
*/
'sakura' => [ 'sakura' => [
'versionInfo' => [ 'versionInfo' => [

5
_sakura/templates/yuuno/global/header.tpl
View file

@ -171,7 +171,7 @@
<a class="menu-item fa-search" href="/search" title="Search"></a> <a class="menu-item fa-search" href="/search" title="Search"></a>
{% if session.checkLogin %} {% if session.checkLogin %}
<a class="menu-item fa-users" href="/members" title="Members"></a> <a class="menu-item fa-users" href="/members" title="Members"></a>
<a class="menu-item menu-donate fa-heart" href="/support" title="Support us"></a> <a class="menu-item fa-heart" href="/support" title="Support us"></a>
{% endif %} {% endif %}
</div> </div>
<div class="menu-ucp fa" id="navMenuUser"> <div class="menu-ucp fa" id="navMenuUser">
@ -190,9 +190,6 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
<div class="menu-mob">
<a class="menu-item" id="mobileNavToggle" href="javascript:;" onclick="mobileMenu(true);">Open Menu</a>
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>

16
_sakura/templates/yuuno/main/memberlist.tpl
View file

@ -7,20 +7,20 @@
<div class="membersPage" style="min-height: 500px;"> <div class="membersPage" style="min-height: 500px;">
<div class="dropDown" style="margin: 0px auto; font-size: 1.5em; line-height: 1.5em; height: 30px;"> <div class="dropDown" style="margin: 0px auto; font-size: 1.5em; line-height: 1.5em; height: 30px;">
<div class="dropDownInner" style="float: left; color: #FFF;"> <div class="dropDownInner" style="float: left; color: #FFF;">
<a class="dropDownDesc">Rank:</a> <a class="dropDownDesc">Rank:</a><!--
<a href="/members/"{% if not page.active %} class="dropDownSelected"{% endif %}>All members</a> --><a href="/members/"{% if not page.active %} class="dropDownSelected"{% endif %}>All members</a><!--
{% for rank in page.ranks %} {% for rank in page.ranks %}
{% if not rank.hidden or (rank.hidden and page.active == rank.id) %} {% if not rank.hidden or (rank.hidden and page.active == rank.id) %}
<a href="/members/{% if page.sort != page.sorts[0] %}{{ page.sort }}/{% endif %}{{ rank.id }}/" style="color: {{ rank.colour }};"{% if page.active == rank.id %} class="dropDownSelected"{% endif %}>{{ rank.name }}{% if rank.multi %}s{% endif %}</a> --><a href="/members/{% if page.sort != page.sorts[0] %}{{ page.sort }}/{% endif %}{{ rank.id }}/" style="color: {{ rank.colour }};"{% if page.active == rank.id %} class="dropDownSelected"{% endif %}>{{ rank.name }}{% if rank.multi %}s{% endif %}</a><!--
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> --></div>
<div class="dropDownInner" style="float: left;"> <div class="dropDownInner" style="float: left;"><!--
<a class="dropDownDesc">View:</a> --><a class="dropDownDesc">View:</a><!--
{% for sort in page.sorts %} {% for sort in page.sorts %}
<a href="/members/{{ sort }}/{% if page.active %}{{ page.active }}/{% endif %}{% if page.page %}p{{ page.page + 1 }}/{% endif %}"{% if page.sort == sort %} class="dropDownSelected"{% endif %}>{{ sort|capitalize }}</a> --><a href="/members/{{ sort }}/{% if page.active %}{{ page.active }}/{% endif %}{% if page.page %}p{{ page.page + 1 }}/{% endif %}"{% if page.sort == sort %} class="dropDownSelected"{% endif %}>{{ sort|capitalize }}</a><!--
{% endfor %} {% endfor %}
</div> --></div>
</div> </div>
{% if page.notfound %} {% if page.notfound %}
<h1 class="stylised" style="margin-top: 20px;">The requested rank was not found!</h1> <h1 class="stylised" style="margin-top: 20px;">The requested rank was not found!</h1>

121
main/content/data/yuuno/css/yuuno.css
View file

@ -440,6 +440,33 @@ a#gotop.exit {
display: none; display: none;
} }
@media (max-width: 1024px) {
.dropDown {
position: static;
}
.dropDown .dropDownInner {
float: none !important;
margin-bottom: 5px;
}
.dropDown .dropDownInner a {
padding: 3px 6px;
float: none !important;
display: inline-block !important;
}
.dropDown .dropDownInner a:not(:last-child) {
border-right: 2px solid #9475B2;
}
.membersPageList {
padding-top: 10px;
}
}
#headerLoginForm { #headerLoginForm {
background: rgba(211, 191, 255, .8); background: rgba(211, 191, 255, .8);
border: 1px solid #9475B2; border: 1px solid #9475B2;
@ -555,9 +582,11 @@ a#gotop.exit {
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.header .logo { .header .logo {
font: 100 50px/60px "SegoeUI-Light", "SegoeUI", "Segoe UI", sans-serif; font: 100 50px/60px "SegoeUI-Light", "SegoeUI", "Segoe UI", sans-serif;
} }
} }
.header .menu { .header .menu {
@ -574,12 +603,8 @@ a#gotop.exit {
float: right; float: right;
} }
.header .menu .menu-mob {
display: none;
}
.header .menu .menu-item { .header .menu .menu-item {
margin: 0 8px -2px; margin: 0 7px -2px 6px;
display: inline-block; display: inline-block;
border-bottom: 2px solid #8364A1; border-bottom: 2px solid #8364A1;
color: inherit; color: inherit;
@ -597,7 +622,6 @@ a#gotop.exit {
.header .menu .menu-item.avatar { .header .menu .menu-item.avatar {
padding-left: 30px; padding-left: 30px;
background: url('/pixel.png') no-repeat scroll left center / contain transparent; background: url('/pixel.png') no-repeat scroll left center / contain transparent;
background-size: auto 30px;
} }
.header .menu .menu-item:hover { .header .menu .menu-item:hover {
@ -609,92 +633,37 @@ a#gotop.exit {
background-color: #503180 !important; background-color: #503180 !important;
} }
.header .menu .menu-donate:hover { @media (max-width: 1024px) {
border-color: #EE9400 !important;
}
.header .menu .menu-donate:active {
border-color: #EE9400 !important;
background-color: #EE9400 !important;
}
@media (max-width: 1283px) and (min-width: 930px) {
.header .menu { .header .menu {
border: 0; border: 0;
padding-bottom: 5px; padding: 10px 0 5px;
} margin: 0 auto;
width: auto;
.header .menu .menu-nav {
margin-left: 32px;
} }
.header .menu .menu-nav, .header .menu .menu-nav,
.header .menu .menu-ucp { .header .menu .menu-ucp {
display: block; display: inline-block;
float: none; float: none;
text-align: center; text-align: center;
} }
.header .menu .menu-ucp {
margin-left: -1px;
}
.header .menu .menu-item { .header .menu .menu-item {
min-width: 120px;
border: 0; border: 0;
margin: 0 8px; height: 50px;
} width: 50px;
line-height: 50px;
.header .menu .menu-nav .menu-item { font-size: 2em;
min-width: 120px; display: inline-block;
border-bottom: 1px solid #8364A1;
}
.header .menu .menu-ucp .menu-item {
min-width: 120px;
border-top: 1px solid #8364A1;
}
}
@media (max-width: 930px) {
.header .menu .menu-nav, .header .menu .menu-ucp {
float: none;
text-align: center;
display: none;
}
.header .menu .menu-hid {
display: block;
}
.header .menu .menu-mob {
display: block;
} }
.header .menu .menu-item.avatar { .header .menu .menu-item.avatar {
padding-left: 0; padding-left: 50px;
}
.header .menu .menu-mob .menu-item {
width: 100px;
}
.header .menu .menu-nav .menu-item, .header .menu .menu-ucp .menu-item {
display: block;
border-top: 0;
border-bottom: 1px solid #8364A1;
margin: 0 8px;
}
.header .menu .menu-nav:before {
content: "Navigation";
font-size: 20px;
line-height: 40px;
}
.header .menu .menu-ucp:before {
content: "User Settings";
font-size: 20px;
line-height: 40px;
} }
} }

33
main/content/data/yuuno/js/yuuno.js
View file

@ -21,39 +21,6 @@ function cookieData(action, name, data) {
} }
// Toggling the menu on mobile devices
function mobileMenu(mode) {
// Assign the elements to variables
var ucpMenuBtn = document.getElementById('navMenuSite');
var navMenuBtn = document.getElementById('navMenuUser');
var mobMenuBtn = document.getElementById('mobileNavToggle');
// Open or close the menus depending on the values
if(mode) {
// Alter the classes
ucpMenuBtn.className = ucpMenuBtn.className + ' menu-hid';
navMenuBtn.className = navMenuBtn.className + ' menu-hid';
// Update the button
mobMenuBtn.innerHTML = 'Close Menu';
mobMenuBtn.setAttribute('onclick', 'mobileMenu(false);');
} else {
// Alter the classes
ucpMenuBtn.className = ucpMenuBtn.className.replace(' menu-hid', '');
navMenuBtn.className = navMenuBtn.className.replace(' menu-hid', '');
// Update the button
mobMenuBtn.innerHTML = 'Open Menu';
mobMenuBtn.setAttribute('onclick', 'mobileMenu(true);');
}
}
// Get the current unix/epoch timestamp // Get the current unix/epoch timestamp
function epochTime() { function epochTime() {