This commit is contained in:
flash 2015-04-02 15:41:05 +02:00
parent 3838395ab8
commit 50ebc7c8d2
7 changed files with 102 additions and 42 deletions

View file

@ -30,15 +30,15 @@ class Main {
Session::init(); Session::init();
// Templating engine // Templating engine
self::initTwig(); self::initTpl();
// Markdown Parser // Markdown Parser
self::initParsedown(); self::initMD();
} }
// Initialise Twig // Initialise Twig
private static function initTwig() { private static function initTpl() {
// Initialise Twig Filesystem Loader // Initialise Twig Filesystem Loader
$twigLoader = new \Twig_Loader_Filesystem(Configuration::getLocalConfig('etc', 'templatesPath') .'/'. Configuration::getLocalConfig('etc', 'design')); $twigLoader = new \Twig_Loader_Filesystem(Configuration::getLocalConfig('etc', 'templatesPath') .'/'. Configuration::getLocalConfig('etc', 'design'));
@ -55,8 +55,15 @@ class Main {
} }
// Render template
public static function tplRender($file, $tags) {
return self::$_TPL->render($file, $tags);
}
// Initialise Parsedown // Initialise Parsedown
private static function initParsedown() { private static function initMD() {
self::$_MD = new \Parsedown(); self::$_MD = new \Parsedown();

View file

@ -1,23 +1,35 @@
{% include 'global/header.tpl' %} {% include 'global/header.tpl' %}
<div class="content homepage"> <div class="content homepage">
<div class="content-right content-column"> <div class="content-right content-column">
<div class="head">Welcome!</div> <div class="head">Welcome!</div>
Welcome to Flashii! This is a site for a bunch of friends to hang out, nothing special. Anyone is pretty much welcome to register so why not have a go? Welcome to Flashii! This is a site for a bunch of friends to hang out, nothing special. Anyone is pretty much welcome to register so why not have a go?
<a class="button registerbutton" href="/register">Register!</a> <a class="button registerbutton" href="/register">Register!</a>
<a class="button loginbutton" href="/login">Login</a> <a class="button loginbutton" href="/login">Login</a>
<div class="head">Stats</div> <div class="head">Stats</div>
We have <b>{{ frontpage.stats.usercount }}</b>, We have <b>{{ frontpage.stats.usercount }}</b>,
<b><a href="/u/{{ frontpage.stats.latestid }}" class="default">{{ frontpage.stats.latestname }}</a></b> is the newest user, <b><a href="/u/{{ frontpage.stats.latestid }}" class="default">{{ frontpage.stats.latestname }}</a></b> is the newest user,
it has been <b>{{ frontpage.stats.lastsignup }}</b> since the last user registered and it has been <b>{{ frontpage.stats.lastsignup }}</b> since the last user registered and
there are <b>{{ frontpage.stats.usersinchat }}</b> in chat right now. there are <b>{{ frontpage.stats.usersinchat }}</b> in chat right now.
</div> </div>
<div class="content-left content-column"> <div class="content-left content-column">
<div class="head">News <a href="/news.xml" class="fa fa-rss news-rss default"></a></div> <div class="head">News <a href="/news.xml" class="fa fa-rss news-rss default"></a></div>
{% for newsPost in newsPosts %} {% for newsPost in newsPosts %}
{% include 'elements/newsPost.tpl' %} {% include 'elements/newsPost.tpl' %}
{% endfor %} {% endfor %}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<script type="text/javascript" src="//{{ sakura.urls.content }}/js/ybabstat.js"></script> <script type="text/javascript" src="//{{ sakura.urls.content }}/js/ybabstat.js"></script>
{% include 'global/footer.tpl' %} <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'flashii';
/* * * DO NOT EDIT BELOW THIS LINE * * */
(function () {
var s = document.createElement('script'); s.async = true;
s.type = 'text/javascript';
s.src = '//' + disqus_shortname + '.disqus.com/count.js';
(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
}());
</script>
{% include 'global/footer.tpl' %}

View file

@ -0,0 +1,22 @@
{% include 'global/header.tpl' %}
<div class="content">
<div class="content-column news">
<div class="head">News <a href="/news.xml" class="fa fa-rss news-rss default"></a></div>
{% for newsPost in newsPosts %}
{% include 'elements/newsPost.tpl' %}
{% endfor %}
</div>
</div>
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'flashii';
/* * * DO NOT EDIT BELOW THIS LINE * * */
(function () {
var s = document.createElement('script'); s.async = true;
s.type = 'text/javascript';
s.src = '//' + disqus_shortname + '.disqus.com/count.js';
(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
}());
</script>
{% include 'global/footer.tpl' %}

View file

@ -1,13 +1,13 @@
<?php <?php
/* /*
* Flashii.net Main Index * Flashii.net Main Index
*/ */
// Declare Namespace // Declare Namespace
namespace Sakura; namespace Sakura;
// Include components // Include components
require_once '/var/www/flashii.net/_sakura/sakura.php'; require_once '/var/www/flashii.net/_sakura/sakura.php';
// Print page contents // Print page contents
print Main::$_TPL->render('errors/http404.tpl', $renderData); print Main::tplRender('errors/http404.tpl', $renderData);

View file

@ -26,4 +26,4 @@ $renderData['thirdParty'] = [
]; ];
// Print page contents // Print page contents
print Main::$_TPL->render('main/credits.tpl', $renderData); print Main::tplRender('main/credits.tpl', $renderData);

View file

@ -16,4 +16,4 @@ $renderData['page'] = [
$renderData['newsPosts'] = Main::getNewsPosts(3); $renderData['newsPosts'] = Main::getNewsPosts(3);
// Print page contents // Print page contents
print Main::$_TPL->render('main/index.tpl', $renderData); print Main::tplRender('main/index.tpl', $renderData);

19
main/news.php Normal file
View file

@ -0,0 +1,19 @@
<?php
/*
* Sakura News Page
*/
// Declare Namespace
namespace Sakura;
// Include components
require_once '/var/www/flashii.net/_sakura/sakura.php';
// Add page specific things
$renderData['page'] = [
'title' => 'Flashii News'
];
$renderData['newsPosts'] = Main::getNewsPosts();
// Print page contents
print Main::tplRender('main/news.tpl', $renderData);