diff options
Diffstat (limited to 'classes/handler/public.php')
| -rwxr-xr-x | classes/handler/public.php | 93 |
1 files changed, 68 insertions, 25 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index 67c188142..8c2700012 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -111,6 +111,8 @@ class Handler_Public extends Handler { $content = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]); + $content = DiskCache::rewriteUrls($content); + if ($line['note']) { $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" . $content; @@ -364,7 +366,18 @@ class Handler_Public extends Handler { <html><head> <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/> <title>".$line["title"]."</title>". - stylesheet_tag("css/default.css")." + javascript_tag("lib/prototype.js"). + javascript_tag("js/utility.js")." + <style type='text/css'> + @media (prefers-color-scheme: dark) { + body { + background : #222; + } + } + body.css_loading * { + display : none; + } + </style> <link rel='shortcut icon' type='image/png' href='images/favicon.png'> <link rel='icon' type='image/png' sizes='72x72' href='images/favicon-72px.png'>"; @@ -387,7 +400,7 @@ class Handler_Public extends Handler { $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>"; } - $rv .= "<body class='flat ttrss_utility ttrss_zoom'>"; + $rv .= "<body class='flat ttrss_utility ttrss_zoom css_loading'>"; $rv .= "<div class='container'>"; if ($line["link"]) { @@ -510,28 +523,43 @@ class Handler_Public extends Handler { <head> <title><?php echo __("Share with Tiny Tiny RSS") ?></title> <?php - echo stylesheet_tag("css/default.css"); echo javascript_tag("lib/prototype.js"); echo javascript_tag("lib/dojo/dojo.js"); + echo javascript_tag("js/utility.js"); echo javascript_tag("lib/dojo/tt-rss-layer.js"); echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls") ?> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <link rel="shortcut icon" type="image/png" href="images/favicon.png"> <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png"> + <style type="text/css"> + @media (prefers-color-scheme: dark) { + body { + background : #303030; + } + } + + body.css_loading * { + display : none; + } + </style> </head> - <body class='flat ttrss_utility share_popup'> + <body class='flat ttrss_utility share_popup css_loading'> <script type="text/javascript"> - require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form', - 'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser, ready){ - ready(function() { - parser.parse(); - - new Ajax.Autocompleter('labels_value', 'labels_choices', - "backend.php?op=rpc&method=completeLabels", - { tokens: ',', paramName: "search" }); - }); - }); + const UtilityApp = { + init: function() { + require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form', + 'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'], function(parser, ready){ + ready(function() { + parser.parse(); + + new Ajax.Autocompleter('labels_value', 'labels_choices', + "backend.php?op=rpc&method=completeLabels", + { tokens: ',', paramName: "search" }); + }); + }); + } + }; </script> <div class="content"> @@ -718,23 +746,38 @@ class Handler_Public extends Handler { <head> <title>Tiny Tiny RSS</title> <?php - echo stylesheet_tag("css/default.css"); echo javascript_tag("lib/prototype.js"); + echo javascript_tag("js/utility.js"); echo javascript_tag("lib/dojo/dojo.js"); echo javascript_tag("lib/dojo/tt-rss-layer.js"); ?> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <link rel="shortcut icon" type="image/png" href="images/favicon.png"> <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png"> + <style type="text/css"> + @media (prefers-color-scheme: dark) { + body { + background : #303030; + } + } + + body.css_loading * { + display : none; + } + </style> </head> - <body class='flat ttrss_utility'> + <body class='flat ttrss_utility css_loading'> <script type="text/javascript"> - require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form', - 'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser, ready){ - ready(function() { - parser.parse(); - }); - }); + const UtilityApp = { + init: function() { + require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form', + 'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'], function(parser, ready){ + ready(function() { + parser.parse(); + }); + }); + } + }; </script> <div class="container"> <h1><?php echo __("Subscribe to feed...") ?></h1> @@ -860,7 +903,7 @@ class Handler_Public extends Handler { <link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <?php - echo stylesheet_tag("css/default.css"); + echo stylesheet_tag("themes/light.css"); echo javascript_tag("lib/prototype.js"); echo javascript_tag("lib/dojo/dojo.js"); echo javascript_tag("lib/dojo/tt-rss-layer.js"); @@ -1061,11 +1104,11 @@ class Handler_Public extends Handler { <head> <title>Database Updater</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <?php echo stylesheet_tag("css/default.css") ?> + <?php echo stylesheet_tag("themes/light.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"> <?php - echo stylesheet_tag("css/default.css"); + echo stylesheet_tag("themes/light.css"); echo javascript_tag("lib/prototype.js"); echo javascript_tag("lib/dojo/dojo.js"); echo javascript_tag("lib/dojo/tt-rss-layer.js"); |