tim/xxx
1
0
Fork 0
Code Issues Pull Requests Releases Activity

A number of changes to the CSS, page layout (moved to HTML5), and updated the editor.

Browse Source
This commit is contained in:
tim
2015-11-21 21:54:02 +02:00
parent a00c1b4c9d
commit f3fd6fd3f1
662 changed files with 6051 additions and 71590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
publish/addeditor.php
+10 -14
View File
@@ -26,26 +26,22 @@ if (!isset($_SESSION['editor'])) {
open_db('close');
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-strict.dtd">
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" value="text/html; charset=UTF-8" />
<title>x.x.x: add editor</title>
<link rel="shortcut icon" href="/favicon.png">
<link rel="icon" href="/favicon.png">
<link rel='stylesheet' type='text/css' href='/style.css'>
<link rel='stylesheet' type='text/css' href='/publish/style.css'>
<meta charset="UTF-8">
<title>x.x.x [add editor]</title>
<link rel="icon" href="favicon.png" />
<link rel="shortcut icon" href="favicon.png" />
<link rel="stylesheet" type="text/css" href="../style.css" />
<link rel='stylesheet' type='text/css' href='../publish/style.css' />
<link rel="alternate" type="application/rss+xml" title="xxx.org.za RSS feed" href="/feed" />
<script type="text/javascript" src="../utilities.js"></script>
</head>
<? flush(); ?>
<body>
<div id="container">
<!-- Include siderbar here -->
<? include_once('../sidebar.inc.php'); ?>
<!-- Continue with main page stuff -->
<div id="main">
<div id="maintext">
@@ -73,11 +69,11 @@ if (!isset($_SESSION['editor'])) {
</div> <!-- maintext -->
</div> <!-- main -->
<? include_once("../sidebar.inc.php"); ?>
<? include_once("../bottombar.inc.php"); ?>
</div> <!-- container -->
<!-- Include bottom bar here -->
<? include('../bottombar.inc.php'); ?>
<!-- Finis -->
</body>
</html>
publish/choose.inc.php
-9
View File
@@ -24,12 +24,3 @@ if ($queue) { ?>
<? }
echo display_stories();
?>
</div> <!-- maintext -->
</div> <!-- main -->
</div> <!-- container -->
<? include_once('../bottombar.inc.php'); ?>
</body>
</html>
publish/edit.php
+12 -18
View File
@@ -10,18 +10,18 @@ if (!isset($_SESSION['editor'])) {
return;
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta charset="UTF-8">
<title>x.x.x [edit]</title>
<link rel="icon" href="/favicon.png" />
<link rel="shortcut icon" href="/favicon.png" />
<link rel="stylesheet" type="text/css" href="/style.css" />
<link rel='stylesheet' type='text/css' href='/publish/style.css' />
<link rel="icon" href="favicon.png" />
<link rel="shortcut icon" href="favicon.png" />
<link rel="stylesheet" type="text/css" href="../style.css" />
<link rel='stylesheet' type='text/css' href='../publish/style.css' />
<link rel="alternate" type="application/rss+xml" title="xxx.org.za RSS feed" href="/feed" />
<script type="text/javascript" src="../utilities.js"></script>
<? include_once('./tinymce_init.inc.php'); ?>
</script>
</head>
<?
flush();
@@ -35,12 +35,6 @@ if (!isset($_SESSION['editor'])) {
<body>
<div id='container'>
<!-- Include siderbar here -->
<? include_once('../sidebar.inc.php'); ?>
<!-- Continue with main page stuff -->
<div id='main'>
<div id='maintext'>
@@ -118,12 +112,12 @@ switch ($action) {
?>
</div>
</div>
</div>
</div> <!-- maintext -->
</div> <!-- main -->
<? include_once("../sidebar.inc.php"); ?>
<? include_once("../bottombar.inc.php"); ?>
</div> <!-- container -->
<!-- Include bottom bar here -->
<? include_once('../bottombar.inc.php'); ?>
<? open_db('close'); ?>
<!-- Finis -->
publish/index.php
+12 -18
View File
@@ -1,14 +1,15 @@
<? require_once("../session.lib.php"); ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta charset="UTF-8">
<title>x.x.x [add]</title>
<link rel="icon" href="/favicon.png" />
<link rel="shortcut icon" href="/favicon.png" />
<link rel="stylesheet" type="text/css" href="/style.css" />
<link rel='stylesheet' type='text/css' href='/publish/style.css' />
<link rel="icon" href="favicon.png" />
<link rel="shortcut icon" href="favicon.png" />
<link rel="stylesheet" type="text/css" href="../style.css" />
<link rel='stylesheet' type='text/css' href='../publish/style.css' />
<link rel="alternate" type="application/rss+xml" title="xxx.org.za RSS feed" href="/feed" />
<script type="text/javascript" src="../utilities.js"></script>
<? include_once('tinymce_init.inc.php'); ?>
</head>
<?
@@ -22,12 +23,6 @@
<body>
<div id='container'>
<!-- Include siderbar here -->
<? include_once('../sidebar.inc.php'); ?>
<!-- Continue with main page stuff -->
<div id='main'>
<div id='maintext'>
@@ -82,14 +77,13 @@ switch ($action) {
?>
</div>
</div>
</div>
</div> <!-- maintext -->
</div> <!-- main -->
<? include_once("../sidebar.inc.php"); ?>
<? include_once("../bottombar.inc.php"); ?>
</div> <!-- container -->
<!-- Include bottom bar here -->
<? include_once('../bottombar.inc.php'); ?>
<? open_db('close'); ?>
<!-- Finis -->
</body>
</html>
publish/login.php
+10 -17
View File
@@ -52,26 +52,22 @@ if (isset($_SESSION['editor'])) {
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-strict.dtd">
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" value="text/html; charset=UTF-8" />
<title>x.x.x: login</title>
<link rel="shortcut icon" href="/favicon.png">
<link rel="icon" href="/favicon.png">
<link rel='stylesheet' type='text/css' href='/style.css'>
<link rel='stylesheet' type='text/css' href='/publish/style.css'>
<meta charset="UTF-8">
<title>x.x.x [login]</title>
<link rel="icon" href="favicon.png" />
<link rel="shortcut icon" href="favicon.png" />
<link rel="stylesheet" type="text/css" href="../style.css" />
<link rel='stylesheet' type='text/css' href='../publish/style.css' />
<link rel="alternate" type="application/rss+xml" title="xxx.org.za RSS feed" href="/feed" />
<script type="text/javascript" src="../utilities.js"></script>
</head>
<? flush(); ?>
<body>
<div id="container">
<!-- Include siderbar here -->
<? include_once('../sidebar.inc.php'); ?>
<!-- Continue with main page stuff -->
<div id="main">
<div id="maintext">
@@ -99,13 +95,10 @@ if ($denied)
</div> <!-- maintext -->
</div> <!-- main -->
<? include_once("../sidebar.inc.php"); ?>
<? include_once("../bottombar.inc.php"); ?>
</div> <!-- container -->
<!-- Include bottom bar here -->
<? include('../bottombar.inc.php'); ?>
<!-- Finis -->
</body>
</html>
publish/style.css
+6 -4
View File
@@ -14,7 +14,7 @@ input#remember {
}
#story {
width: 400px;
width: 450px;
height: 200px;
}
@@ -102,11 +102,13 @@ div.textarea {
}
#uploadparent {
width: 300px;
height: 150px;
padding: 10px;
width: 455px;
height: 200px;
border: 1px dashed #006633;
}
#uploadparent>div {
padding: 10px;
}
/* WordCount */
publish/tinymce_init.inc.php
+34 -18
View File
@@ -1,22 +1,38 @@
<script type="text/javascript" src="/publish/utilities.js"></script>
<script type="text/javascript" src="/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="../publish/utilities.js"></script>
<script type="text/javascript" src="../tinymce/js/tinymce/tinymce.min.js"></script>
<script type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
skin : "xxx",
width : "400",
tinymce.init({
selector: "textarea#story",
width : "450",
height : "300",
auto_reset_designmode : true,
gecko_spellcheck : true,
content_css : "/style.css",
theme_advanced_buttons1 : "bold,italic,|,justifyleft,justifycenter,justifyright,justifyfull,|,blockquote,|,outdent,indent,|,link,unlink,|,charmap,iespell,|,code,cleanup",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "bottom",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "",
handle_event_callback : "mceWordCount",
oninit : "mceWordCount"
skin : "xxx",
content_css : "../style.css",
plugins : "link charmap code",
toolbar : "bold italic | alignleft aligncenter alignright alignjustify | blockquote | outdent indent | link unlink | charmap code",
toolbar_items_size : 'small',
menubar : false,
statusbar : false,
setup : function(editor) {
// Count words
editor.on('keyup', function(e) {
mceWordCount(e);
});
// Move location of toolbar
editor.on('init', function(e) {
var $ = tinymce.dom.DomQuery;
var toolbar = $('div.mce-toolbar-grp');
var editarea = $('div.mce-edit-area');
if (toolbar.hasClass('mce-first')) {
editarea.after(toolbar);
editarea.css('border-width', '0px 0px 1px 0px');
toolbar.removeClass('mce-first');
toolbar.addClass('mce-last');
if (editarea.hasClass('mce-last')) {
editarea.removeClass('mce-last');
editarea.addClass('mce-first');
}
}
});
},
});
</script>
publish/write.inc.php
+3 -3
View File
@@ -58,7 +58,7 @@ echo (isset($story) ? $story : '')
<br class="clear" />
<div class="note">(To get line-breaks&mdash;as in poetry&mdash;instead of paragraph breaks, hit shift-enter instead of enter.)</div>
</div>
<div class="upload" id="uploadparent" style="display: none;">
<div class="upload" id="uploadparent" style="display: none;"><div>
<?
if (isset($file_src) || isset($img)) {
if (isset($file_src)) {
@@ -87,7 +87,7 @@ if (isset($file_src) || isset($img)) {
echo ' </div>';
}
?>
</div>
</div></div>
<br class="clear" />
</div>
@@ -119,7 +119,7 @@ if (isset($file_src) || isset($img)) {
echo '<input type="text" name="recaptcha_response_field" id="recaptcha_response_field" maxlength="150" value="" />';
echo '<span class="required">&nbsp;*</span>';
$publickey = config('RECAPTCHA_SITE_KEY');
echo recaptcha_get_html($publickey);
echo recaptcha_get_html($publickey, FALSE, TRUE);
echo '<span class="icons">';
echo '<a href="javascript:Recaptcha.reload()">';
echo '<img src="/graphics/recaptcha-refresh.png" alt="Refresh CAPTCHA" title="Refresh CAPTCHA" /></a>';