add compact theme

backend.php

@@ -1,5 +1,6 @@
 <?php
 	require_once "sessions.php";
+	require_once "modules/backend-rpc.php";
 	
 	header("Cache-Control: no-cache, must-revalidate");
 	header("Pragma: no-cache");
@@ -24,7 +25,7 @@
 	require_once "db-prefs.php";
 	require_once "functions.php";
 
-	$print_exec_time = true;
+	$print_exec_time = false;
 
 	if ((!$op || $op == "rpc" || $op == "rss" || $op == "digestSend" ||
 			$op == "globalUpdateFeeds") && !$_REQUEST["noxml"]) {
@@ -88,7 +89,6 @@
 	require_once "modules/pref-labels.php";
 	require_once "modules/pref-users.php";
 	require_once "modules/pref-feed-browser.php"; 
-	require_once "modules/backend-rpc.php";
 
 	$script_started = getmicrotime();
 

gecko.css

@@ -1,4 +1,4 @@
-/* #infoBox {	
+#infoBox {	
 	border-width : 1px 1px 1px 1px;
 	border-style : solid;
 	border-color : #88b0f0;
@@ -23,4 +23,4 @@
 	z-index : 3;
 	position : absolute;
 	display : none;
-} */
+} 

modules/pref-feed-browser.php

@@ -155,4 +155,3 @@
 		print "</div>";
 	}
 ?>
-

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;

prefs.php

@@ -36,17 +36,6 @@
 		<link type="text/css" href="<?php echo $user_css_url ?>"/> 
 	<?php } ?>
 
-	<?php if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?>
-
-		<link rel="stylesheet" href="tt-rss_compact.css" type="text/css">
-
-	<?php } else { ?>
-
-		<link title="Compact Stylesheet" rel="alternate stylesheet" 
-			type="text/css" href="tt-rss_compact.css"/> 
-
-	<?php } ?>
-
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 
 	<script type="text/javascript" src="prototype.js"></script>

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).');
 

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).');
 

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;
 

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;
 

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;
+}
+

tt-rss.css

@@ -83,6 +83,7 @@ ul.feedCatList li {
 
 ul.feedList li {
 	margin : 0px;
+	font-size : small;
 }
 
 li.feedUnread, 

tt-rss.php

@@ -37,17 +37,6 @@
 		<link type="text/css" href="<?php echo $user_css_url ?>"/> 
 	<?php } ?>
 
-	<?php if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { ?>
-
-		<link rel="stylesheet" href="tt-rss_compact.css" type="text/css">
-
-	<?php } else { ?>
-
-		<link title="Compact Stylesheet" rel="alternate stylesheet" 
-			type="text/css" href="tt-rss_compact.css"/> 
-
-	<?php } ?>
-
 	<!--[if gte IE 5.5000]>		
 		<script type="text/javascript" src="pngfix.js"></script>
 		<link rel="stylesheet" type="text/css" href="tt-rss-ie.css">