diff --git a/html-templates/pages/pages.tpl b/html-templates/pages/pages.tpl
index 0c561e53..d0473f32 100644
--- a/html-templates/pages/pages.tpl
+++ b/html-templates/pages/pages.tpl
@@ -5,14 +5,15 @@
{block content}
-
-
+ {if Emergence\CMS\PagesRequestHandler::checkWriteAccess(\Emergence\CMS\Page::create())}
+
+ {/if}
{foreach item=Page from=$data}
diff --git a/html-templates/people/people.tpl b/html-templates/people/people.tpl
index 813dee76..480cba4e 100644
--- a/html-templates/people/people.tpl
+++ b/html-templates/people/people.tpl
@@ -8,6 +8,8 @@
{/block}
{block content}
+ {load_templates "subtemplates/paging.tpl"}
+
@@ -39,13 +41,17 @@
+
{foreach item=Person from=$data}
- {if $.foreach.default.index % 6 == 0}
{/if}
-
- {personLink $Person photo=yes photoSize=150 linkCls="thumbnail text-center"}
-
- {if $.foreach.default.index % 6 == 5 || $.foreach.default.last}
{/if}
+
+ {personLink $Person photo=yes photoSize=150 linkCls="thumbnail text-center"}
+
{/foreach}
+
+
+
{/block}
\ No newline at end of file
diff --git a/html-templates/register/register.tpl b/html-templates/register/register.tpl
index 98916d9e..3ae64948 100644
--- a/html-templates/register/register.tpl
+++ b/html-templates/register/register.tpl
@@ -46,7 +46,7 @@
diff --git a/html-templates/subtemplates/paging.tpl b/html-templates/subtemplates/paging.tpl
new file mode 100644
index 00000000..558abd8b
--- /dev/null
+++ b/html-templates/subtemplates/paging.tpl
@@ -0,0 +1,28 @@
+{template pagingLinks total pageSize=12 showAll=false}
+
+
+
+{/template}
\ No newline at end of file
diff --git a/php-classes/Laddr/PeopleRequestHandler.php b/php-classes/Laddr/PeopleRequestHandler.php
index a7ae1ac6..88448a2b 100644
--- a/php-classes/Laddr/PeopleRequestHandler.php
+++ b/php-classes/Laddr/PeopleRequestHandler.php
@@ -9,7 +9,8 @@
class PeopleRequestHandler extends \PeopleRequestHandler
{
public static $accountLevelBrowse = false;
- public static $browseOrder = array('ID' => 'DESC');
+ public static $browseOrder = ['ID' => 'DESC'];
+ public static $browseLimitDefault = 30;
public static function handleBrowseRequest($options = [], $conditions = [], $responseID = null, $responseData = [])
{
diff --git a/php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php b/php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php
new file mode 100644
index 00000000..1994dfa2
--- /dev/null
+++ b/php-config/Emergence/People/PeopleRequestHandler.config.d/paging.php
@@ -0,0 +1,3 @@
+ 'https://github.com/JarvusInnovations/emergence-github.git',
+ 'originBranch' => 'master',
+ 'workingBranch' => 'master',
+ 'trees' => [
+ 'html-templates/connectors/github',
+ 'php-classes/Emergence/GitHub',
+ 'php-config/Emergence/GitHub',
+ 'php-config/Emergence/People/User.config.d/github-token.php',
+ 'php-config/Git.config.d/emergence-github.php',
+ 'php-migrations/Emergence/GitHub',
+ 'site-root/connectors/github.php'
+ ]
+];
\ No newline at end of file
diff --git a/php-config/Git.config.d/laddr.php b/php-config/Git.config.d/laddr.php
index 1be98328..5d7c8f85 100644
--- a/php-config/Git.config.d/laddr.php
+++ b/php-config/Git.config.d/laddr.php
@@ -9,25 +9,34 @@
'event-handlers',
'html-templates' => [
'exclude' => [
- '#^/redirects/#' // exclude redirects library
+ '#^/redirects/#', // exclude redirects library
+ '#^/connectors/github/#'
]
],
'locales',
'php-classes' => [
'exclude' => [
'#^/ReCaptcha/#', // exclude ReCaptcha library pulled from google repo
- '#^/Emergence/Redirects/#'
+ '#^/Emergence/Redirects/#',
+ '#^/Emergence/GitHub/#'
]
],
'php-config' => [
'exclude' => [
- '#^/Site.config.d/redirects.php$#' // exclude redirects library
+ '#^/Site.config.d/redirects\.php$#', // exclude redirects library
+ '#^/Emergence/GitHub/#',
+ '#^/Emergence/People/User\.config\.d/github-token\.php$#'
+ ]
+ ],
+ 'php-migrations' => [
+ 'exclude' => [
+ '#^/Emergence/GitHub/#'
]
],
- 'php-migrations',
'site-root' => [
'exclude' => [
- '#^/redirects.php$#' // exclude redirects library
+ '#^/redirects\.php$#', // exclude redirects library
+ '#^/connectors/github\.php#'
]
]
]
diff --git a/site-root/css/laddr/bootstrap-tweaks.css b/site-root/css/laddr/bootstrap-tweaks.css
index c42c158a..a89ec483 100644
--- a/site-root/css/laddr/bootstrap-tweaks.css
+++ b/site-root/css/laddr/bootstrap-tweaks.css
@@ -27,6 +27,22 @@ legend {
border: 0;
}
+/* - Grids */
+
+.row-wrap {
+ display: -webkit-flex;
+ display: flex;
+ -webkit-flex-wrap: wrap;
+ flex-wrap: wrap;
+}
+
+ .row-wrap [class*="col"] {
+ -webkit-flex: 0 0 auto;
+ flex: 0 0 auto;
+ float: none;
+ }
+
+
/*
* + Components
*/
@@ -105,6 +121,10 @@ h1 .badge {
}
/* - Menus - */
-.dropdown:hover .dropdown-menu {
- display: block;
+@media (min-width: 1024px) {
+ /* Active submenu on hover, but only in desktop mode */
+ .dropdown-toggle:hover + .dropdown-menu,
+ .dropdown-menu:hover {
+ display: block;
+ }
}
\ No newline at end of file