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

Much of the help text was out of date or confusing, and some language strings lacked
clarity or conciseness.
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>

    - disable editing of title and description for special view types,
      but give them good fixed values
    - include the description when installing profile and dashboard views,
      since they aren't included when copying a template
    - don't show view submission form for profile and dashboard views
    - move access control for the profile view to the "my portfolio" page
    - exclude dashboard views from search results
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>

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

Also included is an inbox blocktype for dashboard views which shows the
user's most recent notifications. Multiple instances of this block can
be present in a dashboard view, and the message types displayed in each
can be configured.

A default dashboard view is installed for each user the next time they
log in. Additionally, since the profile view is now shown in the view
list, it is installed on login, rather than when the profile is first
requested.

Conflicts:

	htdocs/lib/version.php
	htdocs/view/blocks.php

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>

Additional data on 'controlled' and 'invite only' groups is fetched
and passed to templates for group control pop-up boxes.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

- Date of birth field in "My Resume"
- View access start/stop date
Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

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

This is a pluggable anti-spam infrastructure for protecting forms in
Mahara again spam.

The contact and register forms have been modified to include the
following anti-spam features:
    - hashed field names
    - honey pot (invisible) fields
    - submission time monitoring

Additionally, content checking is provided by the following spam traps:
    - NoneSpamTrap: the base class for other spam traps, does no
      checking on its own
    - SimpleSpamTrap: provides basic checks that don't require an
      internet connection
    - AdvancedSpamTrap: provides better checks that require an internet
      connection, including checking for the existence of mailservers
      and the presence of blacklisted URLs

New spam traps can easily be created by adding a file to lib/antispam
with the name MyTrapNameSpamTrap.php. Added spam traps will be
automatically detected and available for selection in the site options
page.
Signed-off-by: Evan Goldenberg <evang@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>

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

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

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>

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>

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>

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

This reverts commit c0eb84f4.

(cherry picked from commit f73ec305)

Conflicts:

	htdocs/lang/en.utf8/mahara.php
	htdocs/lib/web.php