Merge pull request #223 from mreishman/4.1.1

4.1.1

Author: mreishman

core/conf/config.php

@@ -15,6 +15,7 @@
 	'enableSystemPrefShellOrPhp'	=> 'false',
 	'expSettingsAvail'	=> 'true',
 	'defaultViewBranch'	=> 'Standard',
+	'defaultExpandTab'	=>	'info',
 	'cacheEnabled'		=> 'true',
 	'dontNotifyVersion'	=> '0',
 	'onlyRefreshVisible'	=> 'true',

core/html/changelog.html

@@ -1,4 +1,28 @@
 <ul>
+	<li>
+		Version 4.1.1
+		<ul>
+			<li>
+				Features
+				<ul>
+					<li>
+						Added option to select default open tab in expanded info window
+					</li>
+				</ul>
+			</li>
+			<li>
+				Bug Fixes
+				<ul>
+					<li>
+						Font style change for updater
+					</li>
+					<li>
+						Created tabs for watchlist settings, more servers are now visible on one screen
+					</li>
+				</ul>
+			</li>
+		</ul>
+	</li>
 	<li>
 		Version 4.1
 		<ul>

core/js/main.js

@@ -1839,7 +1839,13 @@ function toggleDetailBar(e, key)
 	}
 	else
 	{
-		toggleInfoTab();
+		if(defaultExpandTab === "info")
+		{
+			toggleInfoTab();
+		}
+		else if(defaultExpandTab === "commits") {
+			toggleCommitsTab();
+		}
 	}
 }
 

core/js/watchlist.js

@@ -250,6 +250,18 @@ function checkWebsiteStatus(sendUrlHere)
 	});
 }
 
+function toggleSettingsGroupSection(number, type)
+{
+	$("#"+number+"General").hide();
+	$("#"+number+"GeneralButton").removeClass("selected");
+	$("#"+number+"Git").hide();
+	$("#"+number+"GitButton").removeClass("selected");
+	$("#"+number+"Advanced").hide();
+	$("#"+number+"AdvancedButton").removeClass("selected");
+	$("#"+number+type).show();
+	$("#"+number+type+"Button").addClass("selected");
+}
+
 $( document ).ready(function() {
     hideLastMoveDownButton();
 });

core/php/configStatic.php

@@ -2,7 +2,7 @@
 <?php
 
 $configStatic = array(
-  'version'   => '4.1',
+  'version'   => '4.1.1',
   'lastCheck'   => '12-14-2018',
   'newestVersion' => '3.3.4',
   'versionList' => array(

core/php/functions/watchlistFunctions.php

@@ -18,14 +18,37 @@ function generateWatchlistBlock($defaultArray, $arrayKeys, $key = "{{key}}", $it
 	<span class=\"leftSpacingserverNames\" > Name: </span>
 	<input class='inputWidth300' type='text' name='watchListKey" . $i . "' value='" . $key . "'>";
 	$j = 0;
+	$stringToReturn .=	"<div style=\"border-bottom: 1px solid black; margin-bottom: 5px; padding: 5px;\">";
+	if(count($defaultArray) > 1)
+	{
+		$selectedOption = false;
+		foreach($defaultArray as $groupName => $groupData)
+		{
+			$stringToReturn .= "<span id=\"".$i.$groupName."Button\" class=\"buttonButton ";
+			if(!$selectedOption)
+			{
+				$stringToReturn .= " selected ";
+				$selectedOption = true;
+			}
+			$stringToReturn .= " \" style=\"margin-right: 5px;\" onclick=\"toggleSettingsGroupSection('".$i."','".$groupName."');\"  >".$groupName."</span>";
+		}
+	}
+	else
+	{
+		foreach($defaultArray as $groupName => $groupData)
+		{
+			$stringToReturn .= "<h4 style=\"margin: 5px;\">".$groupName."</h4>";
+		}
+	}
+	$stringToReturn .= "</div>";
 	foreach($defaultArray as $groupName => $groupData)
 	{
-		if($groupName !== "")
+		$stringToReturn .= "<span id=\"".$i.$groupName."\" ";
+		if($j !== 0)
 		{
-			$stringToReturn .=	"<div style=\"border-bottom: 1px solid black; margin-bottom: 5px;\">
-	<h4 style=\"margin: 5px;\">".$groupName."</h4>
-	</div>";
+			$stringToReturn .= " style=\"display: none;\" ";
 		}
+		$stringToReturn .= "  >";
 		$brCount = 0;
 		foreach($groupData as $key2 => $item2)
 		{
@@ -148,6 +171,7 @@ function generateWatchlistBlock($defaultArray, $arrayKeys, $key = "{{key}}", $it
 				$stringToReturn .= "'>";
 			}
 		}
+		$stringToReturn .= "</span>";
 	}
 	$stringToReturn .= "
 	<input style=\"display: none\" type=\"text\" name=\"watchListItem" . $i . "-0\" value='" . $j . "'>

core/php/templateFiles/settingsMain.php

@@ -107,6 +107,17 @@
 					</td>
 				</tr>
 				<?php endif; ?>
+				<tr>
+					<td>
+						Default Expand Tab
+					</td>
+					<td>
+						<select name="defaultExpandTab">
+	  						<option <?php if($defaultExpandTab == 'info'){echo "selected";} ?> value="info">Info</option>
+	  						<option <?php if($defaultExpandTab == 'commits'){echo "selected";} ?> value="commits">Commits</option>
+						</select>
+					</td>
+				</tr>
 			</table>
 		</div>
 	</div>

core/template/theme.css

@@ -502,6 +502,13 @@ input {
 	border: 1px solid #999;
 }
 
+.buttonButton.selected {
+    background-color: #555;
+    color: white;
+	border: 1px solid #777;
+	cursor: default;
+}
+
 .noticeMessage{
 	background-color: white;
 	width: 100%;

index.php

@@ -411,6 +411,7 @@
 			echo "var maxCommits = ".$maxCommits.";";
 			echo "var onServerRemoveRemoveNotError = ".$onServerRemoveRemoveNotError.";";
 			echo "var defaultBranchList = '".$defaultBranchList."';";
+			echo "var defaultExpandTab = '".$defaultExpandTab."';";
 			if(empty($cachedStatusMainObject))
 			{
 				echo "var arrayOfWatchFilters = {};";

local/default/template/theme.css

@@ -502,6 +502,13 @@ input {
 	border: 1px solid #999;
 }
 
+.buttonButton.selected {
+    background-color: #555;
+    color: white;
+	border: 1px solid #777;
+	cursor: default;
+}
+
 .noticeMessage{
 	background-color: white;
 	width: 100%;