Merge pull request #102 from mreishman/1.7

1.7

Author: mreishman

core/conf/config.php

@@ -15,13 +15,21 @@
 	'browserStackUsername'			=> 'userNameExample',
 	'buffer'						=> 500,
 	'cacheTestEnable'				=> 'true',
-	'configVersion'					=> 2,
+	'configVersion'					=> 3,
 	'cssVersion'					=> 1,
 	'currentTheme'					=> 'Default',
 	'defaultBaseUrl'				=> '',
 	'defaultCombinedRate'			=> 0.075,
 	'defaultErrorRate'				=> 0.05,
 	'defaultFailRate'				=> 0.05,
+	'defaultNewAddAlertEnabled'		=>	'true',
+	'defaultNewAddAutoDeleteFiles'	=>	'',
+	'defaultNewAddExcludeTrim'		=>	'false',
+	'defaultNewAddPattern'			=>	'.log$',
+	'defaultNewAddRecursive'		=>	'false',
+	'defaultNewPathFile'			=>	'/var/',
+	'defaultNewPathFolder'			=>	'/var/',
+	'defaultNewPathOther'			=>	'/var/',
 	'defaultNumRetry'				=> 5,
 	'defaultShowEta'				=> 'eta',
 	'defaultShowProgressType'		=> 'percent',
@@ -37,7 +45,7 @@
 	'locationForMonitor'			=> '',
 	'locationForSearch'				=> '',
 	'locationForStatus'				=> '',
-	'locationOfTests'				=> '',
+	'locationOfTests'				=> array( 'LocationOfTests1' => array('FileInformation' => '{}','FileType' => 'auto','Location' => '/var/www/html/Tests/Selenium/','Pattern' => '$','Recursive' => 'true')),
 	'locationOfSelenium'			=> '',
 	'logFileLocation'				=> '',
 	'logFontColor'					=> '#FFFFFF',
@@ -60,6 +68,7 @@
 	'sendCrashInfoJS'				=> 'true',
 	'sendCrashInfoPHP'				=> 'true',
 	'showSubFolderTests'			=> 'true',
+	'sortTypeFileFolderPopup'		=> 'startsWithAndcontains',
 	'themeVersion'					=> 3,
 	'timeoutViewMain'				=> 6,
 	'truncateLog'					=> 'true',

core/img/fileIconNR.png

@@ -260,11 +260,37 @@ function poll()
 	{
 		if(checkIfChanges())
 		{
-			document.getElementById(titleOfPage+"Link").innerHTML = titleOfPage+"*";
+			if(titleOfPage === "testList")
+			{
+				if(document.getElementById(titleOfPage+"Link").innerHTML !== "Test List"+"*")
+				{
+					document.getElementById(titleOfPage+"Link").innerHTML = titleOfPage+"*";
+				}
+			}
+			else
+			{
+				if(document.getElementById(titleOfPage+"Link").innerHTML !== titleOfPage+"*")
+				{
+					document.getElementById(titleOfPage+"Link").innerHTML = titleOfPage+"*";
+				}
+			}
 		}
 		else
 		{
-			document.getElementById(titleOfPage+"Link").innerHTML = titleOfPage;
+			if(titleOfPage === "testList")
+			{
+				if(document.getElementById(titleOfPage+"Link").innerHTML !== "Test List")
+				{
+					document.getElementById(titleOfPage+"Link").innerHTML = titleOfPage;
+				}
+			}
+			else
+			{
+				if(document.getElementById(titleOfPage+"Link").innerHTML !== titleOfPage)
+				{
+					document.getElementById(titleOfPage+"Link").innerHTML = titleOfPage;
+				}
+			}
 		}
 	}
 	catch(e)