add 3pane theme

diff --git a/functions.php b/functions.php
index ab03832b0cb94d3b2d9b3b5e1991885fad07233c..53723273c71f5ae26c5a5a4fc38e4fc8554fe995 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2664,6 +2664,7 @@
                        }
                }
 
+               print "<param key=\"theme\" value=\"".$_SESSION["theme"]."\"/>";
                print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
                print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
                print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
@@ -2707,6 +2708,7 @@
 
        function print_runtime_info($link) {
                print "<runtime-info>";
+
                if (ENABLE_UPDATE_DAEMON) {
                        print "<param key=\"daemon_is_running\" value=\"".
                                sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
@@ -3659,23 +3661,26 @@
 } */
 
                        print "<td class=\"headlineTitle$rtl_cpart\">";
-               
-                       if ($feed_site_url) {
-                               if (!$bottom) {
-                                       $target = "target=\"_new\"";
-                               }
-                               print "<a $target href=\"$feed_site_url\">".
-                                       truncate_string($feed_title,30)."</a>";
-                       } else {
-                               print $feed_title;
-                       }
 
-                       if ($search) {
-                               $search_q = "&q=$search&m=$match_on&smode=$search_mode";
-                       }
+                       if ($_SESSION["theme"] != "3pane") {
 
-                       if ($user_page_offset > 1) {
-                               print " [$user_page_offset] ";
+                               if ($feed_site_url) {
+                                       if (!$bottom) {
+                                               $target = "target=\"_new\"";
+                                       }
+                                       print "<a $target href=\"$feed_site_url\">".
+                                               truncate_string($feed_title,30)."</a>";
+                               } else {
+                                       print $feed_title;
+                               }
+       
+                               if ($search) {
+                                       $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+                               }
+       
+                               if ($user_page_offset > 1) {
+                                       print " [$user_page_offset] ";
+                               }
                        }
 
                        if (!$bottom) {
@@ -4287,16 +4292,22 @@
 
                        $num_tags = 0;
 
+                       if ($_SESSION["theme"] == "3pane") {
+                               $tag_limit = 3;
+                       } else {
+                               $tag_limit = 6;
+                       }
+
                        foreach ($tags as $tag) {
                                $num_tags++;
                                $tag_escaped = str_replace("'", "\\'", $tag);
 
                                $tag_str = "<a href=\"javascript:viewfeed('$tag_escaped')\">$tag</a>, ";
                                
-                               if ($num_tags == 6) {
+                               if ($num_tags == $tag_limit) {
                                        $tags_str .= "...";
 
-                               } else if ($num_tags < 6) {
+                               } else if ($num_tags < $tag_limit) {
                                        $tags_str .= $tag_str;
                                }
                                $f_tags_str .= $tag_str;

diff --git a/sanity_check.php b/sanity_check.php
index b9290b50cb3f6937ab54da41722e1c32579abdfa..bff12e38ccc7cd45ab8524aab9d433fae8f5f241 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
        require_once "functions.php";
 
        define('EXPECTED_CONFIG_VERSION', 11);
-       define('SCHEMA_VERSION', 24);
+       define('SCHEMA_VERSION', 25);
 
        if (!file_exists("config.php")) {
                print __("<b>Fatal Error</b>: You forgot to copy 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 88f1080f9b734076c299625fe2044edd4888f4ba..24041bb88e96574e934c398f618da366061f4f14 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -30,6 +30,7 @@ create table ttrss_themes(id integer not null primary key auto_increment,
 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');
+insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
 
 create table ttrss_users (id integer primary key not null auto_increment,
        login varchar(120) not null unique,
@@ -199,7 +200,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 (24);
+insert into ttrss_version values (25);
 
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null) TYPE=InnoDB;

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index bb4c4537556a0d7b7700434b2dd445f392ac75d8..c75e210f16f043dfe7d3cc33365207a3d3091bbb 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -27,6 +27,7 @@ create table ttrss_themes(id serial not null primary key,
 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');
+insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
 
 create table ttrss_users (id serial not null primary key,
        login varchar(120) not null unique,
@@ -178,7 +179,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 (24);
+insert into ttrss_version values (25);
 
 create table ttrss_prefs_types (id integer not null primary key, 
        type_name varchar(100) not null);

diff --git a/schema/versions/mysql/25.sql b/schema/versions/mysql/25.sql
new file mode 100644 (file)
index 0000000..c3f3d5e
--- /dev/null
+++ b/schema/versions/mysql/25.sql
@@ -0,0 +1,3 @@
+insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
+
+update ttrss_version set schema_version = 25;

diff --git a/schema/versions/pgsql/25.sql b/schema/versions/pgsql/25.sql
new file mode 100644 (file)
index 0000000..c3f3d5e
--- /dev/null
+++ b/schema/versions/pgsql/25.sql
@@ -0,0 +1,3 @@
+insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
+
+update ttrss_version set schema_version = 25;

diff --git a/themes/3pane/images/ttrss_logo.png b/themes/3pane/images/ttrss_logo.png
new file mode 100644 (file)
index 0000000..2cedc35
Binary files /dev/null and b/themes/3pane/images/ttrss_logo.png differ

diff --git a/themes/3pane/theme.css b/themes/3pane/theme.css
new file mode 100644 (file)
index 0000000..0f2cada
--- /dev/null
+++ b/themes/3pane/theme.css
@@ -0,0 +1,29 @@
+div.headlines_normal {
+       position : absolute;
+       border-width : 1px 1px 0px 0px;
+       right : 400px;
+       overflow : hidden;
+       bottom : 40px;
+       height : auto;
+}
+
+#content-frame {
+       width : 400px;
+       right : 0px;
+       top : 85px;
+       left : auto;
+}
+
+div.postHeader div.postDate {
+       text-align : left;
+       color : gray;
+       float : none;
+}
+
+div.postHeader div.postDateRTL {
+       text-align : left;
+       color : gray;
+       float : none;
+}
+
+

diff --git a/tt-rss.js b/tt-rss.js
index 1773e64aff3306e972ddca459d5eb920ae70cbb5..617791ce0e11fe2eb5a24b2f0f17d234bd316787 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -357,27 +357,37 @@ function resize_headlines() {
 
        if (!c_frame || !h_frame) return;
 
-       debug("resize_headlines");
+       if (getInitParam("theme") == "3pane") {
+               debug("resize_headlines: HOR-mode");
 
-       if (!is_msie()) {
-               h_frame.style.height = 30 + "%";
-               c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
-               h_frame.style.height = h_frame.offsetHeight + "px";
-       } else {
-               h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
-               c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
+               c_frame.style.width = '30%';
+               h_frame.style.right = c_frame.offsetWidth - 1 + "px";
 
-               var c_bottom = document.documentElement.clientHeight;
+       } else {
+               debug("resize_headlines: VER-mode");
 
-               if (f_frame) {
-                       c_bottom = f_frame.offsetTop;
+               if (!is_msie()) {
+                       h_frame.style.height = 30 + "%";
+                       c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
+                       h_frame.style.height = h_frame.offsetHeight + "px";
+               } else {
+                       h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
+                       c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
+       
+                       var c_bottom = document.documentElement.clientHeight;
+       
+                       if (f_frame) {
+                               c_bottom = f_frame.offsetTop;
+                       }
+       
+                       c_frame.style.height = c_bottom - (h_frame.offsetTop + 
+                               h_frame.offsetHeight + 1) + "px";
+                       h_frame.style.height = h_frame.offsetHeight + "px";
+       
                }
 
-               c_frame.style.height = c_bottom - (h_frame.offsetTop + 
-                       h_frame.offsetHeight + 1) + "px";
-               h_frame.style.height = h_frame.offsetHeight + "px";
-
        }
+
 }
 
 function init_second_stage() {