diff --git a/modules/core/client/directives/tr-boards.client.directive.js b/modules/core/client/directives/tr-boards.client.directive.js index 9f987e8520..7aff48ed9b 100644 --- a/modules/core/client/directives/tr-boards.client.directive.js +++ b/modules/core/client/directives/tr-boards.client.directive.js @@ -132,6 +132,13 @@ 'license': 'CC', 'license_url': 'https://creativecommons.org/licenses/by-nc-nd/4.0/', 'file': 'tribes-1.jpg' + }, + 'woman-bridge': { + 'name': 'Michael Hull', + 'url': 'https://unsplash.com/photos/JibIPPrvITE', + 'license': 'CC', + 'license_url': 'https://unsplash.com/license', + 'file': 'mh-woman-bridge.jpg' } }; diff --git a/modules/core/client/img/board/mh-woman-bridge.jpg b/modules/core/client/img/board/mh-woman-bridge.jpg new file mode 100644 index 0000000000..7cf9afa37d Binary files /dev/null and b/modules/core/client/img/board/mh-woman-bridge.jpg differ diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html index a31cb9b7a8..ad433bbfb8 100644 --- a/modules/core/server/views/layout.server.view.html +++ b/modules/core/server/views/layout.server.view.html @@ -51,8 +51,8 @@ {% if facebookAppId !== "APP_ID" %}{% endif %} {% if facebookPage !== "" %}{% endif %} {% if tribe %} - - + + {% if tribe.image_UUID %} {# https://developers.facebook.com/docs/sharing/best-practices#images #} @@ -73,8 +73,8 @@ {# Twitter #} {% if twitterUsername !== "" %}{% endif %} {% if tribe %} - - + + {% if tribe.image_UUID %} @@ -135,6 +135,7 @@ title = '{{title}}', settings = {{ appSettings | json | safe }}, languages = {{ languages | json | safe }}, + {% if facebookAppId !== "APP_ID" %}facebookAppId = '{{facebookAppId}}',{% endif %} env = '{{ env }}'; diff --git a/modules/pages/client/controllers/home.client.controller.js b/modules/pages/client/controllers/home.client.controller.js index 2feed1fd52..60ad8bdf4b 100644 --- a/modules/pages/client/controllers/home.client.controller.js +++ b/modules/pages/client/controllers/home.client.controller.js @@ -6,7 +6,7 @@ .controller('HomeController', HomeController); /* @ngInject */ - function HomeController(Authentication, TribesService) { + function HomeController(Authentication, TribesService, $stateParams) { var headerHeight = angular.element('#tr-header').height() || 0; @@ -16,8 +16,16 @@ // Exposed to the view vm.windowHeight = angular.element('html').height() - headerHeight; - vm.boards = Authentication.user ? 'wavewatching' : ['rainbowpeople', 'hitchroad', 'desertgirl', 'sierranevada', 'wavewatching', 'hitchgirl1', 'hitchgirl2']; + // Load front page's landing photos + // @todo, move part of this logic data to the DB + if($stateParams.tribe && ['hitchhikers', 'dumpster-divers', 'punks'].indexOf($stateParams.tribe) > -1) { + vm.boards = ['rainbowpeople', 'hitchroad', 'desertgirl', 'hitchgirl1', 'hitchgirl2']; + } + else { + vm.boards = Authentication.user ? ['woman-bridge', 'wavewatching'] : ['woman-bridge', 'rainbowpeople', 'hitchroad', 'hitchgirl1', 'wavewatching']; + } + // Load example tribes vm.tribes = TribesService.query({ limit: 3 }); diff --git a/modules/pages/client/views/faq.client.view.html b/modules/pages/client/views/faq.client.view.html index d80d89d8a8..93fc291d76 100644 --- a/modules/pages/client/views/faq.client.view.html +++ b/modules/pages/client/views/faq.client.view.html @@ -67,11 +67,7 @@

Organisation

- The website is owned and operated by Trustroots Foundation, a non-profit Limited by Guarantee (LBG) under section 60 exemption, registered in the United Kingdom in March 2015. - -

- - Trustroots Foundation’s Articles (pdf) + The website is owned and operated by Trustroots Foundation, a non-profit Limited by Guarantee (LBG) under section 60 exemption, registered in the United Kingdom in March 2015.

diff --git a/modules/tags/client/views/tribe.client.view.html b/modules/tags/client/views/tribe.client.view.html index 1481e2a66b..33ba641187 100644 --- a/modules/tags/client/views/tribe.client.view.html +++ b/modules/tags/client/views/tribe.client.view.html @@ -53,23 +53,15 @@

Trustroots is built on communities. Share this page within your community and invite them to join!

- - + + - + -
-