Commit 8b34dc82 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merging flexible layouts + artefact chooser panel + new UI changes



- Bugs #1201258, #1181010, #1199563

As these are all integrated together it is easier to test them as
one patchset.

Change-Id: I5ce68a4ea2de1de8b9deeb7d95380fcdcae095a0
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 0f7c5b03
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$string['title'] = 'Journal';
$string['description'] = 'Display an entire journal';
$string['description'] = 'A complete journal (see Content -> Journal)';
$string['defaulttitledescription'] = 'If you leave this blank, the title of the journal will be used';
$string['postsperpage'] = 'Entries per page';
......@@ -28,6 +28,6 @@
defined('INTERNAL') || die();
$string['title'] = 'Journal entry';
$string['description'] = 'Display one journal entry';
$string['description'] = 'A single entry from your journal (see Content -> Journal)';
$string['defaulttitledescription'] = 'If you leave this blank, the title of the journal entry will be used';
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$string['title'] = 'Recent journal entries';
$string['description'] = 'Display the most recent journal entries';
$string['description'] = 'Display the most recent journal entries (see Content -> Journal)';
$string['itemstoshow'] = 'Entries to show';
$string['postedin'] = 'in';
$string['postedon'] = 'on';
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$string['title'] = 'Tagged journal entries';
$string['description'] = 'Display journal entries with a particular tag';
$string['description'] = 'Display journal entries with a particular tag (see Content -> Journal)';
$string['blockheading'] = 'Journal entries tagged';
$string['defaulttitledescription'] = 'If you leave this blank, the title of the journal will be used';
$string['postsperpage'] = 'Entries per page';
......
......@@ -57,7 +57,7 @@ class LeapImportComment extends LeapImportArtefactPlugin {
'owner' => $user,
'title' => '--',
'type' => 'portfolio',
'numcolumns' => 1,
'numrows' => 1,
'ctime' => $time,
'mtime' => $time,
'atime' => $time,
......
......@@ -28,6 +28,6 @@
defined('INTERNAL') || die();
$string['title'] = 'File(s) to download';
$string['description'] = 'Select files for people to download';
$string['description'] = 'Select files for people to download (see Content -> Files)';
$string['Files'] = 'Files';
......@@ -28,6 +28,6 @@
defined('INTERNAL') || die();
$string['title'] = 'Folder';
$string['description'] = 'A single folder from your files area';
$string['description'] = 'A single folder from your files area (see Content -> Files)';
$string['defaulttitledescription'] = 'If you leave this blank, the title of the folder will be used';
......@@ -9,7 +9,7 @@ $j('#instconf_select_container input[type="radio"][value="0"]').click(function()
$j('#instconf_folder_container').removeClass('hidden');
// Recalculate the width of config block
var width = getElementDimensions($('instconf_folder_container')).w;
update_width(getFirstParentByTagAndClassName($('instconf_folder_container'), 'div', 'blockinstance'), width);
updateBlockConfigWidth(getFirstParentByTagAndClassName($('instconf_folder_container'), 'div', 'blockinstance'), width);
});
$j('#instconf_select_container input[type="radio"][value="1"]').click(function() {
$j('#instconf_folder_header').addClass('hidden');
......@@ -22,7 +22,7 @@ $j('#instconf_select_container input[type="radio"][value="1"]').click(function()
$j('#instconf_images_container').removeClass('hidden');
// Recalculate the width of config block
var width = getElementDimensions($('instconf_images_container')).w;
update_width(getFirstParentByTagAndClassName($('instconf_images_container'), 'div', 'blockinstance'), width);
updateBlockConfigWidth(getFirstParentByTagAndClassName($('instconf_images_container'), 'div', 'blockinstance'), width);
});
$j('#instconf_select_container input[type="radio"][value="2"]').click(function() {
$j('#instconf_images_header').addClass('hidden');
......@@ -35,7 +35,7 @@ $j('#instconf_select_container input[type="radio"][value="2"]').click(function()
$j('#externalgalleryhelp').removeClass('hidden');
// Recalculate the width of config block
var width = getElementDimensions($('instconf_external_container')).w;
update_width(getFirstParentByTagAndClassName($('instconf_external_container'), 'div', 'blockinstance'), width);
updateBlockConfigWidth(getFirstParentByTagAndClassName($('instconf_external_container'), 'div', 'blockinstance'), width);
});
$j('#instconf_style_container input[type="radio"][value="0"]').click(function () {
$j('#instconf_width').val('75');
......
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