]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88a41b6)
tweak how utility.css-based stuff looks
authorAndrew Dolgov <fox@fakecake.org>
Wed, 27 Mar 2013 06:59:26 +0000 (10:59 +0400)
committerAndrew Dolgov <fox@fakecake.org>
Wed, 27 Mar 2013 06:59:26 +0000 (10:59 +0400)
classes/handler/public.php patch | blob | history
classes/opml.php patch | blob | history
db-updater.php patch | blob | history
images/logo_small.png [new file with mode: 0644] patch | blob
include/sanity_check.php patch | blob | history
install/index.php patch | blob | history
register.php patch | blob | history
update.php patch | blob | history
utility.css patch | blob | history

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 53051a1f8ccdaae5e3757a35485d1d6a3e394875..1efaa0430404457d2a75873d7f80e73383455ba5 100644 (file)
--- 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 d4a0e987567c7061d385f33f2cf765bb70c8a4e8..4c188de5e0b8d9e9bb3e068ca92b96fc44b2d8c3 100644 (file)
--- 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 17a238d284a8d78c4ffa4b2c4d1d03495a56bc4a..d1212d0d64d036bf687f39dea0e1179b1275bf0b 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..f7f28a6
Binary files /dev/null and b/images/logo_small.png differ
diff --git a/include/sanity_check.php b/include/sanity_check.php
index f428550fdc089c524d3440bce8672eeff75800c3..46e9e9d80b998d9d811775a2c483930b9c0f0103 100644 (file)
--- 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 2ac7a093536d1daa104459746a2d1299da8509dc..b0696ca6d155cdbd161b5f4ff8027b8e8ad419bb 100644 (file)
--- 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 035a2cd8e06bc8ea3b3b9c16e4aff6a797296f17..53627d9128d6a711defcbdb643af4a91cfe1bd3e 100644 (file)
--- 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 6850f1fb2cd528449470587c128b5de452408116..f74b95a98c5069cef0bda89efe51d99fa221f64b 100755 (executable)
--- 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 27054dfe9a8e203c7a68e3910110897855104d95..89a6e71d16bca338dd729f684f53cb3def2e7204 100644 (file)
--- 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 {
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/