# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1382444289 -10800
# Node ID 5837b9333964a321b78a7cc86a3a07675c913589
# Parent  7d9e8c82e744bef971d4c7ea9376cd204df2666f
Add new "about" page, and setting for default page.

diff -r 7d9e8c82e744 -r 5837b9333964 about.inc.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/about.inc.php	Tue Oct 22 15:18:09 2013 +0300
@@ -0,0 +1,12 @@
+<?
+echo stGetSetting("aboutDescription");
+
+if (stGetSetting("showNewsOnAbout") &&
+  ($res = stExecSQL("SELECT * FROM news ORDER BY utime DESC LIMIT 1")) !== FALSE)
+{
+  foreach ($res as $item)
+    stPrintNewsItem($item);
+
+  echo "<a class=\"moreNews\" href=\"news\">More news ...</a>\n";
+}
+?>
diff -r 7d9e8c82e744 -r 5837b9333964 admajax.php
--- a/admajax.php	Tue Oct 22 14:40:42 2013 +0300
+++ b/admajax.php	Tue Oct 22 15:18:09 2013 +0300
@@ -14,7 +14,7 @@
 
   stSessionEnd(SESS_ADMIN);
 
-  header("Location: news");
+  header("Location: ".stGetSetting("defaultPage"));
   exit;
 }
 
diff -r 7d9e8c82e744 -r 5837b9333964 createdb.php
--- a/createdb.php	Tue Oct 22 14:40:42 2013 +0300
+++ b/createdb.php	Tue Oct 22 15:18:09 2013 +0300
@@ -30,6 +30,9 @@
 
   "requireEMail"     => array(VT_BOOL, false, "Require e-mail address in registrations"),
 
+  "showNews"         => array(VT_BOOL, true, "Enable News link on main menu"),
+  "showNewsOnAbout"  => array(VT_BOOL, true, "Show latest news item on About page"),
+
   "registerInfoText" => array(VT_TEXT, "<p>
 Only your <b>handle</b> and the answer to the botcheck are strictly required.
 If you plan on joining the IRC channel
@@ -108,7 +111,10 @@
 </div>", "Site header text"),
 
 
-  "newsDescription"  => array(VT_TEXT, "
+  "newsHeader"  => array(VT_TEXT, "", "News page header text"),
+
+
+  "aboutDescription"  => array(VT_TEXT, "
 <div style=\"text-align: center;\">
 <img src=\"img/fap.png\" alt=\"FAP\" />
 <p>
@@ -119,7 +125,7 @@
 </span>
 </p>
 </div>",
-  "News page header text"),
+  "About page text"),
 
 
   "entrySubmitInfo" => array(VT_TEXT, "Rules for entry submission ... ", "Entry submission information blurb"),
diff -r 7d9e8c82e744 -r 5837b9333964 index.php
--- a/index.php	Tue Oct 22 14:40:42 2013 +0300
+++ b/index.php	Tue Oct 22 15:18:09 2013 +0300
@@ -42,7 +42,11 @@
 <div id="menu">
   <? echo stGetSetting("siteMenuHeader") ?>
 
-  <a href="news">News</a>
+  <a href="about">About</a>
+<?
+if (stGetSetting("showNews"))
+  echo "<a href=\"news\">News</a>\n";
+?>
   <a href="compos">Compos</a>
   <a href="event">Event</a>
 <?
diff -r 7d9e8c82e744 -r 5837b9333964 mconfig.inc.php.example
--- a/mconfig.inc.php.example	Tue Oct 22 14:40:42 2013 +0300
+++ b/mconfig.inc.php.example	Tue Oct 22 15:18:09 2013 +0300
@@ -8,6 +8,8 @@
 
   "debug"           => false,
 
+  "defaultPage"     => "about", // Default page
+
   "userKeyLength"   => 8,
   "voteMin"         => -1,
   "voteMax"         => 2,
diff -r 7d9e8c82e744 -r 5837b9333964 news.inc.php
--- a/news.inc.php	Tue Oct 22 14:40:42 2013 +0300
+++ b/news.inc.php	Tue Oct 22 15:18:09 2013 +0300
@@ -1,5 +1,5 @@
 <?
-echo stGetSetting("newsDescription");
+echo stGetSetting("newsHeader");
 
 if (($res = stExecSQL("SELECT * FROM news ORDER BY utime DESC")) !== FALSE)
 {
diff -r 7d9e8c82e744 -r 5837b9333964 usrajax.php
--- a/usrajax.php	Tue Oct 22 14:40:42 2013 +0300
+++ b/usrajax.php	Tue Oct 22 15:18:09 2013 +0300
@@ -44,7 +44,7 @@
 
   stSessionEnd(SESS_USER);
 
-  header("Location: news");
+  header("Location: ".stGetSetting("defaultPage"));
   exit;
 }
 
diff -r 7d9e8c82e744 -r 5837b9333964 usrlogin.php
--- a/usrlogin.php	Tue Oct 22 14:40:42 2013 +0300
+++ b/usrlogin.php	Tue Oct 22 15:18:09 2013 +0300
@@ -34,5 +34,5 @@
   $gotoPage = "loginerror";
 }
 
-header("Location: ".($gotoPage !== FALSE ? $gotoPage : "news"));
+header("Location: ".($gotoPage !== FALSE ? $gotoPage : stGetSetting("defaultPage")));
 ?>
\ No newline at end of file