From: rich Date: Wed, 3 Nov 2004 13:36:44 +0000 (+0000) Subject: Added optional branding
to sites. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=4d8697e40678bfe5a7df72c32adf2470506ef516;p=cocanwiki.git Added optional branding
to sites. --- diff --git a/cocanwiki.sql b/cocanwiki.sql index 82585c9..ae9d826 100644 --- a/cocanwiki.sql +++ b/cocanwiki.sql @@ -18,7 +18,7 @@ GRANT ALL ON SCHEMA public TO PUBLIC; SET search_path = public, pg_catalog; -- --- TOC entry 12 (OID 26046) +-- TOC entry 12 (OID 536004) -- Name: pages; Type: TABLE; Schema: public; Owner: rich -- @@ -40,7 +40,7 @@ CREATE TABLE pages ( -- --- TOC entry 13 (OID 26046) +-- TOC entry 13 (OID 536004) -- Name: pages; Type: ACL; Schema: public; Owner: rich -- @@ -49,7 +49,7 @@ GRANT ALL ON TABLE pages TO "www-data"; -- --- TOC entry 65 (OID 26046) +-- TOC entry 65 (OID 536004) -- Name: pages_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -58,7 +58,7 @@ GRANT ALL ON TABLE pages_id_seq TO "www-data"; -- --- TOC entry 14 (OID 26056) +-- TOC entry 14 (OID 536021) -- Name: contents; Type: TABLE; Schema: public; Owner: rich -- @@ -74,7 +74,7 @@ CREATE TABLE contents ( -- --- TOC entry 15 (OID 26056) +-- TOC entry 15 (OID 536021) -- Name: contents; Type: ACL; Schema: public; Owner: rich -- @@ -83,7 +83,7 @@ GRANT ALL ON TABLE contents TO "www-data"; -- --- TOC entry 66 (OID 26056) +-- TOC entry 66 (OID 536021) -- Name: contents_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -92,7 +92,7 @@ GRANT ALL ON TABLE contents_id_seq TO "www-data"; -- --- TOC entry 16 (OID 26064) +-- TOC entry 16 (OID 536371) -- Name: hosts; Type: TABLE; Schema: public; Owner: rich -- @@ -109,12 +109,15 @@ CREATE TABLE hosts ( search_box boolean DEFAULT true NOT NULL, view_anon boolean DEFAULT true NOT NULL, navigation boolean DEFAULT false NOT NULL, - powered_by integer + powered_by integer, + brand text, + brand_tagline text, + brand_description text ); -- --- TOC entry 17 (OID 26064) +-- TOC entry 17 (OID 536371) -- Name: hosts; Type: ACL; Schema: public; Owner: rich -- @@ -123,7 +126,7 @@ GRANT ALL ON TABLE hosts TO "www-data"; -- --- TOC entry 67 (OID 26064) +-- TOC entry 67 (OID 536371) -- Name: hosts_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -132,7 +135,7 @@ GRANT ALL ON TABLE hosts_id_seq TO "www-data"; -- --- TOC entry 18 (OID 26077) +-- TOC entry 18 (OID 536379) -- Name: hostnames; Type: TABLE; Schema: public; Owner: rich -- @@ -143,7 +146,7 @@ CREATE TABLE hostnames ( -- --- TOC entry 19 (OID 26077) +-- TOC entry 19 (OID 536379) -- Name: hostnames; Type: ACL; Schema: public; Owner: rich -- @@ -152,7 +155,7 @@ GRANT ALL ON TABLE hostnames TO "www-data"; -- --- TOC entry 20 (OID 26084) +-- TOC entry 20 (OID 537151) -- Name: images; Type: TABLE; Schema: public; Owner: rich -- @@ -178,7 +181,7 @@ CREATE TABLE images ( -- --- TOC entry 21 (OID 26084) +-- TOC entry 21 (OID 537151) -- Name: images; Type: ACL; Schema: public; Owner: rich -- @@ -187,7 +190,7 @@ GRANT ALL ON TABLE images TO "www-data"; -- --- TOC entry 68 (OID 26084) +-- TOC entry 68 (OID 537151) -- Name: images_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -196,7 +199,7 @@ GRANT ALL ON TABLE images_id_seq TO "www-data"; -- --- TOC entry 22 (OID 26093) +-- TOC entry 22 (OID 537166) -- Name: files; Type: TABLE; Schema: public; Owner: rich -- @@ -213,7 +216,7 @@ CREATE TABLE files ( -- --- TOC entry 23 (OID 26093) +-- TOC entry 23 (OID 537166) -- Name: files; Type: ACL; Schema: public; Owner: rich -- @@ -222,7 +225,7 @@ GRANT ALL ON TABLE files TO "www-data"; -- --- TOC entry 69 (OID 26093) +-- TOC entry 69 (OID 537166) -- Name: files_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -231,7 +234,7 @@ GRANT ALL ON TABLE files_id_seq TO "www-data"; -- --- TOC entry 24 (OID 26102) +-- TOC entry 24 (OID 540816) -- Name: users; Type: TABLE; Schema: public; Owner: rich -- @@ -255,7 +258,7 @@ CREATE TABLE users ( -- --- TOC entry 25 (OID 26102) +-- TOC entry 25 (OID 540816) -- Name: users; Type: ACL; Schema: public; Owner: rich -- @@ -264,7 +267,7 @@ GRANT ALL ON TABLE users TO "www-data"; -- --- TOC entry 70 (OID 26102) +-- TOC entry 70 (OID 540816) -- Name: users_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -273,7 +276,7 @@ GRANT ALL ON TABLE users_id_seq TO "www-data"; -- --- TOC entry 26 (OID 26117) +-- TOC entry 26 (OID 540832) -- Name: usercookies; Type: TABLE; Schema: public; Owner: rich -- @@ -284,7 +287,7 @@ CREATE TABLE usercookies ( -- --- TOC entry 27 (OID 26117) +-- TOC entry 27 (OID 540832) -- Name: usercookies; Type: ACL; Schema: public; Owner: rich -- @@ -293,7 +296,7 @@ GRANT ALL ON TABLE usercookies TO "www-data"; -- --- TOC entry 28 (OID 26122) +-- TOC entry 28 (OID 540961) -- Name: sitemenu; Type: TABLE; Schema: public; Owner: rich -- @@ -306,7 +309,7 @@ CREATE TABLE sitemenu ( -- --- TOC entry 29 (OID 26122) +-- TOC entry 29 (OID 540961) -- Name: sitemenu; Type: ACL; Schema: public; Owner: rich -- @@ -315,7 +318,7 @@ GRANT ALL ON TABLE sitemenu TO "www-data"; -- --- TOC entry 30 (OID 26129) +-- TOC entry 30 (OID 542605) -- Name: contacts; Type: TABLE; Schema: public; Owner: rich -- @@ -328,7 +331,7 @@ CREATE TABLE contacts ( -- --- TOC entry 31 (OID 26129) +-- TOC entry 31 (OID 542605) -- Name: contacts; Type: ACL; Schema: public; Owner: rich -- @@ -337,7 +340,7 @@ GRANT ALL ON TABLE contacts TO "www-data"; -- --- TOC entry 71 (OID 26129) +-- TOC entry 71 (OID 542605) -- Name: contacts_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -346,7 +349,7 @@ GRANT ALL ON TABLE contacts_id_seq TO "www-data"; -- --- TOC entry 32 (OID 26135) +-- TOC entry 32 (OID 542617) -- Name: contact_emails; Type: TABLE; Schema: public; Owner: rich -- @@ -357,7 +360,7 @@ CREATE TABLE contact_emails ( -- --- TOC entry 33 (OID 26135) +-- TOC entry 33 (OID 542617) -- Name: contact_emails; Type: ACL; Schema: public; Owner: rich -- @@ -366,7 +369,7 @@ GRANT ALL ON TABLE contact_emails TO "www-data"; -- --- TOC entry 34 (OID 26140) +-- TOC entry 34 (OID 543499) -- Name: themes; Type: TABLE; Schema: public; Owner: rich -- @@ -378,7 +381,7 @@ CREATE TABLE themes ( -- --- TOC entry 35 (OID 26140) +-- TOC entry 35 (OID 543499) -- Name: themes; Type: ACL; Schema: public; Owner: rich -- @@ -387,7 +390,7 @@ GRANT SELECT ON TABLE themes TO "www-data"; -- --- TOC entry 36 (OID 26145) +-- TOC entry 36 (OID 543592) -- Name: server_settings; Type: TABLE; Schema: public; Owner: rich -- @@ -399,7 +402,7 @@ CREATE TABLE server_settings ( -- --- TOC entry 38 (OID 26145) +-- TOC entry 38 (OID 543592) -- Name: server_settings; Type: ACL; Schema: public; Owner: rich -- @@ -408,7 +411,7 @@ GRANT SELECT ON TABLE server_settings TO "www-data"; -- --- TOC entry 39 (OID 26150) +-- TOC entry 39 (OID 543754) -- Name: page_emails; Type: TABLE; Schema: public; Owner: rich -- @@ -424,7 +427,7 @@ CREATE TABLE page_emails ( -- --- TOC entry 40 (OID 26150) +-- TOC entry 40 (OID 543754) -- Name: page_emails; Type: ACL; Schema: public; Owner: rich -- @@ -433,7 +436,7 @@ GRANT ALL ON TABLE page_emails TO "www-data"; -- --- TOC entry 41 (OID 26157) +-- TOC entry 41 (OID 543785) -- Name: mailing_lists; Type: TABLE; Schema: public; Owner: rich -- @@ -448,7 +451,7 @@ CREATE TABLE mailing_lists ( -- --- TOC entry 42 (OID 26157) +-- TOC entry 42 (OID 543785) -- Name: mailing_lists; Type: ACL; Schema: public; Owner: rich -- @@ -457,7 +460,7 @@ GRANT ALL ON TABLE mailing_lists TO "www-data"; -- --- TOC entry 43 (OID 26163) +-- TOC entry 43 (OID 544445) -- Name: links; Type: TABLE; Schema: public; Owner: rich -- @@ -470,7 +473,7 @@ CREATE TABLE links ( -- --- TOC entry 44 (OID 26163) +-- TOC entry 44 (OID 544445) -- Name: links; Type: ACL; Schema: public; Owner: rich -- @@ -479,7 +482,7 @@ GRANT ALL ON TABLE links TO "www-data"; -- --- TOC entry 45 (OID 26171) +-- TOC entry 45 (OID 547939) -- Name: templates; Type: TABLE; Schema: public; Owner: rich -- @@ -493,7 +496,7 @@ CREATE TABLE templates ( -- --- TOC entry 46 (OID 26171) +-- TOC entry 46 (OID 547939) -- Name: templates; Type: ACL; Schema: public; Owner: rich -- @@ -502,7 +505,7 @@ GRANT SELECT ON TABLE templates TO "www-data"; -- --- TOC entry 72 (OID 26171) +-- TOC entry 72 (OID 547939) -- Name: templates_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -510,7 +513,7 @@ REVOKE ALL ON TABLE templates_id_seq FROM PUBLIC; -- --- TOC entry 47 (OID 26177) +-- TOC entry 47 (OID 551123) -- Name: recently_visited; Type: TABLE; Schema: public; Owner: rich -- @@ -523,7 +526,7 @@ CREATE TABLE recently_visited ( -- --- TOC entry 48 (OID 26177) +-- TOC entry 48 (OID 551123) -- Name: recently_visited; Type: ACL; Schema: public; Owner: rich -- @@ -532,7 +535,7 @@ GRANT ALL ON TABLE recently_visited TO "www-data"; -- --- TOC entry 49 (OID 26185) +-- TOC entry 49 (OID 551675) -- Name: messages; Type: TABLE; Schema: public; Owner: rich -- @@ -546,7 +549,7 @@ CREATE TABLE messages ( -- --- TOC entry 50 (OID 26185) +-- TOC entry 50 (OID 551675) -- Name: messages; Type: ACL; Schema: public; Owner: rich -- @@ -555,7 +558,7 @@ GRANT ALL ON TABLE messages TO "www-data"; -- --- TOC entry 73 (OID 26185) +-- TOC entry 73 (OID 551675) -- Name: messages_id_seq; Type: ACL; Schema: public; Owner: rich -- @@ -564,7 +567,7 @@ GRANT ALL ON TABLE messages_id_seq TO "www-data"; -- --- TOC entry 51 (OID 26191) +-- TOC entry 51 (OID 551685) -- Name: msg_references; Type: TABLE; Schema: public; Owner: rich -- @@ -576,7 +579,7 @@ CREATE TABLE msg_references ( -- --- TOC entry 52 (OID 26191) +-- TOC entry 52 (OID 551685) -- Name: msg_references; Type: ACL; Schema: public; Owner: rich -- @@ -585,7 +588,7 @@ GRANT ALL ON TABLE msg_references TO "www-data"; -- --- TOC entry 53 (OID 26198) +-- TOC entry 53 (OID 607075) -- Name: powered_by; Type: TABLE; Schema: public; Owner: rich -- @@ -597,7 +600,7 @@ CREATE TABLE powered_by ( -- --- TOC entry 54 (OID 26198) +-- TOC entry 54 (OID 607075) -- Name: powered_by; Type: ACL; Schema: public; Owner: rich -- @@ -606,7 +609,7 @@ GRANT SELECT ON TABLE powered_by TO "www-data"; -- --- TOC entry 55 (OID 26204) +-- TOC entry 55 (OID 607136) -- Name: pending_email_changes; Type: TABLE; Schema: public; Owner: rich -- @@ -619,7 +622,7 @@ CREATE TABLE pending_email_changes ( -- --- TOC entry 56 (OID 26204) +-- TOC entry 56 (OID 607136) -- Name: pending_email_changes; Type: ACL; Schema: public; Owner: rich -- @@ -628,7 +631,7 @@ GRANT ALL ON TABLE pending_email_changes TO "www-data"; -- --- TOC entry 57 (OID 50792) +-- TOC entry 57 (OID 618606) -- Name: pg_ts_dict; Type: TABLE; Schema: public; Owner: postgres -- @@ -642,7 +645,7 @@ CREATE TABLE pg_ts_dict ( -- --- TOC entry 58 (OID 50792) +-- TOC entry 58 (OID 618606) -- Name: pg_ts_dict; Type: ACL; Schema: public; Owner: postgres -- @@ -652,7 +655,7 @@ GRANT SELECT ON TABLE pg_ts_dict TO "www-data"; -- --- TOC entry 113 (OID 50799) +-- TOC entry 113 (OID 618613) -- Name: lexize(oid, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -662,7 +665,7 @@ CREATE FUNCTION lexize(oid, text) RETURNS text[] -- --- TOC entry 114 (OID 50800) +-- TOC entry 114 (OID 618614) -- Name: lexize(text, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -672,7 +675,7 @@ CREATE FUNCTION lexize(text, text) RETURNS text[] -- --- TOC entry 115 (OID 50801) +-- TOC entry 115 (OID 618615) -- Name: lexize(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -682,7 +685,7 @@ CREATE FUNCTION lexize(text) RETURNS text[] -- --- TOC entry 116 (OID 50802) +-- TOC entry 116 (OID 618616) -- Name: set_curdict(integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -692,7 +695,7 @@ CREATE FUNCTION set_curdict(integer) RETURNS void -- --- TOC entry 117 (OID 50803) +-- TOC entry 117 (OID 618617) -- Name: set_curdict(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -702,7 +705,7 @@ CREATE FUNCTION set_curdict(text) RETURNS void -- --- TOC entry 118 (OID 50804) +-- TOC entry 118 (OID 618618) -- Name: dex_init(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -712,7 +715,7 @@ CREATE FUNCTION dex_init(text) RETURNS internal -- --- TOC entry 119 (OID 50805) +-- TOC entry 119 (OID 618619) -- Name: dex_lexize(internal, internal, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -722,7 +725,7 @@ CREATE FUNCTION dex_lexize(internal, internal, integer) RETURNS internal -- --- TOC entry 120 (OID 50807) +-- TOC entry 120 (OID 618621) -- Name: snb_en_init(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -732,7 +735,7 @@ CREATE FUNCTION snb_en_init(text) RETURNS internal -- --- TOC entry 121 (OID 50808) +-- TOC entry 121 (OID 618622) -- Name: snb_lexize(internal, internal, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -742,7 +745,7 @@ CREATE FUNCTION snb_lexize(internal, internal, integer) RETURNS internal -- --- TOC entry 122 (OID 50810) +-- TOC entry 122 (OID 618624) -- Name: snb_ru_init(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -752,7 +755,7 @@ CREATE FUNCTION snb_ru_init(text) RETURNS internal -- --- TOC entry 123 (OID 50812) +-- TOC entry 123 (OID 618626) -- Name: spell_init(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -762,7 +765,7 @@ CREATE FUNCTION spell_init(text) RETURNS internal -- --- TOC entry 124 (OID 50813) +-- TOC entry 124 (OID 618627) -- Name: spell_lexize(internal, internal, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -772,7 +775,7 @@ CREATE FUNCTION spell_lexize(internal, internal, integer) RETURNS internal -- --- TOC entry 125 (OID 50815) +-- TOC entry 125 (OID 618629) -- Name: syn_init(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -782,7 +785,7 @@ CREATE FUNCTION syn_init(text) RETURNS internal -- --- TOC entry 126 (OID 50816) +-- TOC entry 126 (OID 618630) -- Name: syn_lexize(internal, internal, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -792,7 +795,7 @@ CREATE FUNCTION syn_lexize(internal, internal, integer) RETURNS internal -- --- TOC entry 59 (OID 50818) +-- TOC entry 59 (OID 618632) -- Name: pg_ts_parser; Type: TABLE; Schema: public; Owner: postgres -- @@ -808,7 +811,7 @@ CREATE TABLE pg_ts_parser ( -- --- TOC entry 60 (OID 50818) +-- TOC entry 60 (OID 618632) -- Name: pg_ts_parser; Type: ACL; Schema: public; Owner: postgres -- @@ -818,7 +821,7 @@ GRANT SELECT ON TABLE pg_ts_parser TO "www-data"; -- --- TOC entry 5 (OID 50826) +-- TOC entry 5 (OID 618640) -- Name: tokentype; Type: TYPE; Schema: public; Owner: postgres -- @@ -830,7 +833,7 @@ CREATE TYPE tokentype AS ( -- --- TOC entry 127 (OID 50827) +-- TOC entry 127 (OID 618641) -- Name: token_type(integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -840,7 +843,7 @@ CREATE FUNCTION token_type(integer) RETURNS SETOF tokentype -- --- TOC entry 128 (OID 50828) +-- TOC entry 128 (OID 618642) -- Name: token_type(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -850,7 +853,7 @@ CREATE FUNCTION token_type(text) RETURNS SETOF tokentype -- --- TOC entry 129 (OID 50829) +-- TOC entry 129 (OID 618643) -- Name: token_type(); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -860,7 +863,7 @@ CREATE FUNCTION token_type() RETURNS SETOF tokentype -- --- TOC entry 130 (OID 50830) +-- TOC entry 130 (OID 618644) -- Name: set_curprs(integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -870,7 +873,7 @@ CREATE FUNCTION set_curprs(integer) RETURNS void -- --- TOC entry 131 (OID 50831) +-- TOC entry 131 (OID 618645) -- Name: set_curprs(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -880,7 +883,7 @@ CREATE FUNCTION set_curprs(text) RETURNS void -- --- TOC entry 6 (OID 50833) +-- TOC entry 6 (OID 618647) -- Name: tokenout; Type: TYPE; Schema: public; Owner: postgres -- @@ -891,7 +894,7 @@ CREATE TYPE tokenout AS ( -- --- TOC entry 132 (OID 50834) +-- TOC entry 132 (OID 618648) -- Name: parse(oid, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -901,7 +904,7 @@ CREATE FUNCTION parse(oid, text) RETURNS SETOF tokenout -- --- TOC entry 133 (OID 50835) +-- TOC entry 133 (OID 618649) -- Name: parse(text, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -911,7 +914,7 @@ CREATE FUNCTION parse(text, text) RETURNS SETOF tokenout -- --- TOC entry 134 (OID 50836) +-- TOC entry 134 (OID 618650) -- Name: parse(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -921,7 +924,7 @@ CREATE FUNCTION parse(text) RETURNS SETOF tokenout -- --- TOC entry 135 (OID 50837) +-- TOC entry 135 (OID 618651) -- Name: prsd_start(internal, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -931,7 +934,7 @@ CREATE FUNCTION prsd_start(internal, integer) RETURNS internal -- --- TOC entry 136 (OID 50838) +-- TOC entry 136 (OID 618652) -- Name: prsd_getlexeme(internal, internal, internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -941,7 +944,7 @@ CREATE FUNCTION prsd_getlexeme(internal, internal, internal) RETURNS integer -- --- TOC entry 137 (OID 50839) +-- TOC entry 137 (OID 618653) -- Name: prsd_end(internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -951,7 +954,7 @@ CREATE FUNCTION prsd_end(internal) RETURNS void -- --- TOC entry 138 (OID 50840) +-- TOC entry 138 (OID 618654) -- Name: prsd_lextype(internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -961,7 +964,7 @@ CREATE FUNCTION prsd_lextype(internal) RETURNS internal -- --- TOC entry 139 (OID 50841) +-- TOC entry 139 (OID 618655) -- Name: prsd_headline(internal, internal, internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -971,7 +974,7 @@ CREATE FUNCTION prsd_headline(internal, internal, internal) RETURNS internal -- --- TOC entry 61 (OID 50843) +-- TOC entry 61 (OID 618657) -- Name: pg_ts_cfg; Type: TABLE; Schema: public; Owner: postgres -- @@ -983,7 +986,7 @@ CREATE TABLE pg_ts_cfg ( -- --- TOC entry 62 (OID 50843) +-- TOC entry 62 (OID 618657) -- Name: pg_ts_cfg; Type: ACL; Schema: public; Owner: postgres -- @@ -993,7 +996,7 @@ GRANT SELECT ON TABLE pg_ts_cfg TO "www-data"; -- --- TOC entry 63 (OID 50850) +-- TOC entry 63 (OID 618664) -- Name: pg_ts_cfgmap; Type: TABLE; Schema: public; Owner: postgres -- @@ -1005,7 +1008,7 @@ CREATE TABLE pg_ts_cfgmap ( -- --- TOC entry 64 (OID 50850) +-- TOC entry 64 (OID 618664) -- Name: pg_ts_cfgmap; Type: ACL; Schema: public; Owner: postgres -- @@ -1015,7 +1018,7 @@ GRANT SELECT ON TABLE pg_ts_cfgmap TO "www-data"; -- --- TOC entry 140 (OID 50857) +-- TOC entry 140 (OID 618671) -- Name: set_curcfg(integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1025,7 +1028,7 @@ CREATE FUNCTION set_curcfg(integer) RETURNS void -- --- TOC entry 141 (OID 50858) +-- TOC entry 141 (OID 618672) -- Name: set_curcfg(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1035,7 +1038,7 @@ CREATE FUNCTION set_curcfg(text) RETURNS void -- --- TOC entry 142 (OID 50859) +-- TOC entry 142 (OID 618673) -- Name: show_curcfg(); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1045,7 +1048,7 @@ CREATE FUNCTION show_curcfg() RETURNS oid -- --- TOC entry 143 (OID 50921) +-- TOC entry 143 (OID 618735) -- Name: tsvector_in(cstring); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1055,7 +1058,7 @@ CREATE FUNCTION tsvector_in(cstring) RETURNS tsvector -- --- TOC entry 144 (OID 50922) +-- TOC entry 144 (OID 618736) -- Name: tsvector_out(tsvector); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1065,7 +1068,7 @@ CREATE FUNCTION tsvector_out(tsvector) RETURNS cstring -- --- TOC entry 7 (OID 50920) +-- TOC entry 7 (OID 618734) -- Name: tsvector; Type: TYPE; Schema: public; Owner: postgres -- @@ -1079,7 +1082,7 @@ CREATE TYPE tsvector ( -- --- TOC entry 145 (OID 50924) +-- TOC entry 145 (OID 618738) -- Name: length(tsvector); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1089,7 +1092,7 @@ CREATE FUNCTION length(tsvector) RETURNS integer -- --- TOC entry 146 (OID 50925) +-- TOC entry 146 (OID 618739) -- Name: to_tsvector(oid, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1099,7 +1102,7 @@ CREATE FUNCTION to_tsvector(oid, text) RETURNS tsvector -- --- TOC entry 147 (OID 50926) +-- TOC entry 147 (OID 618740) -- Name: to_tsvector(text, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1109,7 +1112,7 @@ CREATE FUNCTION to_tsvector(text, text) RETURNS tsvector -- --- TOC entry 148 (OID 50927) +-- TOC entry 148 (OID 618741) -- Name: to_tsvector(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1119,7 +1122,7 @@ CREATE FUNCTION to_tsvector(text) RETURNS tsvector -- --- TOC entry 149 (OID 50928) +-- TOC entry 149 (OID 618742) -- Name: strip(tsvector); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1129,7 +1132,7 @@ CREATE FUNCTION strip(tsvector) RETURNS tsvector -- --- TOC entry 150 (OID 50929) +-- TOC entry 150 (OID 618743) -- Name: setweight(tsvector, "char"); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1139,7 +1142,7 @@ CREATE FUNCTION setweight(tsvector, "char") RETURNS tsvector -- --- TOC entry 151 (OID 50930) +-- TOC entry 151 (OID 618744) -- Name: concat(tsvector, tsvector); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1149,7 +1152,7 @@ CREATE FUNCTION concat(tsvector, tsvector) RETURNS tsvector -- --- TOC entry 191 (OID 50931) +-- TOC entry 191 (OID 618745) -- Name: ||; Type: OPERATOR; Schema: public; Owner: postgres -- @@ -1161,7 +1164,7 @@ CREATE OPERATOR || ( -- --- TOC entry 152 (OID 50933) +-- TOC entry 152 (OID 618747) -- Name: tsquery_in(cstring); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1171,7 +1174,7 @@ CREATE FUNCTION tsquery_in(cstring) RETURNS tsquery -- --- TOC entry 153 (OID 50934) +-- TOC entry 153 (OID 618748) -- Name: tsquery_out(tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1181,7 +1184,7 @@ CREATE FUNCTION tsquery_out(tsquery) RETURNS cstring -- --- TOC entry 8 (OID 50932) +-- TOC entry 8 (OID 618746) -- Name: tsquery; Type: TYPE; Schema: public; Owner: postgres -- @@ -1195,7 +1198,7 @@ CREATE TYPE tsquery ( -- --- TOC entry 154 (OID 50936) +-- TOC entry 154 (OID 618750) -- Name: querytree(tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1205,7 +1208,7 @@ CREATE FUNCTION querytree(tsquery) RETURNS text -- --- TOC entry 155 (OID 50937) +-- TOC entry 155 (OID 618751) -- Name: to_tsquery(oid, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1215,7 +1218,7 @@ CREATE FUNCTION to_tsquery(oid, text) RETURNS tsquery -- --- TOC entry 156 (OID 50938) +-- TOC entry 156 (OID 618752) -- Name: to_tsquery(text, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1225,7 +1228,7 @@ CREATE FUNCTION to_tsquery(text, text) RETURNS tsquery -- --- TOC entry 157 (OID 50939) +-- TOC entry 157 (OID 618753) -- Name: to_tsquery(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1235,7 +1238,7 @@ CREATE FUNCTION to_tsquery(text) RETURNS tsquery -- --- TOC entry 158 (OID 50940) +-- TOC entry 158 (OID 618754) -- Name: exectsq(tsvector, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1245,7 +1248,7 @@ CREATE FUNCTION exectsq(tsvector, tsquery) RETURNS boolean -- --- TOC entry 160 (OID 50941) +-- TOC entry 160 (OID 618755) -- Name: rexectsq(tsquery, tsvector); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1255,7 +1258,7 @@ CREATE FUNCTION rexectsq(tsquery, tsvector) RETURNS boolean -- --- TOC entry 193 (OID 50942) +-- TOC entry 193 (OID 618756) -- Name: @@; Type: OPERATOR; Schema: public; Owner: postgres -- @@ -1270,7 +1273,7 @@ CREATE OPERATOR @@ ( -- --- TOC entry 192 (OID 50943) +-- TOC entry 192 (OID 618757) -- Name: @@; Type: OPERATOR; Schema: public; Owner: postgres -- @@ -1285,7 +1288,7 @@ CREATE OPERATOR @@ ( -- --- TOC entry 162 (OID 50944) +-- TOC entry 162 (OID 618758) -- Name: tsearch2(); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1295,7 +1298,7 @@ CREATE FUNCTION tsearch2() RETURNS "trigger" -- --- TOC entry 163 (OID 50945) +-- TOC entry 163 (OID 618759) -- Name: rank(real[], tsvector, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1305,7 +1308,7 @@ CREATE FUNCTION rank(real[], tsvector, tsquery) RETURNS real -- --- TOC entry 164 (OID 50946) +-- TOC entry 164 (OID 618760) -- Name: rank(real[], tsvector, tsquery, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1315,7 +1318,7 @@ CREATE FUNCTION rank(real[], tsvector, tsquery, integer) RETURNS real -- --- TOC entry 165 (OID 50947) +-- TOC entry 165 (OID 618761) -- Name: rank(tsvector, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1325,7 +1328,7 @@ CREATE FUNCTION rank(tsvector, tsquery) RETURNS real -- --- TOC entry 166 (OID 50948) +-- TOC entry 166 (OID 618762) -- Name: rank(tsvector, tsquery, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1335,7 +1338,7 @@ CREATE FUNCTION rank(tsvector, tsquery, integer) RETURNS real -- --- TOC entry 167 (OID 50949) +-- TOC entry 167 (OID 618763) -- Name: rank_cd(integer, tsvector, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1345,7 +1348,7 @@ CREATE FUNCTION rank_cd(integer, tsvector, tsquery) RETURNS real -- --- TOC entry 168 (OID 50950) +-- TOC entry 168 (OID 618764) -- Name: rank_cd(integer, tsvector, tsquery, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1355,7 +1358,7 @@ CREATE FUNCTION rank_cd(integer, tsvector, tsquery, integer) RETURNS real -- --- TOC entry 169 (OID 50951) +-- TOC entry 169 (OID 618765) -- Name: rank_cd(tsvector, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1365,7 +1368,7 @@ CREATE FUNCTION rank_cd(tsvector, tsquery) RETURNS real -- --- TOC entry 170 (OID 50952) +-- TOC entry 170 (OID 618766) -- Name: rank_cd(tsvector, tsquery, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1375,7 +1378,7 @@ CREATE FUNCTION rank_cd(tsvector, tsquery, integer) RETURNS real -- --- TOC entry 171 (OID 50953) +-- TOC entry 171 (OID 618767) -- Name: headline(oid, text, tsquery, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1385,7 +1388,7 @@ CREATE FUNCTION headline(oid, text, tsquery, text) RETURNS text -- --- TOC entry 172 (OID 50954) +-- TOC entry 172 (OID 618768) -- Name: headline(oid, text, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1395,7 +1398,7 @@ CREATE FUNCTION headline(oid, text, tsquery) RETURNS text -- --- TOC entry 173 (OID 50955) +-- TOC entry 173 (OID 618769) -- Name: headline(text, text, tsquery, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1405,7 +1408,7 @@ CREATE FUNCTION headline(text, text, tsquery, text) RETURNS text -- --- TOC entry 174 (OID 50956) +-- TOC entry 174 (OID 618770) -- Name: headline(text, text, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1415,7 +1418,7 @@ CREATE FUNCTION headline(text, text, tsquery) RETURNS text -- --- TOC entry 175 (OID 50957) +-- TOC entry 175 (OID 618771) -- Name: headline(text, tsquery, text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1425,7 +1428,7 @@ CREATE FUNCTION headline(text, tsquery, text) RETURNS text -- --- TOC entry 176 (OID 50958) +-- TOC entry 176 (OID 618772) -- Name: headline(text, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1435,7 +1438,7 @@ CREATE FUNCTION headline(text, tsquery) RETURNS text -- --- TOC entry 177 (OID 50960) +-- TOC entry 177 (OID 618774) -- Name: gtsvector_in(cstring); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1445,7 +1448,7 @@ CREATE FUNCTION gtsvector_in(cstring) RETURNS gtsvector -- --- TOC entry 178 (OID 50961) +-- TOC entry 178 (OID 618775) -- Name: gtsvector_out(gtsvector); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1455,7 +1458,7 @@ CREATE FUNCTION gtsvector_out(gtsvector) RETURNS cstring -- --- TOC entry 9 (OID 50959) +-- TOC entry 9 (OID 618773) -- Name: gtsvector; Type: TYPE; Schema: public; Owner: postgres -- @@ -1469,7 +1472,7 @@ CREATE TYPE gtsvector ( -- --- TOC entry 179 (OID 50963) +-- TOC entry 179 (OID 618777) -- Name: gtsvector_consistent(gtsvector, internal, integer); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1479,7 +1482,7 @@ CREATE FUNCTION gtsvector_consistent(gtsvector, internal, integer) RETURNS boole -- --- TOC entry 180 (OID 50964) +-- TOC entry 180 (OID 618778) -- Name: gtsvector_compress(internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1489,7 +1492,7 @@ CREATE FUNCTION gtsvector_compress(internal) RETURNS internal -- --- TOC entry 181 (OID 50965) +-- TOC entry 181 (OID 618779) -- Name: gtsvector_decompress(internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1499,7 +1502,7 @@ CREATE FUNCTION gtsvector_decompress(internal) RETURNS internal -- --- TOC entry 182 (OID 50966) +-- TOC entry 182 (OID 618780) -- Name: gtsvector_penalty(internal, internal, internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1509,7 +1512,7 @@ CREATE FUNCTION gtsvector_penalty(internal, internal, internal) RETURNS internal -- --- TOC entry 183 (OID 50967) +-- TOC entry 183 (OID 618781) -- Name: gtsvector_picksplit(internal, internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1519,7 +1522,7 @@ CREATE FUNCTION gtsvector_picksplit(internal, internal) RETURNS internal -- --- TOC entry 184 (OID 50968) +-- TOC entry 184 (OID 618782) -- Name: gtsvector_union(bytea, internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1529,7 +1532,7 @@ CREATE FUNCTION gtsvector_union(bytea, internal) RETURNS integer[] -- --- TOC entry 185 (OID 50969) +-- TOC entry 185 (OID 618783) -- Name: gtsvector_same(gtsvector, gtsvector, internal); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1539,7 +1542,7 @@ CREATE FUNCTION gtsvector_same(gtsvector, gtsvector, internal) RETURNS internal -- --- TOC entry 194 (OID 50970) +-- TOC entry 194 (OID 618784) -- Name: gist_tsvector_ops; Type: OPERATOR CLASS; Schema: public; Owner: postgres -- @@ -1557,7 +1560,7 @@ CREATE OPERATOR CLASS gist_tsvector_ops -- --- TOC entry 10 (OID 50972) +-- TOC entry 10 (OID 618786) -- Name: statinfo; Type: TYPE; Schema: public; Owner: postgres -- @@ -1569,7 +1572,7 @@ CREATE TYPE statinfo AS ( -- --- TOC entry 186 (OID 50973) +-- TOC entry 186 (OID 618787) -- Name: stat(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1579,7 +1582,7 @@ CREATE FUNCTION stat(text) RETURNS SETOF statinfo -- --- TOC entry 187 (OID 50974) +-- TOC entry 187 (OID 618788) -- Name: reset_tsearch(); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1589,7 +1592,7 @@ CREATE FUNCTION reset_tsearch() RETURNS void -- --- TOC entry 188 (OID 50975) +-- TOC entry 188 (OID 618789) -- Name: get_covers(tsvector, tsquery); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1599,7 +1602,7 @@ CREATE FUNCTION get_covers(tsvector, tsquery) RETURNS text -- --- TOC entry 11 (OID 50977) +-- TOC entry 11 (OID 618791) -- Name: tsdebug; Type: TYPE; Schema: public; Owner: postgres -- @@ -1614,7 +1617,7 @@ CREATE TYPE tsdebug AS ( -- --- TOC entry 189 (OID 50978) +-- TOC entry 189 (OID 618792) -- Name: _get_parser_from_curcfg(); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1624,7 +1627,7 @@ CREATE FUNCTION _get_parser_from_curcfg() RETURNS text -- --- TOC entry 190 (OID 50979) +-- TOC entry 190 (OID 618793) -- Name: ts_debug(text); Type: FUNCTION; Schema: public; Owner: postgres -- @@ -1652,7 +1655,7 @@ where -- --- TOC entry 82 (OID 50632) +-- TOC entry 82 (OID 536388) -- Name: hostnames_hostid_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1660,7 +1663,7 @@ CREATE UNIQUE INDEX hostnames_hostid_name_uq ON hostnames USING btree (hostid, n -- --- TOC entry 83 (OID 50633) +-- TOC entry 83 (OID 536389) -- Name: hostnams_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1668,7 +1671,7 @@ CREATE UNIQUE INDEX hostnams_name_uq ON hostnames USING btree (name); -- --- TOC entry 78 (OID 50634) +-- TOC entry 78 (OID 536419) -- Name: pages_url_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1676,7 +1679,7 @@ CREATE UNIQUE INDEX pages_url_uq ON pages USING btree (hostid, url); -- --- TOC entry 84 (OID 50635) +-- TOC entry 84 (OID 540251) -- Name: images_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1684,7 +1687,7 @@ CREATE UNIQUE INDEX images_name_uq ON images USING btree (hostid, name); -- --- TOC entry 86 (OID 50636) +-- TOC entry 86 (OID 540252) -- Name: files_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1692,7 +1695,7 @@ CREATE UNIQUE INDEX files_name_uq ON files USING btree (hostid, name); -- --- TOC entry 89 (OID 50637) +-- TOC entry 89 (OID 540831) -- Name: users_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1700,7 +1703,7 @@ CREATE UNIQUE INDEX users_name_uq ON users USING btree (hostid, name); -- --- TOC entry 88 (OID 50638) +-- TOC entry 88 (OID 540946) -- Name: users_id_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1708,7 +1711,7 @@ CREATE UNIQUE INDEX users_id_uq ON users USING btree (hostid, id); -- --- TOC entry 91 (OID 50639) +-- TOC entry 91 (OID 540970) -- Name: sitemenu_ordering_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1716,7 +1719,7 @@ CREATE UNIQUE INDEX sitemenu_ordering_uq ON sitemenu USING btree (hostid, orderi -- --- TOC entry 92 (OID 50640) +-- TOC entry 92 (OID 540971) -- Name: sitemenu_url_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1724,7 +1727,7 @@ CREATE UNIQUE INDEX sitemenu_url_uq ON sitemenu USING btree (hostid, url); -- --- TOC entry 95 (OID 50641) +-- TOC entry 95 (OID 542626) -- Name: contact_emails_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1732,7 +1735,7 @@ CREATE UNIQUE INDEX contact_emails_uq ON contact_emails USING btree (contactid, -- --- TOC entry 96 (OID 50642) +-- TOC entry 96 (OID 543505) -- Name: themes_theme_css_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1740,7 +1743,7 @@ CREATE UNIQUE INDEX themes_theme_css_uq ON themes USING btree (theme_css); -- --- TOC entry 97 (OID 50643) +-- TOC entry 97 (OID 543763) -- Name: page_emails_email_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1748,7 +1751,7 @@ CREATE UNIQUE INDEX page_emails_email_uq ON page_emails USING btree (hostid, url -- --- TOC entry 98 (OID 50644) +-- TOC entry 98 (OID 543795) -- Name: mailing_lists_email_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1756,7 +1759,7 @@ CREATE UNIQUE INDEX mailing_lists_email_uq ON mailing_lists USING btree (hostid, -- --- TOC entry 93 (OID 50645) +-- TOC entry 93 (OID 543880) -- Name: contacts_name_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1764,7 +1767,7 @@ CREATE UNIQUE INDEX contacts_name_uq ON contacts USING btree (hostid, name); -- --- TOC entry 99 (OID 50646) +-- TOC entry 99 (OID 544454) -- Name: links_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1772,7 +1775,7 @@ CREATE UNIQUE INDEX links_uq ON links USING btree (hostid, from_url, to_url); -- --- TOC entry 100 (OID 50647) +-- TOC entry 100 (OID 547951) -- Name: templates_ext_ord_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1780,7 +1783,7 @@ CREATE UNIQUE INDEX templates_ext_ord_uq ON templates USING btree (extension, or -- --- TOC entry 102 (OID 50648) +-- TOC entry 102 (OID 547952) -- Name: templates_title_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1788,7 +1791,7 @@ CREATE UNIQUE INDEX templates_title_uq ON templates USING btree (title_regexp); -- --- TOC entry 103 (OID 50649) +-- TOC entry 103 (OID 547953) -- Name: templates_url_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1796,7 +1799,7 @@ CREATE UNIQUE INDEX templates_url_uq ON templates USING btree (url_regexp); -- --- TOC entry 104 (OID 50650) +-- TOC entry 104 (OID 551151) -- Name: recently_visited_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1804,7 +1807,7 @@ CREATE UNIQUE INDEX recently_visited_uq ON recently_visited USING btree (userid, -- --- TOC entry 105 (OID 50651) +-- TOC entry 105 (OID 552155) -- Name: messages_inet_message_id_uq; Type: INDEX; Schema: public; Owner: rich -- @@ -1812,7 +1815,7 @@ CREATE UNIQUE INDEX messages_inet_message_id_uq ON messages USING btree (hostid, -- --- TOC entry 77 (OID 50652) +-- TOC entry 77 (OID 552684) -- Name: pages_url_ix; Type: INDEX; Schema: public; Owner: rich -- @@ -1820,7 +1823,7 @@ CREATE INDEX pages_url_ix ON pages USING btree (url); -- --- TOC entry 76 (OID 50653) +-- TOC entry 76 (OID 552685) -- Name: pages_redirect_ix; Type: INDEX; Schema: public; Owner: rich -- @@ -1828,7 +1831,7 @@ CREATE INDEX pages_redirect_ix ON pages USING btree (redirect); -- --- TOC entry 74 (OID 50981) +-- TOC entry 74 (OID 618795) -- Name: pages_fti_idx; Type: INDEX; Schema: public; Owner: rich -- @@ -1836,7 +1839,7 @@ CREATE INDEX pages_fti_idx ON pages USING gist (title_description_fti); -- --- TOC entry 79 (OID 53128) +-- TOC entry 79 (OID 620946) -- Name: contents_fti_idx; Type: INDEX; Schema: public; Owner: rich -- @@ -1844,7 +1847,7 @@ CREATE INDEX contents_fti_idx ON contents USING gist (content_fti); -- --- TOC entry 75 (OID 50654) +-- TOC entry 75 (OID 536012) -- Name: pages_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1853,7 +1856,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 80 (OID 50656) +-- TOC entry 80 (OID 536027) -- Name: contents_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1862,7 +1865,7 @@ ALTER TABLE ONLY contents -- --- TOC entry 81 (OID 50658) +-- TOC entry 81 (OID 536377) -- Name: hosts_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1871,7 +1874,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 85 (OID 50660) +-- TOC entry 85 (OID 537158) -- Name: images_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1880,7 +1883,7 @@ ALTER TABLE ONLY images -- --- TOC entry 87 (OID 50662) +-- TOC entry 87 (OID 537173) -- Name: files_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1889,7 +1892,7 @@ ALTER TABLE ONLY files -- --- TOC entry 90 (OID 50664) +-- TOC entry 90 (OID 540825) -- Name: users_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1898,7 +1901,7 @@ ALTER TABLE ONLY users -- --- TOC entry 94 (OID 50666) +-- TOC entry 94 (OID 542611) -- Name: contacts_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1907,7 +1910,7 @@ ALTER TABLE ONLY contacts -- --- TOC entry 101 (OID 50668) +-- TOC entry 101 (OID 547945) -- Name: templates_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1916,7 +1919,7 @@ ALTER TABLE ONLY templates -- --- TOC entry 106 (OID 50670) +-- TOC entry 106 (OID 551681) -- Name: messages_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1925,7 +1928,7 @@ ALTER TABLE ONLY messages -- --- TOC entry 107 (OID 50672) +-- TOC entry 107 (OID 607081) -- Name: powered_by_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1934,7 +1937,7 @@ ALTER TABLE ONLY powered_by -- --- TOC entry 108 (OID 50674) +-- TOC entry 108 (OID 607141) -- Name: pending_email_changes_pkey; Type: CONSTRAINT; Schema: public; Owner: rich -- @@ -1943,7 +1946,7 @@ ALTER TABLE ONLY pending_email_changes -- --- TOC entry 109 (OID 50797) +-- TOC entry 109 (OID 618611) -- Name: pg_ts_dict_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres -- @@ -1952,7 +1955,7 @@ ALTER TABLE ONLY pg_ts_dict -- --- TOC entry 110 (OID 50823) +-- TOC entry 110 (OID 618637) -- Name: pg_ts_parser_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres -- @@ -1961,7 +1964,7 @@ ALTER TABLE ONLY pg_ts_parser -- --- TOC entry 111 (OID 50848) +-- TOC entry 111 (OID 618662) -- Name: pg_ts_cfg_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres -- @@ -1970,7 +1973,7 @@ ALTER TABLE ONLY pg_ts_cfg -- --- TOC entry 112 (OID 50855) +-- TOC entry 112 (OID 618669) -- Name: pg_ts_cfgmap_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres -- @@ -1979,7 +1982,7 @@ ALTER TABLE ONLY pg_ts_cfgmap -- --- TOC entry 199 (OID 50676) +-- TOC entry 199 (OID 536029) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1988,7 +1991,7 @@ ALTER TABLE ONLY contents -- --- TOC entry 203 (OID 50680) +-- TOC entry 203 (OID 536384) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -1997,7 +2000,7 @@ ALTER TABLE ONLY hostnames -- --- TOC entry 200 (OID 50684) +-- TOC entry 200 (OID 536394) -- Name: hosts_hostname_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2006,7 +2009,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 195 (OID 50688) +-- TOC entry 195 (OID 536404) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2015,7 +2018,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 204 (OID 50692) +-- TOC entry 204 (OID 537160) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2024,7 +2027,7 @@ ALTER TABLE ONLY images -- --- TOC entry 205 (OID 50696) +-- TOC entry 205 (OID 537175) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2033,7 +2036,7 @@ ALTER TABLE ONLY files -- --- TOC entry 196 (OID 50700) +-- TOC entry 196 (OID 539155) -- Name: pages_redirect_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2042,7 +2045,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 206 (OID 50704) +-- TOC entry 206 (OID 540827) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2051,7 +2054,7 @@ ALTER TABLE ONLY users -- --- TOC entry 207 (OID 50708) +-- TOC entry 207 (OID 540837) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2060,7 +2063,7 @@ ALTER TABLE ONLY usercookies -- --- TOC entry 197 (OID 50712) +-- TOC entry 197 (OID 540942) -- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2069,7 +2072,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 198 (OID 50716) +-- TOC entry 198 (OID 540947) -- Name: pages_user_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2078,7 +2081,7 @@ ALTER TABLE ONLY pages -- --- TOC entry 208 (OID 50720) +-- TOC entry 208 (OID 540966) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2087,7 +2090,7 @@ ALTER TABLE ONLY sitemenu -- --- TOC entry 209 (OID 50724) +-- TOC entry 209 (OID 540972) -- Name: sitemenu_url_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2096,7 +2099,7 @@ ALTER TABLE ONLY sitemenu -- --- TOC entry 210 (OID 50728) +-- TOC entry 210 (OID 542613) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2105,7 +2108,7 @@ ALTER TABLE ONLY contacts -- --- TOC entry 211 (OID 50732) +-- TOC entry 211 (OID 542622) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2114,7 +2117,7 @@ ALTER TABLE ONLY contact_emails -- --- TOC entry 201 (OID 50736) +-- TOC entry 201 (OID 543506) -- Name: hosts_theme_css_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2123,7 +2126,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 212 (OID 50740) +-- TOC entry 212 (OID 543759) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2132,7 +2135,7 @@ ALTER TABLE ONLY page_emails -- --- TOC entry 213 (OID 50744) +-- TOC entry 213 (OID 543764) -- Name: page_emails_url_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2141,7 +2144,7 @@ ALTER TABLE ONLY page_emails -- --- TOC entry 214 (OID 50748) +-- TOC entry 214 (OID 543791) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2150,7 +2153,7 @@ ALTER TABLE ONLY mailing_lists -- --- TOC entry 215 (OID 50752) +-- TOC entry 215 (OID 544450) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2159,7 +2162,7 @@ ALTER TABLE ONLY links -- --- TOC entry 216 (OID 50756) +-- TOC entry 216 (OID 544455) -- Name: links_from_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2168,7 +2171,7 @@ ALTER TABLE ONLY links -- --- TOC entry 217 (OID 50760) +-- TOC entry 217 (OID 551129) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2177,7 +2180,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 218 (OID 50764) +-- TOC entry 218 (OID 551133) -- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2186,7 +2189,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 219 (OID 50768) +-- TOC entry 219 (OID 551137) -- Name: recently_visited_url_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2195,7 +2198,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 220 (OID 50772) +-- TOC entry 220 (OID 551141) -- Name: recently_visited_userid_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2204,7 +2207,7 @@ ALTER TABLE ONLY recently_visited -- --- TOC entry 222 (OID 50776) +-- TOC entry 222 (OID 551690) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2213,7 +2216,7 @@ ALTER TABLE ONLY msg_references -- --- TOC entry 221 (OID 50780) +-- TOC entry 221 (OID 551694) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2222,7 +2225,7 @@ ALTER TABLE ONLY messages -- --- TOC entry 202 (OID 50784) +-- TOC entry 202 (OID 607083) -- Name: hosts_powered_by_cn; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2231,7 +2234,7 @@ ALTER TABLE ONLY hosts -- --- TOC entry 223 (OID 50788) +-- TOC entry 223 (OID 607143) -- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: rich -- @@ -2240,7 +2243,7 @@ ALTER TABLE ONLY pending_email_changes -- --- TOC entry 224 (OID 50980) +-- TOC entry 224 (OID 618794) -- Name: pages_fti_tr; Type: TRIGGER; Schema: public; Owner: rich -- @@ -2251,7 +2254,7 @@ CREATE TRIGGER pages_fti_tr -- --- TOC entry 225 (OID 50983) +-- TOC entry 225 (OID 618796) -- Name: contents_fti_tr; Type: TRIGGER; Schema: public; Owner: rich -- @@ -2270,7 +2273,7 @@ COMMENT ON SCHEMA public IS 'Standard public namespace'; -- --- TOC entry 37 (OID 26145) +-- TOC entry 37 (OID 543592) -- Name: TABLE server_settings; Type: COMMENT; Schema: public; Owner: rich -- @@ -2278,7 +2281,7 @@ COMMENT ON TABLE server_settings IS 'This table contains global settings for the -- --- TOC entry 159 (OID 50940) +-- TOC entry 159 (OID 618754) -- Name: FUNCTION exectsq(tsvector, tsquery); Type: COMMENT; Schema: public; Owner: postgres -- @@ -2286,7 +2289,7 @@ COMMENT ON FUNCTION exectsq(tsvector, tsquery) IS 'boolean operation with text i -- --- TOC entry 161 (OID 50941) +-- TOC entry 161 (OID 618755) -- Name: FUNCTION rexectsq(tsquery, tsvector); Type: COMMENT; Schema: public; Owner: postgres -- @@ -2303,7 +2306,7 @@ SET check_function_bodies = false; SET search_path = public, pg_catalog; -- --- Data for TOC entry 3 (OID 26171) +-- Data for TOC entry 3 (OID 547939) -- Name: templates; Type: TABLE DATA; Schema: public; Owner: rich -- @@ -2315,7 +2318,7 @@ COPY templates (id, title_regexp, url_regexp, extension, ordering) FROM stdin; -- --- TOC entry 2 (OID 26169) +-- TOC entry 2 (OID 547937) -- Name: templates_id_seq; Type: SEQUENCE SET; Schema: public; Owner: rich -- @@ -2332,7 +2335,7 @@ SET check_function_bodies = false; SET search_path = public, pg_catalog; -- --- Data for TOC entry 2 (OID 26140) +-- Data for TOC entry 2 (OID 543499) -- Name: themes; Type: TABLE DATA; Schema: public; Owner: rich -- diff --git a/html/_css/standard.css b/html/_css/standard.css index 085ded8..527e899 100644 --- a/html/_css/standard.css +++ b/html/_css/standard.css @@ -1,5 +1,5 @@ /* Stylesheet for COCANWIKI. - * $Id: standard.css,v 1.25 2004/11/03 12:40:16 rich Exp $ + * $Id: standard.css,v 1.26 2004/11/03 13:36:44 rich Exp $ */ /* Based on the basic stylesheet. */ @@ -352,3 +352,29 @@ div#navigation_div ul { margin-left: 3em; padding-left: 0px; } + +/* Default for branding section. The default doesn't claim to be very + * helpful. If you enabled branding on the site, you should abs-position + * the branding_div, and indeed probably replace it with a logo at the + * top of each page. + */ +div#branding_div { + width: 30%; + float: right; + font-size: 0.7em; +} + +div#branding_div h2 { + border: none; + margin: 0px; + padding: 0px; +} + +div#branding_div p { + margin: 0px; + padding: 0px; +} + +div#branding_div p#brand_description { + display: none; +} \ No newline at end of file diff --git a/scripts/edit_host_settings.ml b/scripts/edit_host_settings.ml index 135bd30..b9cd2c1 100644 --- a/scripts/edit_host_settings.ml +++ b/scripts/edit_host_settings.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit_host_settings.ml,v 1.6 2004/10/10 16:14:43 rich Exp $ + * $Id: edit_host_settings.ml,v 1.7 2004/11/03 13:36:45 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ open Printf open Cocanwiki open Cocanwiki_ok +open Cocanwiki_strings let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = (* Cancel? *) @@ -39,25 +40,37 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } _ = let edit_anon = q#param_true "edit_anon" in let create_account_anon = q#param_true "create_account_anon" in let theme_css = q#param "theme_css" in - let feedback_email = q#param "feedback_email" in + let feedback_email = trim (q#param "feedback_email") in let mailing_list = q#param_true "mailing_list" in let search_box = q#param_true "search_box" in let navigation = q#param_true "navigation" in let view_anon = q#param_true "view_anon" in + let brand = trim (q#param "brand") in + let brand_tagline = trim (q#param "brand_tagline") in + let brand_description = trim (q#param "brand_description") in let theme_css = if theme_css = "" then `Null else `String theme_css in let feedback_email = if feedback_email = "" then `Null else `String feedback_email in + let brand = if brand = "" then `Null else `String brand in + let brand_tagline = + if brand_tagline = "" then `Null else `String brand_tagline in + let brand_description = + if brand_description = "" then `Null else `String brand_description in (* Update the database. *) let sth = dbh#prepare_cached "update hosts set edit_anon = ?, create_account_anon = ?, theme_css = ?, feedback_email = ?, mailing_list = ?, - search_box = ?, navigation = ?, view_anon = ? + search_box = ?, navigation = ?, + view_anon = ?, + brand = ?, brand_tagline = ?, + brand_description = ? where id = ?" in sth#execute [`Bool edit_anon; `Bool create_account_anon; theme_css; feedback_email; `Bool mailing_list; `Bool search_box; `Bool navigation; `Bool view_anon; + brand; brand_tagline; brand_description; `Int hostid]; dbh#commit (); diff --git a/scripts/edit_host_settings_form.ml b/scripts/edit_host_settings_form.ml index d6932bb..553e7d2 100644 --- a/scripts/edit_host_settings_form.ml +++ b/scripts/edit_host_settings_form.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: edit_host_settings_form.ml,v 1.5 2004/10/10 16:14:43 rich Exp $ + * $Id: edit_host_settings_form.ml,v 1.6 2004/11/03 13:36:45 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,25 +44,30 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = let sth = dbh#prepare_cached "select canonical_hostname, edit_anon, create_account_anon, theme_css, - feedback_email, mailing_list, search_box, navigation, view_anon + feedback_email, mailing_list, search_box, navigation, view_anon, + coalesce (brand, ''), coalesce (brand_tagline, ''), + coalesce (brand_description, '') from hosts where id = ?" in sth#execute [`Int hostid]; let canonical_hostname, edit_anon, create_account_anon, theme_css, - feedback_email, mailing_list, search_box, navigation, view_anon = + feedback_email, mailing_list, search_box, navigation, view_anon, + brand, brand_tagline, brand_description = match sth#fetch1 () with [ `String canonical_hostname; `Bool edit_anon; `Bool create_account_anon; (`String _ | `Null) as theme_css; (`String _ | `Null) as feedback_email; `Bool mailing_list; `Bool search_box; `Bool navigation; - `Bool view_anon ] -> + `Bool view_anon; + `String brand; `String brand_tagline; `String brand_description ] -> let theme_css = match theme_css with `String s -> s | `Null -> "" in let feedback_email = match feedback_email with `String s -> s | `Null -> "" in canonical_hostname, edit_anon, create_account_anon, theme_css, - feedback_email, mailing_list, search_box, navigation, view_anon + feedback_email, mailing_list, search_box, navigation, view_anon, + brand, brand_tagline, brand_description | _ -> assert false in template#set "canonical_hostname" canonical_hostname; @@ -73,6 +78,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = template#conditional "search_box" search_box; template#conditional "navigation" navigation; template#conditional "view_anon" view_anon; + template#set "brand" brand; + template#set "brand_tagline" brand_tagline; + template#set "brand_description" brand_description; (* Themes table. *) let table = diff --git a/scripts/host_menu.ml b/scripts/host_menu.ml index 7806efc..e94bb41 100644 --- a/scripts/host_menu.ml +++ b/scripts/host_menu.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: host_menu.ml,v 1.6 2004/10/23 09:36:11 rich Exp $ + * $Id: host_menu.ml,v 1.7 2004/11/03 13:36:45 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,14 +47,17 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid host user = "select h.canonical_hostname, h.css is not null, h.edit_anon, h.create_account_anon, h.theme_css is not null, t.name, t.description, h.feedback_email, h.mailing_list, - h.search_box, h.navigation, h.view_anon + h.search_box, h.navigation, h.view_anon, + h.brand, coalesce (h.brand_tagline, ''), + coalesce (h.brand_description, '') from hosts h left outer join themes t on h.theme_css = t.theme_css where h.id = ?" in sth#execute [`Int hostid]; let canonical_hostname, has_global_css, edit_anon, create_account_anon, has_theme_css, theme_name, theme_description, has_feedback_email, - feedback_email, mailing_list, search_box, navigation, view_anon = + feedback_email, mailing_list, search_box, navigation, view_anon, + has_brand, brand, brand_tagline, brand_description = match sth#fetch1 () with [ `String canonical_hostname; `Bool has_global_css; `Bool edit_anon; `Bool create_account_anon; `Bool has_theme_css; @@ -62,7 +65,9 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid host user = (`String _ | `Null) as theme_description; (`String _ | `Null) as feedback_email; `Bool mailing_list; `Bool search_box; `Bool navigation; - `Bool view_anon ] -> + `Bool view_anon; + (`String _ | `Null) as brand; `String brand_tagline; + `String brand_description ] -> let theme_name = match theme_name with `String s -> s | `Null -> "" in let theme_description = @@ -71,9 +76,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid host user = match feedback_email with `String s -> s, true | `Null -> "", false in + let brand, has_brand = + match brand with + `String s -> s, true + | `Null -> "", false in canonical_hostname, has_global_css, edit_anon, create_account_anon, has_theme_css, theme_name, theme_description, has_feedback_email, - feedback_email, mailing_list, search_box, navigation, view_anon + feedback_email, mailing_list, search_box, navigation, view_anon, + has_brand, brand, brand_tagline, brand_description | _ -> assert false in template#set "canonical_hostname" canonical_hostname; @@ -88,7 +98,11 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid host user = template#conditional "mailing_list" mailing_list; template#conditional "search_box" search_box; template#conditional "navigation" navigation; - template#conditional "view_anon" view_anon + template#conditional "view_anon" view_anon; + template#conditional "has_brand" has_brand; + template#set "brand" brand; + template#set "brand_tagline" brand_tagline; + template#set "brand_description" brand_description; ); q#template template diff --git a/scripts/lib/cocanwiki_template.ml b/scripts/lib/cocanwiki_template.ml index 524255b..a90b614 100644 --- a/scripts/lib/cocanwiki_template.ml +++ b/scripts/lib/cocanwiki_template.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: cocanwiki_template.ml,v 1.2 2004/10/23 10:13:20 rich Exp $ + * $Id: cocanwiki_template.ml,v 1.3 2004/11/03 13:36:45 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -83,20 +83,24 @@ let get_template ?page (dbh : Dbi.connection) hostid filename = (* Get standard fields concerning this host from the database. *) let sth = dbh#prepare_cached - "select h.theme_css, p.name, p.url + "select h.theme_css, p.name, p.url, h.search_box, + h.brand, h.brand_tagline, h.brand_description from hosts h left outer join powered_by p on h.powered_by = p.id where h.id = ?" in sth#execute [`Int hostid]; - let theme_css, powered_by_name, powered_by_url = + let theme_css, powered_by_name, powered_by_url, search_box, + brand, brand_tagline, brand_description = match sth#fetch1 () with - | [ a; b; c] -> a, b, c + | [ a; b; c; d; e; f; g] -> a, b, c, d, e, f, g | _ -> assert false in + let theme_css = match theme_css with | `Null -> "/_css/standard.css" | `String file -> file | _ -> assert false in + let powered_by_name, powered_by_url = match powered_by_name, powered_by_url with | `Null, `Null -> @@ -107,9 +111,39 @@ let get_template ?page (dbh : Dbi.connection) hostid filename = | `String name, `String url -> name, url | _ -> assert false in + let search_box = match search_box with `Bool b -> b | _ -> assert false in + + let branding, brand, + has_brand_tagline, brand_tagline, + has_brand_description, brand_description = + match brand with + | `Null -> false, "", false, "", false, "" + | `String brand -> + let has_brand_tagline, brand_tagline = + match brand_tagline with + | `Null -> false, "" + | `String s -> true, s + | _ -> assert false in + let has_brand_description, brand_description = + match brand_description with + | `Null -> false, "" + | `String s -> true, s + | _ -> assert false in + true, brand, + has_brand_tagline, brand_tagline, + has_brand_description, brand_description + | _ -> assert false in + template#set "theme_css" theme_css; template#set "powered_by_name" powered_by_name; template#set "powered_by_url" powered_by_url; + template#conditional "search_box" search_box; + template#conditional "branding" branding; + template#set "brand" brand; + template#conditional "has_brand_tagline" has_brand_tagline; + template#set "brand_tagline" brand_tagline; + template#conditional "has_brand_description" has_brand_description; + template#set "brand_description" brand_description; (* Site menu. *) let sth = dbh#prepare_cached "select url, label, ordering from sitemenu @@ -138,10 +172,6 @@ let get_template ?page (dbh : Dbi.connection) hostid filename = template#table "sitemenu" table; - (* Wiki version. *) - template#set "cocanwiki_package" Cocanwiki_version.package; - template#set "cocanwiki_version" Cocanwiki_version.version; - (* Copyright year. *) template#set "year" (string_of_int year); diff --git a/scripts/page.ml b/scripts/page.ml index 67ac47c..535b49e 100644 --- a/scripts/page.ml +++ b/scripts/page.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.37 2004/10/30 10:16:10 rich Exp $ + * $Id: page.ml,v 1.38 2004/11/03 13:36:45 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -65,15 +65,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid (* Host-specific fields. *) let sth = dbh#prepare_cached "select css is not null, feedback_email is not null, - mailing_list, search_box, navigation + mailing_list, navigation from hosts where id = ?" in sth#execute [`Int hostid]; - let has_host_css, has_feedback_email, mailing_list, search_box, navigation = + let has_host_css, has_feedback_email, mailing_list, navigation = match sth#fetch1 () with | [ `Bool has_host_css; `Bool has_feedback_email; `Bool mailing_list; - `Bool search_box; `Bool navigation ] -> - has_host_css, has_feedback_email, mailing_list, search_box, - navigation + `Bool navigation ] -> + has_host_css, has_feedback_email, mailing_list, navigation | _ -> assert false in (* User permissions. *) @@ -195,7 +194,6 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid t#conditional "has_feedback_email" has_feedback_email; t#conditional "mailing_list" mailing_list; - t#conditional "search_box" search_box; t#conditional "navigation" navigation; t#conditional "can_edit" can_edit; diff --git a/templates/edit_host_settings_form.html b/templates/edit_host_settings_form.html index 729c6e7..217da6f 100644 --- a/templates/edit_host_settings_form.html +++ b/templates/edit_host_settings_form.html @@ -57,6 +57,27 @@ + Branding: + + + + + + + + + + + + + + +
Title:
+ (If title is blank, branding area is disabled) +
Tagline:
Description:
+ + + diff --git a/templates/footer.html b/templates/footer.html index 9c84edf..bd294f5 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -13,6 +13,22 @@
+::if(search_box):: +
+
+ +
+
+::end:: + +::if(branding):: +
+

::brand_html::

+::if(has_brand_tagline)::

::brand_tagline_html::

::end:: +::if(has_brand_description)::

::brand_description_html::

::end:: +
+::end:: + -::if(search_box):: -
-
- -
-
-::end:: - ::if(navigation):: ::end:: +::if(search_box):: +
+
+ +
+
+::end:: + +::if(branding):: +
+

::if(is_homepage)::::else::::end::::brand_html::::if(is_homepage)::::else::::end::

+::if(has_brand_tagline)::

::if(is_homepage)::::else::::end::::brand_tagline_html::::if(is_homepage)::::else::::end::

::end:: +::if(has_brand_description)::

::brand_description_html::

::end:: +
+::end:: +