diff options
| -rw-r--r-- | classes/handler/public.php | 10 | ||||
| -rw-r--r-- | css/tt-rss.css | 69 | ||||
| -rw-r--r-- | include/functions.php | 10 | ||||
| -rw-r--r-- | index.php | 10 | ||||
| -rw-r--r-- | plugins/auth_internal/init.php | 2 | ||||
| -rw-r--r-- | prefs.php | 10 |
6 files changed, 22 insertions, 89 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index 31376ff60..27b33b4a5 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -427,9 +427,9 @@ class Handler_Public extends Handler { <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\"> <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">"; - stylesheet_tag("css/utility.css"); - javascript_tag("lib/prototype.js"); - javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"); + echo stylesheet_tag("css/utility.css"); + echo javascript_tag("lib/prototype.js"); + echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"); print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> </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=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">"; - stylesheet_tag("css/utility.css"); - javascript_tag("lib/prototype.js"); + echo stylesheet_tag("css/utility.css"); + echo javascript_tag("lib/prototype.js"); print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> </head><body id='forgotpass'>"; diff --git a/css/tt-rss.css b/css/tt-rss.css index 5cb9d8101..98ff38290 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -978,75 +978,6 @@ div.postHeader span.author { 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 { display : block; margin-top : 10px; diff --git a/include/functions.php b/include/functions.php index 7cdeae3b6..6c6bf2661 100644 --- a/include/functions.php +++ b/include/functions.php @@ -3260,8 +3260,10 @@ header("Content-Type: text/html"); $rv['content'] .= "<html><head> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> - <title>Tiny Tiny RSS - ".$line["title"]."</title> - <link rel=\"stylesheet\" type=\"text/css\" href=\"css/tt-rss.css\"> + <title>Tiny Tiny RSS - ".$line["title"]."</title>". + stylesheet_tag("css/tt-rss.css"). + stylesheet_tag("css/zoom.css")." + <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\"> <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\"> @@ -4306,7 +4308,7 @@ function stylesheet_tag($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) { @@ -4321,7 +4323,7 @@ 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() { @@ -56,15 +56,15 @@ <head> <title>Tiny Tiny RSS</title> - <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> - <?php stylesheet_tag("css/layout.css"); ?> + <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> + <?php echo stylesheet_tag("css/layout.css"); ?> <?php if ($_SESSION["uid"]) { $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false); if ($theme && file_exists("themes/$theme")) { - stylesheet_tag("themes/$theme"); + echo stylesheet_tag("themes/$theme"); } else { - stylesheet_tag("themes/default.css"); + echo stylesheet_tag("themes/default.css"); } } ?> @@ -91,7 +91,7 @@ "lib/dojo/tt-rss-layer.js", "errors.php?mode=js") as $jsfile) { - javascript_tag($jsfile); + echo javascript_tag($jsfile); } ?> diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php index 3c38ab8bf..32ec276a7 100644 --- a/plugins/auth_internal/init.php +++ b/plugins/auth_internal/init.php @@ -51,7 +51,7 @@ class Auth_Internal extends Plugin implements IAuthModule { $return = urlencode($_REQUEST["return"]); ?><html> <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"> <form action="public.php?return=<?php echo $return ?>" method="POST" class="otpform"> @@ -32,15 +32,15 @@ <head> <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title> - <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> - <?php stylesheet_tag("css/layout.css"); ?> + <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> + <?php echo stylesheet_tag("css/layout.css"); ?> <?php if ($_SESSION["uid"]) { $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false); if ($theme && file_exists("themes/$theme")) { - stylesheet_tag("themes/$theme"); + echo stylesheet_tag("themes/$theme"); } else { - stylesheet_tag("themes/default.css"); + echo stylesheet_tag("themes/default.css"); } } ?> @@ -57,7 +57,7 @@ "lib/dojo/tt-rss-layer.js", "errors.php?mode=js") as $jsfile) { - javascript_tag($jsfile); + echo javascript_tag($jsfile); } ?> |