GitLab

Naomi Guyer authored Jun 03, 2015 and Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Iac927105e903a1f38fa92792b9a2c388cd29c9a2

Naomi Guyer authored May 28, 2015 and Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I754032b3288bf5ed743756019e6c1ff6d4c729bf

Pat Kira authored Feb 23, 2015 and Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Style plans and tasks pages
Style resume pages excluding collapsible elements
Style plans and tasks pages

Change-Id: Ied782c101b231d919cf1dcd6b267a70d18d39c70

Pat Kira authored Feb 09, 2015 and Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework
Style profile file page
Refinements
Style profile file browser
Style journal page
Edit journal page (work in progrerss)
Tidy up sideblock and blockinstances
Style edit journal view (completed)
Style resume introduction page

Change-Id: I662d8120952c371f7dec57ecf7cd84978c5177d2

Pat Kira authored Feb 05, 2015 and Aaron Wells committed Jun 15, 2015

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I8c11611c32f29ca461945332926d8fbe0431daef

Change-Id: I06bebb5c455fd44514e7f6fb733e8bc0a1559181
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

By doing two things:

1) Getting the embedded SWF object to set the
 allowscriptaccess = "never" and allownetworking = "never"

2) By forcing a 'download file' link to actually download file
- this goes for all files now that don't have embedded=1
in their url.

I've done it this way, having the embedded item have extra url param
so that if a user tries to manipulate a url by removing params it
will default to force download.

I've merged the changes I'd done here https://reviews.mahara.org/#/c/3522/2


and I've also cleaned up places where the download=1 was used as that is
not needed now. Now if there are places where we need to embed rather
than download we add the embedded=1 to the url.

Change-Id: If5290a7c571d06d4178ef2ae5c4c09ed287403b4
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Change-Id: I724a844fc9e4fbae9e58834082279b4f3f21995c

- Like plan tags already do

Change-Id: If284d0288ce4043294653c194a84eea228b5dd6b
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

needed to pass the js to render the expander post ajax load

Change-Id: Ia5d962aae9108ef751c120b9c89ddf18c85b0017
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Evonne Cheung authored Mar 17, 2015 and Robert Lyon committed Mar 19, 2015

Change-Id: Iaf5af0bc039a6fecaa36bbef1e15ad441b23e1d0
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Evonne cheung authored Mar 16, 2015 and Robert Lyon committed Mar 19, 2015

Change-Id: I72e30cc723def00fecf65ea7855e48de5e054d6e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Theme fixes
- random typos
- bad ordering of styles

Change-Id: Iad130212203e4b046fad537d87f5c606d3aa7682

Bug 1431569

This was a bit trickier as the form field is hardcoded so needed to
fetch the css that pieforms adds to html header and add it via smarty()

Deals with the filebrowser in content/groups/institution/site

Change-Id: Ic12b62cbe523a1b56f1fe2856fc062b3d35c68ea
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

A new artefact similar to the comment artefact but with less
functionality (i.e. no attached files, etc).
It's an explenation of why a particular evidence meets a
particular standard.

If an annotation is created and added to a page, when the user
deletes it from the page, the instance is deleted along with the
annotation and its feedback.

TODO:

1. Imports seem to be working.
Can get all comments to import and display.
Needs some serious testing.

2. Made changes for broken images but another bug was reported and is
currently being worked on. So, may not need the fixes in here. Changes in:
- htdocs/artefact/file/download.php

To completely fix the broken images for all artefacts, changes are also required
in htdocs/lib/embeddedimage.php to delete based on resourceid instead of fileid.

Change-Id: Ibdb2e1c6500862645bac741bf61cff37e5a5b35c

Change-Id: Iaa1ef43f30615c253df28c70d20db415779146b8
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

Change-Id: Ibc87e7ae48f7ed8362779977b82d4269fd0c50df
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

so we need to add the class to the template we use

Change-Id: I3a9dc0bdd80133f530c84f0782438939fe52d01e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Change-Id: I96a2108cd9269acc8584c8dd994cc773a293cbc9

Change-Id: I387e4757457791bc6de96e538fb4770160b05781
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug 1422480

Also added a filter to the image block to filter by image files

Change-Id: If5665396894f5f9114cca4b449d383efbfc5f94f
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Tobias Zeuch authored Oct 31, 2014 and Robert Lyon committed Mar 09, 2015

Bug 1387330: Show reply and reply all buttons in a separate column in the inbox
and outbox, like email clients usually do. Also remove the reply-links after
the message text.
The buttons should only appear where applicalbe, e.g. only show a button reply
all when there were multiple recipients and don't show a reply-button for system
messages. Also other links remain in the message text, like links to new pages
in new-page-access notifications.

Change-Id: I938dda6210f4a0a8ab57b56c654cf60931ef7a6a
Signed-off-by: Tobias Zeuch <tobias.zeuch@kit.edu>

In the Content -> files section

Change-Id: I178b7e79490e50bc35337efee2a43ea663214003
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

this patch sends the setupExpanders() js call along with the rest of
the html rather than use the on page load js as the blocks load after
page load.

Change-Id: Id0c212caa0d4bb53ac5fa59044b186c71127c54c
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

I've taken what aceMa provided in bug report and made it a replacement
for the square thumbs option rather than a new option as we don't need
two square thumb options.

I've tweaked it a bit more and hopefully have got the padding/ratio
stuff more consistent and not using hardcoded numbers so much

And getting it to show descriptions/captions below frame

Change-Id: Iafc0ec8a8132d1bef5401b3ebd49e3df013fddc3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

- also updated the location of the file/folder icons so that one can
test/verify this patch.

Note: this patch doesn't fix all the problems of html export but does
fix the regression of where the html export would never complete

Change-Id: I8096e82cfde3dd2f060a05cc6157b201306089e6
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Patrick O'Keeffe authored Jan 13, 2015 and Robert Lyon committed Feb 05, 2015

Change-Id: I448b74850bb387c8d9569a3df72da3927ca691d9

This was causing some problems with tagged posts
- also hiding the 'add comment' link on page edit screen.

And making the comments info show when no comments were on item and
allow comments for artefact was enabled. This is an issue with newer
versions of php.

Also placing some of the template files in the new correct location

Change-Id: I599e16b0899559a3ebcdf68cff53220b1d83f2d6
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

To include and/or exclude certain tags - has two pools of tags; those
that are 'in' and those that are 'out'.

To exclude a tag begin your search with a minus sign.

Change-Id: I32a3b3d3f244d08bd0547d72db25b8189642fc0e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

This patch makes plan description show up on a portfolio page which
it is a part of. Previously the description would only show up on
the content / plans page rather than on a page it was a part of.

Change-Id: I7436d6c2384a5064780f7281968467d08ca60490

Son Nguyen authored Jan 09, 2015 and Robert Lyon committed Jan 12, 2015

- Filter out draft posts when editing the blogpost block
- Don't display the post's content if it is unpublished

Change-Id: Iaaf92f29383e2f3997e214b052dd116005a971dd
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

- Use render_self() in full detail option
- Remove calls of $artefact->get() in template file

Change-Id: I6be321adfda07c7f3e7cb3ac4026894b081e131f
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

Requires https now - used to work with http but no longer

Change-Id: I4aae1d36c532dcdfc96b5a4a673910b654ea9a2c
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Bug 1394330

In most places in mahara we specify that we want base 10 number
returned (or base 16 in case of a hexidecimal css colour)

But there are a few places where we don't specify the radix at all

It's best practice to always include the radix because for older
browsers it interprets leading 0 as octal by default.

Also makes it clearer to developers what type of number is expected to
be retrieved from the string.

Change-Id: Iaecc85cbed875f85b313188c4e96cc1b77c77b31
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Getting the user's institution comment sort order to sort the comments
for the artefacts on the view page. So that the expand out comment
areas are sorted either earliest -> latest or visa versa.

Change-Id: I13b37b0a42c818ccc21147e4a0469015a020dd80
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

If the taggedblog block is set to display full entries then comments
also show

Change-Id: Iea4f6c3df3f61d0b58e8f7b0b06c1fb3713fedd8
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

To handle the fact that blog blocks have more than one blogpost and
therefore more than one comment link I've passed the artefact id and
block id in together and appended a '0'
to the front of the id so that the artefact id + block id does not
clash with another block of the same id.

Change-Id: Iddd4dab7afe70e8926a8556cdb55ea8d4dceda06
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Getting the rendering of the blogpost comment count to be done by the
block instance in a similar fashion as the other artefact blocks.

Change-Id: I67805ac33a9850c1fded17b32873e5ad90c7489f
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

This is only for the displaying of a folder as a gallery
in either the thumbs, square thumbs, or slideshow.

The allow comments is based on the allowing the folder to have
comments so this means any folder comments will display whether they
have been added following the link in gallery block or the folder
block as both end up at the same artefact on artefact/artefact.php page

Change-Id: I787a730861823ef3f731fb5209bf3470b00a7ed3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

- similar to the changes done for textbox

Change-Id: I7419a50b6790d11ee5e4d48b2d1bbd2b134f2126
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>