From 884d16505e2c4502ec4438a7e987855683a2d75d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 27 Mar 2013 10:59:26 +0400 Subject: [PATCH] tweak how utility.css-based stuff looks --- classes/handler/public.php | 10 ++++++---- classes/opml.php | 6 +++--- db-updater.php | 6 +++++- images/logo_small.png | Bin 0 -> 4134 bytes include/sanity_check.php | 5 ++++- install/index.php | 9 +++++++-- register.php | 14 +++++++++----- update.php | 2 +- utility.css | 11 +++++++---- 9 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 images/logo_small.png diff --git a/classes/handler/public.php b/classes/handler/public.php index 53051a1f8..1efaa0430 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -537,9 +537,9 @@ class Handler_Public extends Handler { - \"Tiny -

".__("Subscribe to feed...")."

"; +

".__("Subscribe to feed...")."

"; $rc = subscribe_to_feed($this->link, $feed_url); @@ -612,7 +612,7 @@ class Handler_Public extends Handler {

"; - print ""; + print "
"; } else { render_login_form($this->link); @@ -720,8 +720,9 @@ class Handler_Public extends Handler { "; - print ''; + print ''; print "

".__("Reset password")."

"; + print "
"; @$method = $_POST['method']; @@ -790,6 +791,7 @@ class Handler_Public extends Handler { } + print "
"; print ""; print ""; diff --git a/classes/opml.php b/classes/opml.php index d4a0e9875..4c188de5e 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -29,8 +29,8 @@ class Opml extends Handler_Protected { -
-

".__('OPML Utility')."

"; +
+

".__('OPML Utility')."

"; add_feed_category($this->link, "Imported feeds"); @@ -41,7 +41,7 @@ class Opml extends Handler_Protected { "; - print ""; + print "
"; } diff --git a/db-updater.php b/db-updater.php index 17a238d28..d1212d0d6 100644 --- a/db-updater.php +++ b/db-updater.php @@ -39,10 +39,12 @@ function confirmOP() { } - +

+
+ +
+ diff --git a/images/logo_small.png b/images/logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..f7f28a687d06aaa40bf54cb6c1361534a0b8ee03 GIT binary patch literal 4134 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 literal 0 HcmV?d00001 diff --git a/include/sanity_check.php b/include/sanity_check.php index f428550fd..46e9e9d80 100644 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -150,7 +150,8 @@ - + +

Startup failed

@@ -162,6 +163,8 @@

You might want to check tt-rss wiki or the forums for more information. Please search the forums before creating new topic for your question.

+ +
diff --git a/install/index.php b/install/index.php index 2ac7a0935..b0696ca6d 100644 --- a/install/index.php +++ b/install/index.php @@ -102,7 +102,7 @@ $link = mysql_connect($host, $user, $pass); if ($link) { $result = mysql_select_db($db, $link); - return $link; + if ($result) return $link; } } } @@ -131,10 +131,12 @@ ?> - +

Tiny Tiny RSS Installer

+
+ + +

Checking database

+
diff --git a/register.php b/register.php index 035a2cd8e..53627d912 100644 --- a/register.php +++ b/register.php @@ -181,10 +181,12 @@ - +

+
+ quickMail($email, "", "Registration information for Tiny Tiny RSS", $reg_text, false); if (!$rc) print_error($mail->ErrorInfo); - + unset($reg_text); unset($mail); unset($rc); @@ -321,13 +323,13 @@ "\n". "Login: $login\n". "Email: $email\n"; - - + + $mail = new ttrssMailer(); $mail->IsHTML(false); $rc = $mail->quickMail(REG_NOTIFY_ADDRESS, "", "Registration notice for Tiny Tiny RSS", $reg_text, false); if (!$rc) print_error($mail->ErrorInfo); - + print_notice(__("Account created successfully.")); print "

@@ -358,6 +360,8 @@ +
+ diff --git a/update.php b/update.php index 6850f1fb2..f74b95a98 100755 --- a/update.php +++ b/update.php @@ -51,7 +51,7 @@ - +

diff --git a/utility.css b/utility.css index 27054dfe9..89a6e71d1 100644 --- a/utility.css +++ b/utility.css @@ -1,8 +1,9 @@ body { - margin : 2em; - padding : 0em; + margin : 20px; + padding : 0px; font-family : sans-serif; font-size : 12px; + background : white; } p.warning { @@ -68,8 +69,10 @@ div.error { } h1 { - color : #88b0f0; - font-size : 16pt; + color : black; + font-size : 32px; + font-family : serif; + /* text-shadow : 2px 2px 2px #f0f0f0; */ } h2 {