From 8a8763b24e2317953f4117fab81186cc3c66f8a7 Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Sun, 19 Jan 2020 10:50:47 +0000
Subject: [PATCH] Move tools into files DOM elem

---
 index.php         | 16 ++++++++--------
 lib/ice-coder.css | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/index.php b/index.php
index c9a126e..7952d89 100644
--- a/index.php
+++ b/index.php
@@ -261,6 +261,13 @@ $t = $text['index'];
 	</div>
 	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1';this.contentWindow.onscroll=function(){top.ICEcoder.mouseDown=false; top.ICEcoder.mouseDownInCM=false}"></iframe>
 	<div class="serverMessage" id="serverMessage"></div>
+
+    <div class="tools" id="tools">
+        <div onclick="top.ICEcoder.toolShowHideToggle('terminal')">Terminal</div>
+        <div onclick="top.ICEcoder.toolShowHideToggle('output')">Output</div>
+        <div onclick="top.ICEcoder.toolShowHideToggle('database')">Database</div>
+        <div onclick="top.ICEcoder.toolShowHideToggle('git')">Git</div>
+    </div>
 </div>
 
 <div id="editor" class="editor">
@@ -278,7 +285,7 @@ $t = $text['index'];
 			<div class="findReplace">
 				<div class="findText"><?php echo $t['Find'];?></div>
 				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace(top.document.getElementById('find').value,true,false,event.keyCode == 27)">
-				
+
 				<div class="selectWrapper" style="width: 41px">
 					<select name="connector" onChange="ICEcoder.findReplaceOptions()" style="width: 40px; margin-top: 4px">
 					<option><?php echo $t['in'];?></option>
@@ -334,13 +341,6 @@ $t = $text['index'];
 	<iframe name="contentFrame" id="content" src="editor.php" class="code" scrolling="no"></iframe>
 </div>
 
-<div class="tools" id="tools">
-	<div onclick="top.ICEcoder.toolShowHideToggle('terminal')">Terminal</div>
-	<div onclick="top.ICEcoder.toolShowHideToggle('output')">Output</div>
-	<div onclick="top.ICEcoder.toolShowHideToggle('database')">Database</div>
-	<div onclick="top.ICEcoder.toolShowHideToggle('git')">Git</div>
-</div>
-
 <div class="footer" id="footer" onContextMenu="return false">
 	<div class="nesting" id="nestValid"></div>
 	<div class="versionsDisplay" id="versionsDisplay" onclick="top.ICEcoder.versionsScreen(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1].replace(/\//g,'|'))"></div>
diff --git a/lib/ice-coder.css b/lib/ice-coder.css
index 2c7b8c4..24ce37d 100644
--- a/lib/ice-coder.css
+++ b/lib/ice-coder.css
@@ -83,11 +83,15 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .files .button {position: absolute; border: 0; background: #444; color: #eee; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
 .files .button:hover {background-color: #1d1d1b; color: #eee}
 .files .frame {display: inline-block; width: 250px; margin-top: 24px}
-.files .serverMessage {position: absolute; display: inline-block; width: 450px; bottom: 0; background-color: rgba(255,255,255,0.8); font-size: 10px; padding: 4px 12px 1px 12px; opacity: 0; 
+.files .serverMessage {position: absolute; display: inline-block; width: 450px; bottom: 0; background-color: rgba(255,255,255,0.8); font-size: 10px; padding: 4px 12px 1px 12px; opacity: 0;
 	transition: opacity 0.2s;
 }
 .files .serverMessage b {font-size: 10px}
 
+.files .tools {position: absolute; display: inline-block; width: 250px; height: 30px; left: 0; bottom: 0}
+.files .tools div {display: inline-block; margin: 8px 0 8px 15px; color: #666; cursor: pointer}
+.files .tools div:hover {color: #fff; cursor: pointer}
+
 .editor {position: absolute; display: inline-block; top: 0; left: 15px; width: 2400px}
 .editor .tabsBar {display: inline-block; height: 22px; width: 2400px; margin-top: 20px; padding-left: 53px; background: #fff}
 .tabsBar .tab {position: absolute; display: none; height: 15px; padding: 5px 8px 2px 9px; border-right: 1px solid #ddd; color: #fff; white-space: nowrap; overflow: hidden; cursor: pointer; z-index: 1;
@@ -112,7 +116,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .editor .findBar {display: inline-block; height: 28px; width: 2400px; color: #fff; background-color: #1d1d1b}
 .findBar .findReplace {position: absolute; padding-top: 2px; z-index: 1}
 .findReplace .selectWrapper {position: relative; display: inline-block}
-.findReplace .selectWrapper select {position: relative; padding: 1px; border: 0; background: url('../images/select-arrow.gif') no-repeat right #444; color: #fff; font-size: 10px; height: 16px; 
+.findReplace .selectWrapper select {position: relative; padding: 1px; border: 0; background: url('../images/select-arrow.gif') no-repeat right #444; color: #fff; font-size: 10px; height: 16px;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
@@ -146,10 +150,6 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .editor .git .link:hover {color:  rgba(0,198,255,1)}
 .editor .code {position: relative; display: inline-block; top: 28px; width: 600px; height: 600px; visibility: hidden}
 
-.tools {position: fixed; display: inline-block; width: 250px; height: 30px; left: 0; bottom: 0; z-index: 3}
-.tools div {display: inline-block; margin: 8px 0 8px 15px; color: #666; cursor: pointer}
-.tools div:hover {color: #fff; cursor: pointer}
-
 .footer {position: fixed; display: inline-block; width: 100%; height: 30px; bottom: 0; background-color: rgba(0,0,0,0.15); left: 0; z-index: 1}
 .footer .nesting {position: absolute; display: inline-block; padding: 5px; margin-top: 10px; left: 260px; border-radius: 5px; background-color: #0b0; cursor: default}
 .footer .versionsDisplay {position: absolute; display: inline-block; padding: 5px; margin-top: 3px; left: 275px; color: #fff; font-weight: bold; cursor: pointer}