From c59d33a3a8e5b2aab15f893727227cc1e3bea212 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Aug 2007 09:56:26 +0100 Subject: [PATCH] fix schema --- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 4 +++- schema/ttrss_schema_pgsql.sql | 4 +++- schema/versions/mysql/19.sql | 3 +++ schema/versions/pgsql/19.sql | 3 +++ themes/graycube/theme.css | 3 --- tt-rss.css | 6 ++++-- 7 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 schema/versions/mysql/19.sql create mode 100644 schema/versions/pgsql/19.sql diff --git a/sanity_check.php b/sanity_check.php index 81d96936..74dca116 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 7); - define('SCHEMA_VERSION', 18); + define('SCHEMA_VERSION', 19); if (!file_exists("config.php")) { print __("Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 86261d6f..bbc76907 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -189,7 +189,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (18); +insert into ttrss_version values (19); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null) TYPE=InnoDB; @@ -286,6 +286,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ENABLE_PAGINATION', 2, '', '', 1); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1); + create table ttrss_user_prefs ( owner_uid integer not null, pref_name varchar(250), diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 65a528c3..04abd68a 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -173,7 +173,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (18); +insert into ttrss_version values (19); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null); @@ -266,6 +266,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ENABLE_PAGINATION', 2, '', '', 1); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1); + create table ttrss_user_prefs ( owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE, diff --git a/schema/versions/mysql/19.sql b/schema/versions/mysql/19.sql new file mode 100644 index 00000000..19bb4b25 --- /dev/null +++ b/schema/versions/mysql/19.sql @@ -0,0 +1,3 @@ +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1); + +update ttrss_version set schema_version = 19; diff --git a/schema/versions/pgsql/19.sql b/schema/versions/pgsql/19.sql new file mode 100644 index 00000000..19bb4b25 --- /dev/null +++ b/schema/versions/pgsql/19.sql @@ -0,0 +1,3 @@ +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_PUBLISH_KEY', 2, '', '', 1); + +update ttrss_version set schema_version = 19; diff --git a/themes/graycube/theme.css b/themes/graycube/theme.css index 58263fe5..33805b2c 100644 --- a/themes/graycube/theme.css +++ b/themes/graycube/theme.css @@ -10,7 +10,6 @@ div.cdmArticle { border-width : 0px 0px 1px 0px; border-color : #999999; margin : 0px; - padding : 10px; background : #f9f9f9; -moz-border-radius : 0px; } @@ -19,7 +18,6 @@ div.cdmArticleUnread { border-width : 0px 0px 1px 0px; border-color : #999999; margin : 0px; - padding : 10px; background : white; -moz-border-radius : 0px; } @@ -28,7 +26,6 @@ div.cdmArticleSelected, div.cdmArticleUnreadSelected { border-width : 0px 0px 1px 0px; border-color : #999999; margin : 0px; - padding : 10px; background : #ffcccc; -moz-border-radius : 0px; } diff --git a/tt-rss.css b/tt-rss.css index 18e59a1d..39ae0bdc 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -855,6 +855,7 @@ div.cdmArticle { border-style : solid; background-color : #fafafa; margin : 0px; + color : #505050; /* padding : 10px; */ } @@ -866,9 +867,10 @@ div.cdmArticleUnread { border-color : #a0a0a0; border-width : 0px 0px 1px 0px; border-style : solid; - background-color : #fafeff; + background-color : white; margin : 0px; /* padding : 10px; */ + color : black; } div.cdmArticleSelected, div.cdmArticleUnreadSelected { @@ -941,7 +943,7 @@ div.cdmFooter input, div.cdmHeader input, div.cdmFooter img { } div.cdmHeader, div.cdmHeader a { - color : gray; + color : #505050; font-size : 9pt; }