Count SmartEvidence overview page on "Pages and collections"

[Kristina Hoeppner]

Mahara 17.04RC1 and master

With the new "Pages and collections" overview page, we display the number of pages that are in a collection. When SmartEvidence is turned on and you have an SE collection, the SE matrix page is not counted though in the page count for that collection. It's a psydo page, but we do count it in the navigation when we are viewing the collection itself.

Therefore, to be consistent and not to display two different counts, the SE matrix page should also be counted in the page count on "Pages and collections".

[Mahara Bot (dev-mahara)]

Patch for "master" branch: https://reviews.mahara.org/7624

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/7624
Committed: https://git.mahara.org/mahara/mahara/commit/3175bf68cff12b8a78585f98acc93e8275c873ee
Submitter: Robert Lyon (<email address hidden>)
Branch: master

commit 3175bf68cff12b8a78585f98acc93e8275c873ee
Author: Robert Lyon <email address hidden>
Date: Wed Apr 12 10:50:04 2017 +1200

Bug 1681934: Count SmartEvidence matrix in page count

On the Pages and collections list page.

We count this in other places so need to be consistent

behatnotneeded

Change-Id: I7e11104f2fd10d5954be1055ee23450acd00f02d
Signed-off-by: Robert Lyon <email address hidden>

[Mahara Bot (dev-mahara)]

Patch for "17.04_STABLE" branch: https://reviews.mahara.org/7639

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/7639
Committed: https://git.mahara.org/mahara/mahara/commit/720026c0cf1036c92df4be53e04471c792c795b1
Submitter: Robert Lyon (<email address hidden>)
Branch: 17.04_STABLE

commit 720026c0cf1036c92df4be53e04471c792c795b1
Author: Robert Lyon <email address hidden>
Date: Wed Apr 12 10:50:04 2017 +1200

Bug 1681934: Count SmartEvidence matrix in page count

On the Pages and collections list page.

We count this in other places so need to be consistent

behatnotneeded

Change-Id: I7e11104f2fd10d5954be1055ee23450acd00f02d
Signed-off-by: Robert Lyon <email address hidden>
(cherry picked from commit 3175bf68cff12b8a78585f98acc93e8275c873ee)

[Mahara Bot (dev-mahara)]

Patch for "17.04_STABLE" branch: https://reviews.mahara.org/7822

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/7822
Committed: https://git.mahara.org/mahara/mahara/commit/cb7e1ee6735c76c1f73fbf17f6e490bbff8a1426
Submitter: Robert Lyon (<email address hidden>)
Branch: 17.04_STABLE

commit cb7e1ee6735c76c1f73fbf17f6e490bbff8a1426
Author: Robert Lyon <email address hidden>
Date: Tue Jun 13 12:44:54 2017 +1200

Bug 1681934: Adding the fix to raw_old theme as well

behatnotneeded

Change-Id: I0d4951e311fbd7d14002a6b03ccd57639402d76c
Signed-off-by: Robert Lyon <email address hidden>

[Mahara Bot (dev-mahara)]

Patch for "master" branch: https://reviews.mahara.org/8094

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/8094
Committed: https://git.mahara.org/mahara/mahara/commit/70ac7cec17e778da31d928ea37a7e2c7de13459f
Submitter: Robert Lyon (<email address hidden>)
Branch: master

commit 70ac7cec17e778da31d928ea37a7e2c7de13459f
Author: Cecilia Vela Gurovic <email address hidden>
Date: Thu Oct 5 17:06:05 2017 +1300

Bug 1720269: old_raw patches for bugs: (General)

Bug 1720264
Bug 1720235
Bug 1719736
Bug 1718821
Bug 1705126
Bug 1694908
Bug 1690687
Bug 1690232
Bug 1686843
Bug 1685041
Bug 1683561
Bug 1681987
Bug 1681934
Bug 1675223
Bug 1636064
Bug 1575512
Bug 1369569
Bug 692769

Also fixing up un-closed html tags in Bug 1701437 for raw and old raw

behatnotneeded

Change-Id: I8ac930ceebf78b4edad97289994318e7689a1e94

[Mahara Bot (dev-mahara)]

Patch for "17.10_STABLE" branch: https://reviews.mahara.org/8116

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/8116
Committed: https://git.mahara.org/mahara/mahara/commit/a25f4f11d35bf17d54acfb8010cd29e432fc86ea
Submitter: Robert Lyon (<email address hidden>)
Branch: 17.10_STABLE

commit a25f4f11d35bf17d54acfb8010cd29e432fc86ea
Author: Cecilia Vela Gurovic <email address hidden>
Date: Thu Oct 5 17:06:05 2017 +1300

Bug 1720269: old_raw patches for bugs: (General)

Bug 1720264
Bug 1720235
Bug 1719736
Bug 1718821
Bug 1705126
Bug 1694908
Bug 1690687
Bug 1690232
Bug 1686843
Bug 1685041
Bug 1683561
Bug 1681987
Bug 1681934
Bug 1675223
Bug 1636064
Bug 1575512
Bug 1369569
Bug 692769

Also fixing up un-closed html tags in Bug 1701437 for raw and old raw

behatnotneeded

Change-Id: I8ac930ceebf78b4edad97289994318e7689a1e94
(cherry picked from commit 70ac7cec17e778da31d928ea37a7e2c7de13459f)