more changes, most functions working need to add buttons

mreishman · mreishman · commit eb1ce444888c · 2019-05-10T09:23:42.000-05:00
diff --git a/core/js/main.js b/core/js/main.js
@@ -1406,9 +1406,9 @@ function singleDecreaseView(idOfBlock)
 		{
 			$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondaryExpanded').addClass('devBoxContentSecondary');
 			$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondaryExpanded').removeClass('devBoxContentSecondaryExpanded');
-			document.getElementById(idOfBlock+"UpArrow").style.display = "none";
+			$("#"+idOfBlock+"UpArrow").addClass("disabledArrow");
 		}
-		document.getElementById(idOfBlock+"DownArrow").style.display = "inline-block";
+		$("#"+idOfBlock+"DownArrow").removeClass("disabledArrow");
 	}
 }
 
@@ -1420,14 +1420,14 @@ function singleIncreaseView(idOfBlock)
 		{
 			$('#innerFirstDevBox'+idOfBlock+' .devBoxContentTertiary').addClass('devBoxContentTertiaryExpanded');
 			$('#innerFirstDevBox'+idOfBlock+' .devBoxContentTertiary').removeClass('devBoxContentTertiary');
-			document.getElementById(idOfBlock+"DownArrow").style.display = "none";
+			$("#"+idOfBlock+"DownArrow").addClass("disabledArrow");
 		}
 		else
 		{
 			$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondary').addClass('devBoxContentSecondaryExpanded');
 			$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondary').removeClass('devBoxContentSecondary');
 		}
-		document.getElementById(idOfBlock+"UpArrow").style.display = "inline-block";
+		$("#"+idOfBlock+"UpArrow").removeClass("disabledArrow");
 	}
 }
 
@@ -1450,8 +1450,8 @@ function switchToMinimizedView()
 		$('.devBoxContentTertiaryExpanded').addClass('devBoxContentTertiary');
 		$('.devBoxContentTertiaryExpanded').removeClass('devBoxContentTertiaryExpanded');
 
-		$(".downArrow").css("display","inline-block");
-		$(".upArrow").css("display","none");
+		$(".downArrow").removeClass("disabledArrow");
+		$(".upArrow").addClass("disabledArrow");
 	}
 }
 
@@ -1474,8 +1474,8 @@ function switchToStandardView()
 		$('.devBoxContentTertiaryExpanded').addClass('devBoxContentTertiary');
 		$('.devBoxContentTertiaryExpanded').removeClass('devBoxContentTertiaryExpanded');
 
-		$(".downArrow").css("display","inline-block");
-		$(".upArrow").css("display","inline-block");
+		$(".downArrow").removeClass("disabledArrow");
+		$(".upArrow").removeClass("disabledArrow");
 	}
 }
 
@@ -1498,8 +1498,8 @@ function switchToExpandedView()
 		$('.devBoxContentTertiary').addClass('devBoxContentTertiaryExpanded');
 		$('.devBoxContentTertiary').removeClass('devBoxContentTertiary');
 
-		$(".downArrow").css("display","none");
-		$(".upArrow").css("display","inline-block");
+		$(".downArrow").addClass("disabledArrow");
+		$(".upArrow").removeClass("disabledArrow");
 	}
 }
 
diff --git a/core/php/functions/indexFunctions.php b/core/php/functions/indexFunctions.php
@@ -117,22 +117,22 @@ function generateWindow($data = array(), $pollType)
 
 	if($branchView === "Minimized")
 	{
-		$upArrow = "display: none;";
+		$upArrow = "disabledArrow";
 		$downArrow = "";
 		$branchViewClass = "devBoxContentSecondary";
 		$branchViewClassTwo = "devBoxContentTertiary";
 	}
 	elseif($branchView === "Standard")
 	{
-		$upArrow = "display: none;";
+		$upArrow = "";
 		$downArrow = "";
 		$branchViewClass = "devBoxContentSecondaryExpanded";
 		$branchViewClassTwo = "devBoxContentTertiary";
 	}
 	elseif($branchView === "Expanded")
 	{
 		$upArrow = "";
-		$downArrow = "display: none;";
+		$downArrow = "disabledArrow";
 		$branchViewClass = "devBoxContentSecondaryExpanded";
 		$branchViewClassTwo = "devBoxContentTertiaryExpanded";
 	}
@@ -165,8 +165,8 @@ function generateWindow($data = array(), $pollType)
 	$blockHTML .= "			<img onclick=\"togglePinStatus('".$keyNoSpace."');\" id=\"".$keyNoSpace."Pin\" style=\"cursor: pointer; height: 18px;\" src=\"core/img/pin.png\">";
 	$blockHTML .= "			<img onclick=\"togglePinStatus('".$keyNoSpace."');\" id=\"".$keyNoSpace."PinPinned\" style=\"cursor: pointer; height: 18px; display: none;\" src=\"core/img/pinPinned.png\">";
 	$blockHTML .= "			<img onclick=\"toggleDetailBar(event, '".$keyNoSpace."');\" style=\"cursor: pointer; height: 18px;\" src=\"core/img/externalLink.png\">";
-	$blockHTML .= "			<img class=\"downArrow\" onclick=\"singleIncreaseView('".$keyNoSpace."');\" id=\"".$keyNoSpace."DownArrow\" style=\"cursor: pointer; height: 18px; ".$downArrow." \" src=\"core/img/downarrow.png\">";
-	$blockHTML .= "			<img class=\"upArrow\" onclick=\"singleDecreaseView('".$keyNoSpace."');\" id=\"".$keyNoSpace."UpArrow\" style=\"cursor: pointer; height: 18px; ".$upArrow."  \" src=\"core/img/uparrow.png\">";
+	$blockHTML .= "			<img class=\"downArrow ".$downArrow."\" onclick=\"singleIncreaseView('".$keyNoSpace."');\" id=\"".$keyNoSpace."DownArrow\" style=\"cursor: pointer; height: 18px;\" src=\"core/img/downarrow.png\">";
+	$blockHTML .= "			<img class=\"upArrow ".$upArrow." \" onclick=\"singleDecreaseView('".$keyNoSpace."');\" id=\"".$keyNoSpace."UpArrow\" style=\"cursor: pointer; height: 18px;\" src=\"core/img/uparrow.png\">";
 	$blockHTML .= "				<div class=\"expandMenu\" onclick=\"dropdownShow('".$keyNoSpace."')\" ></div>";
 	$blockHTML .= "			    	<a  style=\"cursor: pointer;\" onclick=\"refreshAction('".$keyNoSpace."','inner');\" ><img style=\"height: 18px;\" src=\"core/img/Refresh2.png\"></a>";
 	$blockHTML .= "				<div  id=\"dropdown-".$keyNoSpace."\" class=\"dropdown-content\">";
diff --git a/core/template/theme.css b/core/template/theme.css
@@ -246,6 +246,10 @@ input {
 .devBoxContentTertiaryExpanded{
 	display: block;
 }
+.disabledArrow{
+	filter: opacity(25%);
+	cursor: default !important;
+}
 #sidebar{
 	background-color: #777777;
 	width: 0;
diff --git a/local/default/template/theme.css b/local/default/template/theme.css
@@ -246,6 +246,10 @@ input {
 .devBoxContentTertiaryExpanded{
 	display: block;
 }
+.disabledArrow{
+	filter: opacity(25%);
+	cursor: default !important;
+}
 #sidebar{
 	background-color: #777777;
 	width: 0;

Original file line number	Diff line number	Diff line change
`@@ -1406,9 +1406,9 @@ function singleDecreaseView(idOfBlock)`
`1406`	`1406`	`{`
`1407`	`1407`	`$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondaryExpanded').addClass('devBoxContentSecondary');`
`1408`	`1408`	`$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondaryExpanded').removeClass('devBoxContentSecondaryExpanded');`
`1409`		`- document.getElementById(idOfBlock+"UpArrow").style.display = "none";`
	`1409`	`+ $("#"+idOfBlock+"UpArrow").addClass("disabledArrow");`
`1410`	`1410`	`}`
`1411`		`- document.getElementById(idOfBlock+"DownArrow").style.display = "inline-block";`
	`1411`	`+ $("#"+idOfBlock+"DownArrow").removeClass("disabledArrow");`
`1412`	`1412`	`}`
`1413`	`1413`	`}`
`1414`	`1414`
`@@ -1420,14 +1420,14 @@ function singleIncreaseView(idOfBlock)`
`1420`	`1420`	`{`
`1421`	`1421`	`$('#innerFirstDevBox'+idOfBlock+' .devBoxContentTertiary').addClass('devBoxContentTertiaryExpanded');`
`1422`	`1422`	`$('#innerFirstDevBox'+idOfBlock+' .devBoxContentTertiary').removeClass('devBoxContentTertiary');`
`1423`		`- document.getElementById(idOfBlock+"DownArrow").style.display = "none";`
	`1423`	`+ $("#"+idOfBlock+"DownArrow").addClass("disabledArrow");`
`1424`	`1424`	`}`
`1425`	`1425`	`else`
`1426`	`1426`	`{`
`1427`	`1427`	`$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondary').addClass('devBoxContentSecondaryExpanded');`
`1428`	`1428`	`$('#innerFirstDevBox'+idOfBlock+' .devBoxContentSecondary').removeClass('devBoxContentSecondary');`
`1429`	`1429`	`}`
`1430`		`- document.getElementById(idOfBlock+"UpArrow").style.display = "inline-block";`
	`1430`	`+ $("#"+idOfBlock+"UpArrow").removeClass("disabledArrow");`
`1431`	`1431`	`}`
`1432`	`1432`	`}`
`1433`	`1433`
`@@ -1450,8 +1450,8 @@ function switchToMinimizedView()`
`1450`	`1450`	`$('.devBoxContentTertiaryExpanded').addClass('devBoxContentTertiary');`
`1451`	`1451`	`$('.devBoxContentTertiaryExpanded').removeClass('devBoxContentTertiaryExpanded');`
`1452`	`1452`
`1453`		`- $(".downArrow").css("display","inline-block");`
`1454`		`- $(".upArrow").css("display","none");`
	`1453`	`+ $(".downArrow").removeClass("disabledArrow");`
	`1454`	`+ $(".upArrow").addClass("disabledArrow");`
`1455`	`1455`	`}`
`1456`	`1456`	`}`
`1457`	`1457`
`@@ -1474,8 +1474,8 @@ function switchToStandardView()`
`1474`	`1474`	`$('.devBoxContentTertiaryExpanded').addClass('devBoxContentTertiary');`
`1475`	`1475`	`$('.devBoxContentTertiaryExpanded').removeClass('devBoxContentTertiaryExpanded');`
`1476`	`1476`
`1477`		`- $(".downArrow").css("display","inline-block");`
`1478`		`- $(".upArrow").css("display","inline-block");`
	`1477`	`+ $(".downArrow").removeClass("disabledArrow");`
	`1478`	`+ $(".upArrow").removeClass("disabledArrow");`
`1479`	`1479`	`}`
`1480`	`1480`	`}`
`1481`	`1481`
`@@ -1498,8 +1498,8 @@ function switchToExpandedView()`
`1498`	`1498`	`$('.devBoxContentTertiary').addClass('devBoxContentTertiaryExpanded');`
`1499`	`1499`	`$('.devBoxContentTertiary').removeClass('devBoxContentTertiary');`
`1500`	`1500`
`1501`		`- $(".downArrow").css("display","none");`
`1502`		`- $(".upArrow").css("display","inline-block");`
	`1501`	`+ $(".downArrow").addClass("disabledArrow");`
	`1502`	`+ $(".upArrow").removeClass("disabledArrow");`
`1503`	`1503`	`}`
`1504`	`1504`	`}`
`1505`	`1505`