Commit 299076aa authored by Martyn Smith's avatar Martyn Smith Committed by Martyn Smith
Browse files
parents 420b5200 eb49f878
mahara (0.4.0-1) unstable; urgency=low
* Bugfix release
-- Nigel McNie <nigel@catalyst.net.nz> Mon, 22 Jan 2007 22:06:15 +1300
mahara (0.3.7-1) unstable; urgency=low
* Bugfix release
-- Martyn Smith <martyn@catalyst.net.nz> Sun, 21 Jan 2007 13:09:50 +1300
mahara (0.3.6-1) unstable; urgency=low
* Bugfix release
......
......@@ -74,6 +74,7 @@ $string['name'] = 'Name';
$string['newattachmentsexceedquota'] = 'The total size of the new files that you have uploaded to this post would exceed your quota. You may be able to save the post if you remove some of the attachments you have just added.';
$string['newblog'] = 'New Blog';
$string['newblogpost'] = 'New Blog Post';
$string['noimageshavebeenattachedtothispost'] = 'No images have been attached to this post. You need to upload or attach an image to the post before you can insert it.';
$string['nofilesattachedtothispost'] = 'No attached files';
$string['noresults'] = 'No results';
$string['postbody'] = 'Body';
......
......@@ -225,7 +225,8 @@ attached.updateOnLoad();
function redrawAttachList() {
if (attached.tbody.hasChildNodes()) {
hideElement(attached.table.previousSibling);
showElement(attached.table);
setDisplayForElement('', attached.table);
//showElement(attached.table);
// Make sure row classes alternate 'r1', 'r0', 'r1', etc.
for (var i = 0; i < attached.tbody.childNodes.length; i++) {
setElementClass(attached.tbody.childNodes[i], 'r'+(i+1)%2);
......@@ -433,6 +434,8 @@ function insertImage() {
var height = form.height.value;
var width = form.width.value;
var align = form.align.value;
// Insert image doesn't work in IE without first focusing the editor:
tinyMCE.execCommand('mceFocus', false, 'mce_editor_0');
tinyMCE.themes['advanced']._insertImage(src, alt, border, hspace, vspace,
width, height, align, '', '', '');
replaceChildNodes('insertimage', null);
......@@ -504,7 +507,7 @@ function imageSelector(src) {
var imageid = imageIdFromSrc(src);
var imagefiles = attachedImageList();
if (imagefiles.length == 0) {
return SPAN({'id':'imageselector'}, {$getstring['noimageshavebeenattachedtothispost']});
return false;
}
else {
var sel = SELECT({'class':'select', 'id':'imageselector'});
......@@ -559,10 +562,15 @@ function blogpostExecCommandHandler(editor_id, elm, command, user_interface, val
switch (command) {
case "mceImage":
a = getSelectedImgAttributes(editor_id);
var sel = imageSelector(a.src);
if (!sel) {
alert({$getstring['noimageshavebeenattachedtothispost']});
return true;
}
var tbody = TBODY(null,
TR(null, TH({'colSpan':2}, LABEL(null,{$getstring['insertimage']}))),
TR(null, TH(null, LABEL(null,{$getstring['name']})),
TD(null, imageSelector(a.src))),
TD(null, sel)),
TR(null, TH(null, LABEL(null,{$getstring['alignment']})),
TD(null, alignSelector(a.align))),
TR(null, TH(null, LABEL(null,{$getstring['dimensions']})),
......
......@@ -28,7 +28,7 @@ defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2007011600;
$config->release = '0.3.7';
$config->release = '0.4.0';
$config->minupgradefrom = 2006121501;
$config->minupgraderelease = '0.1 (build tag BUILD_20061215)';
......
......@@ -269,7 +269,7 @@ class PluginSearchInternal extends PluginSearch {
SELECT
COUNT(*)
FROM
" . get_config('dbprefix') . "usr_group u
" . get_config('dbprefix') . "community u
WHERE (
name ILIKE '%' || ? || '%'
OR description ILIKE '%' || ? || '%'
......
......@@ -8,12 +8,12 @@
<h2>{str tag="search"}</h2>
<label>Query:
<input type="text" name="search_query" id="search_query">
<select id="search_type">
<option value="user">{str tag=users}</option>
<option value="community">{str tag=communities}</option>
</select>
<button type="button" onclick="doSearch();">{str tag="go"}</button>
</label>
<select id="search_type">
<option value="user">{str tag=users}</option>
<option value="community">{str tag=communities}</option>
</select>
<button type="button" onclick="doSearch();">{str tag="go"}</button>
</div>
<div id="seachresults">
<h3>{str tag="results"}</h3>
......
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