diff --git a/skins-xxx.tar.gz b/20100727-skins-xxx-3.3.8.tar.gz similarity index 100% rename from skins-xxx.tar.gz rename to 20100727-skins-xxx-3.3.8.tar.gz diff --git a/20151121-tinymce-xxx-skin.zip b/20151121-tinymce-xxx-skin.zip new file mode 100644 index 0000000..c56391b Binary files /dev/null and b/20151121-tinymce-xxx-skin.zip differ diff --git a/about.php b/about.php index 70a5ba2..6d6571f 100644 --- a/about.php +++ b/about.php @@ -1,23 +1,19 @@ - + - + x.x.x [about] +
- - - - -
@@ -99,14 +95,13 @@ Kawabata has an excellent book of short stories, entitled stories "drabblets".

-
-
-
+ + + + + - - - diff --git a/article.php b/article.php index 9c7729e..67115bc 100644 --- a/article.php +++ b/article.php @@ -1,13 +1,14 @@ - + - + x.x.x [view] +
- - -
@@ -36,9 +34,10 @@ echo display_stories();
+ +
- diff --git a/bottombar.inc.php b/bottombar.inc.php index 32da418..8c20a1d 100644 --- a/bottombar.inc.php +++ b/bottombar.inc.php @@ -1,5 +1,5 @@ -

+

+

diff --git a/get_data.lib.php b/get_data.lib.php index d313588..befec6b 100644 --- a/get_data.lib.php +++ b/get_data.lib.php @@ -50,28 +50,31 @@ searches the title, author, date, and the text of each article.

'."\n"; $entry['id'] = $_SESSION['allow_queue_image']; } if ($entry['date']) - $date = 'Posted ' . $entry['date']; + $date = ''; $page .= '
'; - $page .= '

'; + $page .= '

'; if ($is_admin && !$editable) { $page .= '[edit]'; } + $page .= '

'; if ($nolink) { - $page .= ''.$entry['title'].''; + $page .= $entry['title']; } else if ($is_admin && $editable) { $page .= ''; - $page .= ''.$entry['title'].''; + $page .= $entry['title']; $page .= ''; } else { $page .= ''; - $page .= ''.$entry['title'].''; + $page .= $entry['title']; $page .= ''; } - $page .= '
'; + $page .= '

'; + $page .= '
'; if ($entry['hidden']) $page .= '[hidden]'; - $page .= ''.$entry['author'].'
'; - $page .= ''.$date.'

'; + $page .= '
By
' . $entry['author'] . '
'; + $page .= '
Posted
' . $date . '
'; + $page .= '
'; if (isset($file_src)) { $page .= ''.$entry['title'].''; } else if (!empty($entry['img']) || !empty($entry['uploaded'])) { @@ -83,7 +86,7 @@ searches the title, author, date, and the text of each article.

'."\n"; } else { $page .= $entry['story']."\n"; } - $page .= "
\n"; + $page .= "\n\n"; } $page .= '
'."\n"; @@ -137,13 +140,14 @@ function get_count() { */ function get_query($id = NULL) { global $db, $is_admin; - $search = get_search_args(); - $sort = get_sort_arg(); - $order = get_order(); - $start = get_start_num(); - $show = get_show_num(); - $queue = get_queue(); - $table = which_table(); + $search = get_search_args(); + $sort = get_sort_arg(); + $order = get_order(); + $start = get_start_num(); + $show = get_show_num(); + $queue = get_queue(); + $table = which_table(); + $results = array(); // If id= is defined, show the corresponding application only if (is_numeric($id)) { diff --git a/google.inc.php b/google.inc.php index 1e7e548..62af3f4 100644 --- a/google.inc.php +++ b/google.inc.php @@ -1,17 +1,13 @@ - - diff --git a/index.php b/index.php index bb80520..ae5bf6d 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,14 @@ - + - + x.x.x +
- - -
- +

Welcome to x.x.x. No, not hardcore pornography. Nor is it @@ -44,9 +42,10 @@ echo display_stories(); ?>

+ +
- diff --git a/navigation.lib.php b/navigation.lib.php index e1d919b..907e142 100644 --- a/navigation.lib.php +++ b/navigation.lib.php @@ -64,6 +64,7 @@ function get_pager() { $queue_url = $queue ? 1 : 0; $string = '
'; + $nw = new Numbers_Words(); // Are there later stories? if ($start > 0) { $string .= "\n".'toWords($show)." articles"; $string .= '">« Next '.$articles.''; } // Are there earlier stories? @@ -83,7 +84,7 @@ function get_pager() { if (isset($_GET['show'])) $string .= '&show='.$show; if (isset($_GET['sort'])) $string .= '&sort='.$sort; if (isset($_GET['order'])) $string .= '&order='.$order; - $articles = ($show == 1) ? "article" : Numbers_Words::toWords($show)." articles"; + $articles = ($show == 1) ? "article" : $nw->toWords($show)." articles"; $string .= '">Previous '.$articles.' »'; } $string .= "
\n"; diff --git a/publish/addeditor.php b/publish/addeditor.php index 5acc5b2..6bbbb8f 100644 --- a/publish/addeditor.php +++ b/publish/addeditor.php @@ -26,26 +26,22 @@ if (!isset($_SESSION['editor'])) { open_db('close'); } ?> - + - - x.x.x: add editor - - - - + + x.x.x [add editor] + + + + +
- - - - -
@@ -73,11 +69,11 @@ if (!isset($_SESSION['editor'])) {
+ +
- - diff --git a/publish/choose.inc.php b/publish/choose.inc.php index a25421a..bb692c0 100644 --- a/publish/choose.inc.php +++ b/publish/choose.inc.php @@ -24,12 +24,3 @@ if ($queue) { ?> - - - - - - - - - diff --git a/publish/edit.php b/publish/edit.php index a983728..54d2521 100644 --- a/publish/edit.php +++ b/publish/edit.php @@ -10,18 +10,18 @@ if (!isset($_SESSION['editor'])) { return; } ?> - + - + x.x.x [edit] - - - - + + + + + -
- - - - - -
@@ -118,12 +112,12 @@ switch ($action) { ?> -
-
-
+ + + + + - - diff --git a/publish/index.php b/publish/index.php index d5e8609..a5a7761 100644 --- a/publish/index.php +++ b/publish/index.php @@ -1,14 +1,15 @@ - + - + x.x.x [add] - - - - + + + + +
- - - - - -
@@ -82,14 +77,13 @@ switch ($action) { ?> -
-
-
+ + + + + - - - diff --git a/publish/login.php b/publish/login.php index 8e44cc1..81cb756 100644 --- a/publish/login.php +++ b/publish/login.php @@ -52,26 +52,22 @@ if (isset($_SESSION['editor'])) { } ?> - + - - x.x.x: login - - - - + + x.x.x [login] + + + + +
- - - - -
@@ -99,13 +95,10 @@ if ($denied)
+ +
- - - - - diff --git a/publish/style.css b/publish/style.css index 43bb79c..e31c64b 100644 --- a/publish/style.css +++ b/publish/style.css @@ -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 */ diff --git a/publish/tinymce_init.inc.php b/publish/tinymce_init.inc.php index d2c9902..e0f964a 100644 --- a/publish/tinymce_init.inc.php +++ b/publish/tinymce_init.inc.php @@ -1,22 +1,38 @@ - - + + diff --git a/publish/write.inc.php b/publish/write.inc.php index 2bbc2a1..ec4d989 100644 --- a/publish/write.inc.php +++ b/publish/write.inc.php @@ -58,7 +58,7 @@ echo (isset($story) ? $story : '')
(To get line-breaks—as in poetry—instead of paragraph breaks, hit shift-enter instead of enter.)
-
@@ -119,7 +119,7 @@ if (isset($file_src) || isset($img)) { echo ''; echo ' *'; $publickey = config('RECAPTCHA_SITE_KEY'); - echo recaptcha_get_html($publickey); + echo recaptcha_get_html($publickey, FALSE, TRUE); echo ''; echo ''; echo 'Refresh CAPTCHA'; diff --git a/sidebar.inc.php b/sidebar.inc.php index 6a86ad8..61a4219 100644 --- a/sidebar.inc.php +++ b/sidebar.inc.php @@ -1,6 +1,10 @@ -