jeena/jlog
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge pull request #7 from auge8472/html5

Browse source 
Upgrade the blog template to HTML5
This commit is contained in:
Jeena 2020-04-28 08:48:40 +02:00 • committed by GitHub
commit 2ae67af572
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 75 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/login.php
View file

@ -63,7 +63,7 @@ $c['main'] = '
<input class="userdata" id="password" type="password" name="password" />
<input style="display: none;" name="username" type="text" value="do-not-change" /></p>
<p><input type="hidden" name="url" value="' . htmlspecialchars(!empty($get['url']) ? $get['url'] : '') . '" />
<input type="submit" value="' . $l['admin']['login_send'] . '" /></p>
<button value="' . $l['admin']['login_send'] . '">' . htmlspecialchars($l['admin']['login_send']) . '</button></p>
</form>
';

2
admin/media/select-picture.php
View file

@ -25,7 +25,7 @@ if($_GET['p']) { ?>
<input id="class" type="text" size="20"></p>
<p><?php echo $l['admin']['pic_alt'] ?><br />
<input id="alt" type="text" size="20"></p>
<p><input type="submit" value="<?php echo $l['admin']['pic_insert'] ?>"></p>
<p><button value="<?php echo $l['admin']['pic_insert'] ?>"><?php echo htmlspecialchars($l['admin']['pic_insert']) ?></button></p>
</form>
<?php
}

4
admin/media/upload-picture.php
View file

@ -63,7 +63,7 @@
<input id="class" type="text" size="20"></p>
<p><?php echo $l['admin']['pic_alt'] ?><br />
<input id="alt" type="text" size="20"></p>
<p><input type="submit" value="<?php echo $l['admin']['pic_insert'] ?>"></p>
<p><button value="<?php echo $l['admin']['pic_insert'] ?>"><?php echo htmlspecialchars($l['admin']['pic_insert']) ?></button></p>
</form>
<?php
}
@ -79,7 +79,7 @@ if (empty($_FILES['probe']) or isset($errors))
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
<?php echo add_session_id_input_tag() ?>
<input type="file" name="probe" /><br><br>
<input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">
<button value="<?php echo $l['admin']['pic_upload'] ?>"><?php echo htmlspecialchars($l['admin']['pic_upload']) ?></button>
</form>
<?php
}

2
admin/media/upload-teaser.php
View file

@ -83,7 +83,7 @@ if (empty($_FILES['probe']) or isset($errors))
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
<?php echo add_session_id_input_tag() ?>
<input type="file" name="probe" /><br><br>
<input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">
<button value="<?php echo $l['admin']['pic_upload'] ?>"><?php echo htmlspecialchars($l['admin']['pic_upload']) ?></button>
</form>
<?php
}

2
error404.php
View file

@ -7,7 +7,7 @@
$c['main'] = "<h2>".$l['err404_topic']."</h2>\n<p>".$l['err404_message']."</p>";
$c['main'] .= ' <form id="searchform" action="'.JLOG_PATH.'/search.php" accept-charset="UTF-8">
<p><input class="userdata" type="text" name="q" size="30" value="'.htmlspecialchars($get['url']).'" />
<input class="send" type="submit" value="'.$l['content_search'].'" /></p>
<button class="send" value="'.$l['content_search'].'">'.htmlspecialchars($l['content_search']).'</button></p>
</form>';
require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php');

7
index.php
View file

@ -29,9 +29,10 @@
}
require_once('.'.DIRECTORY_SEPARATOR.'scripts'.DIRECTORY_SEPARATOR.'prepend.inc.php');
$c['meta']['robots'] = "noindex, follow";
$c['meta']['description'] = htmlspecialchars(strip_tags(str_replace("\n", '', JLOG_DESCRIPTION)), ENT_QUOTES);
$c['meta']['title'] = $l['index_topic'];
$c['meta']['robots'] = "noindex, follow";
$c['meta']['description'] = htmlspecialchars(strip_tags(str_replace("\n", '', JLOG_DESCRIPTION)), ENT_QUOTES);
$c['meta']['title'] = $l['index_topic'];
$c['meta']['html_language'] = $l['html_language'];
$c['main'] = "";
$cc = array();

1
lang/lang.de.inc.php
View file

@ -86,6 +86,7 @@
"err404_message" => "Diese Seite existiert leider nicht. Versuchen Sie sie über die Suchfunktion zu finden.",
"language" => "de-de",
"html_language" => "de",
"locale" => array('de_DE.UTF-8', 'de_DE.UTF-8@euro', 'de_DE'),
"date_format" => "%d. %B %Y um %H:%M Uhr",
"date_format_comment" => "%d.%m.%Y",

1
lang/lang.en.inc.php
View file

@ -86,6 +86,7 @@
"err404_message" => "There is no such page. Please try the search engine on this page.",
"language" => "en-gb",
"html_language" => "en",
"locale" => array( "en_US", "us", "verUS" ),
"date_format" => "%d. %B %Y um %H:%M Uhr",
"date_format_comment" => "%d.%m.%Y",

1
lang/lang.it.inc.php
View file

@ -86,6 +86,7 @@
"err404_message" => "Non ci sono file riguardanti la ricerca in questa pagina. Perfavore prova a usare il motore di ricerca di questa pagina.",
"language" => "it-it",
"html_language" => "it",
"locale" => array( "it_IT", "it" ),
"date_format" => "%d. %B %Y alle %H:%M",
"date_format_comment" => "%d.%m.%Y",

1
lang/lang.pl.inc.php
View file

@ -85,6 +85,7 @@
"err404_message" => "Nie ma takiej strony. Prosze użyć przeglądarki na tej stronie.",
"language" => "en-gb",
"html_language" => "pl",
"locale" => array( "en_US", "us", "verUS" ),
"date_format" => "%d. %B %Y um %H:%M Uhr",
"date_format_comment" => "%d.%m.%Y",

3
lang/lang.sv.inc.php
View file

@ -85,7 +85,8 @@
"err404_topic" => "Error 404 - Sidan hittades inte",
"err404_message" => "Denna sida existerar tyvärr inte. Försök hitta den genom sökfunktionen.",
"language" => "sv-se",
"language" => "sv-se",
"html_language" => "sv",
"locale" => array('sv_SE', 'sve_sve'),
"date_format" => "%Y-%B-%d kl %H:%M",
"date_format_comment" => "%Y-%m-%d",

6
personal/css/print.css
View file

@ -3,7 +3,7 @@
*/
/* -- hide -- */
#subnav, .skip, .entryform, .hidecomments, #entryform, hr { display: none; }
aside, #subnav, .skip, .entryform, .hidecomments, #entryform, hr { display: none; }
/* -- main settings -- */
body { font-family: Georgia, "Times New Roman", Times, serif; }
@ -12,8 +12,8 @@
/* -- links -- */
a { text-decoration: none; }
#main a:after { font-size: 70%; content:" <"attr(href)">"; }
#main .meta a:after, #main h2 a:after { content:""; }
main a:after { font-size: 70%; content:" <"attr(href)">"; }
main .meta a:after, main h2 a:after { content:""; }
/* -- comments -- */
ul#commentslist { list-style-type: none; }

16
personal/css/screen.css
View file

@ -26,7 +26,7 @@
border-top: 0;
position: relative;
}
#main {
main {
margin: 0 0 0 25px;
padding: 190px 0 2em 0;
width: 64.5%;
@ -34,7 +34,7 @@
}
/* Clearfix-Hack */
#main:after {
main:after {
content: ".";
display: block;
height: 0;
@ -42,11 +42,11 @@
visibility: hidden;
}
#main {display: inline-table;}
main {display: inline-table;}
/* Hides from IE-mac \*/
* html #main {height: 1%;}
#main {display: block;}
* html main {height: 1%;}
main {display: block;}
/* End hide from IE-mac */
/* -- logo -- */
@ -98,7 +98,7 @@
.rss img { vertical-align: middle; border: 0; width: 94px; height: 15px; }
/* -- footer -- */
#footer {
footer {
clear: both;
height: 60px;
background: url(img/footer.png) no-repeat top center;
@ -132,13 +132,13 @@
/* -- pictures -- */
.fl { float: left; margin: 0 1em 1em 0; }
.fr { float: right; margin: 0 0 1em 1em; }
#main img, dl.img {
main img, dl.img {
border: 1px solid #aaa;
padding: 2px;
max-width: 95%;
}
dl.img dt { padding: 0; margin: 0;}
#main dl.img dt img { margin: 0; padding: 0; max-width: 100%; border: none; }
main dl.img dt img { margin: 0; padding: 0; max-width: 100%; border: none; }
dl.img dd { margin: 0; padding: 0 0.3em; font-size: 90%; }
.teaser { clear: both; }

81
personal/template.tpl
View file

@ -1,40 +1,45 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><jlog:title /> - <jlog:website /></title>
<jlog:aditional-header />
<link rel="stylesheet" href="<jlog:homelink />/personal/css/print.css" type="text/css" media="print" />
<link rel="stylesheet" href="<jlog:homelink />/personal/css/screen.css" type="text/css" media="screen, projection" />
<!--[if lte IE 6]><link rel="stylesheet" href="<jlog:homelink />/personal/css/ielte6.css" type="text/css" media="screen" /><![endif]-->
</head>
<body>
<p class="skip"><a href="#main"><jlog:skipcontent /></a></p>
<div id="container"><span id="pokal"></span>
<h1><a title="<jlog:home />" href="<jlog:homelink />/"><jlog:website /></a></h1>
<dl id="subnav">
<dt class="first"><jlog:slogan-h /></dt>
<dd><jlog:slogan /></dd>
<dt><jlog:search-h /></dt>
<dd>
<form action="<jlog:homelink />/search.php">
<p><input class="userdata" type="text" name="q" size="15" value="" />
<input class="send" type="submit" value="<jlog:search />" /></p>
</form>
</dd>
<dt><jlog:categorieslist-h /></dt>
<dd><jlog:categorieslist /></dd>
<dt><jlog:current-h /></dt>
<dd><jlog:subcurrent /></dd>
<dd><jlog:archive-more /> <a href="<jlog:archivelink />"><jlog:archive /></a>.</dd>
<dt><jlog:sub-info /></dt>
<dd class="rss"><jlog:rss-link /><br /> <jlog:rss-info /></dd>
<dd><jlog:copyright /></dd>
<dd><jlog:powered /></dd>
</dl>
<div id="main">
<jlog:content />
<!DOCTYPE html>
<html lang="<jlog:html-language />">
<head>
<title><jlog:title /> - <jlog:website /></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<jlog:aditional-header />
<link rel="stylesheet" href="<jlog:homelink />/personal/css/print.css" type="text/css" media="print" />
<link rel="stylesheet" href="<jlog:homelink />/personal/css/screen.css" type="text/css" media="screen, projection" />
</head>
<body>
<p class="skip"><a href="#main"><jlog:skipcontent /></a></p>
<div id="container">
<span id="pokal"></span>
<header>
<h1><a title="<jlog:home />" href="<jlog:homelink />/"><jlog:website /></a></h1>
</header>
<aside>
<dl id="subnav">
<dt class="first"><jlog:slogan-h /></dt>
<dd><jlog:slogan /></dd>
<dt><jlog:search-h /></dt>
<dd>
<form action="<jlog:homelink />/search.php">
<p><input class="userdata" type="search" name="q" size="15" value="" />
<button class="send" value="<jlog:search />"><jlog:search /></button></p>
</form>
</dd>
<dt><jlog:categorieslist-h /></dt>
<dd><jlog:categorieslist /></dd>
<dt><jlog:current-h /></dt>
<dd><jlog:subcurrent /></dd>
<dd><jlog:archive-more /> <a href="<jlog:archivelink />"><jlog:archive /></a>.</dd>
<dt><jlog:sub-info /></dt>
<dd class="rss"><jlog:rss-link /><br /> <jlog:rss-info /></dd>
<dd><jlog:copyright /></dd>
<dd><jlog:powered /></dd>
</dl>
</aside>
<main id="main">
<jlog:content />
</main>
<footer>&nbsp;</footer>
</div>
<div id="footer">&nbsp;</div>
</div>
</body>
</body>
</html>

2
plugins/CommentCloser.jplug.php
View file

@ -91,7 +91,7 @@ EOT;
$output .= <<<EOT
automatisch</label>
<input type="submit" name="commclose_do" value="schlie&#223;en" />.</p>
<button name="commclose_do" value="schlie&#223;en">schlie&#223;en</button></p>
<p>Nach der angegeben Zeit k&#246;nnen Beitr&#228;ge nicht mehr kommentiert werden.</p>
</form>
EOT;

2
scripts/JlogUpdater.php
View file

@ -52,7 +52,7 @@ class JlogUpdater
$html .= $class->getForm($l);
$version = $this->versions[$version];
}
$html .= '<p><input type="submit" name="update" value="' . $l['admin']['update_start'] . '" /></p>';
$html .= '<p><button name="update" value="' . $l['admin']['update_start'] . '">' . htmlspecialchars($l['admin']['update_start']) . '</button></p>';
$html .= '</form>';
return $html;
}

2
scripts/do_template.php
View file

@ -54,6 +54,7 @@ if(defined('JLOG_ADMIN')) {
$_search = array (
"<jlog:language />",
"<jlog:html-language />",
"<jlog:website />",
"<jlog:title />",
"<jlog:aditional-header />",
@ -81,6 +82,7 @@ $_search = array (
$_replace = array (
$l['language'],
$l['html_language'],
htmlspecialchars(JLOG_WEBSITE, ENT_QUOTES),
htmlspecialchars($c['meta']['title']),
$c['meta']['aditionalheader'],

2
search.php
View file

@ -9,7 +9,7 @@
$c['main'] .= ' <form id="searchform" action="'.JLOG_PATH.'/search.php" accept-charset="UTF-8">
<p><input class="userdata" type="text" name="q" size="30" value="'.htmlspecialchars($searchstring, ENT_QUOTES).'" />
<input class="send" type="submit" value="'.$l['content_search'].'" /></p>
<button class="send" value="'.$l['content_search'].'">'.htmlspecialchars($l['content_search']).'</button></p>
</form>
<script type="text/javascript">jlog_searchpage = true;</script>
';