opml/db updater tweaks

This commit is contained in:
Andrew Dolgov 2007-03-02 15:08:00 +01:00
parent 75b206cb88
commit ef59e6e85f
6 changed files with 40 additions and 70 deletions

View File

@ -82,8 +82,8 @@
(title = '$feed_title' OR feed_url = '$feed_url') (title = '$feed_title' OR feed_url = '$feed_url')
AND owner_uid = '$owner_uid'"); AND owner_uid = '$owner_uid'");
print "<tr><td><a href='$site_url'><b>$feed_title</b></a></b> print "<tr><td><a target='_new' href='$site_url'><b>$feed_title</b></a></b>
(<a href=\"$feed_url\">rss</a>)</td>"; (<a target='_new' href=\"$feed_url\">rss</a>)</td>";
if (db_num_rows($result) > 0) { if (db_num_rows($result) > 0) {
print "<td>Already imported.</td>"; print "<td>Already imported.</td>";

View File

@ -85,8 +85,8 @@
(title = '$feed_title' OR feed_url = '$feed_url') (title = '$feed_title' OR feed_url = '$feed_url')
AND owner_uid = '$owner_uid'"); AND owner_uid = '$owner_uid'");
print "<tr><td><a href='$site_url'><b>$feed_title</b></a></b> print "<tr><td><a target='_new' href='$site_url'><b>$feed_title</b></a></b>
(<a href=\"$feed_url\">rss</a>)</td>"; (<a target='_new' href=\"$feed_url\">rss</a>)</td>";
if (db_num_rows($result) > 0) { if (db_num_rows($result) > 0) {
print "<td>"._("Already imported.")."</td>"; print "<td>"._("Already imported.")."</td>";

View File

@ -1,57 +0,0 @@
body {
margin : 0px;
padding : 0px;
background : white;
color : black;
}
h1 {
font-size : 16pt;
font-weight : bold;
border-width : 0px 0px 1px 0px;
border-color : #88b0f0;
border-style : solid;
margin-top : 2em;
}
h2 {
font-size : 14pt;
font-weight : bold;
border-width : 0px 0px 1px 0px;
border-style : solid;
border-color : #e0e0e0;
}
div.opmlBody {
margin : 30px;
}
div.error {
background : #fff0f0;
border : 1px solid #c0c0c0;
padding : 5px;
font-size : x-small;
}
a {
text-decoration : none;
}
a {
color : black;
text-decoration : none;
}
a:hover {
color : #5050aa;
}
ul {
list-style-type : none;
margin : 0px;
padding : 10px;
}
.insensitive {
color : gray;
}

View File

@ -97,18 +97,19 @@
print "<html> print "<html>
<head> <head>
<link rel=\"stylesheet\" href=\"opml.css\" type=\"text/css\"> <link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\">
<title>OPML Utility</title>
</head> </head>
<body> <body>
<div style='float : right'><img src=\"images/ttrss_logo.png\"></div> <div class=\"floatingLogo\"><img src=\"images/ttrss_logo.png\"></div>
<h1>"._('OPML Import')."</h1>"; <h1>"._('OPML Utility')."</h1>";
if (function_exists('domxml_open_file')) { if (function_exists('domxml_open_file')) {
print "<p class='insensitive'>Using DOMXML library</p>"; print "<p>Importing OPML (using DOMXML extension)...</p>";
require_once "modules/opml_domxml.php"; require_once "modules/opml_domxml.php";
opml_import_domxml($link, $owner_uid); opml_import_domxml($link, $owner_uid);
} else { } else {
print "<p class='insensitive'>Using DOMDocument library (PHP5)</p>"; print "<p>Importing OPML (using DOMDocument extension)...</p>";
require_once "modules/opml_domdoc.php"; require_once "modules/opml_domdoc.php";
opml_import_domdoc($link, $owner_uid); opml_import_domdoc($link, $owner_uid);
} }

View File

@ -30,7 +30,7 @@
<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="update.css"> <link rel="stylesheet" type="text/css" href="utility.css">
</head> </head>
<body> <body>
@ -41,6 +41,8 @@ function confirmOP() {
} }
</script> </script>
<div class="floatingLogo"><img src="images/ttrss_logo.png"></div>
<h1>Database Updater</h1> <h1>Database Updater</h1>
<?php <?php
@ -81,7 +83,10 @@ function confirmOP() {
if ($version == $latest_version) { if ($version == $latest_version) {
print "<p>Tiny Tiny RSS database is up to date (version $version).</p>"; print "<p>Tiny Tiny RSS database is up to date (version $version).</p>";
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>"; print "<form method=\"GET\" action=\"tt-rss.php\">
<input type=\"submit\" value=\"Return to Tiny Tiny RSS\">
</form>";
return; return;
} }
@ -146,7 +151,9 @@ function confirmOP() {
print "<p>Finished. Performed $num_updates updates up to schema print "<p>Finished. Performed $num_updates updates up to schema
version $version.</p>"; version $version.</p>";
print "<p><a href='tt-rss.php'>Return to Tiny Tiny RSS</a></p>"; print "<form method=\"GET\" action=\"tt-rss.php\">
<input type=\"submit\" value=\"Return to Tiny Tiny RSS\">
</form>";
} }

View File

@ -1,3 +1,8 @@
body {
margin : 2em;
padding : 0em;
}
p.warning { p.warning {
color : red; color : red;
} }
@ -9,3 +14,17 @@ p.query {
p.insensitive { p.insensitive {
color : gray; color : gray;
} }
.floatingLogo {
float : right;
}
a {
color : #4684ff;
text-decoration : none;
}
a:hover {
color : black;
}