Commit ffb7823d authored by Penny Leach's avatar Penny Leach
Browse files

Reparented default onto raw, and removed redundant overrides

Non-Meaningful is defined as:

- no result from diff -uw
- line changes only from diff -uw
- removal of escaping (probably caused by devs adding |escape to the
  master templates and evonne having copied the old one)
- diff, but caused by new features on master in the templates and not in
  evonnes copy (eg plugin config page has disable links now)
parent 05122300
......@@ -26,6 +26,6 @@
$theme = new StdClass;
$theme->name = 'Default';
$theme->parent = null;
$theme->parent = 'raw';
?>
{include file="header.tpl"}
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
<div id="notifications">
<form method="post">
<label>{str section='activity' tag='type'}:</label>
<select name="type" onChange="{$typechange}">
<option value="all">{str section='activity' tag='alltypes'}</option>
{foreach from=$types item=name key=type}
<option value="{$type}">{$name}</option>
{/foreach}
</select>{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</form>
<form name="notificationlist" method="post" onSubmit="{$markread}">
<table id="activitylist" class="fullwidth">
<thead>
<tr>
<th>{str section='activity' tag='subject'}</th>
<th>{str section='activity' tag='type'}</th>
<th>{str section='activity' tag='date'}</th>
<th width="50">{str section='activity' tag='read'}<br><a href="" onclick="{$selectallread}">{str section='activity' tag='selectall'}</a></th>
<th width="50">{str tag='delete'}<br><a href="" onclick="{$selectalldel}">{str section='activity' tag='selectall'}</a></th>
</tr>
</thead>
<tbody>
</tbody>
<tfoot>
<tr>
<td colspan="5" class="markasreadtd">
<div class="fr">
<input class="submit" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn-delete" type="button" value="{str tag='delete'}" onClick="{$markdel}" />
</div>
<div id="messagediv"></div></td>
</tr>
</tfoot>
</table>
</form>
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
{$prefsdescr}
{$form}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
{$form}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
<p>{str tag="institutionmembershipdescription"}</p>
{$memberform}
{$requestedform}
{$invitedform}
{if !empty($joinform)}
<h3>{str tag="requestmembershipofaninstitution"}</h3>
{$joinform}
{/if}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
<div id="column-right">
</div>
{include file="columnleftstart.tpl"}
<h2>{str section=admin tag=editmenus}</h2>
{str tag=edit}:
<select id="menuselect" name="menuselect">
{foreach from=$MENUS item=menu}
<option value={$menu.value}>{$menu.name}</option>
{/foreach}
</select>
<div id="menuitemlist"></div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
<div id="column-right">
</div>
{include file="columnleftstart.tpl"}
<h2>{str section=admin tag=editsitecontent}</h2>
{$pageeditform}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file='header.tpl'}
{include file="columnfullstart.tpl"}
<h2>{$heading}</h2>
<p>{str tag=htmlfiltersdescription section=admin}</p>
{if $filters}
<h3>{str tag=installed section=admin}:</h3>
<ul>
{foreach from=$filters item=filter}
<li>{$filter->site}</li>
{/foreach}
</ul>
{else}
<p>{str tag=nofiltersinstalled section=admin}</p>
{/if}
<p>{$newfiltersdescription}</p>
<div>{$reloadform}</div>
{include file="columnfullend.tpl"}
{include file='footer.tpl'}
{include file='header.tpl'}
{include file="columnfullstart.tpl"}
{$form}
{include file="columnfullend.tpl"}
{include file='footer.tpl'}
{include file='header.tpl'}
{include file="columnfullstart.tpl"}
<div id="adminplugin">
<ul class="adminpluginstypes">
{foreach from=$plugins key='plugintype' item='plugins'}
<li><h4>{str tag='plugintype'}: {$plugintype}</h4>
{assign var="installed" value=$plugins.installed}
{assign var="notinstalled" value=$plugins.notinstalled}
<ul>
<li><b>{str tag='installedplugins'}</b>
<ul id="{$plugintype}.installed">
{foreach from=$installed key='plugin' item='data'}
<li id="{$plugintype}.{$plugin}">{$plugin}
{if $data.config}
(<a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">{str tag='config'}</a>)
{/if}</li>
{if $data.types}
<ul>
{foreach from=$data.types key='type' item='config'}
<li>{$type}
{if $config} (<a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}&amp;type={$type}">{str tag='config'}</a>){/if}</li>
{/foreach}
</ul>
{/if}
{/foreach}</li>
</ul>
{if $notinstalled}
<li><b>{str tag='notinstalledplugins'}</b>
<ul id="{$plugintype}.notinstalled">
{foreach from=$notinstalled key='plugin' item='data'}
<li id="{$plugintype}.{$plugin}">{$plugin} {if $data.notinstallable} {str tag='notinstallable'} {$data.notinstallable}
{else} <span id="{$plugintype}.{$plugin}.install">(<a href="" onClick="{$installlink}('{$plugintype}.{$plugin}'); return false;">{str tag='install' section='admin'}</a>)</span>
{/if}
<span id="{$plugintype}.{$plugin}.message"></span>
</li>
{/foreach}</li>
</ul>
{/if}
</ul>
{/foreach}</li>
</ul>
</div>
{include file="columnfullend.tpl"}
{include file='footer.tpl'}
{include file='header.tpl'}
{include file="columnfullstart.tpl"}
<h2>{str tag='templatesadmin' section='admin'}</h2>
<table id="admintemplates">
<tr>
<th>{str tag='name'}</th>
<th>{str tag='installed' section='admin'}</th>
<th>{str tag='errors' section='admin'}</th>
</tr>
{foreach from=$templates item='template' key='name'}
<tr class="{cycle values=r1,r0}">
<td>{$name}</td>
<td>{if $template.installed}
<img id="{$name}.status" alt="{str tag='yes'}" src="{theme_path location='images/success.gif}" />
{if !$template.error}
<a href="" onClick="{$installlink}('{$name}'); return false;" id="admintemplates_reinstall">{str tag='reinstall' section='admin'}</a>
<span id="{$name}.message"></span>
{/if}
{else}
<img id="{$name}.status" alt="{str tag='yes'}" src="{theme_path location='images/failure.gif}" />
{if !$template.installed && !$template.error}
<a href="" onClick="{$installlink}('{$name}'); return false;" id="admintemplates_install">{str tag='install' section='admin'}</a>
<span id="{$name}.message"></span>
{/if}
{/if}
</td>
<td>{if $template.error} {$template.error} {/if}</td>
</tr>
{/foreach}
</table>
{include file="columnfullend.tpl"}
{include file='footer.tpl'}
{include file='header.tpl'}
{include file="columnfullstart.tpl"}
<h2>{str tag="administration" section=admin}</h2>
<div id="adminhome">
{if $upgrades}
<h3>{str tag="upgrades" section=admin}</h3>
<div id="runupgrade">
<div class="fr"><span class="upgradeicon"><a href="upgrade.php">{str tag=runupgrade section=admin}</a></span></div>
<h4>{str tag=thefollowingupgradesareready section=admin}</h4>
<table id="upgradestable">
<tr>
<th>{str tag=Plugin section=admin}</th>
<th>{str tag=From}</th>
<th>{str tag=To}</th>
</tr>
{foreach from=$upgrades key=key item=upgrade}
{if $key != 'disablelogin'}
<tr>
<td><strong>{$key|hsc}</strong></td>
<td>{$upgrade->fromrelease} ({$upgrade->from})</td>
<td>{$upgrade->torelease} ({$upgrade->to})</td>
</tr>
{/if}
{/foreach}
</table>
</div>
{/if}
{if $register}
<div class="message" id="register-site">
<h3>{str tag=registeryourmaharasite section=admin}</h3>
{str tag=registeryourmaharasitedetail section=admin args=$WWWROOT}
{$register}
</div>
{/if}
<h3>{str tag=configsite section=admin}</h3>
<ul>
<li><strong><a href="{$WWWROOT}admin/site/options.php">{str tag=siteoptions section=admin}</a></strong> - {str tag=siteoptionsdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/site/pages.php">{str tag=editsitepages section=admin}</a></strong> - {str tag=editsitepagesdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/site/menu.php">{str tag=linksandresourcesmenu section=admin}</a></strong> - {str tag=linksandresourcesmenudescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/site/networking.php">{str tag=networking section=admin}</a></strong> - {str tag=networkingdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/site/views.php">{str tag=siteviews section=admin}</a></strong> - {str tag=siteviewsdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/site/files.php">{str tag=sitefiles section=admin}</a></strong> - {str tag=sitefilesdescription section=admin}</li>
</ul>
<h3>{str tag=configusers section=admin}</h3>
<ul>
<li><strong><a href="{$WWWROOT}admin/users/search.php">{str tag=usersearch section=admin}</a></strong> - {str tag=usersearchdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/suspended.php">{str tag=suspendedusers section=admin}</a></strong> - {str tag=suspendedusersdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/staff.php">{str tag=sitestaff section=admin}</a></strong> - {str tag=staffusersdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/admins.php">{str tag=siteadmins section=admin}</a></strong> - {str tag=adminusersdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/notifications.php">{str tag=adminnotifications section=admin}</a></strong> - {str tag=adminnotificationsdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/add.php">{str tag=adduser section=admin}</a></strong> - {str tag=adduserdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/uploadcsv.php">{str tag=uploadcsv section=admin}</a></strong> - {str tag=uploadcsvdescription section=admin}</li>
</ul>
<h3>{str tag=manageinstitutions section=admin}</h3>
<ul>
<li><strong><a href="{$WWWROOT}admin/users/institutions.php">{str tag=institutions section=admin}</a></strong> - {str tag=institutionsdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/institutionusers.php">{str tag=institutionmembers section=admin}</a></strong> - {str tag=institutionmembersdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/institutionstaff.php">{str tag=institutionstaff section=admin}</a></strong> - {str tag=institutionstaffdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/users/institutionadmins.php">{str tag=institutionadmins section=admin}</a></strong> - {str tag=institutionadminsdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}view/institutionviews.php">{str tag=institutionviews section=admin}</a></strong> - {str tag=institutionviewsdescription section=admin}</li>
<li><strong><a href="{$WWWROOT}artefact/file/institutionfiles.php">{str tag=institutionfiles section=admin}</a></strong> - {str tag=institutionfilesdescription section=admin}</li>
</ul>
<h3>{str tag=configextensions section=admin}</h3>
<ul>
<li><strong><a href="{$WWWROOT}admin/extensions/plugins.php">{str tag=pluginadmin section=admin}</a></strong> - {str tag=pluginadmindescription section=admin}</li>
<li><strong><a href="{$WWWROOT}admin/extensions/filter.php">{str tag=htmlfilters section=admin}</a></strong> - {str tag=htmlfiltersdescription section=admin}</li>
</ul>
</div>
{$siteregisterform}
{include file="columnfullend.tpl"}
{include file='footer.tpl'}
{include file='header.tpl' nosearch=true}
{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>
<p>This program is free software; you can redistribute it and/or modify
under the terms of the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
as published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.</p>
<p>This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public
License</a> for more details.</p>
<p>You should have received a copy of the
<a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
</div>
<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"}
<div id="column-right">
</div>
{include file="columnleftstart.tpl"}
<h2>AdminInstitutions</h2>
{if $delete_form}
<h3>{str tag="deleteinstitution" section="admin"}</h3>
<p>{str tag="deleteinstitutionconfirm" section="admin"}</p>
{$delete_form}
{else}
{if $institution_form}
{if $add}
<h3>{str tag="addinstitution" section="admin"}</h3>
{/if}
{$institution_form}
{else}
<table id="adminstitutionslist">
<thead>
<tr>
<th>{str tag="institution"}</th>
<th>{str tag="authplugin" section="admin"}</th>
<th>{str tag="registrationallowed" section="admin"}</th>
<th></th>
</tr>
</thead>
{foreach from=$institutions item=institution}
<tbody>
<tr>
<td>{$institution->displayname|escape}</td>
<td>{$institution->authplugin}</td>
<td>{if $institution->authplugin == 'internal'}{if $institution->registerallowed}{str tag="yes"}{else}{str tag="no"}{/if}{else}-{/if}</td>
<td>
<form action="" method="post">
<input type="hidden" name="i" value="{$institution->name}">
<input type="submit" name="edit" value="{str tag="edit"}">
{if !$institution->hasmembers && $institution->name != 'mahara'}<input type="submit" name="delete" value="{str tag="delete"}">{/if}
</form>
</td>
</tr>
{/foreach}
<tr>
<td colspan="4">
<form action="" method="post">
<input type="submit" name="add" value="{str tag="addinstitution" section="admin"}">
</form>
</td>
</tr>
</tbody>
</table>
{/if}
{/if}
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
{include file='header.tpl'}
<div id="column-right">
</div>
{include file="columnleftstart.tpl"}
<h2>Plugin Administration</h2>
{foreach from=$plugins key='plugintype' item='plugins'}
<h4>{str tag='plugintype'}: {$plugintype}</h4>
{assign var="installed" value=$plugins.installed}
{assign var="notinstalled" value=$plugins.notinstalled}
<p><b>{str tag='installedplugins'}</b></p>
{foreach from=$installed key='plugin' item='data'}
{$plugin}
{if $data.config}
(<a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">{str tag='config'}</a>)
{/if}<br />
{if $data.types}
{foreach from=$data.types key='type' item='config'}
&nbsp;&nbsp;&nbsp;{$type}
{if $config} (<a href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}&amp;type={$type}">{str tag='config'}</a>){/if}<br />
{/foreach}
{/if}
{/foreach}
{if $notinstalled}
<p><b>{str tag='notinstalledplugins'}</b></p>
{foreach from=$notinstalled key='plugin' item='data'}
{$plugin} {if $data.notinstallable} {str tag='notinstallable'} {$data.notinstallable}
{else} (<a href="" onClick="{$installlink}('{$plugintype}.{$plugin}'); return false;">install</a>)
{/if}
<div id="{$plugintype}.{$plugin}"></div>
{/foreach}
{/if}
{/foreach}
{include file="columnleftend.tpl"}
{include file='footer.tpl'}
{include file='header.tpl'}
<div id="column-right">
</div>
{include file="columnleftstart.tpl"}
<h2>Plugin Administration: {$plugintype}: {$pluginname}{if $type}: {$type}{/if}</h2>
{$form}
{include file="columnleftend.tpl"}
{include file='footer.tpl'}
{include file="header.tpl"}
{include file="columnfullstart.tpl"}
<p>{str tag=linksandresourcesmenupagedescription section=admin args=$descriptionstrargs}</p>
<div id="editmenus">
<label>{str tag=edit}:</label>
<select id="menuselect" name="menuselect">
{foreach from=$MENUS item=menu}
<option value={$menu.value}>{$menu.name}</option>
{/foreach}
</select>
{contextualhelp plugintype='core' pluginname='admin' section='adminmenuselect'}
<div id="menuitemlist"></div>
</div>
{include file="columnfullend.tpl"}
{include file="footer.tpl"}
{include file='header.tpl'}
{include file="columnfullstart.tpl"}
<h2>{str section=admin tag=networking}</h2>
{if $missingextensions}
<p>{str section=admin tag=networkingextensionsmissing}</p>
<ul>
{foreach from=$missingextensions item=extension}
<li><a href="http://www.php.net/{$extension|escape}">{$extension|escape}</a></li>
{/foreach}
</ul>
{else}
<p>{str tag=networkingpagedescription section=admin}</p>
{$networkingform}
{/if}
{include file="columnfullend.tpl"}
{include file='footer.tpl'}
{include file="header.tpl"}
{include file="columnfullstart.tpl"}
<h2>{str tag=siteoptions section=admin}</h2>
<p>{str tag=siteoptionspagedescription section=admin}</p>
{$siteoptionform}
{include file="columnfullend.tpl"}
{include file="footer.tpl"}
{include file="header.tpl"}
{include file="columnfullstart.tpl"}
<p>{str tag=editsitepagespagedescription section=admin}</p>
{$pageeditform}
{include file="columnfullend.tpl"}
{include file="footer.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