logo

blog

Unnamed repository; edit this file 'description' to name the repository.
commit c280b84944dd8a1a0e0cb4e3cae3f08dacf8a6b0
parent a499634d3b975660a7f69e7ff84d33d65bc61a79
Author: lanodan <lanodan.delta@free.fr>
Date:   Tue, 19 Aug 2014 09:55:18 +0200

Wow Such Big Commit

Diffstat:
css/index.css | 11++++-------
footer.php | 2+-
index.php | 4+---
lang/en.php | 3++-
lang/fr.php | 3++-
lang/index.php | 2+-
lang/lang.php | 6+++---
live.php | 10++++++++--
navbar.php | 17+++++------------
post.php | 26+++++++++++++-------------
rss.php | 11++++++-----
11 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/css/index.css b/css/index.css @@ -1,11 +1,10 @@ html, body { background-color: #E3E3E3; color: #000000; - height: 100%; margin: 0; padding: 0; } -#content {margin: 20px;} +.postTitle {text-align: center;} .tags {font-family: monospace;} .warn { background-color: rgba(255, 60, 0, 0.2); @@ -19,7 +18,7 @@ a:hover {text-decoration: underline;} article { border-radius: 0.5em; box-shadow: 0 0 0.5em 0; - margin: 0.5em; + margin: 1.5em; padding: 0.5em; } code { @@ -82,14 +81,13 @@ nav ul ul li {display: block;} nav ul ul li:hover {background: #B00;} nav ul ul li:active {background: #E00;} nav ul ul ul { - font-size: 14px; left: 100%; position: absolute; top: 0; } nav ul.right {float: right;} -nav li.expand_down:after {content: " ▿";} -nav li.expand_right:after {content: " ▻";} +//nav ul li + li:after {content: " ▿";} +//nav ul li + li li:after {content: " ‣";} /* FOOTER */ footer { background-color: #B80000; @@ -99,5 +97,4 @@ footer { margin-top: 1vh; padding: 0.5vw 0.5vh; text-align: center; - width: 100%; } diff --git a/footer.php b/footer.php @@ -1,5 +1,5 @@ <footer> - <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="CC-BY-SA" src="/images/cc-by-sa.png" /></a><?=$locale['license']?> + <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="CC-BY-SA" src="/images/cc-by-sa.png" /></a> <?=$locale['license']?> <a href="http://www.anybrowser.org/campaign/" title="http://www.anybrowser.org/campaign/"><img src="/images/anybrowser.png" alt="<?=$locale['anybrowser']?>"/></a> <a href="https://flattr.com/submit/auto?user_id=lanodan&amp;url=<?=(isset($_SERVER['HTTPS']) ? "https" : "http") . "://{$_SERVER[HTTP_HOST]}{$_SERVER[REQUEST_URI]}"?>" target="_blank"><img src="/images/flattr.png" alt="Flattr" title="Flattr"></a> </footer> diff --git a/index.php b/index.php @@ -23,7 +23,6 @@ </head> <body> <?php include 'navbar.php'; ?> - <div id="content"> <?php while($row = $result->fetch_array()) { $rows[] = $row; @@ -31,7 +30,7 @@ foreach($rows as $row) { print ' <article> - <h2><a href="post?id='.$row['id'].'">'.$row['title'].'</a></h2> + <h2 class="postTitle"><a href="post?id='.$row['id'].'">'.$row['title'].'</a></h2> '.$row['content'].' <div class="info">'.$row['tags'].' ~~ '.date("c", strtotime($row['pubDate']) ).'</div> </article> @@ -44,7 +43,6 @@ # close connection $mysqli->close(); ?> - </div> <?php include 'footer.php';?> </body> </html> diff --git a/lang/en.php b/lang/en.php @@ -12,7 +12,7 @@ $locale['home']='Home'; $locale['tuto']='Tutorials'; $locale['coding']='Coding'; $locale['creations']='Creations'; -$locale['drawing']='Drawing'; +$locale['drawing']='Drawings'; $locale['links']='Links'; $locale['about']='About'; $locale['license']='This work is licensed under a <a rel="license" href="//creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.'; @@ -21,4 +21,5 @@ $locale['list']='Anime & Movies list'; $locale['name']='name'; $locale['startWatching']='Start Watching'; $locale['finnishWatching']='Finnish Watching'; +$locale['ToC']='Table of Contents'; ?> diff --git a/lang/fr.php b/lang/fr.php @@ -12,7 +12,7 @@ $locale['home']='Accueil'; $locale['tuto']='Tutoriels'; $locale['coding']='Programmation'; $locale['creations']='Créations'; -$locale['drawing']='Graphisme'; +$locale['drawing']='Dessins'; $locale['links']='Liens'; $locale['about']='À Propos'; $locale['license']='Cette œuvre est mise à disposition selon les termes de la <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Licence Creative Commons Attribution - Partage dans les Mêmes Conditions 4.0 International</a>.'; @@ -21,4 +21,5 @@ $locale['list']='Liste Anime & Films'; $locale['name']='Nom'; $locale['startWatching']='Début du visionage'; $locale['finnishWatching']='Fin du visionage'; +$locale['ToC']='Table des Matières'; ?> diff --git a/lang/index.php b/lang/index.php @@ -3,6 +3,6 @@ $lang = $_COOKIE['lang']; $lang = $_GET['lang'];//let user define his lang setting - setcookie('lang', $lang, '0', '/'); + setcookie('lang', $lang, '0', '/', "the-delta.net", 0, 1); header('Location: '.$_SERVER['HTTP_REFERER']); ?> diff --git a/lang/lang.php b/lang/lang.php @@ -1,12 +1,12 @@ <?php $langs = array('fr','en'); //just add new language here when you need - if (empty($_COOKIE['lang'])) { + $lang = $_COOKIE['lang']; + + if (empty($lang)) { $header = new http\Header('Language-Accept', $_SERVER['HTTP_ACCEPT_LANGUAGE']); $negotiate = $header->negotiate($langs); $lang = substr($negotiate, 0, 2); setcookie('lang', $lang, '0', '/'); - } else { - $lang = $_COOKIE['lang']; } include_once 'lang/'.$lang.'.php'; diff --git a/live.php b/live.php @@ -8,11 +8,17 @@ <title>Livestream <?=$locale['fullTitle']?></title> <link rel="stylesheet" type="text/css" href="css/live.css"> <link rel="stylesheet" type="text/css" href="css/index.css"> + <script> + function livePopup() { + window.open("http://kiwiirc.com/client/the-delta.net/#live"); + return false; + } + </script> </head> <body> <?php include 'navbar.php'; ?> - <div>Tchat: irc://the-delta.net/#live <noscript>enable javascript or use a irc client/activer javascript ou utiliser un client irc</noscript></div> - <iframe src="https://kiwiirc.com/client/the-delta.net/?theme=basic#live" style="border:0; width:350px; height:100%;"></iframe> + <div><a onclick="livePopup()" target="_blank" href="http://kiwiirc.com/client/the-delta.net/#live">web IRC Tchat</a> or use a irc client/ou utilisez un client irc</noscript></div> + <video src="live.webm" width="100%"/> <?php include 'footer.php';?> </body> </html> diff --git a/navbar.php b/navbar.php @@ -3,22 +3,15 @@ <li><a href="/"><?=$locale['home']?></a></li> <li><a href="/about"><?=$locale['about']?></a></li> <?php -/* <li><a class="expand_down" href="/tuto/"><?=$locale['tuto']?></a> +/* <li><a href="/tuto/"><?=$locale['tuto']?></a> + * <li><a href="/creations/"><?=$locale['creations']?></a> * <ul> - * <li><a href="/tuto/coding/"><?=$locale['coding']?></a></li> - * </ul> - * </li> - * <li><a class="expand_down" href="/creations/"><?=$locale['creations']?></a> - * <ul> - * <li><a class="expand_right" href="/creations/code/"><?=$locale['coding']?></a> - * <ul> - * <li><a href="/creations/code/php">PHP</a></li> - * <li><a href="/creations/code/htmlCSS">HTML/CSS</a></li> - * </ul> - * </li> + * <li><a href="/creations/code/"><?=$locale['coding']?></a></li> + * <li><a href="/creations/htmlCSS/">HTML/CSS</a></li> * <li><a href="/creations/drawing/"><?=$locale['drawing']?></a></li> * </ul> * </li> + * <li><a href="/live">Live</a></li> */ ?> </ul> diff --git a/post.php b/post.php @@ -31,19 +31,20 @@ <link rel="stylesheet" type="text/css" href="css/index.css"> </head> <body> - <?php include 'navbar.php'; ?> - <section id=content> - <?php - /* fetch associative array */ - $row = $result->fetch_array(); - print ' <section class="article"> - <h1><a href="post?id='.$row['id'].'">'.$row['title'].'</a></h1> - <article> +<?php + require_once 'config.php'; + include 'navbar.php'; +?> +<?php + /* fetch associative array */ + $row = $result->fetch_array(); + print ' <article> + <h2 class="postTitle"><a href="post?id='.$row['id'].'">'.$row['title'].'</a></h2> '.$row['content'].' - </article> - <div class="info"><span class="tags>"'.$row['tags'].'</span><date>'.date("c", strtotime($row['pubDate']) ).'</date></div> - </section> + <div class="info">'.$row['tags'].' ~~ '.date("c", strtotime($row['pubDate']) ).'</div> + </article> '; + print ' Share: <a href="https://twitter.com/intent/tweet?text='.$baseURL.'post?id='.$row['id'].' '.$row['title'].'">Twitter</a> <a href="mailto:?to&subject='.$row[title].'&body='.$baseURL.'post?id='.$row['id'].'">Mail</a>'; $result->close(); $mysqli->close(); ?> @@ -70,7 +71,6 @@ * $mysqli->close(); */ ?> - </section> - <?php include 'footer.php';?> +<?php include 'footer.php';?> </body> </html> diff --git a/rss.php b/rss.php @@ -7,8 +7,9 @@ <rss version="2.0"> <channel> <title><?=$locale['title']?></title> - <description></description> + <description><?=$description?></description> <link>http://<?=$_SERVER['HTTP_HOST']?>/</link> + <generator>My own genetator</generator> <?php $mysqli = new mysqli($mysql['host'], $mysql['user'], $mysql['passwd'], $mysql['database']); @@ -27,12 +28,12 @@ foreach($rows as $row) { print ' <item> <title>'.$row['title'].'</title> - <description>'.$row['description'].'</description> - <link>'.$row['link'].'</link> - <guid permalink="">http://'.$_SERVER['HTTP_HOST'].'/post?id='.$row['id'].'</guid> + <description>'.$row['content'].'</description> + <link>http://'.$_SERVER['HTTP_HOST'].'/post?id='.$row['id'].'</link> <pubDate>'.date("c", strtotime($row['pubDate']) ).'</pubDate> <category>'.$row['tags'].'</category> - </item>'."\n"; + </item> +'; } $result->close();