Merge pull request #9 from watermark-hollywood/ryan's-branch

Ryan's branch

index.php

@@ -1,5 +1,5 @@
 <?php
-	$allowed_hosts = array('local.project-oslo.com','project-oslo.com','www.project-oslo.com','osloideas.com','portal.osloideas.com','local.osloideas.com','www.osloideas.com','www.watermarkdigital.com');
+	$allowed_hosts = array('local.project-oslo.com','project-oslo.com','www.project-oslo.com','www.watermarkdigital.com');
 	if (!isset($_SERVER['HTTP_HOST']) || !in_array($_SERVER['HTTP_HOST'], $allowed_hosts)) {
 		header( "Location: portal/login.php" );
 	}
@@ -234,7 +234,7 @@
 
       $.ajax({
         type: 'post',
-        url: 'user/register.php',
+        url: 'portal/user/register.php',
         data: $('#admin_register_form').serialize(),
         success: function (data) {
           if(data == "exists"){

login.php

@@ -270,7 +270,7 @@
 
       $.ajax({
         type: 'post',
-        url: 'user/register.php',
+        url: 'portal/user/register.php',
         data: $('#admin_register_form').serialize(),
         success: function (data) {
           if(data == "exists"){
@@ -307,7 +307,7 @@
       e.preventDefault();
       $.ajax({
         type: 'post',
-        url: 'user/login.php',
+        url: 'portal/user/login.php',
         data: $('#login_form').serialize(),
         success: function (data) {
           if(data == "error"){
@@ -342,7 +342,7 @@
 
       $.ajax({
         type: 'post',
-        url: 'user/recover.php',
+        url: 'portal/user/recover.php',
         data: $('#recover_form').serialize(),
         success: function (data) {
           if(data == "error"){

portal/assets/css/home.css

@@ -0,0 +1,17 @@
+:root {
+	font-size: 14px;
+}
+
+body {
+	position: relative;
+	min-height: 100%;
+	background: none;
+}
+
+.top-nav-bar {
+	padding: 0 .0825rem;
+}
+
+.navbar-inverse .navbar-toggler {
+	border-color: #ffffff;
+}

assets/email_creatives/user_contact.html → portal/assets/email_creatives/user_contact.html

@@ -109,7 +109,7 @@
 										</table>
 										<p style="mso-table-lspace:0;mso-table-rspace:0; margin:0; text-align: left;" >
 											<span style="font-family: 'Roboto', Helvetica, Arial, sans-serif !important;">
-												<a href="http://%%domain%%/portal/verify.php?guid=%%guid%%">Click here to verify your email address</a>
+												<a href="http://%%domain%%/verify.php?guid=%%guid%%">Click here to verify your email address</a>
 											</span>
 											<br/>
 											<br/>

portal/assets/plugins/font-awesome-4.7.0/HELP-US-OUT.txt

@@ -0,0 +1,7 @@
+I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
+Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
+comprehensive icon sets or copy and paste your own.
+
+Please. Check it out.
+
+-Dave Gandy