Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-03 07:13:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change Source tab to Settings tab

Browse Source
This commit is contained in:
mattpass
2020-06-29 18:13:38 +01:00
parent 34e48e8930
commit b3dd541459
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/js/icecoder.js
View File

@@ -77,7 +77,7 @@ var ICEcoder = {
// Set our aliases
initAliases: function() {
const aliasArray = ["header", "files", "fileOptions", "optionsFile", "optionsEdit", "optionsSource", "optionsHelp", "filesFrame", "editor", "tabsBar", "findBar", "terminal", "output", "database", "git", "content", "tools", "footer", "versionsDisplay", "splitPaneControls", "splitPaneNamesMain", "splitPaneNamesDiff", "charDisplay", "byteDisplay"];
const aliasArray = ["header", "files", "fileOptions", "optionsFile", "optionsEdit", "optionsSettings", "optionsHelp", "filesFrame", "editor", "tabsBar", "findBar", "terminal", "output", "database", "git", "content", "tools", "footer", "versionsDisplay", "splitPaneControls", "splitPaneNamesMain", "splitPaneNamesDiff", "charDisplay", "byteDisplay"];
// Create our ID aliases
for (let i = 0; i < aliasArray.length; i++) {
@@ -199,7 +199,7 @@ var ICEcoder = {
headerH = 15, fileNavH = 38, tabsBarH = 27, findBarH = 28, toolsBarH = 30;
this.header.style.width = this.tabsBar.style.width = this.findBar.style.width = winW + "px";
this.files.style.width = this.editor.style.left = this.filesW + "px";
this.optionsFile.style.width = this.optionsEdit.style.width = this.optionsSource.style.width = this.optionsHelp.style.width = this.filesW + "px";
this.optionsFile.style.width = this.optionsEdit.style.width = this.optionsSettings.style.width = this.optionsHelp.style.width = this.filesW + "px";
this.filesFrame.style.height = (winH - headerH - fileNavH - 7 - toolsBarH) + "px";
this.versionsDisplay.style.left = (this.filesW + 10) + "px";
this.splitPaneControls.style.left =
@@ -2167,7 +2167,7 @@ var ICEcoder = {
// Show/hide file manager nav options
showHideFileNav: function(vis, elem) {
let options = ["optionsFile", "optionsEdit", "optionsSource", "optionsHelp"];
let options = ["optionsFile", "optionsEdit", "optionsSettings", "optionsHelp"];
if ("hide" === vis) {
fileNavInt = setTimeout(function(ic) {
for (let i = 0; i < options.length; i++) {
@@ -2443,7 +2443,6 @@ var ICEcoder = {
// Moving files
if ("move" === action) {
// TODO: Drag a file somewhere, then try and try it somewhere else, causes JS error
// Target is root, or another dir?
const tgtClass = location === ""
? this.filesFrame.contentWindow.document.getElementById("|").parentNode.parentNode.className
@@ -3408,9 +3407,10 @@ var ICEcoder = {
},
// Show the settings screen
settingsScreen: function(hide) {
settingsScreen: function(hide, tab) {
if (!hide) {
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/settings-screen.php" id="settingsIFrame" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
tabExtra = tab ? '?tab=' + tab +'&csrf=' + this.csrf : '';
get('mediaContainer').innerHTML = '<iframe src="'+iceLoc+'/lib/settings-screen.php' + tabExtra + '" id="settingsIFrame" class="whiteGlow" style="width: 970px; height: 610px"></iframe>';
}
this.showHide(hide?'hide':'show',get('blackMask'));
},

17
index.php
View File

@@ -223,7 +223,7 @@ if (true === file_exists(dirname(__FILE__) . "/plugins/prettier/standalone.js"))
<ul>
<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsFile')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsFile')}" id="optionsFileNav"><?php echo $t['File'];?></a></li>
<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsEdit')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsEdit')}" id="optionsEditNav"><?php echo $t['Edit'];?></a></li>
<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsSource')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsSource')}" id="optionsSourceNav"><?php echo $t['Source'];?></a></li>
<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsSettings')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsSettings')}" id="optionsSettingsNav"><?php echo $t['Settings'];?></a></li>
<li><a nohref onclick="ICEcoder.canShowFMNav=true; ICEcoder.showHideFileNav('show','optionsHelp')" onmouseover="if(ICEcoder.canShowFMNav) {ICEcoder.showHideFileNav('show', 'optionsHelp')}" id="optionsHelpNav"><?php echo $t['Help'];?></a></li>
</ul>
</div>
@@ -259,15 +259,28 @@ if (true === file_exists(dirname(__FILE__) . "/plugins/prettier/standalone.js"))
<li><a nohref onclick="ICEcoder.autocomplete()"><?php echo $t['Autocomplete'];?></a></li>
<li><a nohref onclick="ICEcoder.lineCommentToggle()"><?php echo $t['Comment/Uncomment'];?></a></li>
<li><a nohref onclick="ICEcoder.jumpToDefinition()"><?php echo $t['Jump to Definition'];?></a></li>
<li><a nohref onClick="ICEcoder.settingsScreen()"><?php echo $t['Settings'];?></a></li>
</ul>
</div>
<div id="optionsSettings" class="optionsList" onmouseover="ICEcoder.showHideFileNav('show',this.id)" onmouseout="ICEcoder.showHideFileNav('hide', this.id);ICEcoder.canShowFMNav = false">
<ul>
<li><a nohref onclick="ICEcoder.settingsScreen(false, 'general')">General</a></li>
<li><a nohref onclick="ICEcoder.settingsScreen(false, 'style')">Style</a></li>
<li><a nohref onclick="ICEcoder.settingsScreen(false, 'accounts')">Accounts</a></li>
<li><a nohref onclick="ICEcoder.settingsScreen(false, 'security')">Security</a></li>
<li><a nohref onclick="ICEcoder.pluginsManager()">Plugins</a></li>
</ul>
</div>
<!--
FTP is a far less used method of data transfer and so this menu hidden for now
Uncomment if you really want to use it but please note, in future versions of ICEcoder
that FTP is likely to be removed altogether
<div id="optionsSource" class="optionsList" onmouseover="ICEcoder.showHideFileNav('show',this.id)" onmouseout="ICEcoder.showHideFileNav('hide', this.id);ICEcoder.canShowFMNav = false">
<ul>
<li><a nohref onclick="ICEcoder.goLocalhostRoot()">Localhost</a></li>
<li><a nohref onclick="ICEcoder.ftpManager()">FTP</a></li>
</ul>
</div>
//-->
<div id="optionsHelp" class="optionsList" onmouseover="ICEcoder.showHideFileNav('show',this.id)" onmouseout="ICEcoder.showHideFileNav('hide', this.id);ICEcoder.canShowFMNav = false">
<ul>
<li><a nohref onclick="ICEcoder.viewTutorial(false, 500)">Tutorial</a></li>

8
lib/settings-screen.php
View File

@@ -34,11 +34,17 @@ sort($themeArray);
for ($i=0;$i<count($themeArray);$i++) {
echo '<link rel="stylesheet" href="../assets/css/theme/'.$themeArray[$i].'.css?microtime='.microtime(true).'">'.PHP_EOL;
}
// Do we have a tab to switch to?
$tabSwitchExtra = "";
if (true === isset($_GET['tab'])) {
$tabSwitchExtra = "switchTab('" . $_GET['tab'] . "');";
}
?>
<link rel="stylesheet" href="../assets/css/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
</head>
<body class="settings" onkeyup="parent.ICEcoder.handleModalKeyUp(event, 'settings')" onload="this.focus();">
<body class="settings" onkeyup="parent.ICEcoder.handleModalKeyUp(event, 'settings')" onload="<?php echo $tabSwitchExtra;?>this.focus();">
<div class="infoPane">
<a href="https://icecoder.net" target="_blank"><img src="../assets/images/icecoder.png" alt="ICEcoder" class="logo"></a>