Skip to content

Commit

Permalink
Merge pull request #579 from mreishman/5.2.2
Browse files Browse the repository at this point in the history 
5.2.2
  • Loading branch information
@mreishman
mreishman committed Nov 12, 2018
2 parents a2167c2 + 6efa475 commit 280a240
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 22 deletions.
2 changes: 1 addition & 1 deletion core/conf/config.php
View file
Expand Up @@ -312,7 +312,7 @@
'sortTypeFileFolderPopup' => 'startsWithAndcontains',
'successVerifyNum' => 2,
'themesEnabled' => 'true',
'themeVersion' => 20,
'themeVersion' => 21,
'timeoutHighlight' => 30,
'TrimSize' => 'K',
'truncateLog' => 'true',
Expand Down
18 changes: 16 additions & 2 deletions core/js/main.js
View file
Expand Up @@ -1935,12 +1935,12 @@ function removeFromMultiLog(idOfName)
{
logDisplayArray[i]["id"] = null;
windowNum = i;
break;
break;
}
}
if(windowNum > -1)
{
$("#log"+i).html("");
$("#log"+windowNum).html("");
$("#menu ." + idOfName + "Button currentWindowNum").html("");
}
}
Expand Down Expand Up @@ -4558,6 +4558,20 @@ function getCurrentWindowLayout()

function saveLayoutTo(letter)
{
if(logLoadLayout.length === 0)
{
for(var iCount = 1; iCount <= 3; iCount++)
{
for(var jCount = 1; jCount <= 3; jCount++)
{
logLoadLayout[""+iCount+"x"+jCount] = [];
for(var kCount = 0; kCount < (iCount * jCount); kCount++)
{
logLoadLayout[""+iCount+"x"+jCount][kCount] = {A: "", B: "", C: ""};
}
}
}
}
var currentConfig = getCurrentWindowLayout();
var currentConfigArray = currentConfig.split("x");
var outerLoop = parseInt(currentConfigArray[0]);
Expand Down
3 changes: 1 addition & 2 deletions core/js/rightClickJS.js
View file
Expand Up @@ -21,9 +21,8 @@ var doClearAllNotifications = {action: "removeAllNotifications();", name: "Clear
var deleteMenu = [clearAllLogs,clearCurrentLog,deleteCurrentLog];
var pauseMenu = [tmpTogglePauseOnUnfocus];
var notificationMenuHidden = [doClearAllNotifications];
var notificationMenuClicked = [doToggleClearAllNotifications];

var menuObjectRightClick = {deleteImage: deleteMenu, pauseImage: pauseMenu, notificationNotClicked: notificationMenuHidden, notificationClicked: notificationMenuClicked};
var menuObjectRightClick = {deleteImage: deleteMenu, pauseImage: pauseMenu, notificationNotClicked: notificationMenuHidden, notificationClicked: notificationMenuHidden, notificationBadge: notificationMenuHidden , notificationCount: notificationMenuHidden};

$( document ).ready(function() {
(function() {
Expand Down
23 changes: 20 additions & 3 deletions core/js/settingsMain.js
View file
Expand Up @@ -234,6 +234,14 @@ function updateJsonForPopupThemeInner()

function selectLogPopup(locationForNewLogText)
{
var selctor = locationForNewLogText.split("-");
var currentWindow = 0;
var arrayOfAlreadySelectedLogs = [];
while(typeof document.getElementsByName(selctor[0]+"-"+currentWindow+"-"+selctor[2])[0] !== "undefined")
{
arrayOfAlreadySelectedLogs.push(document.getElementsByName(selctor[0]+"-"+currentWindow+"-"+selctor[2])[0].value);
currentWindow++;
}
displayLoadingPopup();
var urlForSend = "../core/php/pollCheck.php?format=json";
var data = {};
Expand All @@ -247,14 +255,23 @@ function selectLogPopup(locationForNewLogText)
var popupFileList = Object.keys(data);
var popupFileListLength = popupFileList.length;
var htmlForPopup = "";
var counter = 0;
htmlForPopup += "<div class=\"selectDiv\"><select id=\"newLogSelectionFromPopup\" ><option value=\"\" >None</option>";
for(var i = 0; i < popupFileListLength; i++)
{
var fileName = popupFileList[i];
htmlForPopup += "<option value=\""+popupFileList[i]+"\">"+popupFileList[i]+"</option>";
if(arrayOfAlreadySelectedLogs.indexOf(popupFileList[i]) === -1)
{
htmlForPopup += "<option value=\""+popupFileList[i]+"\">"+popupFileList[i]+"</option>";
counter++;
}
}
htmlForPopup += "</select></div>";
document.getElementById('popupContentInnerHTMLDiv').innerHTML = "<div class='settingsHeader' >Select Log:</div><br><div style='width:100%;text-align:center;padding-left:10px;padding-right:10px;'>"+htmlForPopup+"</div><div class='link' onclick='selectLog(\""+locationForNewLogText+"\")' style='margin-left:100px; margin-right:50px;margin-top:25px;'>Select</div><div onclick='hidePopup();' class='link'>Close</div></div>";
htmlForPopup = "<div class='settingsHeader' >Select Log:</div><br><div style='width:100%;text-align:center;padding-left:10px;padding-right:10px;'>"+htmlForPopup+"</div><div class='link' onclick='selectLog(\""+locationForNewLogText+"\")' style='margin-left:100px; margin-right:50px;margin-top:25px;'>Select</div><div onclick='hidePopup();' class='link'>Close</div></div>";
if(counter === 0)
{
htmlForPopup = "<div class='settingsHeader' >No Logs:</div><br><div style='width:100%;text-align:center;padding-left:10px;padding-right:10px;'>There are not logs to select</div><div onclick='hidePopup();' class='link'>Close</div></div>";
}
document.getElementById('popupContentInnerHTMLDiv').innerHTML = htmlForPopup;
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions core/php/configStatic.php
View file

Large diffs are not rendered by default.

35 changes: 25 additions & 10 deletions core/php/template/innerAddon.php
View file
Expand Up @@ -162,18 +162,25 @@
</td>
<?php if(strpos($URI, 'step') === false): ?>
<td>
<?php if ($value['ConfigStatic']['version'] !== $value['ConfigStatic']['newestVersion']): ?>
Update Available - <?php echo $value['ConfigStatic']['newestVersion']; ?>
<?php else: ?>
No Update
<?php endif; ?>
<span class="<?php echo $lowercase; ?>RemoveHideThis" >
<?php if ($value['ConfigStatic']['version'] !== $value['ConfigStatic']['newestVersion']): ?>
Update Available - <?php echo $value['ConfigStatic']['newestVersion']; ?>
<?php else: ?>
No Update
<?php endif; ?>
</span>
</td>
<td>
<?php if ($value['ConfigStatic']['version'] !== $value['ConfigStatic']['newestVersion']): ?>
<a class="link" onclick="installUpdates('<?php echo $lowercase; ?>/','<?php echo $lowercase; ?>UpdateForm');">Install <?php echo $value['ConfigStatic']["newestVersion"];?> Update</a>
<?php else: ?>
<a onclick="checkForUpdates('<?php echo $lowercase; ?>/','<?php echo $uppercase; ?>','<?php echo $value['ConfigStatic']['version'];?>','<?php echo $lowercase; ?>UpdateForm');" class="link">Check For Updates</a>
<?php endif; ?>
<span class="<?php echo $lowercase; ?>RemoveHideThis" >
<?php if ($value['ConfigStatic']['version'] !== $value['ConfigStatic']['newestVersion']): ?>
<a class="link" onclick="installUpdates('<?php echo $lowercase; ?>/','<?php echo $lowercase; ?>UpdateForm');">Install <?php echo $value['ConfigStatic']["newestVersion"];?> Update</a>
<?php else: ?>
<a onclick="checkForUpdates('<?php echo $lowercase; ?>/','<?php echo $uppercase; ?>','<?php echo $value['ConfigStatic']['version'];?>','<?php echo $lowercase; ?>UpdateForm');" class="link">Check For Updates</a>
<?php endif; ?>
</span>
<span class="<?php echo $lowercase; ?>RemoveShowThis" style="display: none;" >
Removing...
</span>
</td>
<?php else: ?>
<td colspan="2">
Expand Down Expand Up @@ -270,6 +277,14 @@ function addonMonitorAction(idToSubmit)
}
else
{
if($("."+idToSubmit+"RemoveHideThis"))
{
$("."+idToSubmit+"RemoveHideThis").hide();
}
if($("."+idToSubmit+"RemoveShowThis"))
{
$("."+idToSubmit+"RemoveShowThis").show();
}
removeFilesFromToppFolder(true);
}
}
Expand Down
8 changes: 8 additions & 0 deletions index.php
View file
Expand Up @@ -190,6 +190,14 @@
{
Rightclick_ID_list.push('notificationClicked');
}
if(document.getElementById("notificationCount"))
{
Rightclick_ID_list.push('notificationCount');
}
if(document.getElementById("notificationBadge"))
{
Rightclick_ID_list.push('notificationBadge');
}
<?php
endif;
if($levelOfUpdate !== 0 && $configStatic["version"] !== $dontNotifyVersion && $updateNotificationEnabled === "true"):
Expand Down

0 comments on commit 280a240

Please sign in to comment.