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

template installer ajaxey thing now works. changed some strings around to

make more sense.
parent 73e63330
......@@ -96,7 +96,7 @@ $successicon = theme_get_image_path('success.gif');
$failureicon = theme_get_image_path('failure.gif');
$loadingstring = get_string('upgradeloading', 'admin');
$successstring = get_string('upgradesuccess', 'admin');
$successstring = get_string('upgradesuccesstoversion', 'admin');
$failurestring = get_string('upgradefailure', 'admin');
$javascript = <<<JAVASCRIPT
......
......@@ -75,7 +75,7 @@ function installtemplate(name) {
d.addCallbacks(function (data) {
if (!data.error) {
var message = '{$successstring}' + data.newversion;
var message = '{$successstring}';
$(name + '.message').innerHTML = '<img src="{$successicon}" alt=":)" /> ' + message;
// move the whole thing into the list of installed plugins
// new parent node
......
......@@ -45,7 +45,7 @@ $failureicon = theme_get_image_path('failure.gif');
$loadingstring = get_string('upgradeloading', 'admin');
$installsuccessstring = get_string('installsuccess', 'admin');
$successstring = get_string('upgradesuccess', 'admin');
$successstring = get_string('upgradesuccesstoversion', 'admin');
$failurestring = get_string('upgradefailure', 'admin');
$coresuccess = get_string('coredatasuccess', 'admin');
......
......@@ -41,7 +41,8 @@ $string['notinstalled'] = 'Not installed';
$string['nothingtoupgrade'] = 'Nothing to upgrade';
$string['successfullyinstalled'] = 'Successfully installed Mahara!';
$string['upgradeloading'] = 'Loading...';
$string['upgradesuccess'] = 'Successfully upgraded to version ';
$string['upgradesuccess'] = 'Successfully upgraded';
$string['upgradesuccesstoversion'] = 'Successfully upgraded to version ';
$string['upgradefailure'] = 'Failed to upgrade!';
$string['noupgrades'] = 'Nothing to upgrade! You are fully up to date!';
$string['fixtemplatescontinue'] = 'Some view templates failed to install. Continue here for more information and a fix.';
......@@ -193,4 +194,5 @@ $string['notificationssaved'] = 'Notification settings saved';
$string['installed'] = 'Installed';
$string['errors'] = 'Errors';
$string['install'] = 'Install';
$string['reinstall'] = 'Reinstall';
?>
......@@ -16,9 +16,13 @@
<td>{$name}</td>
<td>{if $template.installed}
<img id="{$name}.status" alt="{str tag='yes'}" src="{image_path imagelocation='success.gif}" />
{if !$template.error}
<a href="" onClick="{$installlink}('{$name}'); return false;">{str tag='reinstall' section='admin'}</a>
<span id="{$name}.message"></span>
{/if}
{else}
<img id="{$name}.status" alt="{str tag='yes'}" src="{image_path imagelocation='failure.gif}" />
{if !$template.installed}
{if !$template.installed && !$template.error}
<a href="" onClick="{$installlink}('{$name}'); return false;">{str tag='install' section='admin'}</a>
<span id="{$name}.message"></span>
{/if}
......
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