Commit dc585739 authored by Nigel McNie's avatar Nigel McNie
Browse files

Installer cleanups:

* Valid HTML with the raw theme
* Tidyups to CSS in raw theme
* Make it more obvious you can't run the installer without JS
parent e3204d24
......@@ -112,7 +112,6 @@ $js = <<< EOJS
true);
}
addLoadEvent( function () { removeElement('jsrequiredforupgrade'); } );
addLoadEvent( processNext );
EOJS;
......
......@@ -5,6 +5,39 @@
* This file is distributed under the same terms as Mahara itself
*/
/* Installer/upgrader */
#gpl-terms {
margin: 0 auto 1em;
width: 30em;
}
#jsrequiredforupgrade {
color: #f00;
}
#installer {
margin: 0 auto;
width: 90%;
}
#installer tr {
height: 2em;
}
#installer th {
vertical-align: middle;
border-bottom: 1px solid #aaa;
}
#installer tr:last-child td {
border-bottom: 1px solid #aaa;
}
#finished {
font-size: larger;
font-weight: bold;
margin-top: 1em;
text-align: center;
visibility: hidden;
}
#msgscol {
width: 50%;
}
/* ADMIN HOME */
#register-site {
text-align: left;
......
{include file='header.tpl' nosearch=true}
<h3 class="center"><a href="http://mahara.org">Mahara</a> {str section='admin' tag='release' args=$releaseargs} {str tag='copyright' section='admin'}</h3>
{include file="columnfullstart.tpl"}
<h3 class="center"><a href="http://mahara.org">Mahara</a> {str section='admin' tag='release' args=$releaseargs} {str tag='copyright' section='admin'}</h3>
<div style="margin: 0 auto 1em; width: 30em;">
<h4 class="center">GNU General Public License</h4>
<div id="gpl-terms">
<h4 class="center">GNU General Public License</h4>
<p>This program is free software; you can redistribute it and/or modify
under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3 of the
......@@ -22,6 +19,4 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/gpl.h
<form action="{$WWWROOT}admin/upgrade.php" method="post" class="center"><input type="submit" class="submit" value="{str tag=agreelicense section=admin}" style="font-weight: bold;"></form>
{include file="columnfullend.tpl"}
{include file='admin/upgradefooter.tpl'}
{include file='header.tpl' nosearch='true'}
{include file="columnfullstart.tpl"}
<h2 class="center">{str tag=performinginstallsandupgrades section=admin}</h2>
<div class="center error" id="jsrequiredforupgrade">{str tag=jsrequiredforupgrade section=admin}</div>
<table id="installer">
<div class="center js-hidden" id="jsrequiredforupgrade">{str tag=jsrequiredforupgrade section=admin}</div>
<table id="installer" class="nojs-hidden-table">
<thead>
<tr>
<th>{str section=admin tag=component}</th>
......@@ -28,8 +25,8 @@
</tr>
{/foreach}
</tbody>
</table>
<div id="finished" style="visibility: hidden; margin-top: 1em; text-align: center;">{str section=admin tag=successfullyinstalled} <a href="{$WWWROOT}">{str section=admin tag=continue}</a></div>
</table>
<div id="finished" class="nojs-hidden-block">{str section=admin tag=successfullyinstalled} <a href="{$WWWROOT}">{str section=admin tag=continue}</a></div>
{include file="columnfullend.tpl"}
......
<div id="footerwrap">
<div id="footer">
<a href="http://mahara.org/">Mahara</a> {if $releaseargs}{str section=admin tag=release args=$releaseargs}{/if}, &copy; 2006 onwards, <a href="http://catalyst.net.nz/">Catalyst IT Ltd</a>
</div>
</div>
</div>
</div>
</body>
</div>
</div>
<div id="footer-wrap" class="center">
<a href="http://mahara.org/">Mahara</a> {if $releaseargs}{str section=admin tag=release args=$releaseargs}{/if}, &copy; 2006 onwards, <a href="http://catalyst.net.nz/">Catalyst IT Ltd</a>
</div>
</div>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment