new style: conform to new <scripts.mit.edu> textpattern template

git-svn-id: svn://presbrey.mit.edu/sql/mitsql@99 a142d4bd-2cfb-0310-9673-cb33a7e74f58

diff --git a/mitsql.css b/mitsql.css
index 721c5be49a4331e818c282213a15a664e0a0f1a5..979deeedf9e4b3994cea04b5e98f13f31b2b2bf6 100644 (file)
--- a/mitsql.css
+++ b/mitsql.css
@@ -1,80 +1,19 @@
-body {
-       margin: 1px;
-       font: 12pt verdana, arial, helvetica, sans-serif;
-       background-color: #bbb;
-}
-#body {
-       position: relative;
-       width: 640px;
-       margin-left: auto;
-       margin-right: auto;
-       padding: 5px 2px 2px 2px;
-}
-#content0 {
-       position: relative;
-       padding: 5px 0 5px 0;
-}
-#sitename {
-       font-size: 24pt;
-       font-weight: bold;
-}
-#contact {
-       position: absolute;
-       right: 0;
-       font-size: 10pt;
-       margin-top: 20px;
-}
-#content1 {
-       background-color: #aaa;
-       border: 1px outset #aaa;
-       padding: 3px;
-       font-size: 9pt;
-       text-align: right;
-}
-#content2 {
-       padding: 10px;
-       background-color: #aaa;
-       border: 1px inset #999;
-       font-size: 9pt;
-       text-align: left;
-       display: block;
-       padding-bottom: auto;
-}
-#content3 {
-       background-color: #aaa;
-       padding: 3px;
-       font-size: 7pt;
-       text-align: right;
-       border: 1px outset #999;
-       font-style: italic;
-}
-a, a:link, a:visited, a:active {
-       color: maroon;
-       text-decoration: none;
-}
-a:hover {
-       color: white;
-       text-decoration: none;
-       border-bottom: 1px dashed #aaa;
-}
-form {
+#content_wide form {
        margin: 0;
        display: inline;
 }
-p {
-       font-family: Verdana;
+#content_wide p {
        font-size: 10pt;
        text-indent: 25px;
 }
-h2 {
+#content_wide h2 {
        margin-top: 0;
 }
-input {
-       font-family: Verdana;
+#content_wide input {
        font-size: 9pt;
        border: 1px solid black;
 }
-table,tr,td {
+#content_wide table,tr,td {
        padding: 0;
 }
 td p {
@@ -83,7 +22,7 @@ td p {
        border-left: 1px solid black;
 }
 div.msg {
-       margin: 0px 20px 20px 20px;
+       padding: 0px 20px 0px 0px;
        background-color: #ccc;
        border: 1px solid black;
        font-weight: bold;
@@ -94,7 +33,7 @@ div.msg li {
 }
 div.err {
        color: maroon;
-       margin: 0px 20px 20px 20px;
+       padding: 0px 20px 0px 0px;
        background-color: #ccc;
        border: 1px dashed black;
        font-variant: small-caps;

diff --git a/test.php b/test.php
index 1aab1e4e4c6e2e3f0b71b01a5ff0414a9ec76a2f..16150f4d1ea62651232272762dc4d53495e2986e 100755 (executable)
--- a/test.php
+++ b/test.php
@@ -36,5 +36,11 @@ print_r($GLOBALS);
 
 //checkQuotas();
 
+printMsgs(array('this is a test msg: test 0'));
+printMsgs(array('this is a test msg: test 1', 'this is a test msg: test 2'));
+
+printErrors(array('this is a test error: test 0'));
+printErrors(array('this is a test error: test 1', 'this is a test error: test 2'));
+
 include 'tpl/foot.php';
 ?>

diff --git a/tpl/contact.php b/tpl/contact.php
index 70a721ad1862782c5a9b4244c8fe385036516224..3ab17f3a8072e9f477f37f3c6e48b3559d8bd3d5 100755 (executable)
--- a/tpl/contact.php
+++ b/tpl/contact.php
@@ -2,7 +2,7 @@
 include 'head.php';
 ?>
 
-<h2>Contact/Help</h2>
+<h3>Contact/Help</h3>
 
 <?php printErrors($err); ?>
 

diff --git a/tpl/error.php b/tpl/error.php
index 9b73460fb3f585a8548f5605514542333138a922..873de8e3c43f2407b8c49ceb0bd4ee5718f0f27d 100755 (executable)
--- a/tpl/error.php
+++ b/tpl/error.php
@@ -2,7 +2,7 @@
 include 'head.php';
 ?>
 
-<h2>Page Error</h2>
+<h3>Page Error</h3>
 
 <p>
 The page you were trying to view experienced an error while loading.

diff --git a/tpl/foot.php b/tpl/foot.php
index 736734ad0804af929f045fcbd78db21eca039370..4f46d855e6cd7c08baa7f89e4c47e6b8d2c51b96 100644 (file)
--- a/tpl/foot.php
+++ b/tpl/foot.php
@@ -1,8 +1,21 @@
+                               </div> <!-- end#content -->
+                       </div> <!-- end#main -->
+               </div>
+               <!-- end#rap -->
+               <!-- footer -->
+               <div id="foot">&nbsp;</div>
+               <!-- end#foot -->
+               <div id="clearer">&nbsp;</div>
+               <!-- end#clearer -->
+               <div id="footer">
+                       <p id="credit" style="text-align: right;">
+                               <strong><em>sql.mit.edu v<?php echo VERSION; ?></em></strong>&nbsp;
+                       </p>
+               </div>
+               <!-- end#footer -->
+       </div>
+       <!-- end#outer -->
 </div>
-<?/*
-<div id="content3">The SIPB MySQL Service is part of the <a href="http://scripts.mit.edu">scripts.mit.edu project</a>.<?php //echo VERSION; ?></div>
-*/?>
-<div id="content3"><a alt="scripts.mit.edu" href="/">sql.mit.edu v<?php echo VERSION; ?></a></div>
-</div>
+<!-- end#farouter -->
 </body>
 </html>

diff --git a/tpl/head.php b/tpl/head.php
index 6bcc7fd8a7e32f3e53e74869f32dc88aeb041531..39176ba56b0c6689f90b17063a6d127589becd9d 100644 (file)
--- a/tpl/head.php
+++ b/tpl/head.php
@@ -12,17 +12,27 @@ if (isOffline()) {
 }\r
 \r
 ?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\r
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
-<html>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\r
 <head>\r
+       <meta http-equiv="content-type" content="text/html; charset=utf-8" />\r
     <title>MIT SIPB MySQL Service for Athena</title>\r
-    <link rel=stylesheet href="<?=$BASE_URL?>mitsql.css" type="text/css">\r
-       <base href="<?=$BASE_URL?>">\r
+       <link rel="stylesheet" href="http://scripts.mit.edu/style.css" type="text/css" />\r
+    <link rel="stylesheet" href="<?=$BASE_URL?>mitsql.css" type="text/css" />\r
+       <base href="<?=$BASE_URL?>" />\r
 </head>\r
-\r
 <body>\r
-<div id="body">\r
-<div id="content0"><span id="sitename">MIT SIPB MySQL Service</span><span id="contact"><a href="do/contact">Contact/Help</a></span></div>\r
-<div id="content1"><?php isOnline() && include('menu.php'); ?>&nbsp;</div>\r
-<div id="content2">\r
+<div id="farouter">\r
+       <div id="outer">\r
+               <div id="rap">\r
+                       <div id="masthead">\r
+                               <h1 id="header"><a href="http://sql.mit.edu/">sql.mit.edu</a></h1>\r
+                               <h2 id="tagline">MIT SIPB MySQL Service for Athena<br />\r
+                                       email: <? echo htmlentities('sql@mit.edu'); ?></h2>\r
+                       </div>\r
+                       <div id="hmenu">\r
+                               <?php isOnline() && include('menu.php'); ?>\r
+                       </div>\r
+                       <div id="main">\r
+                               <div id="content_wide">\r

diff --git a/tpl/index.php b/tpl/index.php
index ba88c0eefe223af41e6130c114045dc8bbde560f..24ee7b84a7787fb04e585083ded4f60e7cfd7e29 100644 (file)
--- a/tpl/index.php
+++ b/tpl/index.php
@@ -1,7 +1,7 @@
 <?php
 include 'head.php';
 ?>
-<h2>About</h2>
+<h3>About</h3>
 
 <p>
 This service provides <a href="http://dev.mysql.com/doc">MySQL</a> databases to <a href="http://ca.mit.edu/">MIT certificate</a> holders.
@@ -17,7 +17,7 @@ All uses of this service must comply with the <a href="http://web.mit.edu/olh/We
 The SIPB MySQL Service is part of the <a href="http://scripts.mit.edu/">scripts.mit.edu</a> project.
 </p>
 
-<h2>Backups</h2>
+<h3>Backups</h3>
 
 <p>
 <strong>We strongly recommend you keep your own backups of your SQL schema and data.</strong> Your MySQL data is not stored in AFS.
@@ -25,7 +25,7 @@ Although we use various technical means to try to ensure the availability of you
 </p>
 
 <?/*
-<h2>Quotas</h2>
+<h3>Quotas</h3>
 
 <p>
 By default, new users can create up to <strong>5 databases</strong>, consuming a total of <strong>50 megabytes</strong> of SQL data.
@@ -43,7 +43,7 @@ Although you can drop any of your databases outside this interface, doing so wil
 </p>
 */?>
 
-<h2>Disclaimer</h2>
+<h3>Disclaimer</h3>
 
 <p>
 Although this service has been designed with reliability in mind, the SIPB MySQL service should not be used to host critical applications that cannot tolerate downtime.

diff --git a/tpl/login.php b/tpl/login.php
index cd9acc5ed5efb5af17ca98578fed59fccb5d8b36..a9ce2b5e269e4feb83cd8c87589dbe4e18f31303 100644 (file)
--- a/tpl/login.php
+++ b/tpl/login.php
@@ -4,21 +4,21 @@ include 'head.php';
 $thisTxt = isSSL()?' using this Certificate':' using your MySQL Password';
 ?>
 
-<h2>Login</h2>
+<h3>Login</h3>
 
 <?php printErrors($err); ?>
 
 <?php if (!isSSL()): ?>
 
 <form method=post action="<?=$URI?>">
-<h3>Please enter your MySQL login information:</h3>
+<p>Please enter your MySQL login information:</p>
 <p>username: <input type="text" name="u" value="<?=isset($i_u)?$i_u:''?>"></p>
 <p>password: <input type="password" name="p"></p>
 
 <?php elseif (isSSL() && !empty($SSLCred)): ?>
 
 <form method=post action="<?=$URI?>">
-<h3>You are identified as: <?=$SSLUsername?></h3>
+<p>You are identified as: <?=$SSLUsername?></p>
 <p><?=$SSLName?></p>
 <p><?=$SSLEmail?></p>
 
@@ -31,7 +31,7 @@ $thisTxt = isSSL()?' using this Certificate':' using your MySQL Password';
 
 <?php elseif (isSSL() && !is_null($SSLCred)): ?>
 
-<h3><a href="do/signup">Sign up</a> to use this service.</h3>
+<p><a href="do/signup">Sign up</a> to use this service.</p>
 
 <?php endif; ?>
 

diff --git a/tpl/main.php b/tpl/main.php
index c52a23b6756d809582117a02a5419f270ed8bcf9..d3744eba2a51bc7fa0dacc29a8291185b391f47f 100644 (file)
--- a/tpl/main.php
+++ b/tpl/main.php
@@ -12,7 +12,7 @@ if (isset($i_dropask)) {
 }
 
 ?>
-<h2>Databases</h2>
+<h3>Databases</h3>
 
 <form method="post" action="<?=$URI?>">
 <?php printErrors($err1); ?>
@@ -58,7 +58,7 @@ if (isset($i_dropask)) {
 <input type=submit value="add"></p>
 </form>
 
-<h2>Manage Data</h2>
+<h3>Manage Data</h3>
 <p>One interface we recommend for managing SQL data is <a href="https://scripts.mit.edu/~sql/phpMyAdmin/" target="_blank">phpMyAdmin</a>. Feel free to use it after you've created your databases.</p>
 
 <?php

diff --git a/tpl/menu.php b/tpl/menu.php
index e3aa9f0704a93624fc2aa88436d0da480d80ba50..7de4ac47bc371fe10f637effaafca6ff92e528ce 100644 (file)
--- a/tpl/menu.php
+++ b/tpl/menu.php
@@ -1,27 +1,32 @@
+                               <div id="hnav">
+                                       <ul id="navlist">
 <?php if (isLoggedIn()): ?>
 <div style="float:left">
-<a href="do/main?refresh">Databases</a> |
-<a href="do/setup">Account</a> |
+<li><a href="do/main?refresh">Databases</a></li>
+<li><a href="do/setup">Account</a></li>
 <?php if (isAdmin()) { ?>
-<a href="do/admin/main">Admin</a> |
+<li><a href="do/admin/main">Admin</a></li>
 <?php } ?>
-<a href="do/logout">Logout</a>
-</div>&nbsp;
+<li><a href="do/logout">Logout</a></li>
+</div>
 <?php
        $loggedInText = $Login->getUsername();
        if (isImpersonating()) {
-               $loggedInText = '<a href="do/admin/main?impersonate">'.$loggedInText.'</a>';
+               $loggedInText = '<li><a href="do/admin/main?impersonate">'.$loggedInText.'</a></li>';
        }
 ?>
-Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>
+<div style="text-align: right;">
+Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>&nbsp;
+</div>
 <?php else: ?>
-<div style="float:left; position: relative;">
-<a href="do/signup">Sign up</a> |
-<a href="https://scripts.mit.edu/~sql/phpMyAdmin/" target="_blank">phpMyAdmin</a> |
-<a href="do/index">Home</a>
+<div style="float:left;">
+<li><a href="do/signup">Sign up</a></li>
+<li><a href="https://scripts.mit.edu/~sql/phpMyAdmin/" target="_blank">phpMyAdmin</a></li>
+<li><a href="do/index">Home</a></li>
 </div>
-<div style="float: right;">
-Login via <a href="do/login?ssl=0">SQL Password</a> or <a href="do/login?ssl=1">MIT Certificate</a>
+<div style="text-align: right;">
+Login via <li><a href="do/login?ssl=0">SQL Password</a><li><a href="do/login?ssl=1">MIT Certificate</a></li>
 </div>
-&nbsp;
 <?php endif; ?>
+                                       </ul>
+                               </div>

diff --git a/tpl/offline.php b/tpl/offline.php
index dffa7e0ba6492cf33527037de04564254f8ec268..c330bc7b139a52b10f907c2aeb88eeff319239b7 100755 (executable)
--- a/tpl/offline.php
+++ b/tpl/offline.php
@@ -2,7 +2,7 @@
 include 'head.php';
 ?>
 
-<h2>System Maintenance</h2>
+<h3>System Maintenance</h3>
 
 <p>
 The MySQL Service interface is temporarily offline while we perform system maintenance.

diff --git a/tpl/setup.php b/tpl/setup.php
index fb5b6fe6b61c63a95e5ccecaabe21d52a8789186..284a69a7e2fef1ac921f601f6e36393d0d0a0034 100755 (executable)
--- a/tpl/setup.php
+++ b/tpl/setup.php
@@ -2,7 +2,7 @@
 include 'head.php';
 ?>
 
-<h2>Change MySQL Password</h2>
+<h3>Change MySQL Password</h3>
 
 Your MySQL password should be different from your Athena account password.<br>
 <br>

diff --git a/tpl/signup.php b/tpl/signup.php
index e5e532e7a25b9194fb3df9cb44cb762071e34a8e..b980a4a1328eb39d12add1a2a61537b786529d3c 100644 (file)
--- a/tpl/signup.php
+++ b/tpl/signup.php
@@ -4,12 +4,12 @@ include 'head.php';
 $thisTxt = isSSL()?' with this Certificate':' via SQL';
 ?>
 
-<h2>Signup</h2>
+<h3>Signup</h3>
 
 <?php printErrors($err); ?>
 
 <?php if ($LoginSSL->canSignup()): ?>
-<h3>You are registering as: <?=$LoginSSL->getUsername()?></h3>
+<p>You are registering as: <?=$LoginSSL->getUsername()?></p>
 <p><?=$LoginSSL->getName()?></p>
 <p><?=$LoginSSL->getEmail()?></p>
 
@@ -23,7 +23,7 @@ Your MySQL password should be different from your Athena account password.
 
 <?php elseif ($LoginSSL->canLogin()): ?>
 
-<h3>This account is already signed up.</h3>
+<p>Your account [<?=$LoginSSL->getUsername()?>] is already signed up.</p>
 
 <?php else: ?>