Commit 82bb87ca authored by Penny Leach's avatar Penny Leach
Browse files

Merge commit 'origin/master'

parents cdb633b6 4a96635d
......@@ -99,18 +99,18 @@ $loadingicon = theme_get_url('images/loading.gif');
$successicon = theme_get_url('images/success.gif');
$failureicon = theme_get_url('images/failure.gif');
$loadingstring = get_string('upgradeloading', 'admin');
$successstring = get_string('upgradesuccesstoversion', 'admin');
$failurestring = get_string('upgradefailure', 'admin');
$loadingstring = json_encode(get_string('upgradeloading', 'admin'));
$successstring = json_encode(get_string('upgradesuccesstoversion', 'admin'));
$failurestring = json_encode(get_string('upgradefailure', 'admin'));
$javascript = <<<JAVASCRIPT
function installplugin(name) {
$(name + '.message').innerHTML = '<img src="{$loadingicon}" alt="{$loadingstring}" />';
$(name + '.message').innerHTML = '<img src="{$loadingicon}" alt=' + {$loadingstring} + '" />';
sendjsonrequest('../upgrade.json.php', { 'name': name }, 'GET', function (data) {
if (!data.error) {
var message = '{$successstring}' + data.newversion;
var message = {$successstring} + data.newversion;
$(name + '.message').innerHTML = '<img src="{$successicon}" alt=":)" /> ' + message;
$(name + '.install').innerHTML = '';
// move the whole thing into the list of installed plugins
......@@ -125,13 +125,13 @@ function installplugin(name) {
message = data.errormessage;
}
else {
message = '{$failurestring}';
message = {$failurestring};
}
$(name).innerHTML = '<img src="{$failureicon}" alt=":(" /> ' + message;
}
},
function () {
message = '{$failurestring}';
message = {$failurestring};
$(name).innerHTML = message;
},
true);
......
......@@ -65,18 +65,18 @@ $loadingicon = theme_get_url('images/loading.gif');
$successicon = theme_get_url('images/success.gif');
$failureicon = theme_get_url('images/failure.gif');
$loadingstring = get_string('upgradeloading', 'admin');
$successstring = get_string('upgradesuccess', 'admin');
$failurestring = get_string('upgradefailure', 'admin');
$loadingstring = json_encode(get_string('upgradeloading', 'admin'));
$successstring = json_encode(get_string('upgradesuccess', 'admin'));
$failurestring = json_encode(get_string('upgradefailure', 'admin'));
$javascript = <<<JAVASCRIPT
function installtemplate(name) {
$(name + '.message').innerHTML = '<img src="{$loadingicon}" alt="{$loadingstring}" />';
$(name + '.message').innerHTML = '<img src="{$loadingicon}" alt="' + {$loadingstring} + '" />';
sendjsonrequest('templateinstall.json.php', { 'name': name }, 'GET', function (data) {
if (!data.error) {
var message = '{$successstring}';
var message = {$successstring};
$(name + '.message').innerHTML = '<img src="{$successicon}" alt=":)" /> ' + message;
// move the whole thing into the list of installed plugins
// new parent node
......@@ -88,13 +88,13 @@ function installtemplate(name) {
message = data.message;
}
else {
message = '{$failurestring}';
message = {$failurestring};
}
$(name + '.message').innerHTML = '<img src="{$failureicon}" alt=":(" /> ' + message;
}
},
function () {
message = '{$failurestring}';
message = {$failurestring};
$(name).innerHTML = message;
},
true);
......
......@@ -4,8 +4,10 @@
{include file="columnleftstart.tpl"}
<h2>{str section="artefact.blog" tag="blogsettings"}</h2>
<div class="viewblogbtn">
<a href="{$WWWROOT}artefact/blog/view/?id={$blog->get('id')}">{str section="artefact.blog" tag="viewblog"}</a>
<div style="margin-top: 1em;">
<span class="viewicon">
<a href="{$WWWROOT}artefact/blog/view/?id={$blog->get('id')}">{str section="artefact.blog" tag="viewblog"}</a>
</span>
</div>
{$editform}
......
......@@ -12,18 +12,18 @@
<h2>{str section="artefact.blog" tag="viewblog"} - {$blog->get('title')|escape}</h2>
<div id="myblogs">
<div class="blogsettingscontainer">
<div class="addiconcontainer">
<span class="addicon">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='blogaddpostbutton'}
</div>
<span class="blogsettings">
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='blogsettingsbutton'}
<div class="blogsettingscontainer">
<div class="addiconcontainer">
<span class="addicon">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='blogaddpostbutton'}
</div>
<span class="settingsicon">
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</span>
{contextualhelp plugintype='artefact' pluginname='blog' section='blogsettingsbutton'}
</div>
<div><table id="postlist" class="hidden tablerenderer">
......
......@@ -3,9 +3,9 @@
{include file="columnleftstart.tpl"}
<div class="fr leftrightlink"><a href="profileicons.php" id="editprofileicons">{str tag="editprofileicons" section="artefact.internal"} &raquo;</a></div>
<div class="fr leftrightlink"><span class="editicon"><a href="profileicons.php">{str tag="editprofileicons" section="artefact.internal"} &raquo;</a></span></div>
{if $resumeinstalled}
<div class="fr leftrightlink"><a href="{$WWWROOT}artefact/resume/" id="profilegotoresume">{str tag="profilegotoresume" section="artefact.resume"} &raquo;</a></div>
<div class="fr leftrightlink"><span class="editicon"><a href="{$WWWROOT}artefact/resume/">{str tag="profilegotoresume" section="artefact.resume"} &raquo;</a></span></div>
{/if}
<div style="position: relative;">
<div style="position: absolute; top: 3.5em; right: 0;"><img src="{$WWWROOT}thumb.php?type=profileicon&size=100x100&id={$USER->get('id')}" alt=""></div>
......
......@@ -3,7 +3,7 @@
{include file="columnleftstart.tpl"}
<div class="fr leftrightlink"><a href="{$WWWROOT}artefact/internal/" id="backtoeditprofile">&laquo; {str tag="backtoeditprofile" section="artefact.internal"}</a></div>
<div class="fr leftrightlink"><span class="editicon"><a href="{$WWWROOT}artefact/internal/">&laquo; {str tag="backtoeditprofile" section="artefact.internal"}</a></span></div>
<h2>{str section="artefact.internal" tag="profileicons"}</h2>
{$settingsformtag}
......
......@@ -43,13 +43,17 @@ $string['toversion'] = 'To version';
$string['notinstalled'] = 'Not installed';
$string['nothingtoupgrade'] = 'Nothing to upgrade';
$string['performinginstallsandupgrades'] = 'Performing installs and upgrades...';
$string['runupgrade'] = 'Run upgrade';
$string['successfullyinstalled'] = 'Successfully installed Mahara!';
$string['thefollowingupgradesareready'] = 'The following upgrades are ready:';
$string['upgradeloading'] = 'Loading...';
$string['upgrades'] = 'Upgrades';
$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.';
$string['youcanupgrade'] = 'You can upgrade Mahara from %s (%s) to %s (%s)!';
// Admin navigation menu
$string['adminhome'] = 'Admin home';
......
<?php
/**
* Smarty plugin
* @package Smarty
* @subpackage plugins
*/
/**
* Smarty {mahara_version} function plugin
*
* Type: function<br>
* Name: mahara_version<br>
* Date: July 10, 2007<br>
* Purpose: Fetch the mahara version number if in the admin section
* @author Nigel McNie <nigel@catalyst.net.nz>
* @version 1.0
* @param array
* @param Smarty
* @return html to display in the footer.
*/
function smarty_function_mahara_version($params, &$smarty) {
if (!defined('ADMIN')) {
return '';
}
return '<div class="center">Mahara version ' . get_config('release') . ' (' . get_config('version') . ')</div>';
}
?>
......@@ -939,30 +939,6 @@ table#installer {
padding: 5px 0 5px 0;
margin: -3px 0 0 0;
}
.maincontent #editprofileicons {
background: url(../images/btn_editprofileicons.gif) no-repeat;
width: 170px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 5px 20px 6px 45px;
}
.maincontent #profilegotoresume {
background: url(../images/btn_editprofileicons.gif) no-repeat;
width: 170px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 5px 20px 6px 35px;
}
.maincontent #backtoeditprofile {
background: url(../images/btn_editprofileicons.gif) no-repeat;
width: 170px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 5px 20px 6px 35px;
}
.maincontent #upload th,
.maincontent #upload td {
padding: 0 5px;
......@@ -988,64 +964,30 @@ table#installer {
#myblogs .blogsettingscontainer {
margin: 10px 0 10px 0;
}
#myblogs .addicon a,
#myblogs .addicon a:link,
#myblogs .addicon a:active,
#myblogs .addicon a:visited,
#myblogs .addicon a:hover,
#myblogs .blogsettingscontainer .addicon a,
#myblogs .blogsettingscontainer .addicon a:link,
#myblogs .blogsettingscontainer .addicon a:active,
#myblogs .blogsettingscontainer .addicon a:visited,
#myblogs .blogsettingscontainer .addicon a:hover {
background: url(../images/btn_add.gif) no-repeat;
width: 120px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 6px 23px 4px 47px;
}
#myblogs .blogsettings a,
#myblogs .blogsettings a:link,
#myblogs .blogsettings a:active,
#myblogs .blogsettings a:visited,
#myblogs .blogsettings a:hover {
background: url(../images/btn_settings.gif) no-repeat;
width: 120px;
height: 24px;
.addicon, .editicon, .settingsicon, .viewicon, .upgradeicon {
height: 24px;
padding: 5px 0 5px 0;
background: url(../images/btn_add_left.gif) no-repeat left;
}
.addicon a, .editicon a, .settingsicon a, .viewicon a, .upgradeicon a {
background: url(../images/btn_right.gif) no-repeat right !important;
color: #eef7d4;
height: 24px;
margin-left: 24px;
font-weight: bold;
padding: 4px 27px 6px 47px;
padding: 5px 15px !important;
}
.maincontent .viewblogbtn {
margin: 10px 0 10px 0;
.editicon {
background-image: url(../images/btn_edit_left.gif);
}
.maincontent .viewblogbtn a,
.maincontent .viewblogbtn a:link,
.maincontent .viewblogbtn a:active,
.maincontent .viewblogbtn a:visited,
.maincontent .viewblogbtn a:hover {
background: url(../images/btn_view.gif) no-repeat;
border: 0;
width: 120px;
height: 24px;
color: #eef7d4;
font-size: 11px;
font-weight: bold;
margin: 0;
padding: 5px 25px 5px 40px;
}
#myblogs .newpost a,
#myblogs .newpost a:link,
#myblogs .newpost a:active,
#myblogs .newpost a:visited,
#myblogs .newpost a:hover {
background: url(../images/btn_add.gif) no-repeat;
width: 120px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 4px 34px 7px 36px;
.settingsicon {
background-image: url(../images/btn_settings_left.gif);
}
.viewicon {
background-image: url(../images/btn_view_left.gif);
}
.upgradeicon {
background-image: url(../images/btn_upgrade_left.gif);
}
.maincontent #editblog_commentsnotify_container label,
.maincontent #editblog_commentsallowed_container label,
......@@ -1115,18 +1057,6 @@ table#installer {
margin: 10px 0 10px 0;
text-align: right;
}
.maincontent #mygroups #addnewgroup a,
.maincontent #mygroups #addnewgroup a:link,
.maincontent #mygroups #addnewgroup a:active,
.maincontent #mygroups #addnewgroup a:visited,
.maincontent #mygroups #addnewgroup a:hover {
background: url(../images/btn_add_long.gif) no-repeat;
width: 120px;
height: 24px;
color: #eef7d4;
font-weight: bold;
padding: 4px 43px 7px 43px;
}
.maincontent #creategroup #creategroup_description_header th,
.maincontent #creategroup #creategroup_members_header th,
.maincontent #editgroup #editgroup_description_header th,
......@@ -1159,18 +1089,6 @@ table#installer {
margin: 10px 0 10px 0;
text-align: right;
}
.maincontent .addcommunitylink a,
.maincontent .addcommunitylink a:link,
.maincontent .addcommunitylink a:active,
.maincontent .addcommunitylink a:visited,
.maincontent .addcommunitylink a:hover {
color: #eef7d4;
font-weight: bold;
background: url(../images/btn_add_long.gif) no-repeat;
width: 170px;
height: 24px;
padding: 4px 24px 7px 33px;
}
.maincontent #memberlist tbody td,
.maincontent #communitylist tbody td {
padding: 2px 5px;
......@@ -1461,13 +1379,16 @@ span.block_targetted, div.block_targetted {
background-color: #f4f7e8;
border: 1px solid #e5e8da;
}
#runupgrade a {
color: #eef7d4;
font-weight: bold;
background: url(../images/btn_upgrade.gif) no-repeat;
width: 130px;
height: 24px;
padding: 4px 24px 7px 30px;
#runupgrade h4 {
margin-top: 0;
padding-bottom: .5em;
}
#runupgrade table {
border: none;
}
#runupgrade table th {
padding: 3px 5px;
border-bottom: 1px solid #7C9853;
}
/* Configure Site styles */
......
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