From 38254f51d1ea0c74ded767dba576bef42a8954f9 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Fri, 20 Jul 2012 17:16:10 +0100
Subject: [PATCH] Combined CM libs, ternary statement & root info

3 x util libs (foldcode, searchcursor & match-highlighter) now in
codemirror-compressed.js
(this means less files and saves around 7k of data)
Ternary statement now used to specify theme CSS file
ICEcoder root shown which is the file manager tree root
---
 editor.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/editor.php b/editor.php
index 51919c4..ddaeceb 100644
--- a/editor.php
+++ b/editor.php
@@ -6,18 +6,17 @@
 <title>CodeMirror 2: ICE Coders Editor of Choice</title>
 <?php include("lib/settings.php");?>
 <link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
-<!--codemirror-compressed.js includes codemirror.js plus the mode files for clike, coffeescript, css, javascript, less, php, ruby & xml //-->
+<!--
+codemirror-compressed.js
+includes:
+codemirror.js
+modes:
+clike, coffeescript, css, javascript, less, php, ruby & xml
+utils:
+foldcode, searchcursor, match-highlighter
+//-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
-<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/util/searchcursor.js"></script>
-<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/util/match-highlighter.js"></script>
-<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/util/foldcode.js"></script>
-<?php
-if ($ICEcoder["theme"]=="default") {
-	echo '<link rel="stylesheet" href="lib/editor.css">';
-} else {
-	echo '<link rel="stylesheet" href="'.$ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css">';
-}
-?>
+<link rel="stylesheet" href="<?php echo $ICEcoder["theme"]=="default" ? 'lib/editor.css' : '{$ICEcoder["codeMirrorDir"]}/theme/{$ICEcoder["theme"]}.css';?>">
 <style type="text/css">
 .CodeMirror {position: absolute; width: 0; background-color: #fff; top: 0px; width: 100px; z-index: 1}
 .CodeMirror-scroll {height: 100px;}
@@ -39,6 +38,8 @@ span.CodeMirror-matchhighlight {background: #555}
 	echo $_SERVER['SERVER_NAME'].' &nbsp;&nbsp; '.$_SERVER['SERVER_SOFTWARE'].' &nbsp;&nbsp; '.$_SERVER['SERVER_ADDR'].'<br><br>'.PHP_EOL;
 	echo '<span style="color:#888">Root:</span><br>'.PHP_EOL;
 	echo $_SERVER['DOCUMENT_ROOT'].'<br><br>'.PHP_EOL;
+	echo '<span style="color:#888">ICEcoder Root:</span><br>'.PHP_EOL;
+	echo $ICEcoder['root'].'<br><br>'.PHP_EOL;
 	echo '<span style="color:#888">PHP version:</span><br>'.PHP_EOL;
 	echo phpversion().'<br><br>'.PHP_EOL;
 	echo '<span style="color:#888">Date & time:</span><br>'.PHP_EOL;