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

move Zoom stylesheet to a separate file 

update stylesheet/javascript tag helpers to return output instead of
printing it
This commit is contained in:
Andrew Dolgov 2014-01-28 01:39:24 +04:00
parent 8d6fd8be85
commit cdbcb2778a
6 changed files with 22 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/handler/public.php
View File

@ -427,9 +427,9 @@ class Handler_Public extends Handler {
<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\"> <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">"; <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
stylesheet_tag("css/utility.css"); echo stylesheet_tag("css/utility.css");
javascript_tag("lib/prototype.js"); echo javascript_tag("lib/prototype.js");
javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"); echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head><body id='sharepopup'>"; </head><body id='sharepopup'>";
@ -788,8 +788,8 @@ class Handler_Public extends Handler {
<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\"> <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">"; <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
stylesheet_tag("css/utility.css"); echo stylesheet_tag("css/utility.css");
javascript_tag("lib/prototype.js"); echo javascript_tag("lib/prototype.js");
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head><body id='forgotpass'>"; </head><body id='forgotpass'>";

69
css/tt-rss.css
View File

@ -978,75 +978,6 @@ div.postHeader span.author {
font-weight : normal; font-weight : normal;
} }
body#ttrssZoom {
margin-left : auto;
margin-right : auto;
padding : 20px;
max-width : 670px;
background : #f9fbff;
}
body#ttrssZoom div.postHeader div.postFeedTitle {
float : left;
text-align : right;
padding-left : 0px;
font-size : 10px;
}
body#ttrssZoom div.postHeader a.postComments {
text-align : right;
padding-left : 0px;
font-size : 10px;
}
body#ttrssZoom div.postHeader div.postDate {
float : none;
text-align : right;
padding-left : 0px;
color : #777;
font-size : 10px;
}
body#ttrssZoom div.postHeader div.postTags {
color : #777;
font-size : 10px;
}
body#ttrssZoom div.postHeader div.postTitle {
white-space : normal;
}
body#ttrssZoom div.postContent p {
max-width : 650px;
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
}
body#ttrssZoom div.postHeader {
margin : 10px;
border : 1px solid #ccc;
}
body#ttrssZoom div.postReply {
border : 1px solid #ccc;
background : white;
}
body#ttrssZoom div.postContent {
}
body#ttrssZoom div.footer {
margin-top : 1em;
text-align : center;
}
body#ttrssZoom div.postContent img {
max-width : 650px;
height : auto;
}
select.attachments { select.attachments {
display : block; display : block;
margin-top : 10px; margin-top : 10px;

10
include/functions.php
View File

@ -3260,8 +3260,10 @@
header("Content-Type: text/html"); header("Content-Type: text/html");
$rv['content'] .= "<html><head> $rv['content'] .= "<html><head>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
<title>Tiny Tiny RSS - ".$line["title"]."</title> <title>Tiny Tiny RSS - ".$line["title"]."</title>".
<link rel=\"stylesheet\" type=\"text/css\" href=\"css/tt-rss.css\"> stylesheet_tag("css/tt-rss.css").
stylesheet_tag("css/zoom.css")."
<link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\"> <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
<link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\"> <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
@ -4306,7 +4308,7 @@
function stylesheet_tag($filename) { function stylesheet_tag($filename) {
$timestamp = filemtime($filename); $timestamp = filemtime($filename);
echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$filename?$timestamp\"/>\n"; return "<link rel=\"stylesheet\" type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
} }
function javascript_tag($filename) { function javascript_tag($filename) {
@ -4321,7 +4323,7 @@
if ($query) $timestamp .= "&$query"; if ($query) $timestamp .= "&$query";
echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n"; return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
} }
function calculate_dep_timestamp() { function calculate_dep_timestamp() {

10
index.php
View File

@ -56,15 +56,15 @@
<head> <head>
<title>Tiny Tiny RSS</title> <title>Tiny Tiny RSS</title>
<?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php stylesheet_tag("css/layout.css"); ?> <?php echo stylesheet_tag("css/layout.css"); ?>
<?php if ($_SESSION["uid"]) { <?php if ($_SESSION["uid"]) {
$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false); $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
if ($theme && file_exists("themes/$theme")) { if ($theme && file_exists("themes/$theme")) {
stylesheet_tag("themes/$theme"); echo stylesheet_tag("themes/$theme");
} else { } else {
stylesheet_tag("themes/default.css"); echo stylesheet_tag("themes/default.css");
} }
} }
?> ?>
@ -91,7 +91,7 @@
"lib/dojo/tt-rss-layer.js", "lib/dojo/tt-rss-layer.js",
"errors.php?mode=js") as $jsfile) { "errors.php?mode=js") as $jsfile) {
javascript_tag($jsfile); echo javascript_tag($jsfile);
} ?> } ?>

2
plugins/auth_internal/init.php
View File

@ -51,7 +51,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
$return = urlencode($_REQUEST["return"]); $return = urlencode($_REQUEST["return"]);
?><html> ?><html>
<head><title>Tiny Tiny RSS</title></head> <head><title>Tiny Tiny RSS</title></head>
<?php stylesheet_tag("css/utility.css") ?> <?php echo stylesheet_tag("css/utility.css") ?>
<body class="otp"><div class="content"> <body class="otp"><div class="content">
<form action="public.php?return=<?php echo $return ?>" <form action="public.php?return=<?php echo $return ?>"
method="POST" class="otpform"> method="POST" class="otpform">

10
prefs.php
View File

@ -32,15 +32,15 @@
<head> <head>
<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title> <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
<?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php stylesheet_tag("css/layout.css"); ?> <?php echo stylesheet_tag("css/layout.css"); ?>
<?php if ($_SESSION["uid"]) { <?php if ($_SESSION["uid"]) {
$theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false); $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
if ($theme && file_exists("themes/$theme")) { if ($theme && file_exists("themes/$theme")) {
stylesheet_tag("themes/$theme"); echo stylesheet_tag("themes/$theme");
} else { } else {
stylesheet_tag("themes/default.css"); echo stylesheet_tag("themes/default.css");
} }
} }
?> ?>
@ -57,7 +57,7 @@
"lib/dojo/tt-rss-layer.js", "lib/dojo/tt-rss-layer.js",
"errors.php?mode=js") as $jsfile) { "errors.php?mode=js") as $jsfile) {
javascript_tag($jsfile); echo javascript_tag($jsfile);
} ?> } ?>