valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable triple-pane theme; fix theme system not working

This commit is contained in:
Andrew Dolgov 2010-11-17 13:39:30 +03:00
parent 500943a45b
commit 8d3cb8c0a9
7 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
functions.php
View File

@ -2044,9 +2044,9 @@
}
if ($theme_path) {
if (is_file("$t/theme.ini")) {
$ini = parse_ini_file("$t/theme.ini", true);
if ($ini['theme']['version'] > THEME_VERSION_REQUIRED) {
if (is_file("$theme_path/theme.ini")) {
$ini = parse_ini_file("$theme_path/theme.ini", true);
if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) {
return $theme_path;
}
}
@ -2068,6 +2068,20 @@
return '';
}
function print_theme_includes($link) {
$t = get_user_theme_path($link);
$time = time();
if ($t) {
print "<link rel=\"stylesheet\" type=\"text/css\"
href=\"$t/theme.css?$time \">";
if (file_exists("$t/theme.js")) {
print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\">
</script>";
}
}
}
function get_all_themes() {
$themes = glob("themes/*");
@ -2079,7 +2093,7 @@
foreach ($themes as $t) {
if (is_file("$t/theme.ini")) {
$ini = parse_ini_file("$t/theme.ini", true);
if ($ini['theme']['version'] > THEME_VERSION_REQUIRED &&
if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED &&
!$ini['theme']['disabled']) {
$entry = array();
$entry["path"] = $t;

5
prefs.php
View File

@ -27,10 +27,7 @@
<link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
<?php $user_theme = get_user_theme_path($link);
if ($user_theme) { ?>
<link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css"/>
<?php } ?>
<?php print_theme_includes($link) ?>
<?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
<?php if ($user_css_url) { ?>

13
themes/triple-pane/theme.css
View File

@ -1,4 +1,13 @@
div.headlines_normal {
#content-insert {
border-left-width : 1px;
border-bottom-width : 0px;
}
#headlines-frame {
border-right-width : 1px;
}
/* div.headlines_normal {
position : absolute;
border-width : 1px 1px 0px 0px;
right : 400px;
@ -66,7 +75,7 @@ span.headlineInnerTitle {
bottom : 0px;
top : 0px;
}
} */
/*#footer, #prefFooter {

4
themes/triple-pane/theme.ini
View File

@ -1,5 +1,5 @@
[theme]
name=Triple-Pane
author=seeker
version=1.0
options=horiz_resize,hide_footer
version=1.1
options=

14
themes/triple-pane/theme.js Normal file
View File

@ -0,0 +1,14 @@
function themeBeforeLayout() {
$("headlines-wrap-inner").setAttribute("design", 'sidebar');
$("content-insert").setAttribute("region", "trailing");
$("content-insert").setStyle({
width: '50%',
height: 'auto'});
}
function themeAfterLayout() {
$("headlines-toolbar").setStyle({
'border-right-width': '1px',
'border-color': '#88b0f0',
});
}

9
tt-rss.js
View File

@ -282,9 +282,18 @@ function init() {
dojo.require("dijit.form.Select");
dojo.require("dojo.parser");
if (typeof themeBeforeLayout == 'function') {
themeBeforeLayout();
}
dojo.addOnLoad(function() {
updateFeedList();
closeArticlePanel();
if (typeof themeAfterLayout == 'function') {
themeAfterLayout();
}
});
if (!genericSanityCheck())

5
tt-rss.php
View File

@ -30,10 +30,7 @@
<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
<?php $user_theme = get_user_theme_path($link);
if ($user_theme) { ?>
<link rel="stylesheet" type="text/css" href="<?php echo $user_theme ?>/theme.css?<?php echo $dt_add ?>">
<?php } ?>
<?php print_theme_includes($link) ?>
<?php $user_css_url = get_pref($link, 'USER_STYLESHEET_URL'); ?>
<?php if ($user_css_url) { ?>