From 0ea4348fea1c0104495501bdf9421a2cff4f5ddf Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 13 May 2017 16:39:37 -0600 Subject: [PATCH] User name in navbar now links to Portal home --- app.php | 2 +- nbproject/project.properties | 1 + settings.template.php | 6 ++++-- static/css/bootstrap.min.css | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app.php b/app.php index f3cecb5..74ee2e2 100644 --- a/app.php +++ b/app.php @@ -108,7 +108,7 @@ if (!is_empty($_GET['page'])) { } ?> diff --git a/nbproject/project.properties b/nbproject/project.properties index 364d4fd..36becaf 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,5 @@ auxiliary.org-netbeans-modules-html-editor-lib.default-html-public-id=-//W3C//DTD HTML 4.01 Transitional//EN +browser.reload.on.save=true include.path=${php.global.include.path} php.version=PHP_70 source.encoding=UTF-8 diff --git a/settings.template.php b/settings.template.php index 9dbcf8e..fc0f037 100644 --- a/settings.template.php +++ b/settings.template.php @@ -28,7 +28,9 @@ define("ICON_POSITION", "menu"); define("MENU_BAR_STYLE", "fixed"); // URL of the Business Portal API endpoint -define("PORTAL_API", "http://localhost:8000/api.php"); +define("PORTAL_API", "http://localhost/portal/api.php"); +// URL of the Portal home page +define("PORTAL_URL", "http://localhost/portal/home.php"); // Business Portal API Key define("PORTAL_KEY", "123"); @@ -36,7 +38,7 @@ define("PORTAL_KEY", "123"); define("TIMEZONE", "America/Denver"); // Base URL for site links. -define('URL', 'http://localhost:8000/'); +define('URL', 'http://localhost/taskfloor/'); // Use reCAPTCHA on login screen // https://www.google.com/recaptcha/ diff --git a/static/css/bootstrap.min.css b/static/css/bootstrap.min.css index 357b318..d967ddf 100644 --- a/static/css/bootstrap.min.css +++ b/static/css/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700");/*! +/*@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700");/*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com * Copyright 2012-2017 Thomas Park