From: Andrew Dolgov Date: Fri, 2 Mar 2007 14:08:00 +0000 (+0100) Subject: opml/db updater tweaks X-Git-Tag: 1.2.9~59 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ef59e6e85fe949a3afcd42a4a9b9df42a625ace2;p=tt-rss.git opml/db updater tweaks --- diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php index 45984102..156e46c7 100644 --- a/modules/opml_domdoc.php +++ b/modules/opml_domdoc.php @@ -82,8 +82,8 @@ (title = '$feed_title' OR feed_url = '$feed_url') AND owner_uid = '$owner_uid'"); - print "$feed_title - (rss)"; + print "$feed_title + (rss)"; if (db_num_rows($result) > 0) { print "Already imported."; diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php index 2a140f32..dabba789 100644 --- a/modules/opml_domxml.php +++ b/modules/opml_domxml.php @@ -85,8 +85,8 @@ (title = '$feed_title' OR feed_url = '$feed_url') AND owner_uid = '$owner_uid'"); - print "$feed_title - (rss)"; + print "$feed_title + (rss)"; if (db_num_rows($result) > 0) { print ""._("Already imported.").""; diff --git a/opml.css b/opml.css deleted file mode 100644 index e6d7612b..00000000 --- a/opml.css +++ /dev/null @@ -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; -} diff --git a/opml.php b/opml.php index b3707df7..718d47bb 100644 --- a/opml.php +++ b/opml.php @@ -97,18 +97,19 @@ print " - + + OPML Utility -

"._('OPML Import')."

"; +

"._('OPML Utility')."

"; if (function_exists('domxml_open_file')) { - print "

Using DOMXML library

"; + print "

Importing OPML (using DOMXML extension)...

"; require_once "modules/opml_domxml.php"; opml_import_domxml($link, $owner_uid); } else { - print "

Using DOMDocument library (PHP5)

"; + print "

Importing OPML (using DOMDocument extension)...

"; require_once "modules/opml_domdoc.php"; opml_import_domdoc($link, $owner_uid); } diff --git a/update.php b/update.php index 34357f2f..4e1eb923 100644 --- a/update.php +++ b/update.php @@ -30,7 +30,7 @@ Database Updater - + @@ -41,6 +41,8 @@ function confirmOP() { } +

Database Updater

Tiny Tiny RSS database is up to date (version $version).

"; - print "

Return to Tiny Tiny RSS

"; + print ""; + return; } @@ -146,8 +151,10 @@ function confirmOP() { print "

Finished. Performed $num_updates updates up to schema version $version.

"; - print "

Return to Tiny Tiny RSS

"; - + print ""; + } ?> diff --git a/utility.css b/utility.css index f4b9da36..9bdb77c2 100644 --- a/utility.css +++ b/utility.css @@ -1,3 +1,8 @@ +body { + margin : 2em; + padding : 0em; +} + p.warning { color : red; } @@ -9,3 +14,17 @@ p.query { p.insensitive { color : gray; } + +.floatingLogo { + float : right; +} + +a { + color : #4684ff; + text-decoration : none; +} + +a:hover { + color : black; +} +