Skip to content

Commit

Permalink
New styling for readme.html and installation.
Browse files Browse the repository at this point in the history
git-svn-id: http://lilina.googlecode.com/svn/trunk/lilina@506 13ecc93d-8f1e-0410-9266-85e8f28b97b7
  • Loading branch information
rmccue committed Nov 11, 2009
1 parent 62065b1 commit 41bc308
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 156 deletions.
53 changes: 53 additions & 0 deletions admin/resources/reset.css
@@ -0,0 +1,53 @@
/*
From http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, font, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td {
margin: 0;
padding: 0;
border: 0;
outline: 0;
font-weight: inherit;
font-style: inherit;
font-size: 100%;
font-family: inherit;
vertical-align: baseline;
}

:focus {
outline: 0;
}

body {
line-height: 1;
color: black;
background: white;
}

ol, ul {
list-style: none;
}

table {
border-collapse: separate;
border-spacing: 0;
}

caption, th, td {
text-align: left;
font-weight: normal;
}

blockquote:before, blockquote:after, q:before, q:after {
content: "";
}

blockquote, q {
quotes: "" "";
}
30 changes: 14 additions & 16 deletions inc/core/install-functions.php
Expand Up @@ -80,9 +80,9 @@ public function install($sitename, $username, $password) {
return false;
}
?>
<h1>Installation Complete!</h1>
<h1 id="title">Installation Complete!</h1>
<p>Lilina has been installed and is now ready to go. Please note your username and password below, as it <strong>won't be shown again</strong>!</p>
<dl>
<dl id="logindetails">
<dt>Your username is</dt>
<dd id="username"><?php echo $username;?></dd>
<dt>and your password is</dt>
Expand Down Expand Up @@ -219,14 +219,15 @@ public function file_error_notice($filename, $sitename, $username, $password) {
* Checks the PHP version and whether Lilina is installed and up-to-date
*/
function lilina_check_installed() {
require_once(LILINA_PATH . '/inc/core/version.php');
if(version_compare('5.2', phpversion(), '>'))
lilina_nice_die('<p>Your server is running PHP version ' . phpversion() . ' but Lilina needs PHP 5.2 or newer</p>');
lilina_nice_die('<p>Your server is running PHP version ' . phpversion() . ' but Lilina needs PHP 5.2 or newer.</p>');

if(!lilina_is_installed()) {
lilina_nice_die("<p>Whoops! It doesn't look like you've installed Lilina yet. Don't panic, you can <a href='" . guess_baseurl() . "install.php'>install it now</a></p>", 'Not Installed');
lilina_nice_die("<p>Whoops! It doesn't look like you've installed Lilina yet. Don't panic, you can <a href='" . guess_baseurl() . "install.php'>install it now</a>.</p>", 'Not Installed');
}
if(!lilina_settings_current()) {
lilina_nice_die("<p>Looks like Lilina is out of date! No worries, just <a href='" . guess_baseurl() . "install.php?action=upgrade'>go ahead and update</a></p>", 'Out of Date');
lilina_nice_die("<p>Looks like Lilina is out of date! No worries, just <a href='" . guess_baseurl() . "install.php?action=upgrade'>go ahead and update</a>.</p>", 'Out of Date');
}
}

Expand Down Expand Up @@ -261,9 +262,6 @@ function lilina_settings_current() {

require_once(LILINA_PATH . '/inc/core/conf.php');

global $lilina;
require_once(LILINA_PATH . '/inc/core/version.php');

global $settings;
if( isset($settings['settings_version'])
&& $settings['settings_version'] == LILINA_SETTINGS_VERSION ) {
Expand All @@ -287,18 +285,18 @@ function lilina_nice_die($message, $title = 'Whoops!', $class = false) {
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><?php echo $title; ?> &mdash; Lilina News Aggregator</title>
<style type="text/css">
@import "<?php echo $guessurl ?>install.css";
</style>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<title><?php echo $title; ?> &mdash; Lilina News Aggregator</title>
<link rel="stylesheet" type="text/css" href="<?php echo $guessurl ?>admin/resources/reset.css" />
<link rel="stylesheet" type="text/css" href="<?php echo $guessurl ?>install.css" />
</head>
<body<?php if($class !== false) echo ' class="' . $class . '"'; ?>>
<div id="container">
<h1><?php echo $title; ?></h1>
<div id="content">
<h1 id="title"><?php echo $title; ?></h1>
<?php echo $message; ?>

<img id="logo" src="<?php echo $guessurl ?>admin/logo-small.png" alt="Lilina Logo" />
</div>
<div id="footer">
<p>Powered by <a href="http://getlilina.org/">Lilina</a> <span class="version"><?php echo LILINA_CORE_VERSION; ?></span>. Read the <a href="http://codex.getlilina.org/">documentation</a> or get help on the <a href="http://getlilina.org/forums/">forums</a></p>
</div>
</body>
</html>
Expand Down
209 changes: 99 additions & 110 deletions install.css
@@ -1,127 +1,116 @@
/*
Lilina News Aggregator
Installation Style Sheet
Licensed under the GNU General Public License
Copyright 2007 Ryan McCue
*/

/* General styles for all error pages and installation */
html, body {
color: #333;
html, body { min-height: 100%; }
html {
background: #ccc;
}
body {
font-family: Arial, sans-serif;
font-size: 62.5%;
line-height: 2.2em;
}
h1 {
font-weight: 400;
font-size: 3em;
margin: 0.6em 0;
}
h2 {
font-weight: 400;
font-size: 2.6em;
margin: 0.8em 0;
}
p, ul, pre {
font-size: 1.5em;
margin-top: 1em;
}
ul ul {
font-size: 1em;
min-height: 100%;
background: #fff;
color: #000;
width: 600px;
margin: 0 auto;
border-left: 1px solid #aaa;
border-right: 1px solid #aaa;

font: 12px/16px Arial, sans-serif;
}

a {
text-decoration: none;
color: #2e91d0;
font-weight: 700;
}
#container {
margin: 10em auto 0;
width: 60%;
max-width: 700px;
padding-bottom: 100px;
background: url(admin/logo-small.png) no-repeat center bottom;
text-align: center;
}
#logo {
margin-top: 2em;
display: none;
color: #01A0C7;
}
a:hover {
color: #00F;
}

/* Readme only */
#header-logo {
float: right;
h1, h2, h3, p, form, ul {
margin-bottom: 16px;
}

/* Login only */
.login #container {
width: 40%;
h1, h2, h3 {
border-bottom: 1px solid #ccc;
padding-bottom: 5px;
width: 80%;
}
.alert {
position: absolute;
top: 0;
width: 40%;
left: 30%;
right: 30%;
background: #8CC63F;
padding: 1.5em;
margin: 0;
-moz-border-radius-bottomleft: 8px;
-moz-border-radius-bottomright: 8px;
color: #FFF;
ul ul {
margin-bottom: 0;
}
h1 { font-size: 20px; }
#title {
text-align: center;
border-bottom: 1px solid #aaa;
padding-bottom: 10px;
width: 100%;
}
h2 { font-size: 16px; }
h3 { font-size: 12px; font-weight: bold; }
p {
margin-top: 16px;
}

/* Installation only */
dl {
font-size: 1.5em;
}
dd#username, dd#password {
font-weight: 700;
margin: 0;
padding: 0;
}
#footnote-quote {
color: #999;
text-align: right;
}
ul {
margin-left: 15px;
list-style-type: disc;
}
li {
margin-bottom: 3px;
}
li ul {
margin-top: 3px;
}

/* Forms */
fieldset {
border: none;
margin-top: 1em;
padding: 0;
}
legend {
font-size: 1.8em;
margin: 0.8em 0;
}
form label {
font-size: 1.5em;
padding: 0.5em;
float: left;
}
form .input {
float: right;
padding: 0.6em
}
.row {
width: 80%;
clear: both;
overflow: hidden;
margin: 0 auto;
form .row {
margin-bottom: 20px;
}
label {
display: block;
font-weight: bold;
font-size: 13px;
line-height: 20px;
padding-bottom: 5px;
}
input {
border: 1px solid #ccc;
font-size: 18px;
color: #333;
padding: 5px;
}
.sidenote {
color: #666;
font-size: 11px;
margin: 10px 0;
}

code, pre {
font-family: Consolas, monospace;
font-size: 12px;
}
pre {
margin: 10px;
}

#logindetails {
border: 1px solid #ccc;
padding: 10px;
display: inline-block;
}
#logindetails dd {
margin-left: 10px;
font-weight: bold;
}

.submit {
clear: both;
width: 20%;
margin: 1em 0 0 auto;
font-size: 1.6em;
#footer {
background: #333;
color: #fff;
border: none;
border-radius: px;
-moz-border-radius: 10px;
color: #666;
padding: 10px;
text-align: center;
font-size: 11px;
}
#footer a {
color: #aaa;
}
#footer a:hover {
color: #ddd;
}

#content {
padding: 20px;
}

0 comments on commit 41bc308

Please sign in to comment.