Merge branch 'development' into h-node

3 files changed, 5 insertions, 5 deletions

diff --git a/h-source/admin/Library/Helper/Popup.php b/h-source/admin/Library/Helper/Popup.php
index 9ceac72..17ba908 100755
--- a/h-source/admin/Library/Helper/Popup.php
+++ b/h-source/admin/Library/Helper/Popup.php
@@ -78,10 +78,10 @@ class Helper_Popup extends Helper_Html {
 				$this->viewArgs[$field] = $tempArg;
 			}
 			if (count($this->popupArray)>0) {
-				$returnString .= "<script type=\"text/javascript\" src=\"http://".DOMAIN_NAME."/Public/Js/DisplayTag.js\"></script>\n";
+				$returnString .= "<script type=\"text/javascript\" src=\"/admin/Public/Js/DisplayTag.js\"></script>\n";
 			}
 		}
 		return $returnString;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/h-source/admin/Library/Theme.php b/h-source/admin/Library/Theme.php
index 692697e..afa3660 100755
--- a/h-source/admin/Library/Theme.php
+++ b/h-source/admin/Library/Theme.php
@@ -22,8 +22,8 @@ class Theme {
 	
 	function __construct($controller) {
 		$this->controller = $controller;
-		$this->baseUrl = MOD_REWRITE_MODULE === true ? 'http://' . DOMAIN_NAME : 'http://' . DOMAIN_NAME . '/index.php';
-		$this->baseUrlSrc = 'http://' . DOMAIN_NAME;
+		$this->baseUrl = MOD_REWRITE_MODULE === true ? '/admin' : '/admin/index.php';
+		$this->baseUrlSrc = '/admin';
 	}
 
 
diff --git a/h-source/admin/Library/Url.php b/h-source/admin/Library/Url.php
index 4e2ca5e..54d6e3e 100755
--- a/h-source/admin/Library/Url.php
+++ b/h-source/admin/Library/Url.php
@@ -9,7 +9,7 @@ class Url {
 
 	//get the url starting from the root folder
 	public static function getRoot($pathFromRootFolder = null) {
-		$url = MOD_REWRITE_MODULE === true ? 'http://' . DOMAIN_NAME . '/' . $pathFromRootFolder : 'http://' . DOMAIN_NAME . '/index.php/' . $pathFromRootFolder;
+		$url = MOD_REWRITE_MODULE === true ? '/admin/' . $pathFromRootFolder : '/admin/index.php/' . $pathFromRootFolder;
 		return $url;
 	}