honto jibun
This commit is contained in:
parent
b041779ebb
commit
2f0a84295e
25 changed files with 140 additions and 105 deletions
|
|
@ -44,7 +44,8 @@
|
|||
"20150812",
|
||||
"20150813",
|
||||
"20150818",
|
||||
"20150819"
|
||||
"20150819",
|
||||
"20150820"
|
||||
|
||||
]
|
||||
|
||||
|
|
@ -2088,6 +2089,26 @@
|
|||
"user": "Flashwave"
|
||||
}
|
||||
|
||||
],
|
||||
|
||||
"20150820": [
|
||||
|
||||
{
|
||||
"type": "UPD",
|
||||
"change": "Cleaned up the sakura template variable.",
|
||||
"user": "Flashwave"
|
||||
},
|
||||
{
|
||||
"type": "FIX",
|
||||
"change": "Fixed font on changelog not displaying correctly.",
|
||||
"user": "Flashwave"
|
||||
},
|
||||
{
|
||||
"type": "FIX",
|
||||
"change": "Fixed the \"Enable JavaScript\" message look a bit less mentally challenged.",
|
||||
"user": "Flashwave"
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
namespace Sakura;
|
||||
|
||||
// Define Sakura version
|
||||
define('SAKURA_VERSION', '20150819');
|
||||
define('SAKURA_VERSION', '20150820');
|
||||
define('SAKURA_VLABEL', 'Eminence');
|
||||
define('SAKURA_COLOUR', '#6C3082');
|
||||
define('SAKURA_STABLE', false);
|
||||
|
|
@ -63,36 +63,51 @@ if(!defined('SAKURA_NO_TPL')) {
|
|||
|
||||
'sakura' => [
|
||||
|
||||
'versionInfo' => [
|
||||
|
||||
'version' => SAKURA_VERSION,
|
||||
'vlabel' => SAKURA_VLABEL,
|
||||
'vcolour' => SAKURA_COLOUR,
|
||||
'stable' => SAKURA_STABLE,
|
||||
'url_main' => Configuration::getConfig('url_main'),
|
||||
'url_api' => Configuration::getConfig('url_api'),
|
||||
'content_path' => Configuration::getConfig('content_path'),
|
||||
'label' => SAKURA_VLABEL,
|
||||
'colour' => SAKURA_COLOUR,
|
||||
'stable' => SAKURA_STABLE
|
||||
|
||||
],
|
||||
|
||||
'cookie' => [
|
||||
|
||||
'prefix' => Configuration::getConfig('cookie_prefix'),
|
||||
'domain' => Configuration::getConfig('cookie_domain'),
|
||||
'path' => Configuration::getConfig('cookie_path'),
|
||||
|
||||
],
|
||||
|
||||
'urlMain' => Configuration::getConfig('url_main'),
|
||||
'urlApi' => Configuration::getConfig('url_api'),
|
||||
|
||||
'contentPath' => Configuration::getConfig('content_path'),
|
||||
'resources' => Configuration::getConfig('content_path') .'/data/'. strtolower(Templates::$_TPL),
|
||||
|
||||
'charset' => Configuration::getConfig('charset'),
|
||||
'currentpage' => '//'. $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'],
|
||||
'recaptcha_public' => Configuration::getConfig('recaptcha_public'),
|
||||
'recaptcha_enable' => Configuration::getConfig('recaptcha'),
|
||||
'disableregister' => Configuration::getConfig('disable_registration'),
|
||||
'locksite' => Configuration::getConfig('lock_site'),
|
||||
'locksitereason' => Configuration::getConfig('lock_site_reason'),
|
||||
'lockauth' => Configuration::getConfig('lock_authentication'),
|
||||
'requireregcodes' => Configuration::getConfig('require_registration_code'),
|
||||
'requireactiveate' => Configuration::getConfig('require_activation'),
|
||||
'sitename' => Configuration::getConfig('sitename'),
|
||||
'sitedesc' => Configuration::getConfig('sitedesc'),
|
||||
'sitetags' => implode(", ", json_decode(Configuration::getConfig('sitetags'), true)),
|
||||
'cookieprefix' => Configuration::getConfig('cookie_prefix'),
|
||||
'cookiedomain' => Configuration::getConfig('cookie_domain'),
|
||||
'cookiepath' => Configuration::getConfig('cookie_path'),
|
||||
'minpwdentropy' => Configuration::getConfig('min_entropy'),
|
||||
'minusernamelength' => Configuration::getConfig('username_min_length'),
|
||||
'maxusernamelength' => Configuration::getConfig('username_max_length'),
|
||||
'siteName' => Configuration::getConfig('sitename'),
|
||||
'siteDesc' => Configuration::getConfig('sitedesc'),
|
||||
'siteTags' => implode(", ", json_decode(Configuration::getConfig('sitetags'), true)),
|
||||
'dateFormat' => Configuration::getConfig('date_format'),
|
||||
'currentPage' => '//'. $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'],
|
||||
|
||||
'recaptchaPublic' => Configuration::getConfig('recaptcha_public'),
|
||||
'recaptchaEnabled' => Configuration::getConfig('recaptcha'),
|
||||
|
||||
'disableRegistration' => Configuration::getConfig('disable_registration'),
|
||||
'lockSite' => Configuration::getConfig('lock_site'),
|
||||
'lockSiteReason' => Configuration::getConfig('lock_site_reason'),
|
||||
'lockAuth' => Configuration::getConfig('lock_authentication'),
|
||||
'requireRegCodes' => Configuration::getConfig('require_registration_code'),
|
||||
'requireActivation' => Configuration::getConfig('require_activation'),
|
||||
'minPwdEntropy' => Configuration::getConfig('min_entropy'),
|
||||
'minUsernameLength' => Configuration::getConfig('username_min_length'),
|
||||
'maxUsernameLength' => Configuration::getConfig('username_max_length'),
|
||||
|
||||
'disqus_shortname' => Configuration::getConfig('disqus_shortname'),
|
||||
'disqus_api_key' => Configuration::getConfig('disqus_api_key'),
|
||||
'date_format' => Configuration::getConfig('date_format')
|
||||
'disqus_api_key' => Configuration::getConfig('disqus_api_key')
|
||||
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
</div>
|
||||
<div class="footer">
|
||||
<div style="color: {{ sakura.vcolour }};">Sakura b{{ sakura.version }} ({{ sakura.vlabel }}/{{ sakura.stable ? 'Stable' : 'Development' }})</div>
|
||||
<div style="color: {{ sakura.versionInfo.colour }};">Sakura b{{ sakura.versionInfo.version }} ({{ sakura.versionInfo.label }}/{{ sakura.versionInfo.stable ? 'Stable' : 'Development' }})</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@
|
|||
<meta charset="utf-8" />
|
||||
<title>Sakura Changelog</title>
|
||||
<style type="text/css">
|
||||
@import url('/content/fonts/segoeui-light/font.css');
|
||||
|
||||
body {
|
||||
background: #000;
|
||||
color: #FFF;
|
||||
font: 300 12px/20px "Segoe UI", sans-serif;
|
||||
font: 300 12px/20px "SegoeUI-Light", sans-serif;
|
||||
margin: 45px 30px;
|
||||
padding: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</ul>
|
||||
<div class="clear"></div>
|
||||
{% else %}
|
||||
{% if sakura.lockauth %}
|
||||
{% if sakura.lockAuth %}
|
||||
<div class="head">Whoops!</div>
|
||||
You caught the site at the wrong moment! Right now registration <i>and</i> logging in is disabled for unspecified reasons. Sorry for the inconvenience but please try again later!
|
||||
<div class="indexSidePanelLinks">
|
||||
|
|
|
|||
|
|
@ -12,5 +12,5 @@
|
|||
</div>
|
||||
<div class="clear"></div>
|
||||
<div class="news-post-time">
|
||||
Posted on {{ newsPost.date|date(sakura.date_format) }}{% if not page.view_post %} <a class="default" href="/news/{{ newsPost.id }}#disqus_thread">View comments</a>{% endif %}
|
||||
Posted on {{ newsPost.date|date(sakura.dateFormat) }}{% if not page.view_post %} <a class="default" href="/news/{{ newsPost.id }}#disqus_thread">View comments</a>{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
<br />
|
||||
<h2>Additional information</h2>
|
||||
<ul style="margin-left: 30px;">
|
||||
<li>You were banned on {{ ban.issued|date(sakura.date_format) }}.</li>
|
||||
<li>{% if ban.expires %}This ban expires on {{ ban.expires|date(sakura.date_format) }}.{% else %}<b>You are permanently banned.</b>{% endif %}</li>
|
||||
<li>You were banned on {{ ban.issued|date(sakura.dateFormat) }}.</li>
|
||||
<li>{% if ban.expires %}This ban expires on {{ ban.expires|date(sakura.dateFormat) }}.{% else %}<b>You are permanently banned.</b>{% endif %}</li>
|
||||
{% if ban.expires %}
|
||||
<li>You were banned by <a href="/u/{{ ban.issuer.id }}" class="default">{{ ban.issuer.username }}</a>.</li>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,6 @@
|
|||
<link rel="stylesheet" type="text/css" href="{{ sakura.resources }}/css/error.css" />
|
||||
</head>
|
||||
<body>
|
||||
<audio autoplay="">
|
||||
<source src="{{ sakura.content_path }}/sounds/notfound.ogg" type="audio/ogg" />
|
||||
<source src="{{ sakura.content_path }}/sounds/notfound.mp3" type="audio/mp3" />
|
||||
</audio>
|
||||
<div id="wrap">
|
||||
<h1>
|
||||
<img src="{{ sakura.resources }}/images/404-info.gif" />
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
<div class="content standalone" style="text-align: center;">
|
||||
<h1 class="stylised" style="margin: 1em auto;">Thank you for your contribution!</h1>
|
||||
<h1 class="fa fa-heart stylised" style="font-size: 20em;"></h1>
|
||||
<h3>Your Tenshi will expire on {{ page.expiration|date(sakura.date_format) }}.</h3>
|
||||
<h3>Your Tenshi will expire on {{ page.expiration|date(sakura.dateFormat) }}.</h3>
|
||||
</div>
|
||||
{% include 'global/footer.tpl' %}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<td class="forumLastColumn">
|
||||
<div>
|
||||
{% if forum.last_poster.user.id %}
|
||||
<a href="/forum/thread/{{ forum.last_poster.post.topic_id }}" class="default">{{ forum.last_poster.post.post_subject }}</a><br /><span title="{{ forum.last_poster.post.post_time|date(sakura.date_format) }}">{{ forum.last_poster.elap }}</span> by {% if forum.last_poster.user.id %}<a href="/u/{{ forum.last_poster.user.id }}" class="default" style="color: {% if forum.last_poster.user.name_colour %}{{ forum.last_poster.user.name_colour }}{% else %}{{ forum.last_poster.rank.colour }}{% endif %};">{{ forum.last_poster.user.username }}</a>{% else %}[deleted user]{% endif %} <a href="/forum/post/{{ forum.last_poster.post.post_id }}#p{{ forum.last_poster.post.post_id }}" class="default fa fa-tag"></a>
|
||||
<a href="/forum/thread/{{ forum.last_poster.post.topic_id }}" class="default">{{ forum.last_poster.post.post_subject }}</a><br /><span title="{{ forum.last_poster.post.post_time|date(sakura.dateFormat) }}">{{ forum.last_poster.elap }}</span> by {% if forum.last_poster.user.id %}<a href="/u/{{ forum.last_poster.user.id }}" class="default" style="color: {% if forum.last_poster.user.name_colour %}{{ forum.last_poster.user.name_colour }}{% else %}{{ forum.last_poster.rank.colour }}{% endif %};">{{ forum.last_poster.user.username }}</a>{% else %}[deleted user]{% endif %} <a href="/forum/post/{{ forum.last_poster.post.post_id }}#p{{ forum.last_poster.post.post_id }}" class="default fa fa-tag"></a>
|
||||
{% else %}
|
||||
There are no posts in this forum.<br />
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{% include 'global/header.tpl' %}
|
||||
<div class="content">
|
||||
<div class="content-column forum posting">
|
||||
<form method="post" action="{{ sakura.currentpage }}">
|
||||
<form method="post" action="{{ sakura.currentPage }}">
|
||||
<div class="head">Forum / Posting</div>
|
||||
<div class="posting-subject">
|
||||
<input type="text" class="inputStyling" name="subject" placeholder="Subject" />
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@
|
|||
{% else %}
|
||||
[deleted user]
|
||||
{% endif %} <a href="/forum/post/{{ topic.last_poster.post.post_id }}#p{{ topic.last_poster.post.post_id }}" class="default fa fa-tag"></a><br />
|
||||
<span title="{{ topic.last_poster.post.post_time|date(sakura.date_format) }}">{{ topic.last_poster.elap }}</span>
|
||||
<span title="{{ topic.last_poster.post.post_time|date(sakura.dateFormat) }}">{{ topic.last_poster.elap }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
{% endif %}
|
||||
<div class="userdata">
|
||||
<div class="usertitle">{% if not post.user.usertitle %}{{ post.rank.title }}{% else %}{{ post.user.usertitle }}{% endif %}</div>
|
||||
<img src="{{ sakura.content_path }}/images/tenshi.png" alt="Tenshi"{% if not post.is_premium %} style="opacity: 0;"{% endif %} /> <img src="{{ sakura.content_path }}/images/flags/{% if post.user.country|lower == 'eu' %}europeanunion{% else %}{{ post.user.country|lower }}{% endif %}.png" alt="{{ post.country }}" />
|
||||
<img src="{{ sakura.contentPath }}/images/tenshi.png" alt="Tenshi"{% if not post.is_premium %} style="opacity: 0;"{% endif %} /> <img src="{{ sakura.contentPath }}/images/flags/{% if post.user.country|lower == 'eu' %}europeanunion{% else %}{{ post.user.country|lower }}{% endif %}.png" alt="{{ post.country }}" />
|
||||
{% if session.checkLogin %}
|
||||
<div class="actions">
|
||||
{% if user.data.id == post.user.id %}
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
<a href="#p{{ post.post_id }}" class="clean">{{ post.post_subject }}</a>
|
||||
</div>
|
||||
<div class="date">
|
||||
<a href="/forum/post/{{ post.post_id }}#p{{ post.post_id }}" class="clean" title="{{ post.post_time|date(sakura.date_format) }}">{{ post.time_elapsed }}</a>
|
||||
<a href="/forum/post/{{ post.post_id }}#p{{ post.post_id }}" class="clean" title="{{ post.post_time|date(sakura.dateFormat) }}">{{ post.time_elapsed }}</a>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<!-- META -->
|
||||
<meta charset="{{ sakura.charset }}" />
|
||||
<title>{{ page.title }}</title>
|
||||
<meta name="description" content="{{ sakura.sitedesc }}" />
|
||||
<meta name="keywords" content="{{ sakura.sitetags }}" />
|
||||
<meta name="description" content="{{ sakura.siteDesc }}" />
|
||||
<meta name="keywords" content="{{ sakura.siteTags }}" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
|
||||
<meta name="msapplication-TileColor" content="#fbeeff" />
|
||||
<meta name="msapplication-TileImage" content="/content/images/icons/ms-icon-144x144.png" />
|
||||
|
|
@ -49,20 +49,21 @@
|
|||
|
||||
"cookie": {
|
||||
|
||||
"prefix": "{{ sakura.cookieprefix }}",
|
||||
"domain": "{{ sakura.cookiedomain }}",
|
||||
"path": "{{ sakura.cookiepath }}"
|
||||
"prefix": "{{ sakura.cookie.prefix }}",
|
||||
"domain": "{{ sakura.cookie.domain }}",
|
||||
"path": "{{ sakura.cookie.path }}"
|
||||
|
||||
},
|
||||
|
||||
"url_main": "{{ sakura.url_main }}",
|
||||
"content": "{{ sakura.content_path }}",
|
||||
"urlMain": "{{ sakura.urlMain }}",
|
||||
"content": "{{ sakura.contentPath }}",
|
||||
"resources": "{{ sakura.resources }}",
|
||||
"recaptchaEnabled": "{{ sakura.recaptchaEnabled }}",
|
||||
|
||||
"minUserLen": {{ sakura.minusernamelength }},
|
||||
"maxUserLen": {{ sakura.maxusernamelength }},
|
||||
"minPwdEntropy": {{ sakura.minpwdentropy }},
|
||||
"checklogin": {% if session.checkLogin %}true{% else %}false{% endif %}
|
||||
"minUserLen": {{ sakura.minUsernameLength }},
|
||||
"maxUserLen": {{ sakura.maxUsernameLength }},
|
||||
"minPwdEntropy": {{ sakura.minPwdEntropy }},
|
||||
"checkLogin": {% if session.checkLogin %}true{% else %}false{% endif %}
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -77,7 +78,7 @@
|
|||
{% if session.checkLogin %}
|
||||
// Convert href to object in logout link
|
||||
prepareAjaxLink('headerLogoutLink', 'submitPost', ', true, "Logging out..."');
|
||||
{% elseif not sakura.lockauth and php.self != '/authenticate.php' %}
|
||||
{% elseif not sakura.lockAuth and php.self != '/authenticate.php' %}
|
||||
// Make the header login form dynamic
|
||||
var headerLoginForm = document.getElementById('headerLoginForm');
|
||||
var createInput = document.createElement('input');
|
||||
|
|
@ -115,13 +116,13 @@
|
|||
}
|
||||
{% endif %}
|
||||
|
||||
{% if php.self == '/authenticate.php' and not sakura.lockauth %}
|
||||
{% if php.self == '/authenticate.php' and not sakura.lockAuth %}
|
||||
// AJAX Form Submission
|
||||
var forms = {
|
||||
{% if not auth.changingPass %}
|
||||
"loginForm": 'Logging in...',
|
||||
{% if not sakura.disableregister %}"registerForm": 'Processing registration...',{% endif %}
|
||||
{% if not sakura.requireactive %}"resendForm": 'Attempting to resend activation...',{% endif %}
|
||||
{% if not sakura.disableRegistration %}"registerForm": 'Processing registration...',{% endif %}
|
||||
{% if not sakura.requireActivation %}"resendForm": 'Attempting to resend activation...',{% endif %}
|
||||
"passwordForm": 'Sending password recovery mail...'
|
||||
{% else %}
|
||||
"passwordForm": 'Changing password...'
|
||||
|
|
@ -157,13 +158,13 @@
|
|||
<div id="container">
|
||||
<span id="top"></span>
|
||||
<div class="header" id="header">
|
||||
<a class="logo" href="//{{ sakura.url_main }}/">{{ sakura.sitename }}</a>
|
||||
<a class="logo" href="//{{ sakura.urlMain }}/">{{ sakura.siteName }}</a>
|
||||
<div class="menu">
|
||||
<div class="menu-nav" id="navMenuSite">
|
||||
<!-- Navigation menu, displayed on left side of the bar. -->
|
||||
<a class="menu-item" href="/" title="Return to the front page of Flashii">Home</a>
|
||||
<a class="menu-item" href="/news" title="Here you can read updates on Flashii">News</a>
|
||||
<a class="menu-item" href="//chat.{{ sakura.url_main }}/" title="Chat with other Flashii members">Chat</a>
|
||||
<a class="menu-item" href="//chat.{{ sakura.urlMain }}/" title="Chat with other Flashii members">Chat</a>
|
||||
<a class="menu-item" href="/forum" title="Discuss things with other members but static">Forums</a>
|
||||
<a class="menu-item" href="/search" title="Search on Flashii">Search</a>
|
||||
{% if session.checkLogin %}
|
||||
|
|
@ -180,7 +181,7 @@
|
|||
<a class="menu-item" href="/settings" title="Change your settings">Settings</a>
|
||||
<a class="menu-item" href="/logout?mode=logout&time={{ php.time }}&session={{ php.sessionid }}&redirect={{ sakura.currentpage }}" title="End your login session" id="headerLogoutLink">Logout</a>
|
||||
{% else %}
|
||||
{% if sakura.lockauth %}
|
||||
{% if sakura.lockAuth %}
|
||||
<div class="menu-item" style="padding-left: 10px; padding-right: 10px;">Authentication is locked</div>
|
||||
{% else %}
|
||||
<a class="menu-item" href="/authenticate" title="Login to Flashii">Login or Register</a>
|
||||
|
|
@ -200,7 +201,7 @@
|
|||
{% endif %}
|
||||
{% if not session.checkLogin and php.self != '/authenticate.php' %}
|
||||
<form method="post" action="/authenticate" id="headerLoginForm" onkeydown="formEnterCatch(event, 'headerLoginButton');">
|
||||
<input type="hidden" name="redirect" value="{{ sakura.currentpage }}" />
|
||||
<input type="hidden" name="redirect" value="{{ sakura.currentPage }}" />
|
||||
<input type="hidden" name="session" value="{{ php.sessionid }}" />
|
||||
<input type="hidden" name="time" value="{{ php.time }}" />
|
||||
<input type="hidden" name="mode" value="login" />
|
||||
|
|
@ -222,8 +223,8 @@
|
|||
</form>
|
||||
{% endif %}
|
||||
<noscript>
|
||||
<div class="headerNotify">
|
||||
<div class="headerNotify" style="padding-top: 10px; padding-bottom: 10px;">
|
||||
<h1>You have JavaScript disabled!</h1>
|
||||
<p>A lot of things on this site require JavaScript to be enabled (e.g. the chat), we try to keep both sides happy but it is highly recommended that you enable it (you'll also have to deal with this message being here if you don't enable it).</p>
|
||||
<p style="padding: 0 10px;">A lot of things on this site require JavaScript to be enabled (e.g. the chat), we try to keep both sides happy but it is highly recommended that you enable it (you'll also have to deal with this message being here if you don't enable it).</p>
|
||||
</div>
|
||||
</noscript>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{% include 'global/header.tpl' %}
|
||||
{% if sakura.lockauth %}
|
||||
{% if sakura.lockAuth %}
|
||||
<h1 class="stylised" style="line-height: 1.8em; text-align: center;">Authentication is currently disallowed, try again later.</h1>
|
||||
{% else %}
|
||||
<div class="loginPage">
|
||||
<div class="loginCont">
|
||||
<div class="loginForm">
|
||||
<div class="head">
|
||||
Login to {{ sakura.sitename }}
|
||||
Login to {{ sakura.siteName }}
|
||||
</div>
|
||||
<form method="post" action="/authenticate" id="loginForm">
|
||||
<input type="hidden" name="redirect" value="{{ auth.redirect }}" />
|
||||
|
|
@ -65,9 +65,9 @@
|
|||
<div class="registerCont">
|
||||
<div class="registerForm">
|
||||
<div class="head">
|
||||
Register on {{ sakura.sitename }}
|
||||
Register on {{ sakura.siteName }}
|
||||
</div>
|
||||
{% if not sakura.disableregister %}
|
||||
{% if not sakura.disableRegistration %}
|
||||
<form id="registerForm" method="post" action="/authenticate" style="display:{% if auth.blockRegister.do %}none{% else %}block{% endif %};">
|
||||
<input type="hidden" name="mode" value="register" />
|
||||
<input type="hidden" name="session" value="{{ php.sessionid }}" />
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
<div class="centreAlign">
|
||||
<input class="inputStyling" type="password" id="registerConfirmPassword" name="confirmpassword" onkeyup="registerVarCheck(this.id, 'confirmpw', 'registerPassword');" placeholder="Just to make sure" />
|
||||
</div>
|
||||
{% if sakura.requireregcodes %}
|
||||
{% if sakura.requireRegCodes %}
|
||||
<div class="leftAlign">
|
||||
<label for="registerCode">Registration Code:</label>
|
||||
</div>
|
||||
|
|
@ -104,18 +104,18 @@
|
|||
<input class="inputStyling" type="text" id="registerCode" name="registercode" placeholder="Ask another member for one" />
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if sakura.recaptcha_enable %}
|
||||
{% if sakura.recaptchaEnable %}
|
||||
<div class="leftAlign">
|
||||
<label for="recaptcha_response_field">Verification:</label>
|
||||
</div>
|
||||
<div class="centreAlign">
|
||||
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
|
||||
<div class="g-recaptcha" data-sitekey="{{ sakura.recaptcha_public }}" style="margin: auto; display: inline-block;"></div>
|
||||
<div class="g-recaptcha" data-sitekey="{{ sakura.recaptchaPublic }}" style="margin: auto; display: inline-block;"></div>
|
||||
<noscript>
|
||||
<div style="width: 302px; height: 352px; margin: auto; display: inline-block;">
|
||||
<div style="width: 302px; height: 352px; position: relative;">
|
||||
<div style="width: 302px; height: 352px; position: absolute;">
|
||||
<iframe src="https://www.google.com/recaptcha/api/fallback?k={{ sakura.recaptcha_public }}" frameborder="0" scrolling="no" style="width: 302px; height:352px; border-style: none;"></iframe>
|
||||
<iframe src="https://www.google.com/recaptcha/api/fallback?k={{ sakura.recaptchaPublic }}" frameborder="0" scrolling="no" style="width: 302px; height:352px; border-style: none;"></iframe>
|
||||
</div>
|
||||
<div style="width: 250px; height: 80px; position: absolute; border-style: none; bottom: 21px; left: 25px; margin: 0px; padding: 0px; right: 25px;">
|
||||
<textarea id="g-recaptcha-response" name="g-recaptcha-response" class="g-recaptcha-response" style="width: 250px; height: 80px; border: 1px solid #c1c1c1; margin: 0px; padding: 0px; resize: none;" value=""></textarea>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if not sakura.requireactive %}
|
||||
{% if not sakura.requireActivation %}
|
||||
<div class="resendForm">
|
||||
<div class="head">
|
||||
Resend Activation E-mail
|
||||
|
|
|
|||
|
|
@ -54,16 +54,16 @@
|
|||
<a href="/u/{{ user.id }}" class="default" style="font-weight: bold; color: {{ page.ranks[user.rank_main].colour }};">{{ user.username }}</a>
|
||||
</td>
|
||||
<td>
|
||||
{{ user.regdate|date(sakura.date_format) }}
|
||||
{{ user.regdate|date(sakura.dateFormat) }}
|
||||
</td>
|
||||
<td>
|
||||
{% if user.lastdate == 0 %}<i>Never logged in.</i>{% else %}{{ user.lastdate|date(sakura.date_format) }}{% endif %}
|
||||
{% if user.lastdate == 0 %}<i>Never logged in.</i>{% else %}{{ user.lastdate|date(sakura.dateFormat) }}{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if not user.usertitle %}<i>{{ page.ranks[user.rank_main].title }}</i>{% else %}{{ user.usertitle }}{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<img src="{{ sakura.content_path }}/images/flags/{% if user.country|lower == 'eu' %}europeanunion{% else %}{{ user.country|lower }}{% endif %}.png" alt="{% if user.country|lower == 'eu' %}?{% else %}{{ user.country }}{% endif %}" />
|
||||
<img src="{{ sakura.contentPath }}/images/flags/{% if user.country|lower == 'eu' %}europeanunion{% else %}{{ user.country|lower }}{% endif %}.png" alt="{% if user.country|lower == 'eu' %}?{% else %}{{ user.country }}{% endif %}" />
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
{% for user in page.users[page.page] %}
|
||||
<a href="/u/{{ user.id }}">{# These comment tags are here to prevent the link extending too far
|
||||
#}<div class="userBox" id="u{{ user.id }}">{#
|
||||
#}<img src="{{ sakura.content_path }}/pixel.png" alt="{{ user.username }}" style="background: url('/a/{{ user.id }}') no-repeat center / contain;" />{#
|
||||
#}<img src="{{ sakura.contentPath }}/pixel.png" alt="{{ user.username }}" style="background: url('/a/{{ user.id }}') no-repeat center / contain;" />{#
|
||||
#}<span class="userBoxUserName"{% if page.sort == page.sorts[1] %} style="color: {{ page.ranks[user.rank_main].colour }};"{% endif %}>{#
|
||||
#}{{ user.username }}{#
|
||||
#}</span>{#
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<tr>
|
||||
<td><a href="/u/{{ message.data.from.user.id }}" class="default" style="font-weight: 700; color: {% if message.data.from.user.name_colour == null %}{{ message.data.from.rank.colour }}{% else %}{{ message.data.from.user.name_colour }}{% endif %};">{{ message.data.from.user.username }}</a></td>
|
||||
<td><a href="/messages/read/{{ message.id }}" class="default">{{ message.subject }}</a></td>
|
||||
<td>{{ message.time|date(sakura.date_format) }}</td>
|
||||
<td>{{ message.time|date(sakura.dateFormat) }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
var disqus_shortname = '{{ sakura.disqus_shortname }}';
|
||||
var disqus_identifier = 'news_{{ newsPosts[0].id }}';
|
||||
var disqus_title = '{{ newsPosts[0].title }}';
|
||||
var disqus_url = 'http://{{ sakura.url_main }}/news/{{ newsPosts[0].id }}';
|
||||
var disqus_url = 'http://{{ sakura.urlMain }}/news/{{ newsPosts[0].id }}';
|
||||
|
||||
(function() {
|
||||
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
|
||||
|
|
|
|||
|
|
@ -18,25 +18,25 @@
|
|||
{% if profile.data.rank_main > 1 and profile.checkBan|length < 1 %}
|
||||
<span style="font-size: .8em;">{{ profile.userTitle }}</span>
|
||||
<h1 style="color: {{ profile.colour }}; text-shadow: 0 0 7px {% if profile.colour != 'inherit' %}{{ profile.colour }}{% else %}#222{% endif %}; padding: 0 0 2px;">{{ profile.data.username }}</h1>
|
||||
{% if profile.checkPremium[0] %}<img src="{{ sakura.content_path }}/images/tenshi.png" alt="Tenshi" /> {% endif %}<img src="{{ sakura.content_path }}/images/flags/{% if profile.country.short|lower == 'eu' %}europeanunion{% else %}{{ profile.country.short|lower }}{% endif %}.png" alt="{{ profile.country.short }}" /> <span style="font-size: .9em; line-height: 11px;">{{ profile.country.long }}</span>
|
||||
{% if profile.checkPremium[0] %}<img src="{{ sakura.contentPath }}/images/tenshi.png" alt="Tenshi" /> {% endif %}<img src="{{ sakura.contentPath }}/images/flags/{% if profile.country.short|lower == 'eu' %}europeanunion{% else %}{{ profile.country.short|lower }}{% endif %}.png" alt="{{ profile.country.short }}" /> <span style="font-size: .9em; line-height: 11px;">{{ profile.country.long }}</span>
|
||||
{% if session.checkLogin %}
|
||||
<div class="user-actions">
|
||||
{% if user.data.id == profile.data.id %}
|
||||
<a class="fa fa-pencil-square-o" title="Edit your profile" href="/settings/profile"></a>
|
||||
{% else %}
|
||||
{% if profile.checkFriends(user.data.id) != 0 %}<a class="fa fa-{% if profile.checkFriends(user.data.id) == 2 %}heart{% else %}star{% endif %}" title="You are friends"></a>{% endif %}
|
||||
<a class="fa fa-user-{% if profile.checkFriends(user.data.id) == 0 %}plus{% else %}times{% endif %}" title="{% if profile.checkFriends(user.data.id) == 0 %}Add {{ legacyprofile.data.username }} as a friend{% else %}Remove friend{% endif %}" href="/friends?{% if profile.checkFriends(user.data.id) == 0 %}add{% else %}remove{% endif %}={{ profile.data.id }}&session={{ php.sessionid }}&time={{ php.time }}&redirect={{ sakura.currentpage }}" id="profileFriendToggle"></a>
|
||||
<a class="fa fa-user-{% if profile.checkFriends(user.data.id) == 0 %}plus{% else %}times{% endif %}" title="{% if profile.checkFriends(user.data.id) == 0 %}Add {{ legacyprofile.data.username }} as a friend{% else %}Remove friend{% endif %}" href="/friends?{% if profile.checkFriends(user.data.id) == 0 %}add{% else %}remove{% endif %}={{ profile.data.id }}&session={{ php.sessionid }}&time={{ php.time }}&redirect={{ sakura.currentPage }}" id="profileFriendToggle"></a>
|
||||
<a class="fa fa-flag" title="Report {{ profile.data.username }}" href="/u/{{ profile.data.id }}/report"></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
<hr class="default" />
|
||||
<b>Joined</b> {{ profile.data.regdate|date(sakura.date_format) }}
|
||||
<b>Joined</b> {{ profile.data.regdate|date(sakura.dateFormat) }}
|
||||
<br />
|
||||
{% if profile.data.lastdate < 1 %}
|
||||
<b>{{ profile.data.username }} hasn't logged in yet.</b>
|
||||
{% else %}
|
||||
<b>Last Seen on</b> {{ profile.data.lastdate|date(sakura.date_format) }}
|
||||
<b>Last Seen on</b> {{ profile.data.lastdate|date(sakura.dateFormat) }}
|
||||
{% endif %}
|
||||
<br />
|
||||
<b>{{ profile.data.username }} has {% if not profile.forumStats.posts %}no{% else %}{{ profile.forumStats.posts }}{% endif %} forum post{% if profile.forumStats.posts != 1 %}s{% endif %}.</b>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
<div class="content support">
|
||||
<div class="head">Support {{ sakura.sitename }}</div>
|
||||
<div class="head">Support {{ sakura.siteName }}</div>
|
||||
<div style="font-size: .9em; margin-bottom: 10px;">
|
||||
<p>In order to keep the site, its services and improvements on it going I need money but I'm not that big of a fan of asking for money without giving anything special in return thus Tenshi exists. Tenshi is the name for our supporter rank which gives you access to an extra set of features (which are listed further down on this page). With your help we can keep adding new stuff, get new hardware and keep the site awesome!</p>
|
||||
</div>
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
Your current Tenshi tag
|
||||
</div>
|
||||
<div style="margin-bottom: 10px;">
|
||||
<h3>{% if page.current[0] == 2 %}Your rank has persistent Tenshi.{% else %}Your Tenshi tag is valid till {{ page.current[2]|date(sakura.date_format) }}.{% endif %}</h3>
|
||||
<h3>{% if page.current[0] == 2 %}Your rank has persistent Tenshi.{% else %}Your Tenshi tag is valid till {{ page.current[2]|date(sakura.dateFormat) }}.{% endif %}</h3>
|
||||
<progress value="{{ page.current[0] == 2 ? 100 : (100 - (((php.time - page.current[1]) / (page.current[2] - page.current[1])) * 100)) }}" max="100" style="width: 100%"></progress>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<br />
|
||||
<h1 class="stylised">Personal Statistics</h1>
|
||||
<ul>
|
||||
<li>You joined on <b>{{ user.data.regdate|date(sakura.date_format) }}</b>.</li>
|
||||
<li>You joined on <b>{{ user.data.regdate|date(sakura.dateFormat) }}</b>.</li>
|
||||
<li>You have made <b>{{ settings.forum_stats.posts }} forum post{% if settings.forum_stats.posts != 1 %}s{% endif %}</b> and started <b>{{ settings.forum_stats.topics }} forum thread{% if settings.forum_stats.topics != 1 %}s{% endif %}</b>.</li>
|
||||
<li>You have <b>x</b> warnings.</li>
|
||||
<li>You have <b>{{ settings.friends|length - (settings.friends.online ? 1 : 0) - (settings.friends.offline ? 1 : 0) }} friend{% if settings.friends|length - (settings.friends.online ? 1 : 0) - (settings.friends.offline ? 1 : 0) != 1 %}s{% endif %}</b>.</li>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="notif-hist-time">
|
||||
{{ notif.timestamp|date(sakura.date_format) }}
|
||||
{{ notif.timestamp|date(sakura.dateFormat) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<form enctype="multipart/form-data" method="post" action="{{ sakura.currentpage }}" id="editProfileForm">
|
||||
<form enctype="multipart/form-data" method="post" action="{{ sakura.currentPage }}" id="editProfileForm">
|
||||
<input type="hidden" name="sessid" value="{{ php.sessionid }}" />
|
||||
<input type="hidden" name="timestamp" value="{{ php.time }}" />
|
||||
<input type="hidden" name="mode" value="profile" />
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
<hr class="default" />
|
||||
{% endif %}
|
||||
<form enctype="multipart/form-data" method="post" action="{{ sakura.currentpage }}">
|
||||
<form enctype="multipart/form-data" method="post" action="{{ sakura.currentPage }}">
|
||||
<input type="hidden" name="sessid" value="{{ php.sessionid }}" />
|
||||
<input type="hidden" name="timestamp" value="{{ php.time }}" />
|
||||
<input type="hidden" name="mode" value="userpage" />
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ function notifyRequest(session) {
|
|||
|
||||
// Create XMLHttpRequest and notifyURL
|
||||
var notificationWatcher = new XMLHttpRequest();
|
||||
var notifyURL = '//' + sakuraVars.url_main + '/settings.php?request-notifications=true&time=' + epochTime() + '&session=' + session;
|
||||
var notifyURL = '//' + sakuraVars.urlMain + '/settings.php?request-notifications=true&time=' + epochTime() + '&session=' + session;
|
||||
|
||||
// Wait for the ready state to change
|
||||
notificationWatcher.onreadystatechange = function() {
|
||||
|
|
@ -581,7 +581,7 @@ function submitPost(action, requestParts, busyView, msg, resetCaptchaOnFailure)
|
|||
}
|
||||
|
||||
// If request reset the recaptcha on failure
|
||||
if(resetCaptchaOnFailure && request[2] != '1') {
|
||||
if(resetCaptchaOnFailure && request[2] != '1' && sakuraVars.recpatchaEnabled) {
|
||||
|
||||
grecaptcha.reset();
|
||||
|
||||
|
|
|
|||
Reference in a new issue