Commit cd63276d authored by Francois Marier's avatar Francois Marier
Browse files

Installation page: reformat and reword

Move the copyright statement next to the permission statement (as per
http://www.fsf.org/licensing/education/licenses/gpl-howto.html

).

Rename the "I agree" button since technically users/admins don't have
to agree to the GPL before they install Mahara or use it.
Signed-off-by: default avatarFrancois Marier <francois@catalyst.net.nz>
parent ec7d19fd
......@@ -33,7 +33,7 @@ $string['administration'] = 'Administration';
$string['installation'] = 'Installation';
$string['release'] = 'version %s (%s)';
$string['copyright'] = 'Copyright &copy; 2006 onwards, <a href="http://wiki.mahara.org/Contributors">Catalyst IT Ltd and others</a>';
$string['agreelicense'] = 'I agree';
$string['installmahara'] = 'Install Mahara';
$string['component'] = 'Component or plugin';
$string['continue'] = 'Continue';
$string['coredata'] = 'core data';
......
{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>
<div class="message">You may want to check out the <a href="http://wiki.mahara.org/Release_Notes{if substr($releaseargs[0], -3) != 'dev'}/{$releaseargs[0]|escape}{/if}" target="_blank">release notes</a> for this release.</div>
<h3 class="center"><a href="http://mahara.org">Mahara</a> {str section='admin' tag='release' args=$releaseargs}</h3>
<div id="gpl-terms">
<h4 class="center">GNU General Public License</h4>
{str tag='copyright' section='admin'}
<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
......@@ -19,6 +17,8 @@ GNU General Public License for more details.</p>
along with this program. If not, see <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/</a>.
</div>
<form action="{$WWWROOT}admin/upgrade.php" method="post" class="center"><input type="submit" class="submit" value="{str tag=agreelicense section=admin}"></form>
<div class="message">Before you install Mahara, you may want to check out the <a href="http://wiki.mahara.org/Release_Notes{if substr($releaseargs[0], -3) != 'dev'}/{$releaseargs[0]|escape}{/if}" target="_blank">release notes</a> for this release.</div>
<form action="{$WWWROOT}admin/upgrade.php" method="post" class="center"><input type="submit" class="submit" value="{str tag=installmahara section=admin}"></form>
{include file='admin/upgradefooter.tpl'}
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