diff options
| -rw-r--r-- | classes/handler/public.php | 10 | ||||
| -rw-r--r-- | classes/opml.php | 6 | ||||
| -rw-r--r-- | db-updater.php | 6 | ||||
| -rw-r--r-- | images/logo_small.png | bin | 0 -> 4134 bytes | |||
| -rw-r--r-- | include/sanity_check.php | 5 | ||||
| -rw-r--r-- | install/index.php | 9 | ||||
| -rw-r--r-- | register.php | 14 | ||||
| -rwxr-xr-x | update.php | 2 | ||||
| -rw-r--r-- | utility.css | 11 |
9 files changed, 42 insertions, 21 deletions
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 { <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> </head> <body> - <img class=\"floatingLogo\" src=\"images/logo_wide.png\" + <img class=\"floatingLogo\" src=\"images/logo_small.png\" alt=\"Tiny Tiny RSS\"/> - <h1>".__("Subscribe to feed...")."</h1>"; + <h1>".__("Subscribe to feed...")."</h1><div class='content'>"; $rc = subscribe_to_feed($this->link, $feed_url); @@ -612,7 +612,7 @@ class Handler_Public extends Handler { <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> </form></p>"; - print "</body></html>"; + print "</div></body></html>"; } else { render_login_form($this->link); @@ -720,8 +720,9 @@ class Handler_Public extends Handler { </head> <body id='forgotpass'>"; - print '<div class="floatingLogo"><img src="images/logo_wide.png"></div>'; + print '<div class="floatingLogo"><img src="images/logo_small.png"></div>'; print "<h1>".__("Reset password")."</h1>"; + print "<div class='content'>"; @$method = $_POST['method']; @@ -790,6 +791,7 @@ class Handler_Public extends Handler { } + print "</div>"; print "</body>"; print "</html>"; 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 { <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> </head> <body> - <div class=\"floatingLogo\"><img src=\"images/logo_wide.png\"></div> - <h1>".__('OPML Utility')."</h1>"; + <div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div> + <h1>".__('OPML Utility')."</h1><div class='content'>"; add_feed_category($this->link, "Imported feeds"); @@ -41,7 +41,7 @@ class Opml extends Handler_Protected { <input type=\"submit\" value=\"".__("Return to preferences")."\"> </form>"; - print "</body></html>"; + print "</div></body></html>"; } 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() { } </script> -<div class="floatingLogo"><img src="images/logo_wide.png"></div> +<div class="floatingLogo"><img src="images/logo_small.png"></div> <h1><?php echo __("Database Updater") ?></h1> +<div class="content"> + <?php function getline($fp, $delim) { $result = ""; @@ -181,6 +183,8 @@ function confirmOP() { ?> +</div> + </body> </html> diff --git a/images/logo_small.png b/images/logo_small.png Binary files differnew file mode 100644 index 000000000..f7f28a687 --- /dev/null +++ b/images/logo_small.png 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 @@ <link rel="stylesheet" type="text/css" href="utility.css"> </head> <body> - <div class="floatingLogo"><img src="images/logo_wide.png"></div> + <div class="floatingLogo"><img src="images/logo_small.png"></div> + <div class="content"> <h1>Startup failed</h1> @@ -162,6 +163,8 @@ <p>You might want to check tt-rss <a href="http://tt-rss.org/wiki">wiki</a> or the <a href="http://tt-rss.org/forum">forums</a> for more information. Please search the forums before creating new topic for your question.</p> + + </div> </body> </html> 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 @@ ?> -<div class="floatingLogo"><img src="../images/logo_wide.png"></div> +<div class="floatingLogo"><img src="../images/logo_small.png"></div> <h1>Tiny Tiny RSS Installer</h1> +<div class='content'> + <?php if (file_exists("../config.php")) { require "../config.php"; @@ -226,6 +228,8 @@ ?> + <?php print_notice("Configuration check succeeded."); ?> + <h2>Checking database</h2> <?php @@ -347,6 +351,7 @@ } ?> +</div> </body> </html> diff --git a/register.php b/register.php index 035a2cd8e..53627d912 100644 --- a/register.php +++ b/register.php @@ -181,10 +181,12 @@ <body> -<div class="floatingLogo"><img src="images/logo_wide.png"></div> +<div class="floatingLogo"><img src="images/logo_small.png"></div> <h1><?php echo __("Create new account") ?></h1> +<div class="content"> + <?php if (!ENABLE_REGISTRATION) { print_error(__("New user registrations are administratively disabled.")); @@ -311,7 +313,7 @@ $rc = $mail->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 "<p><form method=\"GET\" action=\"index.php\"> @@ -358,6 +360,8 @@ <?php } ?> + </div> + </body> </html> diff --git a/update.php b/update.php index 6850f1fb2..f74b95a98 100755 --- a/update.php +++ b/update.php @@ -51,7 +51,7 @@ </head> <body> - <div class="floatingLogo"><img src="images/logo_wide.png"></div> + <div class="floatingLogo"><img src="images/logo_small.png"></div> <h1><?php echo __("Tiny Tiny RSS data update script.") ?></h1> <?php print_error("Please run this script from the command line. Use option \"-help\" to display command help if this error is displayed erroneously."); ?> 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 { |
