Commit c017a50b authored by Richard Mansfield's avatar Richard Mansfield
Browse files
parents 71f1e2b8 16422b16
......@@ -51,7 +51,9 @@ var communitylist = new TableRenderer(
},
function (r) {
var help = SPAN(null);
help.innerHTML = '{$edithelp}';
if (r._rownumber == 1) {
help.innerHTML = '{$edithelp}';
}
return TD(null, A({'href': '{$editurl}' + r.id}, '{$editstr}'), help);
}
]
......
......@@ -502,6 +502,7 @@ function augment_tags_control(elem, returnContainer) {
function quotaUpdate(quotaused, quota) {
if (! $('quota_percentage') ) {
logWarning('quotaUpdate(', quotaused, quota, ') called but no id="quota_percentage" on page');
return;
}
......@@ -546,20 +547,8 @@ function quotaUpdate(quotaused, quota) {
update(data);
}
else {
var req = getXMLHttpRequest();
req.open('post', config.wwwroot + 'json/quota.php');
req.setRequestHeader('Content-type','application/x-www-form-urlencoded');
var d = sendXMLHttpRequest(req);
processingStart();
d.addCallbacks(
function (data) {
processingStop();
data = evalJSONRequest(data);
update(data);
},
function (error) {
processingStop();
}
);
sendjsonrequest(config.wwwroot + 'json/quota.php', {}, 'POST', function (data) {
update(data);
}, null, true);
}
}
......@@ -124,10 +124,12 @@ function TableRenderer(target, source, columns, options) {
if (data.count > 0) {
forEach(data.data, function(row) {
var tr = self.rowfunction(row, ++rownumber, data);
rownumber++;
row._rownumber = rownumber;
var tr = self.rowfunction(row, rownumber, data);
if ( row._class ) { tr.className = row._class; }
if ( row._id ) { tr.id = row._id; }
row._rownumber = rownumber;
forEach(self.columns, function (column) {
if ( typeof(column) == 'string' ) {
......
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Login</title>
</head>
<body bgcolor="#FFFFFF">
<h3><strong>Create New View</strong></h3>
<p> Create New View launches the 4 Step View creation process to create a new collection of Artefacts.</p>
</body>
</html>
<p><strong>Edit View Information</strong><br>
The Edit View Information area is equivalent to the Create View Step 1 page and allows you to change the Title, Access Start and End Dates, Description and your Name Display preference for your View. </p>
<p><strong>Edit View</strong><br>
The Edit View area is equivalent to the Create View Step 3 page and allows you to add to, or modify the display of the Artefacts associated with your View.</p>
<p><strong>Edit Access</strong><br>
The Edit View area is equivalent to the Create View Step 4 page and allows to you to add, modify or remove View access to any of your Groups, Communities and any individuals of your choice.</p>
<p><strong>Submit for Assessment</strong><br>
If you are preparing a View as part of an assessed task and you have been added as a member of a Controlled Membership Community that has an assigned Tutor, you will be able to Submit your View for assessment. <br>
Submit View will lock the entire View and all associated Artefacts from editing and provide a ‘snapshot’ of your View on a certain date, and send it to your Tutor. <br>
Note that any users with access to that View will still be able to place Feedback and Comments while it is locked for submission.<br>
Once the assessment process has been completed your tutor will release your View so that you may resume editing. You will be notified via Recent Activity when your View has been released from submission.</p>
......@@ -42,17 +42,17 @@ function pieform_renderer_table(Pieform $form, $builtelement, $rawelement) {
$closelegendpos = strpos($builtelement, '</legend>');
if ($closelegendpos !== false) {
$closelegendpos += 9;
$builtelement = substr($builtelement, 0, $closelegendpos) . '<table>' . substr($builtelement, $closelegendpos);
$builtelement = substr($builtelement, 0, $closelegendpos) . '<table><tbody>' . substr($builtelement, $closelegendpos);
}
else {
$pos = strpos($builtelement, '>') + 1;
$builtelement = substr($builtelement, 0, $pos) . '<table>' . substr($builtelement, $pos);
$builtelement = substr($builtelement, 0, $pos) . '<table><tbody>' . substr($builtelement, $pos);
}
}
else {
$builtelement = substr($builtelement, 0, 11) . '<table>' . substr($builtelement, 11);
$builtelement = substr($builtelement, 0, 11) . '<table><tbody>' . substr($builtelement, 11);
}
$builtelement = substr($builtelement, 0, -12) . '</table></fieldset>';
$builtelement = substr($builtelement, 0, -12) . '</tbody></table></fieldset>';
$result = "\t<tr>\n\t\t<td colspan=\"2\">";
$result .= $builtelement;
......
......@@ -85,7 +85,7 @@ class PluginSearchInternal extends PluginSearch {
' . $prefix . 'usr u
LEFT JOIN ' . $prefix . 'artefact a ON u.id=a.owner
WHERE
u.id <> 0
u.id <> 0 AND u.active = 1
AND ((
u.preferredname IS NULL
AND (
......@@ -109,7 +109,7 @@ class PluginSearchInternal extends PluginSearch {
FROM ' . $prefix . 'artefact a
INNER JOIN ' . $prefix .'usr u ON u.id = a.owner
WHERE
u.id <> 0
u.id <> 0 AND u.active = 1
AND ((
u.preferredname IS NULL
AND (
......
......@@ -836,11 +836,6 @@ acronym {
border-bottom: 1px dotted #d4d1c0;
cursor: help;
}
.help {
font-size: 9px;
vertical-align: super;
text-decoration: none;
}
.description {
font-size: 9px;
color: #7e7e7e;
......@@ -872,21 +867,17 @@ table#installer {
.maincontent fieldset {
border: 1px solid #819f18;
padding: 0 0 0 1em;
width: 100%;
}
.maincontent fieldset table {
margin: 0;
}
.maincontent fieldset.collapsed {
height: 1em;
border-color: #819f18 transparent transparent;
border-color: #819f18 white white;
}
.maincontent fieldset.collapsed * {
.maincontent fieldset.collapsed table {
display: none;
}
.maincontent fieldset.collapsed legend, .maincontent fieldset.collapsed legend * {
display: block;
}
.maincontent legend {
font-weight: bold;
color: #4c7c10;
......@@ -1226,6 +1217,10 @@ table#installer {
padding: 0;
margin: 0 0 15px 15px;
}
#viewlist .viewbuttons,
#viewlist form {
display:inline;
}
.maincontent #tree {
color: #819f18;
font-size: 15px;
......@@ -1694,3 +1689,16 @@ a.pieform-calendar-toggle img {
/* FOOTER ENDS */
/* CONTENT LAYOUT ENDS */
.help {
vertical-align: super;
text-decoration: none;
}
.help a,
.help a:link,
.help a:active,
.help a:visited {
font-size: 9px !important;
font-weight:normal !important;
}
......@@ -8,7 +8,7 @@
<div id="views">
<div style="text-align:right;">
<input type="button" class="button" value="{str tag="createnewview"}" onclick="window.location='create1.php';" id="createnew">
</div>
</div>{contextualhelp plugintype='core' pluginname='views' section='createviewbutton'}
<table id="viewlist">
<tbody>
</tbody>
......
......@@ -36,7 +36,7 @@ $getstring = quotestrings(array('mahara' => array(
'editaccess', 'editview', 'editviewinformation', 'submitted', 'submitview', 'submitviewquestion'
)));
$editcontrolshelp = get_help_icon('core', 'views', null, null, null, 'vieweditcontrols');
$javascript = <<<JAVASCRIPT
var viewlist = new TableRenderer(
......@@ -74,10 +74,14 @@ function title(r, communities) {
}
var f = FORM({'id':('form'+r.id),'method':'post','enctype':'multipart/form-data',
'encoding':'multipart/form-data'},
DIV(null,buttons),
DIV(null,assess));
DIV({'class': 'viewbuttons'}, buttons),
DIV({'class': 'viewbuttons'}, assess));
var s = SPAN();
if (r._rownumber == 1) {
s.innerHTML = '{$editcontrolshelp}';
}
return [TD(null,A({'href':'view.php?view='+r.id},r.title)),
TD(null,f)];
TD(null,f, s)];
}
function communityoption(community) {
......
Supports Markdown
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