From 8080c6c61145a1d4e01d6178ccec368bf140b859 Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Mon, 20 Jun 2016 19:07:04 +0200 Subject: [PATCH] - closed #195 fixed "BASE" dir for subDir installations - fixed "Home" menu link --- app/config.ini | 2 +- app/environment.ini | 4 ++-- js/app/page.js | 2 +- public/js/v1.1.1/app/page.js | 2 +- public/templates/ui/jsonld.html | 2 +- public/templates/view/index.html | 34 ++++++++++++++++---------------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/config.ini b/app/config.ini index ea8ca2ee..8720f45c 100644 --- a/app/config.ini +++ b/app/config.ini @@ -36,7 +36,7 @@ UI = public/ AUTOLOAD = app/main/ ; path to favicons folder -FAVICON = /favicon +FAVICON = favicon/ ; load additional config files ; DO NOT load environment.ini, it is loaded automatically diff --git a/app/environment.ini b/app/environment.ini index eea23f0c..d12081bf 100644 --- a/app/environment.ini +++ b/app/environment.ini @@ -8,7 +8,7 @@ SERVER = DEVELOP [ENVIRONMENT.DEVELOP] ; path to index.php (Default: leave blank == "auto-detect") -; -> e.g. set /pathfinder if your URL looks like https://www.[YOUR_DOMAIN]/pathfinder (subfolder) +; -> e.g. set pathfinder/ if your URL looks like https://www.[YOUR_DOMAIN]/pathfinder (subfolder) BASE = ; deployment URL (e.g. http://localhost) URL = http://pathfinder.local @@ -47,7 +47,7 @@ SMTP_ERROR = pathfinder@localhost.com [ENVIRONMENT.PRODUCTION] ; path to index.php (Default: leave blank == "auto-detect") -; -> e.g. set /pathfinder if your URL looks like https://www.[YOUR_DOMAIN]/pathfinder (subfolder) +; -> e.g. set pathfinder/ if your URL looks like https://www.[YOUR_DOMAIN]/pathfinder (subfolder) BASE = ; deployment URL (e.g. https://www.pathfinder-w.space) URL = https://www.pathfinder-w.space diff --git a/js/app/page.js b/js/app/page.js index 75c4f1df..d0094c71 100644 --- a/js/app/page.js +++ b/js/app/page.js @@ -132,7 +132,7 @@ define([ }).append( $('', { class: 'list-group-item', - href: '#' + href: '/' }).html('  Home').prepend( $('',{ class: 'fa fa-home fa-fw' diff --git a/public/js/v1.1.1/app/page.js b/public/js/v1.1.1/app/page.js index 75c4f1df..d0094c71 100644 --- a/public/js/v1.1.1/app/page.js +++ b/public/js/v1.1.1/app/page.js @@ -132,7 +132,7 @@ define([ }).append( $('', { class: 'list-group-item', - href: '#' + href: '/' }).html('  Home').prepend( $('',{ class: 'fa fa-home fa-fw' diff --git a/public/templates/ui/jsonld.html b/public/templates/ui/jsonld.html index 595a5ca8..680253b5 100644 --- a/public/templates/ui/jsonld.html +++ b/public/templates/ui/jsonld.html @@ -7,7 +7,7 @@ "name": "{{ @PATHFINDER.NAME }}", "legalName": "Pathfinder - OpenSource", "url": "{{ Controller\Controller::getEnvironmentData('URL') }}", - "logo": "{{@SCHEME.'://'.@HOST.@FAVICON}}/favicon-192x192.png", + "logo": "{{@SCHEME.'://'.@HOST.'/'.@BASE.@FAVICON}}favicon-192x192.png", "foundingDate": "2014", "founders": [{ "@type": "Person", diff --git a/public/templates/view/index.html b/public/templates/view/index.html index 064767c8..1d6f10dd 100644 --- a/public/templates/view/index.html +++ b/public/templates/view/index.html @@ -7,22 +7,22 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + @@ -52,7 +52,7 @@ {* Youtube verification code *} - + @@ -61,7 +61,7 @@ - +