Browse Source

tweak how utility.css-based stuff looks

Andrew Dolgov 7 years ago
parent
commit
884d16505e
9 changed files with 42 additions and 21 deletions
  1. 6 4
      classes/handler/public.php
  2. 3 3
      classes/opml.php
  3. 5 1
      db-updater.php
  4. BIN
      images/logo_small.png
  5. 4 1
      include/sanity_check.php
  6. 7 2
      install/index.php
  7. 9 5
      register.php
  8. 1 1
      update.php
  9. 7 4
      utility.css

+ 6 - 4
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>";
 

+ 3 - 3
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>";
 
 
 	}

+ 5 - 1
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>
 

BIN
images/logo_small.png


+ 4 - 1
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>
 

+ 7 - 2
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>

+ 9 - 5
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>
 

+ 1 - 1
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."); ?>

+ 7 - 4
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 {