From eed8b297536057621ea9fb22df5f312b5a53f08c Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Wed, 5 Jun 2013 16:14:36 +0100 Subject: [PATCH] ICEcoder logo update and docRoot setting added New ICEcoder logo added plus docRoot available as a setting in config___settings.php --- favicon.png | Bin 1069 -> 1331 bytes images/ice-coder-icon.png | Bin 0 -> 1792 bytes images/ice-coder.png | Bin 3435 -> 4184 bytes index.php | 2 +- lib/config___settings.php | 1 + lib/ice-coder.css | 2 +- lib/settings-screen.php | 6 +++++- lib/settings.php | 4 ++-- 8 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 images/ice-coder-icon.png diff --git a/favicon.png b/favicon.png index b04f06daaa220495d724dade5debc165191d58c6..47808416495250c0768ba322a7b9755625fef38a 100644 GIT binary patch delta 656 zcmZ3>v6*Xw8&izAv9Y6(v6GRri<_aLp{tRFrL&={sjIQEiG{JTp@EZ$_i>(q+L@y;X#R{s|7?5|o-|m4e#>LtJ_%>oGgk zFXEo@h=GA|xu=U`NX4z1%h4LCfilNG9@a4Q^3@9zNh|8K3A)51TPdI!=T|wy#$Zo{ zg68%QN|`<-axR))nmcVj6v&m#a+$S#rQ-BS6EvnP^}H^BxxK{dVf_5C>i1v&zu)^W z`z=HN@y8X)UIyJ(Uz7#z!98H%vzEF3=s&#D2((JdcnTblc^?bXhV=faMv4Pd?!iwUAMUw7bMuH1B zIzHCZGRWt@By;V9xbcs-(*sr-Ke}pU{gJVJ+kq`=Y71jy@3|?ty}Meu`Jc?!ELrdM zf4S9GN{9a1qx&c5Qu8^l-_`b$I~jN~ySqxy@2Pe8yXp2nA%7+whW7L6s}tu2lrsQ< Mr>mdKI;Vst04{S3lK=n! delta 392 zcmdnYwU%Rp8&iytfwQrtlc}Mzi?NBJp{tRjfw`rH84ws58yXlm87nDN7BfY$pC7Bi5o6ON(#j#L8)n0DYz{#z@>Mx9p?e%Ty72CW1Jtpm#>S#JDyRNc6Xp+nN~lY;XF6XQiIQ;$4t>UOBPcHx4+ z{6`)WUT=6%uOR+HP%!L{#SzKEqfAw=W-*tFve~ssGxYGXg@%TfI6M5{7MT6$!=d^K ujP?`fwxn^K`8jFFpJNuY#3dM*co=l}t-800zSszKErX}4pUXO@geCy+Mu*1$ diff --git a/images/ice-coder-icon.png b/images/ice-coder-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dfeea1dff195bd7cfe067e354120822983bf93de GIT binary patch literal 1792 zcmaJ?c~BE~7>z`bL7|EV0|IU%hlsh!Vj>}ui$mfO!r?I^OR|sv$%bS#2~||UDuP-I z1A=&St7@rb6JiWS6*ig#u3Y-JSaMg{vv>CW!{j(P8W-|ze0&gLy%81C%k z;e^BCoFgOnVr=xp9&bkn?9I87wHF)QQ9%M4gCwImNCV@-WJnSWL@J>aSPVllLxvR& z!Qt=(g(Lw@5Jj`3h>`@^FeJTFjj?gK5RP6ANz-5yNP<%oDmJ07ww?eeWNbn_Lqrj& zd9Yj&k*R@WG8amunQ2m{jKB#6Li8+5KnbG|pjW1=v@AWF@L89I&28Ic0`M7vrm+cM zl1dOQ26%`D1{fqdQA(jw0T3ingBT!4odeJ)R2rFr-5`+~#A1LfS}^eSB4E)pvSgN+ zFZ>z{Td@gp6jigxWSve&($PtXCWTC8GMP3F8jXk{h+2aRh4e&~cIL1GAJ$4W3N@-g zRDewpN%pTmhd(Jw?CCcdLC7xIN25NmPrx+51 z&2!538;VQaEc}_Rzg`Nwo9iwGZ?%o5`;@tPgZH5c3Z)xVk;L2cCi{(DBi|z`w-5Qa z=dU}r&z~Ix>w8ZPF`o{$_U|6*dtUyh^H@9Yl4`Fh)obmWwDjArYfAPQy?R$`;+>@P z9iHKnn71mjh7N#}nswto9p#pOa5jx;-e;eV=iHn(qk+|C(QVKEPU8KC5VD(V?_kHN zX?SfnoAL8_m+AqBCaBgfT6dtW)!Ng!cT7u8gvt^z@k#@^QX3@pR?8iq!g~3-Z#7hj)G;?KEcH>1~THF-aoC0}9fOXmF=> z^~%Nv-_1WcYfX#1FsQ~&w&PM_OmGpr{0aCbZ~COaR|JO^>|2+)(b0t8x5ID9l$Dm; zVih*d9|GQ9dGuBk_9{btG>_ohD(@N_>-ZwCablwdeK;F=cj!)0I+$0ZpeKdh-Cw&u4dg?MBb%f?PVGWT%5pn+evh8gpH zQNftkp{(~xw=vhRE%S)#`X#7*b7|p~g8|)M{x2)@4oEI|_8d7ew<$^S?y;!s#^tNC zEa8l`^*0;w3EXw(mv!goQh0{V9z)GWSL@)S?%0N>6~1<+O981X2+YPMhv#oF5;TLv z(?#YJFMGw(O4BTJYV<>BhuE)p-o?y&OBd{tw^%0n1txD}$2|e_JLtft5MuiCMDGsw zjd?3h++%qanC$ys1UdTpn!qy?#vN~nwTfn}ElClSm){@gJdQ3|5Ll`${nX`c%(QOk zzUJmFK9mku7YBxO%+o~XH|@o#p;vP0$NE2d-m-ABG@di(~wj?5PTBlc<8GC8Mn;-ma0+4)AqD4LqT7+PB*XrI1Z1iYPP)h0lLC$|D;I4 KLVguDG5a4O56N@@ literal 0 HcmV?d00001 diff --git a/images/ice-coder.png b/images/ice-coder.png index 25f86f81cec2e739f8a8326902388130b631e88d..d17b2bc2c2641ae268f5d9338fac0c1f54227cad 100644 GIT binary patch delta 3587 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 delta 2810 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 diff --git a/index.php b/index.php index 3fe6abd..c797d92 100644 --- a/index.php +++ b/index.php @@ -126,7 +126,7 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
logout : v
- +
diff --git a/lib/config___settings.php b/lib/config___settings.php index f222d29..e5526a6 100644 --- a/lib/config___settings.php +++ b/lib/config___settings.php @@ -3,6 +3,7 @@ $ICEcoderSettings = array( "versionNo" => "2.5", "codeMirrorDir" => "CodeMirror-3.13", + "docRoot" => $_SERVER['DOCUMENT_ROOT'], "demoMode" => false, "devMode" => false, "multiUser" => false, diff --git a/lib/ice-coder.css b/lib/ice-coder.css index 09c5a1b..8310cd7 100644 --- a/lib/ice-coder.css +++ b/lib/ice-coder.css @@ -69,7 +69,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff} .header .tools {position: absolute; display: inline-block; left: 15px; top: 3px} .header .plugins {position: absolute; display: inline-block; left: 55px; top: 3px} .header .plugins img {position: relative; display: inline-block; margin-right: 15px} -.header .screenModeIcon {position: absolute; top: 5px; right: 178px; cursor: pointer} +.header .screenModeIcon {position: absolute; top: 5px; right: 46px; cursor: pointer} .header .version {position: relative; display: inline-block; margin-top: 25px; font-size: 10px; color: #bbb} .header .version a {font-size: 10px; color: #bbb; text-decoration: none} .header .logo {position: relative; margin: 5px 10px 0 5px; cursor: pointer} diff --git a/lib/settings-screen.php b/lib/settings-screen.php index 80bac70..fae878c 100644 --- a/lib/settings-screen.php +++ b/lib/settings-screen.php @@ -37,9 +37,13 @@ for ($i=0;$i -
v

+

+ version:
+ v +

+ website:
http://icecoder.net

diff --git a/lib/settings.php b/lib/settings.php index 3d56865..98a107a 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -186,7 +186,7 @@ $_SESSION['username'] = $_SESSION['username']; // Define the serverType, docRoot & iceRoot $serverType = stristr($_SERVER['SERVER_SOFTWARE'], "win") ? "Windows" : "Linux"; -$docRoot = rtrim(str_replace("\\","/",$_SERVER['DOCUMENT_ROOT'])); +$docRoot = rtrim(str_replace("\\","/",$ICEcoder['docRoot'])); $iceRoot = rtrim(str_replace("\\","/",$ICEcoder["root"])); if ($_SESSION['loggedIn']) { echo ""; @@ -360,7 +360,7 @@ echo $ICEcoder["password"] == "" && !$ICEcoder["multiUser"] ? "Setup" : "Login";

- +
v


';};?>