Skip to content

Commit 7c10ad8

Browse files
mreishmanmreishman
authored
Merge pull request #217 from mreishman/4.0
4.0
2 parents ebd8a20 + 3e0ed79 commit 7c10ad8

30 files changed

+1009
-621
lines changed

‎about.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<!doctype html>
1717
<head>
1818
<title>Git Status | About</title>
19+
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
1920
<link rel="stylesheet" type="text/css" href="<?php echo $baseUrl ?>template/theme.css?v=<?php echo $configStatic['version']; ?>">
2021
<link rel="icon" type="image/png" href="core/img/favicon.png" />
2122
<script src="core/js/jquery.js"></script>
@@ -27,7 +28,7 @@
2728
<body>
2829
<?php require_once('core/php/templateFiles/sidebar.php'); ?>
2930
<?php require_once('core/php/templateFiles/header.php'); ?>
30-
<div id="main" style="overflow: auto; overflow-y: auto;" >
31+
<div id="main" style="overflow: auto; overflow-y: auto; right: 0;" >
3132
<div class="firstBoxDev">
3233
<div class="innerFirstDevBox" >
3334
<div class="devBoxTitle">
@@ -71,13 +72,10 @@ function calcuateWidth()
7172
var left = "0px";
7273
if(document.getElementById("sidebar").style.width == '100px')
7374
{
74-
left = "100px";
75+
left = "103px";
7576
}
7677
document.getElementById("main").style.left = left;
7778
}
7879
</script>
7980
<script src="core/js/allPages.js?v=<?php echo $configStatic['version']; ?>"></script>
80-
<script type="text/javascript">
81-
document.getElementById("menuBarLeftAbout").style.backgroundColor = "#ffffff";
82-
</script>
8381
</body>

‎core/html/changelog.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
<ul>
2+
<li>
3+
Version 4.0
4+
<ul>
5+
<li>
6+
Features
7+
<ul>
8+
<li>
9+
New theme! (Lots of style changes)
10+
</li>
11+
</ul>
12+
</li>
13+
<li>
14+
Bug Fixes
15+
<ul>
16+
<li>
17+
Cleaned up look of settings pages making some settings easier to understand
18+
</li>
19+
<li>
20+
Info panel in popup sidebar now easier to read at lower resolution
21+
</li>
22+
<li>
23+
LED indicator switches to yellow when unsure of status
24+
</li>
25+
</ul>
26+
</li>
27+
</ul>
28+
</li>
229
<li>
330
Version 3.4.3
431
<ul>

‎core/js/allPages.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function toggleMenuSideBar()
3838
document.cookie = objSett[selector]["cookie"];
3939
calcuateWidth();
4040
document.getElementById("openMenuHamburger").style.display = objSett[selector]["openMenuHamburger"];
41-
document.getElementById("closeMenuHamburger").style.display = objSett[selector]["closeMenuHamburger"];
41+
document.getElementById("closeMenuHamburger").style.display = objSett[selector]["closeMenuHamburger"];
4242
}
4343

4444
calcuateWidth();
@@ -54,9 +54,9 @@ function resizeFunction()
5454
document.getElementById("windows").style.height = heightVar;
5555
document.getElementById("sideBox").style.height = (heightWindow-100)+"px";
5656
document.getElementById("iframeForStuff").style.height = (heightWindow-143)+"px";
57-
document.getElementById("listOfCommitHistory").style.height = (heightWindow-138)+"px";
58-
document.getElementById("spanForMainDiff").style.height = (heightWindow-138)+"px";
59-
57+
document.getElementById("listOfCommitHistory").style.height = (heightWindow-143)+"px";
58+
document.getElementById("spanForMainDiff").style.height = (heightWindow-143)+"px";
59+
document.getElementById("sideBoxForActualInfo").style.height = (heightWindow-143)+"px";
6060
}
6161
if(document.getElementById("widthForWatchListSection"))
6262
{
@@ -77,7 +77,7 @@ $(window).resize(function(){
7777
jQuery(document).ready(function()
7878
{
7979
calcuateWidth();
80-
80+
8181
var offset = 220;
8282
var duration = 500;
8383
$('#main').scroll(function() {
@@ -87,7 +87,7 @@ jQuery(document).ready(function()
8787
jQuery('.back-to-top').fadeOut(duration);
8888
}
8989
});
90-
90+
9191
jQuery('.back-to-top').click(function(event) {
9292
event.preventDefault();
9393
$('#main').animate({scrollTop: 0}, duration);

‎core/js/main.js‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ function pollTwo(all, counterForSaveNew)
144144
{
145145
counterForSave = numberOfLogs+1;
146146
var arrayOfFilesLength = arrayOfFiles.length
147+
//Change ALL leds to yellow
148+
$(".led-green").hide();
149+
$(".led-red").hide();
150+
$(".led-yellow").css("display","inline-block");
147151
for(var i = 0; i < arrayOfFilesLength; i++)
148152
{
149153
var boolForRun = true;
@@ -544,11 +548,14 @@ function pollFailure(xhr, error, dataInnerPass)
544548
//get all with class of id
545549
var subBoxes = document.getElementsByClassName(dataInnerPass["id"]);
546550
var countOfBoxes = subBoxes.length;
547-
for(var i = 0; i < countOfBoxes; i++)
551+
if(countOfBoxes > 0)
548552
{
549-
nameForBackground = subBoxes[i].getElementsByClassName("innerFirstDevBox")[0].id;
550-
noSpaceName = nameForBackground.replace("innerFirstDevBox", "");
551-
pollFailureInner(xhr, error, noSpaceName, nameForBackground);
553+
for(var i = 0; i < countOfBoxes; i++)
554+
{
555+
nameForBackground = subBoxes[i].getElementsByClassName("innerFirstDevBox")[0].id;
556+
noSpaceName = nameForBackground.replace("innerFirstDevBox", "");
557+
pollFailureInner(xhr, error, noSpaceName, nameForBackground);
558+
}
552559
}
553560
}
554561
}
@@ -1503,7 +1510,7 @@ function calcuateWidth()
15031510
{
15041511
windowWidthText = "0px";
15051512
}
1506-
document.getElementById("main").style.marginLeft = windowWidthText;
1513+
document.getElementById("main").style.paddingLeft = windowWidthText;
15071514
document.getElementById("main").style.paddingRight = windowWidthText;
15081515
if(document.getElementById("sideBox").style.display !== "none")
15091516
{
@@ -1655,10 +1662,20 @@ function actuallyInstallUpdates()
16551662
$("#settingsInstallUpdate").submit();
16561663
}
16571664

1665+
function resetDevBoxTitleColor()
1666+
{
1667+
$(".devBoxTitle , .devBoxActions").css("background-color","");
1668+
}
1669+
1670+
function setDevBoxTitleColor(key)
1671+
{
1672+
$("#innerFirstDevBox"+key+" .devBoxTitle , #innerFirstDevBox"+key+" .devBoxActions").css("background-color","#FFFFFF");
1673+
}
1674+
16581675
function toggleDetailBar(e, key)
16591676
{
1660-
$(".devBoxTitle").css("background-color","#aaaaaa");
1661-
$("#innerFirstDevBox"+key+" .devBoxTitle").css("background-color","#FFFFFF");
1677+
resetDevBoxTitleColor();
1678+
setDevBoxTitleColor(key);
16621679
if(document.getElementById("sideBox").style.display == "none")
16631680
{
16641681
document.getElementById("sideBox").style.display = "inline-block";
@@ -1702,7 +1719,7 @@ function toggleDetailBar(e, key)
17021719
function closeDetailBar()
17031720
{
17041721
$('#iframeForStuff').prop('src', "./iframe.html");
1705-
$(".devBoxTitle").css("background-color","#aaaaaa");
1722+
resetDevBoxTitleColor();
17061723
document.getElementById("sideBox").style.display = "none";
17071724
document.getElementById("windows").style.width = "auto";
17081725
resizeFunction();

‎core/js/settings.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
if(document.getElementById("menuBarLeftSettings"))
2-
{
3-
document.getElementById("menuBarLeftSettings").style.backgroundColor = "#ffffff";
4-
}
51
var countOfClicksFilterBranch = 0;
62
var countOfClicksFilterAuthor = 0;
73
var countOfClicksFilterComittee = 0;
@@ -118,7 +114,7 @@ function whichTypeOfFilterIsSelected()
118114
{
119115
return 'newRowLocationForFilterComittee';
120116
}
121-
}
117+
}
122118

123119
function switchToNewFilterBranchColor()
124120
{

‎core/js/watchlist.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ function addRowFunction()
120120
document.getElementById('numberOfRows').value = countOfWatchList;
121121
countOfAddedFiles++;
122122
hideLastMoveDownButton();
123+
$(".devBoxContent").scrollTop($(".devBoxContent")[0].scrollHeight);
123124
}
124125

125126
function deleteRowFunction(currentRow, decreaseCountWatchListNum)

‎core/php/configStatic.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?php
33

44
$configStatic = array(
5-
'version' => '3.4.3',
5+
'version' => '4.0',
66
'lastCheck' => '12-14-2018',
77
'newestVersion' => '3.3.4',
88
'versionList' => array(

‎core/php/functions/indexFunctions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function generateWindow($data = array(), $pollType)
148148
$blockHTML .= " <img id=\"".$keyNoSpace."loadingSpinnerHeader\" class=\"loadingSpinnerHeader\" style=\"width: 20px; margin-bottom: -7px; display: none; margin-top: 3px; margin-left: 3px; margin-right: 1px;\" src=\"core/img/loading.gif\" >";
149149
$blockHTML .= " <a style=\"color: black;\" target=\"_blank\" href=\"https://".$website."\"><b>".$name."</b></a>";
150150
$blockHTML .= " </div>";
151-
$blockHTML .= " <div style=\"background-color: white; padding-left: 5px; padding-right: 5px;\" >";
151+
$blockHTML .= " <div class=\"devBoxActions\" style=\"padding-left: 5px; padding-right: 5px;\" >";
152152
$blockHTML .= " <img onclick=\"togglePinStatus('".$keyNoSpace."');\" id=\"".$keyNoSpace."Pin\" style=\"cursor: pointer; height: 18px;\" src=\"core/img/pin.png\">";
153153
$blockHTML .= " <img onclick=\"togglePinStatus('".$keyNoSpace."');\" id=\"".$keyNoSpace."PinPinned\" style=\"cursor: pointer; height: 18px; display: none;\" src=\"core/img/pinPinned.png\">";
154154
$blockHTML .= " <img onclick=\"toggleDetailBar(event, '".$keyNoSpace."');\" style=\"cursor: pointer; height: 18px;\" src=\"core/img/externalLink.png\">";

0 commit comments

Comments
 (0)