Better code style

This commit is contained in:
Marcel Kapfer (mmk2410) 2016-04-22 19:46:46 +02:00
parent ac65f5ee70
commit 297cf418c0
7 changed files with 85 additions and 54 deletions

View file

@ -5,7 +5,7 @@
*/ */
function main() { function main() {
console.log("Welcome Developer! \nYou're seeing the output of a javascript extension for the rangitaki blogging engine.") console.log("Welcome Developer! \nYou're seeing the output of a javascript extension for the rangitaki blogging engine.");
} }
$(document).ready(main()); $(document).ready(main());

View file

@ -100,7 +100,6 @@ if ($config["rcc"]["rcc"] == "on") {
<?php <?php
} else { } else {
if ($passwd == $password) { if ($passwd == $password) {
$_SESSION['login'] = true; $_SESSION['login'] = true;
include_once "./../res/php/BlogListGenerator.php"; include_once "./../res/php/BlogListGenerator.php";

View file

@ -37,19 +37,19 @@ body{
.main{ .main{
height: 100%; height: 100%;
width: 100%; width: 100%;
margin-left: 0px; margin-left: 0;
} }
/* HEADER */ /* HEADER */
.header{ .header{
background-color: #ff4415; background-color: #ff4415;
position: fixed; position: fixed;
top: 0px; top: 0;
right: 0px; right: 0;
left: 0px; left: 0;
width: 100%; width: 100%;
height: 64px; height: 64px;
box-shadow: 2px 0px 2px 2px rgba(62, 62, 62, 0.45); box-shadow: 2px 0 2px 2px rgba(62, 62, 62, 0.45);
} }
.title{ .title{
@ -81,7 +81,7 @@ body{
background: #fff; background: #fff;
border-radius: 2px; border-radius: 2px;
padding: 24px; padding: 24px;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
margin-bottom: 40px; margin-bottom: 40px;
max-width: 1160px; max-width: 1160px;
} }
@ -144,9 +144,9 @@ body{
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-color: #ff4415; border-color: #ff4415;
box-shadow: 0.4px 1px 1.5px 1px #aaa;
-moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
-webkit-box-shadow: 0.4px 1px 1.5px 1px #aaa; -webkit-box-shadow: 0.4px 1px 1.5px 1px #aaa;
-moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
box-shadow: 0.4px 1px 1.5px 1px #aaa;
border-radius: 2px; border-radius: 2px;
margin-top: 4px; margin-top: 4px;
margin-bottom: 5px; margin-bottom: 5px;
@ -157,6 +157,10 @@ body{
transition-delay: 50ms; transition-delay: 50ms;
transition-duration: 125ms; transition-duration: 125ms;
transition-timing-function: ease; transition-timing-function: ease;
-o-transition-property: box-shadow;
-o-transition-delay: 50ms;
-o-transition-duration: 125ms;
-o-transition-timing-function: ease;
-moz-transition-property: box-shadow; -moz-transition-property: box-shadow;
-moz-transition-delay: 50ms; -moz-transition-delay: 50ms;
-moz-transition-duration: 125ms; -moz-transition-duration: 125ms;
@ -169,12 +173,13 @@ body{
} }
.button:hover, .button:hover { .button:hover, .button:hover {
box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa; -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa; -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa; } box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
}
input.button{ input.button{
padding: 0px 8px; padding: 0 8px;
} }
/* INPUT FIELD */ /* INPUT FIELD */
@ -191,6 +196,10 @@ input.button{
transition-delay: 50ms; transition-delay: 50ms;
transition-duration: 125ms; transition-duration: 125ms;
transition-timing-function: ease; transition-timing-function: ease;
-o-transition-property: border-bottom-color;
-o-transition-delay: 50ms;
-o-transition-duration: 125ms;
-o-transition-timing-function: ease;
-moz-transition-property: border-bottom-color; -moz-transition-property: border-bottom-color;
-moz-transition-delay: 50ms; -moz-transition-delay: 50ms;
-moz-transition-duration: 125ms; -moz-transition-duration: 125ms;
@ -223,6 +232,10 @@ input.button{
transition-delay: 50ms; transition-delay: 50ms;
transition-duration: 125ms; transition-duration: 125ms;
transition-timing-function: ease; transition-timing-function: ease;
-o-transition-property: border-bottom-color;
-o-transition-delay: 50ms;
-o-transition-duration: 125ms;
-o-transition-timing-function: ease;
-moz-transition-property: border-bottom-color; -moz-transition-property: border-bottom-color;
-moz-transition-delay: 50ms; -moz-transition-delay: 50ms;
-moz-transition-duration: 125ms; -moz-transition-duration: 125ms;

View file

@ -11,26 +11,33 @@
* @link http://marcel-kapfer.de/rangitaki * @link http://marcel-kapfer.de/rangitaki
*/ */
require_once "BlogListGenerator.php"; require_once "BlogListGenerator.php";
require_once "config.php";
require_once "lang/" . $language . ".php";
if ($pagination) { require '../res/php/Config.php';
use mmk2410\rbe\config\Config as Config;
$configParser = new Config('../config.yaml', '../vendor/autoload.php');
$config = $configParser->getConfig();
require_once "lang/" . $config["language"] . ".php";
if ($blog["design"]["pagination"]) {
?> ?>
<div class="pag_buttons"> <div class="pag_buttons">
<?php <?php
if ($pag_min > 0) { if ($pag_min > 0) {
if (isset($getblog)) { if (isset($getblog)) {
?> ?>
<a href="<?php <a href="<?php
echo "?blog=" . $getblog . "&page=" . ($pagenumber - 1); echo "?blog=" . $getblog . "&page=" . ($pagenumber - 1);
?>" class="pag_prev button"><?php echo $BLOGLANG["Previous Page"]; ?></a> ?>" class="pag_prev button"><?php echo $BLOGLANG["Previous Page"]; ?></a>
<?php <?php
} else { } else {
?> ?>
<a href="<?php <a href="<?php
echo "?page=" . ($pagenumber - 1); echo "?page=" . ($pagenumber - 1);
?>" class="pag_prev button"><?php echo $BLOGLANG['Previous Page']; ?></a> ?>" class="pag_prev button"><?php echo $BLOGLANG['Previous Page']; ?></a>
<?php <?php
} }
} }
if (isset($getblog)) { if (isset($getblog)) {
@ -40,20 +47,20 @@ if ($pagination) {
} }
if ($pag_max < BlogListGenerator::getArticleAmount($pag_blog)) { if ($pag_max < BlogListGenerator::getArticleAmount($pag_blog)) {
if (isset($getblog)) { if (isset($getblog)) {
?> ?>
<a href="<?php <a href="<?php
echo "?blog=" . $getblog . "&page=" . ($pagenumber + 1); echo "?blog=" . $getblog . "&page=" . ($pagenumber + 1);
?>" class="pag_next button"><?php echo $BLOGLANG["Next Page"]; ?></a> ?>" class="pag_next button"><?php echo $BLOGLANG["Next Page"]; ?></a>
<?php <?php
} else { } else {
?> ?>
<a href="<?php <a href="<?php
echo "?page=" . ($pagenumber + 1); echo "?page=" . ($pagenumber + 1);
?>" class="pag_next button"><?php echo $BLOGLANG["Next Page"];?></a> ?>" class="pag_next button"><?php echo $BLOGLANG["Next Page"];?></a>
<?php <?php
} }
} }
?> ?>
</div> </div>
<?php <?php
} }

View file

@ -83,7 +83,7 @@ body{
.card{ .card{
background: #fff; background: #fff;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
} }
@ -129,21 +129,21 @@ body{
.fab{ .fab{
background-color: #ff4415; background-color: #ff4415;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
} }
.subfab{ .subfab{
background-color: #fff; background-color: #fff;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
} }
.button { .button {
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
text-transform: uppercase; text-transform: uppercase;
box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); -webkit-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-moz-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); -moz-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-webkit-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
border-radius: 2px; border-radius: 2px;
letter-spacing: 0.4px; letter-spacing: 0.4px;
font-weight: 700; font-weight: 700;
@ -152,6 +152,10 @@ body{
transition-delay: 50ms; transition-delay: 50ms;
transition-duration: 125ms; transition-duration: 125ms;
transition-timing-function: ease; transition-timing-function: ease;
-o-transition-property: box-shadow;
-o-transition-delay: 50ms;
-o-transition-duration: 125ms;
-o-transition-timing-function: ease;
-moz-transition-property: box-shadow; -moz-transition-property: box-shadow;
-moz-transition-delay: 50ms; -moz-transition-delay: 50ms;
-moz-transition-duration: 125ms; -moz-transition-duration: 125ms;
@ -163,9 +167,9 @@ body{
} }
.button:hover, .button:hover { .button:hover, .button:hover {
box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85); -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
} }
.pag_next{ .pag_next{

View file

@ -35,7 +35,7 @@ body{
.header{ .header{
background-color: #212121; background-color: #212121;
position: fixed; position: fixed;
box-shadow: 2px 0px 2px 2px rgba(32, 32, 32, 0.85); box-shadow: 2px 0 2px 2px rgba(32, 32, 32, 0.85);
} }
.title{ .title{
@ -79,7 +79,7 @@ body{
.card{ .card{
background: #424242; background: #424242;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
} }
@ -125,21 +125,21 @@ body{
.fab{ .fab{
background-color: #ff4415; background-color: #ff4415;
box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
} }
.subfab{ .subfab{
background-color: #424242; background-color: #424242;
box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
} }
.button{ .button{
text-transform: uppercase; text-transform: uppercase;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); -webkit-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-moz-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); -moz-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-webkit-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65); box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
border-radius: 2px; border-radius: 2px;
letter-spacing: 0.4px; letter-spacing: 0.4px;
font-weight: 700; font-weight: 700;
@ -148,6 +148,10 @@ body{
transition-delay: 50ms; transition-delay: 50ms;
transition-duration: 125ms; transition-duration: 125ms;
transition-timing-function: ease; transition-timing-function: ease;
-o-transition-property: box-shadow;
-o-transition-delay: 50ms;
-o-transition-duration: 125ms;
-o-transition-timing-function: ease;
-moz-transition-property: box-shadow; -moz-transition-property: box-shadow;
-moz-transition-delay: 50ms; -moz-transition-delay: 50ms;
-moz-transition-duration: 125ms; -moz-transition-duration: 125ms;
@ -159,9 +163,9 @@ body{
} }
.button:hover, .button:hover { .button:hover, .button:hover {
box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85); -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
} }
.pag_next{ .pag_next{

View file

@ -35,7 +35,7 @@ body{
.header{ .header{
background-color: #ff4415; background-color: #ff4415;
position: fixed; position: fixed;
box-shadow: 2px 0px 2px 2px rgba(62, 62, 62, 0.45); box-shadow: 2px 0 2px 2px rgba(62, 62, 62, 0.45);
} }
.title{ .title{
@ -83,7 +83,7 @@ body{
.card{ .card{
background: #fff; background: #fff;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
} }
@ -129,21 +129,21 @@ body{
.fab{ .fab{
background-color: #ff4415; background-color: #ff4415;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
} }
.subfab{ .subfab{
background-color: #fff; background-color: #fff;
box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3); box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
} }
.button { .button {
text-transform: uppercase; text-transform: uppercase;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
box-shadow: 0.4px 1px 1.5px 1px #aaa;
-moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
-webkit-box-shadow: 0.4px 1px 1.5px 1px #aaa; -webkit-box-shadow: 0.4px 1px 1.5px 1px #aaa;
-moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
box-shadow: 0.4px 1px 1.5px 1px #aaa;
border-radius: 2px; border-radius: 2px;
letter-spacing: 0.4px; letter-spacing: 0.4px;
font-weight: 700; font-weight: 700;
@ -152,6 +152,10 @@ body{
transition-delay: 50ms; transition-delay: 50ms;
transition-duration: 125ms; transition-duration: 125ms;
transition-timing-function: ease; transition-timing-function: ease;
-o-transition-property: box-shadow;
-o-transition-delay: 50ms;
-o-transition-duration: 125ms;
-o-transition-timing-function: ease;
-moz-transition-property: box-shadow; -moz-transition-property: box-shadow;
-moz-transition-delay: 50ms; -moz-transition-delay: 50ms;
-moz-transition-duration: 125ms; -moz-transition-duration: 125ms;
@ -163,9 +167,9 @@ body{
} }
.button:hover, .button:hover { .button:hover, .button:hover {
box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa; -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-moz-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
} }
.pag_next{ .pag_next{