Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit e720ba5

Browse files
author
mattpass
committed
Dynamic assets path, tweak and fix in settings, ignore .idea
1 parent 958e91a commit e720ba5

21 files changed

+133
-85
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea/*
12
data/*
23
!data/.gitkeep
34
plugins/*

‎assets/css/icecoder.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
1313
.blackMask {position: fixed; display: table; width: 100%; height: 100%; top: 0; left: 0; visibility: hidden; background-color: rgba(0,0,0,0.8); text-align: center; z-index: 100}
1414
.blackMask .popupVCenter {#position: absolute; display: table-cell; #top: 50%; vertical-align: middle; text-align: center}
1515
.popupVCenter .popup {#position: relative; #top: -50%; text-align: center; color: #fff; font-size: 10px}
16+
.popupVCenter .popup .imgDisplay {border: solid 10px #fff; max-width: 700px; max-height: 500px; background-color: #000; background-image: url('../images/checkerboard.png')}
1617
.floatingContainer {position: absolute; top: 0; left: 0; width: 55px; height: 55px; visibility: hidden; border: solid 1px #444; image-rendering: pixelated}
1718
.floatingContainer:before {position: absolute; display: inline-block; width: 3px; height: 3px; left: 25px; top: 25px; content: ''; border: solid 1px #b00}
1819

‎assets/js/icecoder.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ var ICEcoder = {
1010
// INIT
1111
// ====
1212

13-
// URL we're viewing ICEcoder from
13+
// URLs we're viewing ICEcoder and its assets from
1414
iceLoc: window.location.origin + window.location.pathname.replace(/\/$/, ""),
15+
assetsLoc: get('icecoderJSFile').dataset.assetsRoot,
1516

1617
// Define settings
1718
filesW: 250, // Width of files pane
@@ -4429,7 +4430,7 @@ var ICEcoder = {
44294430
this.openFiles.push(shortURL);
44304431

44314432
// Setup a new tab
4432-
closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3), 10))"><img src="' + this.iceLoc + '/assets/images/nav-close.gif" class="closeTab" onMouseOver="prevBG = this.style.backgroundColor; this.style.backgroundColor = \'#333\'; parent.ICEcoder.overCloseLink = true" onMouseOut="this.style.backgroundColor = prevBG; parent.ICEcoder.overCloseLink = false"></a>';
4433+
closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3), 10))"><img src="' + this.assetsLoc + '/images/nav-close.gif" class="closeTab" onMouseOver="prevBG = this.style.backgroundColor; this.style.backgroundColor = \'#333\'; parent.ICEcoder.overCloseLink = true" onMouseOut="this.style.backgroundColor = prevBG; parent.ICEcoder.overCloseLink = false"></a>';
44334434
get('tab' + (this.openFiles.length)).style.display = "inline-block";
44344435
fileName = this.openFiles[this.openFiles.length - 1];
44354436
fileExt = fileName.substr(fileName.lastIndexOf(".") + 1);
@@ -4477,7 +4478,7 @@ var ICEcoder = {
44774478
this.openFiles[tabNum - 1] = newName;
44784479

44794480
// Setup a new tab
4480-
closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3), 10))"><img src="' + this.iceLoc + '/assets/images/nav-close.gif" class="closeTab" onMouseOver="prevBG = this.style.backgroundColor; this.style.backgroundColor = \'#333\'; parent.ICEcoder.overCloseLink = true" onMouseOut="this.style.backgroundColor = prevBG; parent.ICEcoder.overCloseLink = false"></a>';
4481+
closeTabLink = '<a nohref onClick="ICEcoder.closeTab(parseInt(this.parentNode.id.slice(3), 10))"><img src="' + this.assetsLoc + '/images/nav-close.gif" class="closeTab" onMouseOver="prevBG = this.style.backgroundColor; this.style.backgroundColor = \'#333\'; parent.ICEcoder.overCloseLink = true" onMouseOut="this.style.backgroundColor = prevBG; parent.ICEcoder.overCloseLink = false"></a>';
44814482
fileName = this.openFiles[tabNum - 1];
44824483
fileExt = fileName.substr(fileName.lastIndexOf(".") + 1);
44834484
get('tab' + tabNum).innerHTML = closeTabLink + "<span style=\"display: inline-block; width: 19px\"></span>" + fileName.slice(fileName.lastIndexOf("/")).replace(/\//, "");
@@ -5301,7 +5302,7 @@ var ICEcoder = {
53015302
"height": 55,
53025303
"top": -55,
53035304
"left": 0,
5304-
"title": "<img src=\"" + this.iceLoc + "/assets/images/icecoder.png\" style=\"position: absolute; margin: -105px 0 0 -55px\"><br><br>Code editor awesomeness ...in your browser",
5305+
"title": "<img src=\"" + this.assetsLoc + "/images/icecoder.png\" style=\"position: absolute; margin: -105px 0 0 -55px\"><br><br>Code editor awesomeness ...in your browser",
53055306
"message": "View the quick start tutorial? (Well worthwhile!) or <a onclick=\"ICEcoder.viewTutorial(99, 0)\" style=\"font-size: 14px; text-decoration: underline; cursor: pointer\">skip it</a>.",
53065307
"button": "view tutorial"
53075308
},

‎classes/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public function returnLoadImageScript() {
234234
parent.parent.document.getElementById(\'blackMask\').style.visibility = "visible";
235235
parent.parent.document.getElementById(\'mediaContainer\').innerHTML =
236236
"<canvas id=\"canvasPicker\" width=\"1\" height=\"1\" style=\"position: absolute; margin: 10px 0 0 10px; cursor: crosshair\"></canvas>" +
237-
"<img src=\"' . $fileLoc . "/" . $fileName . "?unique=" . microtime(true) .'\" style=\"border: solid 10px #fff; max-width: 700px; max-height: 500px; background-color: #000; background-image: url(http://github.com/%3C/span%3E%3C/span%3E%3Cspan%20class=%22x%22%3E/'%3C/span%3E%3Cspan%20class=%22pl-s%20x%22%3Eassets/images/checkerboard.png%3C/span%3E%3Cspan%20class=%22x%22%3E/'%3C/span%3E%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22x%20x-last%22%3E)\" onLoad=\"reducedImgMsg = (this.naturalWidth > 700 || this.naturalHeight > 500) ? \', ' .$t['displayed at'] . '\' + this.width + \' x \' + this.height : \'\'; document.getElementById(\'imgInfo\').innerHTML += \' (\' + this.naturalWidth + \' x \' + this.naturalHeight + reducedImgMsg + \')\'; ICEcoder.initCanvasImage(this); ICEcoder.interactCanvasImage(this)\"><br>" +
237+
"<img src=\"' . $fileLoc . "/" . $fileName . "?unique=" . microtime(true) .'\" class=\"imgDisplay\" onLoad=\"reducedImgMsg = (this.naturalWidth > 700 || this.naturalHeight > 500) ? \', ' .$t['displayed at'] . '\' + this.width + \' x \' + this.height : \'\'; document.getElementById(\'imgInfo\').innerHTML += \' (\' + this.naturalWidth + \' x \' + this.naturalHeight + reducedImgMsg + \')\'; ICEcoder.initCanvasImage(this); ICEcoder.interactCanvasImage(this)\"><br>" +
238238
"<div style=\"display: inline-block; margin-top: -10px; border: solid 10px #fff; color: #000; background-color: #fff\" id=\"imgInfo\" onmouseover=\"parent.parent.ICEcoder.overPopup=true\" onmouseout=\"parent.parent.ICEcoder.overPopup=false\">" +
239239
"<b>' . $fileLoc . "/" . $fileName . '</b>" +
240240
"</div><br>" +

‎classes/Settings.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ class Settings
77
public function __construct()
88
{
99
// Set version number and document root as core settings
10-
$this->versionNo = "8.1";
11-
$this->docRoot = $_SERVER['DOCUMENT_ROOT'];
10+
// Defaults to the right
11+
$this->versionNo = "8.1"; // "8.1";
12+
$this->docRoot = $_SERVER['DOCUMENT_ROOT']; // $_SERVER['DOCUMENT_ROOT']
13+
$this->assetsRoot = "assets"; // "assets" (relative or absolute)
1214
}
1315

1416
public function getCoreDetails()
1517
{
1618
return [
1719
"versionNo" => $this->versionNo,
1820
"docRoot" => $this->docRoot,
21+
"assetsRoot" => $this->assetsRoot,
1922
];
2023
}
2124

‎editor.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> editor</title>
1111
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
1212
<meta name="robots" content="noindex, nofollow">
13-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/codemirror.css?microtime=<?php echo microtime(true);?>">
14-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/show-hint.css?microtime=<?php echo microtime(true);?>">
15-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/lint.css?microtime=<?php echo microtime(true);?>">
13+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/codemirror.css?microtime=<?php echo microtime(true);?>">
14+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/show-hint.css?microtime=<?php echo microtime(true);?>">
15+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/lint.css?microtime=<?php echo microtime(true);?>">
1616
<!--
1717
codemirror-compressed.js
1818
- incls: codemirror
1919
- modes: clike, coffeescript, css, erlang, go, htmlmixed, javascript, julia, lua, markdown, perl, php, python, ruby, sass, sql, xml, yaml
2020
- addon: brace-fold, closebrackets, closetag, css-hint, foldcode, foldgutter, html-hint, javascript-hint, javascript-lint, lint, match-highlighter, matchbrackets, runmode, searchcursor, show-hint, simplescrollbars, sql-hint, trailingspace, xml-fold, xml-hint
2121
//-->
22-
<script src="http://github.com/%3Cspan%20class="x x-first x-last">assets/js/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
22+
<script src="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/js/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
2323
<?php
2424
$pluginFiles = [
2525
"jshint/jshint-2.5.6.min.js",
@@ -36,7 +36,7 @@
3636
}
3737
?>
3838
<link rel="stylesheet" href="<?php
39-
echo dirname(basename(__DIR__)) . '/assets/css/theme/';
39+
echo $settingsClass->assetsRoot . '/css/theme/';
4040
echo "default" === $ICEcoder["theme"] ? 'icecoder.css' : $ICEcoder["theme"] . '.css';
4141
echo "?microtime=" . microtime(true);
4242
// Light themes
@@ -53,9 +53,9 @@
5353
$activeLineNum = "#ccc";
5454
}
5555
?>">
56-
<script src="http://github.com/%3Cspan%20class="x x-first x-last">assets/js/mmd.js?microtime=<?php echo microtime(true);?>"></script>
57-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/foldgutter.css?microtime=<?php echo microtime(true);?>">
58-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
56+
<script src="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/js/mmd.js?microtime=<?php echo microtime(true);?>"></script>
57+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/foldgutter.css?microtime=<?php echo microtime(true);?>">
58+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
5959

6060
<style type="text/css">
6161
/* Make sure this next one remains the 1st item, updated with JS */
@@ -86,9 +86,9 @@
8686
h2 {color: rgba(0,198,255,0.7)}
8787
.cm-s-diff {left: 50%}
8888
</style>
89-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/editor.css?microtime=<?php echo microtime(true);?>">
90-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/file-types.css?microtime=<?php echo microtime(true);?>">
91-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
89+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/editor.css?microtime=<?php echo microtime(true);?>">
90+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/file-types.css?microtime=<?php echo microtime(true);?>">
91+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
9292
</head>
9393

9494
<body style="color: #fff; margin: 0" onkeydown="return parent.ICEcoder.interceptKeys('content', event);" onkeyup="parent.ICEcoder.resetKeys(event);" onblur="parent.ICEcoder.resetKeys(event);" oncontextmenu="return false">

‎files.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<head>
1010
<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> file manager</title>
1111
<meta name="robots" content="noindex, nofollow">
12-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/resets.css?microtime=<?php echo microtime(true);?>">
13-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/files.css?microtime=<?php echo microtime(true);?>">
14-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/file-types.css?microtime=<?php echo microtime(true);?>">
15-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="x x-first x-last">assets/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
12+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/resets.css?microtime=<?php echo microtime(true);?>">
13+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/files.css?microtime=<?php echo microtime(true);?>">
14+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/file-types.css?microtime=<?php echo microtime(true);?>">
15+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $settingsClass->assetsRoot;?>/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
1616
<!--Updated via settings so must remain 5th stylesheet//-->
1717
<style>
1818
ul.fileManager li a span { font-size: <?php echo $ICEcoder["fontSize"];?>; }

‎images/file-manager-icons.png

-15.4 KB
Binary file not shown.

‎index.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@
4747
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
4848
<meta name="robots" content="noindex, nofollow">
4949
<meta name="viewport" content="width=device-width, initial-scale=0.5, user-scalable=no">
50-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/css/resets.css?microtime=<?php echo microtime(true);?>">
51-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/css/icecoder.css?microtime=<?php echo microtime(true);?>">
52-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
50+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/css/resets.css?microtime=<?php echo microtime(true);?>">
51+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/css/icecoder.css?microtime=<?php echo microtime(true);?>">
52+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/css/file-type-icons.css?microtime=<?php echo microtime(true);?>">
5353
<link rel="stylesheet" href="<?php
54-
echo $iceURLPath . "/assets/css/theme/";
54+
echo $settingsClass->assetsRoot . "/css/theme/";
5555
echo "default" === $ICEcoder["theme"] ? 'icecoder.css' : $ICEcoder["theme"] . '.css';
5656
echo "?microtime=" . microtime(true);
5757
?>">
58-
<link rel="icon" type="image/png" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/images/favicon.png">
58+
<link rel="icon" type="image/png" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/images/favicon.png">
5959
<script>
6060
iceRoot = "<?php echo $ICEcoder['root']; ?>";
6161

@@ -85,7 +85,7 @@
8585
?>
8686
}
8787
</script>
88-
<script language="JavaScript" src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/js/icecoder.js?microtime=<?php echo microtime(true);?>"></script>
88+
<script language="JavaScript" src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/js/icecoder.js?microtime=<?php echo microtime(true);?>" id="icecoderJSFile" data-assets-root="<?php echo $settingsClass->assetsRoot;?>"></script>
8989
<?php
9090
$havePrettier = false;
9191
foreach ($ICEcoder['plugins'] as $plugin) {
@@ -106,10 +106,10 @@
106106
<?php
107107
}
108108
?>
109-
<script src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/js/mmd.js?microtime=<?php echo microtime(true);?>"></script>
110-
<script src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/js/farbtastic.js?microtime=<?php echo microtime(true);?>"></script>
111-
<script src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/js/difflib.js?microtime=<?php echo microtime(true);?>"></script>
112-
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/css/farbtastic.css?microtime=<?php echo microtime(true);?>" type="text/css">
109+
<script src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/js/mmd.js?microtime=<?php echo microtime(true);?>"></script>
110+
<script src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/js/farbtastic.js?microtime=<?php echo microtime(true);?>"></script>
111+
<script src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/js/difflib.js?microtime=<?php echo microtime(true);?>"></script>
112+
<link rel="stylesheet" href="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/css/farbtastic.css?microtime=<?php echo microtime(true);?>" type="text/css">
113113
</head>
114114

115115
<body onload="<?php
@@ -180,7 +180,7 @@
180180
<div id="plugins" class="plugins" style="<?php echo $ICEcoder["pluginPanelAligned"];?>: 0" onmouseover="ICEcoder.showHidePlugins('show')" onmouseout="ICEcoder.showHidePlugins('hide')" onclick="ICEcoder.showHidePlugins('hide')">
181181
<div style="padding: 15px">
182182
<a nohref onclick="ICEcoder.showColorPicker(document.getElementById('color') ? document.getElementById('color').value : '#123456')" title="Farbtastic
183-
<?php echo $t['Color picker'];?>"><img src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/images/color-picker.png" style="cursor: pointer" alt="Color Picker"></a><br><br>
183+
<?php echo $t['Color picker'];?>"><img src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/images/color-picker.png" style="cursor: pointer" alt="Color Picker"></a><br><br>
184184
<div id="pluginsOptional"><?php echo $pluginsDisplay; ?></div>
185185
<a nohref onclick="ICEcoder.pluginsManager()" title="<?php echo $t['Plugins Manager'];?>" style="color: #ddd; margin-left: 2px; cursor: pointer"><?php echo file_get_contents(dirname(__FILE__) . "/assets/images/icons/plus.svg");?></a>
186186
</div>
@@ -303,8 +303,8 @@
303303

304304
<div id="editor" class="editor">
305305
<div id="tabsBar" class="tabsBar" oncontextmenu="return false">
306-
<a nohref onClick="ICEcoder.closeAllTabs()"><img src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/images/nav-close-all.gif" class="closeAllTabs" title="<?php echo $t['Close all tabs'];?>"></a>
307-
<a nohref onClick="ICEcoder.alphaTabs()"><img src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $iceURLPath;?>/assets/images/nav-alpha.png" class="alphaTabs" title="<?php echo $t['Alphabetize tabs'];?>"></a>
306+
<a nohref onClick="ICEcoder.closeAllTabs()"><img src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/images/nav-close-all.gif" class="closeAllTabs" title="<?php echo $t['Close all tabs'];?>"></a>
307+
<a nohref onClick="ICEcoder.alphaTabs()"><img src="http://github.com/%3Cspan%20class="pl-ent"><?php echo $settingsClass->assetsRoot;?>/images/nav-alpha.png" class="alphaTabs" title="<?php echo $t['Alphabetize tabs'];?>"></a>
308308
<?php
309309
for ($i = 1; $i <= 100; $i++) {
310310
echo '<div id="tab' . $i . '" class="tab" onmousedown="if (false === ICEcoder.overCloseLink) {ICEcoder.switchTab(parseInt(this.id.slice(3), 10)); ICEcoder.tabDragStart(parseInt(this.id.slice(3), 10))}; if (1 === event.button) {ICEcoder.closeTab(parseInt(this.id.slice(3), 10)); return false}; thisColor = ICEcoder.colorSelectedText;" onmouseover="thisColor = this.style.color; this.style.color = ICEcoder.colorSelectedText" onmouseout="this.style.color = thisColor" ondblclick="ICEcoder.focusUnfocusTab()"></div>';

‎lib/auto-logout-warning.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
include "headers.php";
33
include "settings.php" ;
44
$t = $text['auto-logout-warning'];
5+
6+
$assetsPath = "assets" === $settingsClass->assetsRoot
7+
? "../" . $settingsClass->assetsRoot
8+
: $settingsClass->assetsRoot;
59
?>
610
<!DOCTYPE html>
711

@@ -10,8 +14,8 @@
1014
<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> auto-logout</title>
1115
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
1216
<meta name="robots" content="noindex, nofollow">
13-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="x x-first x-last">../assets/css/resets.css?microtime=<?php echo microtime(true);?>">
14-
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="x x-first x-last">../assets/css/auto-logout-warning.css?microtime=<?php echo microtime(true);?>">
17+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $assetsPath;?>/css/resets.css?microtime=<?php echo microtime(true);?>">
18+
<link rel="stylesheet" type="text/css" href="http://github.com/%3Cspan%20class="pl-ent x x-first"><?php echo $assetsPath;?>/css/auto-logout-warning.css?microtime=<?php echo microtime(true);?>">
1519
</head>
1620

1721
<body class="auto-logout-warning">

0 commit comments

Comments
 (0)