move stylesheets to css/, reference default tt-rss stylesheets from

default.css to make custom themes easier
master
Andrew Dolgov 12 years ago
parent a5eca88750
commit 5bbc4bb4b0

@ -44,7 +44,7 @@ class Article extends Handler_Protected {
} else if ($mode == "raw") { } else if ($mode == "raw") {
if ($_REQUEST['html']) { if ($_REQUEST['html']) {
header("Content-Type: text/html"); header("Content-Type: text/html");
print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>'; print '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>';
} }
$article = format_article($id, false); $article = format_article($id, false);

@ -382,7 +382,7 @@ class Handler_Public extends Handler {
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
print "<html><head><title>Tiny Tiny RSS</title>"; print "<html><head><title>Tiny Tiny RSS</title>";
stylesheet_tag("utility.css"); stylesheet_tag("css/utility.css");
javascript_tag("lib/prototype.js"); javascript_tag("lib/prototype.js");
javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"); 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\"/>
@ -553,7 +553,7 @@ class Handler_Public extends Handler {
print "<html> print "<html>
<head> <head>
<title>Tiny Tiny RSS</title> <title>Tiny Tiny RSS</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\"> <link rel=\"stylesheet\" type=\"text/css\" href=\"css/utility.css\">
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head> </head>
<body> <body>
@ -735,7 +735,7 @@ class Handler_Public extends Handler {
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
print "<html><head><title>Tiny Tiny RSS</title>"; print "<html><head><title>Tiny Tiny RSS</title>";
stylesheet_tag("utility.css"); stylesheet_tag("css/utility.css");
javascript_tag("lib/prototype.js"); 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\"/>
@ -835,7 +835,7 @@ class Handler_Public extends Handler {
<head> <head>
<title>Database Updater</title> <title>Database Updater</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="utility.css"/> <link rel="stylesheet" type="text/css" href="css/utility.css"/>
</head> </head>
<style type="text/css"> <style type="text/css">
span.ok { color : #009000; font-weight : bold; } span.ok { color : #009000; font-weight : bold; }

@ -24,7 +24,7 @@ class Opml extends Handler_Protected {
print "<html> print "<html>
<head> <head>
<link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\"> <link rel=\"stylesheet\" href=\"css/utility.css\" type=\"text/css\">
<title>".__("OPML Utility")."</title> <title>".__("OPML Utility")."</title>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head> </head>

@ -962,7 +962,7 @@ class Pref_Prefs extends Handler_Protected {
$value = str_replace("<br/>", "\n", $value); $value = str_replace("<br/>", "\n", $value);
print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "tt-rss.css")); print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline.", "css/tt-rss.css"));
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">"; print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setpref\">"; print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setpref\">";

@ -3126,7 +3126,7 @@
$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=\"tt-rss.css\"> <link rel=\"stylesheet\" type=\"text/css\" href=\"css/tt-rss.css\">
</head><body id=\"ttrssZoom\">"; </head><body id=\"ttrssZoom\">";
} }

@ -2,7 +2,7 @@
<head> <head>
<title>Tiny Tiny RSS : Login</title> <title>Tiny Tiny RSS : Login</title>
<link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/> <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
<link rel="stylesheet" type="text/css" href="tt-rss.css"> <link rel="stylesheet" type="text/css" href="css/tt-rss.css">
<link rel="shortcut icon" type="image/png" href="images/favicon.png"> <link rel="shortcut icon" type="image/png" href="images/favicon.png">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript" src="lib/dojo/dojo.js"></script> <script type="text/javascript" src="lib/dojo/dojo.js"></script>

@ -160,7 +160,7 @@
<head> <head>
<title>Startup failed</title> <title>Startup failed</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="utility.css"> <link rel="stylesheet" type="text/css" href="css/utility.css">
</head> </head>
<body> <body>
<div class="floatingLogo"><img src="images/logo_small.png"></div> <div class="floatingLogo"><img src="images/logo_small.png"></div>

@ -57,13 +57,13 @@
<title>Tiny Tiny RSS</title> <title>Tiny Tiny RSS</title>
<?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?> <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php stylesheet_tag("tt-rss.css"); ?>
<?php stylesheet_tag("cdm.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) { if ($theme && file_exists("themes/$theme")) {
stylesheet_tag("themes/$theme"); stylesheet_tag("themes/$theme");
} else {
stylesheet_tag("themes/default.css");
} }
} }
?> ?>

@ -2,7 +2,7 @@
<head> <head>
<title>Tiny Tiny RSS - Installer</title> <title>Tiny Tiny RSS - Installer</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="../utility.css"> <link rel="stylesheet" type="text/css" href="../css/utility.css">
<style type="text/css"> <style type="text/css">
textarea { font-size : 12px; } textarea { font-size : 12px; }
</style> </style>

@ -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("utility.css") ?> <?php 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">

@ -33,13 +33,13 @@
<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 stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php stylesheet_tag("tt-rss.css"); ?>
<?php stylesheet_tag("prefs.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) { if ($theme && file_exists("themes/$theme")) {
stylesheet_tag("themes/$theme"); stylesheet_tag("themes/$theme");
} else {
stylesheet_tag("themes/default.css");
} }
} }
?> ?>

@ -93,7 +93,7 @@
<head> <head>
<title>Create new account</title> <title>Create new account</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="utility.css"> <link rel="stylesheet" type="text/css" href="css/utility.css">
<script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript" src="js/functions.js"></script>
<script type="text/javascript" src="lib/prototype.js"></script> <script type="text/javascript" src="lib/prototype.js"></script>
<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script> <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>

@ -0,0 +1,3 @@
@import "../css/tt-rss.css";
@import "../css/cdm.css";
@import "../css/prefs.css";

@ -47,7 +47,7 @@
<head> <head>
<title>Tiny Tiny RSS data update script.</title> <title>Tiny Tiny RSS data update script.</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="utility.css"> <link rel="stylesheet" type="text/css" href="css/utility.css">
</head> </head>
<body> <body>

Loading…
Cancel
Save