mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-15 20:55:56 +00:00
add 3pane theme
This commit is contained in:
@@ -2664,6 +2664,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
print "<param key=\"theme\" value=\"".$_SESSION["theme"]."\"/>";
|
||||||
print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
|
print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
|
||||||
print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
|
print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
|
||||||
print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
|
print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
|
||||||
@@ -2707,6 +2708,7 @@
|
|||||||
|
|
||||||
function print_runtime_info($link) {
|
function print_runtime_info($link) {
|
||||||
print "<runtime-info>";
|
print "<runtime-info>";
|
||||||
|
|
||||||
if (ENABLE_UPDATE_DAEMON) {
|
if (ENABLE_UPDATE_DAEMON) {
|
||||||
print "<param key=\"daemon_is_running\" value=\"".
|
print "<param key=\"daemon_is_running\" value=\"".
|
||||||
sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
|
sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
|
||||||
@@ -3659,23 +3661,26 @@
|
|||||||
} */
|
} */
|
||||||
|
|
||||||
print "<td class=\"headlineTitle$rtl_cpart\">";
|
print "<td class=\"headlineTitle$rtl_cpart\">";
|
||||||
|
|
||||||
if ($feed_site_url) {
|
if ($_SESSION["theme"] != "3pane") {
|
||||||
if (!$bottom) {
|
|
||||||
$target = "target=\"_new\"";
|
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] ";
|
||||||
}
|
}
|
||||||
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) {
|
if (!$bottom) {
|
||||||
@@ -4287,16 +4292,22 @@
|
|||||||
|
|
||||||
$num_tags = 0;
|
$num_tags = 0;
|
||||||
|
|
||||||
|
if ($_SESSION["theme"] == "3pane") {
|
||||||
|
$tag_limit = 3;
|
||||||
|
} else {
|
||||||
|
$tag_limit = 6;
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($tags as $tag) {
|
foreach ($tags as $tag) {
|
||||||
$num_tags++;
|
$num_tags++;
|
||||||
$tag_escaped = str_replace("'", "\\'", $tag);
|
$tag_escaped = str_replace("'", "\\'", $tag);
|
||||||
|
|
||||||
$tag_str = "<a href=\"javascript:viewfeed('$tag_escaped')\">$tag</a>, ";
|
$tag_str = "<a href=\"javascript:viewfeed('$tag_escaped')\">$tag</a>, ";
|
||||||
|
|
||||||
if ($num_tags == 6) {
|
if ($num_tags == $tag_limit) {
|
||||||
$tags_str .= "...";
|
$tags_str .= "...";
|
||||||
|
|
||||||
} else if ($num_tags < 6) {
|
} else if ($num_tags < $tag_limit) {
|
||||||
$tags_str .= $tag_str;
|
$tags_str .= $tag_str;
|
||||||
}
|
}
|
||||||
$f_tags_str .= $tag_str;
|
$f_tags_str .= $tag_str;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
require_once "functions.php";
|
require_once "functions.php";
|
||||||
|
|
||||||
define('EXPECTED_CONFIG_VERSION', 11);
|
define('EXPECTED_CONFIG_VERSION', 11);
|
||||||
define('SCHEMA_VERSION', 24);
|
define('SCHEMA_VERSION', 25);
|
||||||
|
|
||||||
if (!file_exists("config.php")) {
|
if (!file_exists("config.php")) {
|
||||||
print __("<b>Fatal Error</b>: You forgot to copy
|
print __("<b>Fatal Error</b>: You forgot to copy
|
||||||
|
|||||||
@@ -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 ('Old-skool', 'compat');
|
||||||
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');
|
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,
|
create table ttrss_users (id integer primary key not null auto_increment,
|
||||||
login varchar(120) not null unique,
|
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;
|
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,
|
create table ttrss_prefs_types (id integer not null primary key,
|
||||||
type_name varchar(100) not null) TYPE=InnoDB;
|
type_name varchar(100) not null) TYPE=InnoDB;
|
||||||
|
|||||||
@@ -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 ('Old-skool', 'compat');
|
||||||
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');
|
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,
|
create table ttrss_users (id serial not null primary key,
|
||||||
login varchar(120) not null unique,
|
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);
|
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,
|
create table ttrss_prefs_types (id integer not null primary key,
|
||||||
type_name varchar(100) not null);
|
type_name varchar(100) not null);
|
||||||
|
|||||||
3
schema/versions/mysql/25.sql
Normal file
3
schema/versions/mysql/25.sql
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
|
||||||
|
|
||||||
|
update ttrss_version set schema_version = 25;
|
||||||
3
schema/versions/pgsql/25.sql
Normal file
3
schema/versions/pgsql/25.sql
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
insert into ttrss_themes (theme_name, theme_path) values ('Three-pane', '3pane');
|
||||||
|
|
||||||
|
update ttrss_version set schema_version = 25;
|
||||||
BIN
themes/3pane/images/ttrss_logo.png
Normal file
BIN
themes/3pane/images/ttrss_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
29
themes/3pane/theme.css
Normal file
29
themes/3pane/theme.css
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
40
tt-rss.js
40
tt-rss.js
@@ -357,27 +357,37 @@ function resize_headlines() {
|
|||||||
|
|
||||||
if (!c_frame || !h_frame) return;
|
if (!c_frame || !h_frame) return;
|
||||||
|
|
||||||
debug("resize_headlines");
|
if (getInitParam("theme") == "3pane") {
|
||||||
|
debug("resize_headlines: HOR-mode");
|
||||||
|
|
||||||
|
c_frame.style.width = '30%';
|
||||||
|
h_frame.style.right = c_frame.offsetWidth - 1 + "px";
|
||||||
|
|
||||||
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 {
|
} else {
|
||||||
h_frame.style.height = document.documentElement.clientHeight * 0.3 + "px";
|
debug("resize_headlines: VER-mode");
|
||||||
c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
|
|
||||||
|
|
||||||
var c_bottom = document.documentElement.clientHeight;
|
if (!is_msie()) {
|
||||||
|
h_frame.style.height = 30 + "%";
|
||||||
if (f_frame) {
|
c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
|
||||||
c_bottom = f_frame.offsetTop;
|
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() {
|
function init_second_stage() {
|
||||||
|
|||||||
Reference in New Issue
Block a user