Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Having notifications under the settings tab makes little sense. This
commit makes the following changes:

    - separate site notifications into its own main nav item called
      "inbox". Everything under "settings" is now a settings page!
    - in settings, rename "activity preferences" to "notifications"
    - in settings, rename "preferences" to "account"
    - updates to help text to reflect the above

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

A wysiwyg editor is not always the first form element, so always
focusing the first wysiwyg editor on the page makes little sense. Also,
this fixes an earlier issue where certain browsers were attempting to
focus the wysiwyg editor before the page was fully loaded, causing
javascript errors.

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Fix merge
Simplify to use normal themes as view themes
Remove view/edit profile page links from menu and add to edit profile page
Add link to edit profile page when editing profile View
Use microheader on view editing pages

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Remove use of tablerenderer for view/artefact feedback; create feedback list using templates; use artefactchooser paginator

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

We now have a nice import screen in the admin section :)

Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

There is a new optional setting called $cfg->httpswwwroot. The reason we
have a new setting instead of simply substituting 'http://' with
'https://' in $cfg->wwwroot, like Moodle currently does, is that this
prevents people from using non-standard ports in their HTTPS setups.
This may be necessary if you want to run both Moodle and Mahara on the
same host/ip and use HTTPS logins for both of them.

Signed-off-by: Iñaki Arenaza <iarenaza@eps.mondragon.edu>

Catches URLs that are on lines by themselves. Spotted by Stephen Coles.

Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

integrating dwoo into mahara, includes many small templates changes, smarty plugins ported to dwoo syntax as well as the custom mahara resource types ported to dwoo templates

Signed-off-by: Jordi Boggiano <j.boggiano@seld.be>

Let tinymce insert <p> tags rather than <br> in text boxes; hack twitter filter do deal with stray <p>s inserted by tinymce

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
(cherry picked from commit 03667644)

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Then we can use them on pages without sideblocks.

Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

JS popup position now a bit off - fix to come (probably in theme)

Conflicts: