add compact theme

4 files changed, 12 insertions, 6 deletions

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index ada03bc44..19f38eaa7 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -25,6 +25,8 @@ create table ttrss_themes(id integer not null primary key auto_increment,
 	theme_path varchar(200) not null) TYPE=InnoDB;
 
 insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat');
+insert into ttrss_themes (theme_name, theme_path) values ('Graycube', 'graycube');
+insert into ttrss_themes (theme_name, theme_path) values ('Default (Compact)', 'compact');
 
 create table ttrss_users (id integer primary key not null auto_increment,
 	login varchar(120) not null unique,
@@ -218,7 +220,6 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
    'Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 'Default interval between feed updates (in minutes)',1);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('USE_COMPACT_STYLESHEET', 1, 'false', 'Use compact stylesheet by default',2);
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DEFAULT_ARTICLE_LIMIT', 3, '0', 'Default article limit',2,
    'Default limit for articles to display, any custom number you like (0 - disables).');
 
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 83a837c9e..0bd4caad7 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -25,6 +25,8 @@ create table ttrss_themes(id serial not null primary key,
 	theme_path varchar(200) not null);
 
 insert into ttrss_themes (theme_name, theme_path) values ('Old-skool', 'compat');
+insert into ttrss_themes (theme_name, theme_path) values ('Graycube', 'graycube');
+insert into ttrss_themes (theme_name, theme_path) values ('Default (Compact)', 'compact');
 
 create table ttrss_users (id serial not null primary key,
 	login varchar(120) not null unique,
@@ -198,7 +200,6 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 	'Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution.');
 	
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 'Default interval between feed updates (in minutes)',1);
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('USE_COMPACT_STYLESHEET', 1, 'false', 'Use compact stylesheet by default',2);
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DEFAULT_ARTICLE_LIMIT', 3, '0', 'Default article limit',2,
 	'Default limit for articles to display, any custom number you like (0 - disables).');
 
diff --git a/schema/upgrade-1.2.3-1.2.4-mysql.sql b/schema/upgrade-1.2.3-1.2.4-mysql.sql
index 664419aa1..690b978eb 100644
--- a/schema/upgrade-1.2.3-1.2.4-mysql.sql
+++ b/schema/upgrade-1.2.3-1.2.4-mysql.sql
@@ -3,13 +3,15 @@ begin;
 delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_HEADER';
 delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_FOOTER';
 delete FROM ttrss_user_prefs WHERE pref_name = 'ENABLE_SEARCH_TOOLBAR';
+delete FROM ttrss_user_prefs WHERE pref_name = 'USE_COMPACT_STYLESHEET';
 
 delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_HEADER';
 delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_FOOTER';
 delete FROM ttrss_prefs WHERE pref_name = 'ENABLE_SEARCH_TOOLBAR';
+delete FROM ttrss_prefs WHERE pref_name = 'USE_COMPACT_STYLESHEET';
 
-insert into ttrss_themes (theme_name, theme_path) 
-	values ('Graycube', 'graycube');
+insert into ttrss_themes (theme_name, theme_path) values ('Graycube', 'graycube');
+insert into ttrss_themes (theme_name, theme_path) values ('Default (Compact)', 'compact');
 
 update ttrss_version set schema_version = 11;
 
diff --git a/schema/upgrade-1.2.3-1.2.4-pgsql.sql b/schema/upgrade-1.2.3-1.2.4-pgsql.sql
index 664419aa1..690b978eb 100644
--- a/schema/upgrade-1.2.3-1.2.4-pgsql.sql
+++ b/schema/upgrade-1.2.3-1.2.4-pgsql.sql
@@ -3,13 +3,15 @@ begin;
 delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_HEADER';
 delete FROM ttrss_user_prefs WHERE pref_name = 'DISPLAY_FOOTER';
 delete FROM ttrss_user_prefs WHERE pref_name = 'ENABLE_SEARCH_TOOLBAR';
+delete FROM ttrss_user_prefs WHERE pref_name = 'USE_COMPACT_STYLESHEET';
 
 delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_HEADER';
 delete FROM ttrss_prefs WHERE pref_name = 'DISPLAY_FOOTER';
 delete FROM ttrss_prefs WHERE pref_name = 'ENABLE_SEARCH_TOOLBAR';
+delete FROM ttrss_prefs WHERE pref_name = 'USE_COMPACT_STYLESHEET';
 
-insert into ttrss_themes (theme_name, theme_path) 
-	values ('Graycube', 'graycube');
+insert into ttrss_themes (theme_name, theme_path) values ('Graycube', 'graycube');
+insert into ttrss_themes (theme_name, theme_path) values ('Default (Compact)', 'compact');
 
 update ttrss_version set schema_version = 11;