add compact theme

diff --git a/backend.php b/backend.php
index 24295769a1037654975cc65cc2a5e7b9c536dca7..4ff25c49f92e94321e155e1e6d1cd8e10eb6108c 100644 (file)
--- a/backend.php
+++ b/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"]) {
@@ -87,8 +88,7 @@
        require_once "modules/pref-filters.php";
        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";
+       require_once "modules/pref-feed-browser.php"; 
 
        $script_started = getmicrotime();
 

diff --git a/gecko.css b/gecko.css
index bca317dd03c0db0e3af3579c586bce0eac292ba3..a0270327dd77926772a52d742d3db61ad92837e8 100644 (file)
--- a/gecko.css
+++ b/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;
-} */
+} 

diff --git a/modules/pref-feed-browser.php b/modules/pref-feed-browser.php
index 4086822b8624dd551d055a7848480bdcb74baf4c..893f8f5a10cff22d91cef9920b68dd7883f32899 100644 (file)
--- a/modules/pref-feed-browser.php
+++ b/modules/pref-feed-browser.php
@@ -155,4 +155,3 @@
                print "</div>";
        }
 ?>
-

diff --git a/opera.css b/opera.css
index 6174e9814fd61a5ead9107e942e8f1a1dcc7e7a1..058036f80453bea347cef2e11ee8d23d89d2531f 100644 (file)
--- 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 35af499440955b219e36f0c048ee3aedbf3a1ac3..16c65e2ada5959de198cb87a126bb208b852d326 100644 (file)
--- a/prefs.php
+++ b/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>

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index ada03bc44cd8906bcc90c9a783c8b8da3e9704a7..19f38eaa735d24c4448ca0d05b18c0008991c431 100644 (file)
--- 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 83a837c9e637cb67955e4022f449b6e331742afe..0bd4caad7a0395816d93628374d352143d1ca904 100644 (file)
--- 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 664419aa147374d178844b92783c6312b64476ed..690b978ebc4c97b199dd9d0bb5a6580c6ae91d63 100644 (file)
--- 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 664419aa147374d178844b92783c6312b64476ed..690b978ebc4c97b199dd9d0bb5a6580c6ae91d63 100644 (file)
--- 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 (file)
index 0000000..1a25a78
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 (file)
index 0000000..2cedc35
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 (file)
index 0000000..ed7e9bd
--- /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 de1ce72621280b443cc52a35e1bb12f4e7d974d5..d1a504134dbf333a7bd2a427858b02030ed4da7e 100644 (file)
--- 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 9d6a556e9a270f88288d82b95350c8b04e5f9a2d..a71436b98f4c04abc20fdc4042b51df93a7446c9 100644 (file)
--- a/tt-rss.php
+++ b/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">