changeset 47:73123e322133

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 05 Oct 2013 00:49:28 +0300
parents 86582e43a4c8
children 1fccb8f031ed
files createdb.php index.php
diffstat 2 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/createdb.php	Sat Oct 05 00:18:43 2013 +0300
+++ b/createdb.php	Sat Oct 05 00:49:28 2013 +0300
@@ -17,7 +17,6 @@
   "showAdmin"        => array(VT_BOOL, false, "Show administration interface link on the menu"),
   "showAttendees"    => array(VT_BOOL, false, "Show attendees list"),
   "allowRegister"    => array(VT_BOOL, false, "Enable event registration"),
-  "allowSubmit"      => array(VT_BOOL, false, "Enable compo entry submission"),
   "allowVoting"      => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"),
 
   "showResults"      => array(VT_BOOL, false, "Enable results page"),
@@ -95,12 +94,12 @@
 
   "siteInfoText"     => array(VT_TEXT, "
 <a href=\"news\">
-<img src=\"img/fapsm.png\" alt=\"Finnish Amiga Party 2012\" class=\"logo\" /></a>
+<img src=\"img/fapsm.png\" alt=\"Finnish Amiga Party 2013\" class=\"logo\" /></a>
 <div id=\"date\">
-30.11. - 2.12.2012<br />
+5.-8.12.2013<br />
 Helsinki, Finland<br />
 @ old location<br />
-Entry 15 EUR + prod
+<span class=\"notice\">Entry 15 EUR + prod</span>
 </div>", "Site header text"),
 
 
@@ -120,15 +119,15 @@
 
   "entrySubmitInfo" => array(VT_TEXT, "Rules for entry submission ... ", "Entry submission information blurb"),
 
-  "siteMenuHeader" => array(VT_TEXT, "<div>- FAP 2013 -</div>", "Site menu header text"),
+  "siteMenuHeader" => array(VT_TEXT, "<div>13.FAP:> <span class=\"mblink\">&#9632;</span></div>", "Site menu header text"),
+  "siteMenuFooter" => array(VT_TEXT, "", "Site menu footer text"),
 );
 
 $sqlTables = array(
   "news" => "id INTEGER PRIMARY KEY AUTOINCREMENT, utime INT, title VARCHAR(128), text VARCHAR(4096), author VARCHAR(64), persist INT DEFAULT 0",
-  "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(64), groups VARCHAR(64), oneliner VARCHAR(64), email VARCHAR(80)",
+  "attendees" => "id INTEGER PRIMARY KEY AUTOINCREMENT, regtime INT, name VARCHAR(64), groups VARCHAR(64), oneliner VARCHAR(64), email VARCHAR(80), key VARCHAR(64), active INT DEFAULT 0",
   "compos" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(128), description VARCHAR(4096), visible INT DEFAULT 0, voting INT DEFAULT 0",
   "entries" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(64), author VARCHAR(64), uploader_id INT DEFAULT NULL, compo_id INT DEFAULT NULL, filename VARCHAR(128) DEFAULT NULL, screenshot VARCHAR(128) DEFAULT NULL",
-  "users" => "id INTEGER PRIMARY KEY AUTOINCREMENT, key VARCHAR(64), name VARCHAR(64), email VARCHAR(64), active INT DEFAULT 0",
   "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, voter_id INT DEFAULT NULL, value INT DEFAULT 0",
   "settings" => "key VARCHAR(32) PRIMARY KEY, vtype INT, vstr VARCHAR(128), vtext TEXT, vint INT, desc VARCHAR(128)",
 );
--- a/index.php	Sat Oct 05 00:18:43 2013 +0300
+++ b/index.php	Sat Oct 05 00:49:28 2013 +0300
@@ -48,9 +48,6 @@
 if (stGetSetting("showAttendees"))
 echo "  <a href=\"attendees\">Attendees</a>\n";
 
-if (stGetSetting("allowSubmit"))
-echo "  <a href=\"entry\">Submit</a>\n";
-
 if (stGetSetting("allowVoting"))
 echo "  <a href=\"vote\">Vote</a>\n";
 
@@ -60,6 +57,7 @@
 if (stGetSetting("showAdmin"))
 echo "  <a href=\"admin\">Admin</a>\n";
 ?>
+  <? echo stGetSetting("siteMenuFooter") ?>
 </div>
 
 <?