diff --git a/backend.php b/backend.php
index 24295769a..4ff25c49f 100644
--- a/backend.php
+++ b/backend.php
@@ -1,5 +1,6 @@
";
}
?>
-
diff --git a/opera.css b/opera.css
index 6174e9814..058036f80 100644
--- a/opera.css
+++ b/opera.css
@@ -5,6 +5,32 @@ table.main td.headlines {
border-color : #c0c0c0;
}
+#infoBox {
+ border-width : 1px 1px 1px 1px;
+ border-style : solid;
+ border-color : #88b0f0;
+ font-size : small;
+ position : relative;
+ top : 30%;
+ left : 30%;
+ width : 30%;
+ padding-bottom : 5px;
+ background-image : url("images/prefs-content.png");
+ background-position : top left;
+ background-repeat : repeat-x;
+ background-color : white;
+}
+
+#infoBoxShadow {
+ background-image : url("images/overlay.png");
+ left : 0;
+ top : 0;
+ height : 100%;
+ width : 100%;
+ z-index : 3;
+ position : absolute;
+ display : none;
+}
/* #infoBox {
border-width : 1px 1px 1px 1px;
border-style : solid;
diff --git a/prefs.php b/prefs.php
index 35af49944..16c65e2ad 100644
--- a/prefs.php
+++ b/prefs.php
@@ -36,17 +36,6 @@
-
-
-
-
-
-
-
-
-
-
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;
diff --git a/themes/compact/images/grad_1.png b/themes/compact/images/grad_1.png
new file mode 100644
index 000000000..1a25a785a
Binary files /dev/null and b/themes/compact/images/grad_1.png differ
diff --git a/themes/compact/images/ttrss_logo.png b/themes/compact/images/ttrss_logo.png
new file mode 100644
index 000000000..2cedc35ed
Binary files /dev/null and b/themes/compact/images/ttrss_logo.png differ
diff --git a/themes/compact/theme.css b/themes/compact/theme.css
new file mode 100644
index 000000000..ed7e9bd60
--- /dev/null
+++ b/themes/compact/theme.css
@@ -0,0 +1,43 @@
+#feeds-holder {
+ border-width : 0px 1px 0px 0px;
+ top : 0px;
+ bottom : 0px;
+ background : white;
+}
+
+#header {
+ left : 270px;
+}
+
+#toolbar {
+ font-size : small;
+}
+
+#toolbar input {
+ font-size : small;
+}
+
+div.headlines_cdm {
+ border-width : 1px 0px 0px 0px;
+ bottom : 0px;
+}
+
+#content-frame {
+ border-width : 1px 0px 0px 0px;
+ bottom : 0px;
+}
+
+div.postReply {
+ font-size : small;
+ padding : 0px;
+ margin : 0px;
+}
+
+div.postReply div.postHeader {
+ border-width : 0px 0px 1px 1px;
+}
+
+#footer, #prefFooter {
+ display : none;
+}
+
diff --git a/tt-rss.css b/tt-rss.css
index de1ce7262..d1a504134 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -83,6 +83,7 @@ ul.feedCatList li {
ul.feedList li {
margin : 0px;
+ font-size : small;
}
li.feedUnread,
diff --git a/tt-rss.php b/tt-rss.php
index 9d6a556e9..a71436b98 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -37,17 +37,6 @@
-
-
-
-
-
-
-
-
-
-