From 0108d1b49c44d05a63b6ae759b32e0d7bfd45136 Mon Sep 17 00:00:00 2001
From: Jon Benson <hastarin+github@gmail.com>
Date: Tue, 7 May 2013 14:09:30 +1000
Subject: [PATCH] Added debug menu option and started tidying up 'window'
 handling

---
 code/chat.js                                  |   7 ++--
 code/debugging.js                             |  17 +++++++---
 code/smartphone.js                            |   8 -----
 code/window_management.js                     |  30 ++++++++++++++++++
 .../alerts_and_states_warning.png             | Bin 0 -> 1618 bytes
 .../alerts_and_states_warning.png             | Bin 0 -> 1362 bytes
 mobile/res/drawable-xhdpi/action_settings.png | Bin 0 -> 1641 bytes
 .../alerts_and_states_warning.png             | Bin 0 -> 1813 bytes
 mobile/res/menu/main.xml                      |   7 ++--
 mobile/res/values/strings.xml                 |   2 +-
 .../com/cradle/iitc_mobile/IITC_Mobile.java   |  21 ++++++------
 11 files changed, 62 insertions(+), 30 deletions(-)
 create mode 100644 code/window_management.js
 create mode 100644 mobile/res/drawable-hdpi/alerts_and_states_warning.png
 create mode 100644 mobile/res/drawable-mdpi/alerts_and_states_warning.png
 create mode 100644 mobile/res/drawable-xhdpi/action_settings.png
 create mode 100644 mobile/res/drawable-xhdpi/alerts_and_states_warning.png

diff --git a/code/chat.js b/code/chat.js
index cf10a99d..7f0a2c64 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -522,10 +522,11 @@ window.chat.chooseAnchor = function(t) {
   chat.needMoreMessages();
 }
 
-window.chat.choose = function(name) {
-    $('#chat, #chatinput, #updatestatus').show();
+window.chat.show = function(name) {
+	 if (!window.isSmartphone) $('#updatestatus').show();
+    $('#chat, #chatinput').show();
     $('#map').css('visibility', 'hidden');
-	
+
     var t = $('<a>'+name+'</a>');
     window.chat.chooseAnchor(t);
 }
diff --git a/code/debugging.js b/code/debugging.js
index 8c40a155..49091d72 100644
--- a/code/debugging.js
+++ b/code/debugging.js
@@ -48,16 +48,23 @@ window.debug.console = function() {
   $('#debugconsole').text();
 }
 
-window.debug.console.create = function() {
-  if($('#debugconsole').length) return;
-  $('#chatcontrols').append('<a>debug</a>');
-  $('#chatcontrols a:last').click(function() {
+window.debug.console.show = function() {
+    $('#scrollwrapper, #updatestatus').hide();
+    // not displaying the map causes bugs in Leaflet
+    $('#map').css('visibility', 'hidden');
+    $('#chat, #chatinput').show();
+	 window.debug.console.create();
     $('#chatinput mark').css('cssText', 'color: #bbb !important').text('debug:');
     $('#chat > div').hide();
     $('#debugconsole').show();
     $('#chatcontrols .active').removeClass('active');
     $(this).addClass('active');
-  });
+}
+
+window.debug.console.create = function() {
+  if($('#debugconsole').length) return;
+  $('#chatcontrols').append('<a>debug</a>');
+  $('#chatcontrols a:last').click(window.debug.console.show);
   $('#chat').append('<div style="display: none" id="debugconsole"><table></table></div>');
 }
 
diff --git a/code/smartphone.js b/code/smartphone.js
index 5a1700ed..c6693c1c 100644
--- a/code/smartphone.js
+++ b/code/smartphone.js
@@ -34,14 +34,6 @@ window.runOnSmartphonesBeforeBoot = function() {
       + '</style>');
   }
 
-  // this also matches the expand button, but it is hidden via CSS
-  $('#chatcontrols a').click(function() {
-    $('#scrollwrapper, #updatestatus').hide();
-    // not displaying the map causes bugs in Leaflet
-    $('#map').css('visibility', 'hidden');
-    $('#chat, #chatinput').show();
-  });
-
   window.smartphone.mapButton = $('<a>map</a>').click(function() {
     $('#chat, #chatinput, #scrollwrapper').hide();
     $('#map').css('visibility', 'visible');
diff --git a/code/window_management.js b/code/window_management.js
new file mode 100644
index 00000000..2927aa4f
--- /dev/null
+++ b/code/window_management.js
@@ -0,0 +1,30 @@
+// created to start cleaning up "window" interaction
+//
+window.show = function(id) {
+	switch(id) {
+		case 'full':
+			window.chat.show('full');
+			break;
+		case 'compact':
+			window.chat.show('compact');
+			break;
+		case 'public':
+			window.chat.show('public');
+			break;
+		case 'faction':
+			window.chat.show('faction');
+			break;
+		case 'debug':
+			window.debug.console.show();
+			break;
+		case 'map':
+			window.smartphone.mapButton.click();
+			break;
+		case 'info':
+			window.smartphone.sideButton.click();
+			break;
+		default:
+			window.smartphone.mapButton.Click();
+			break;
+	}
+}
diff --git a/mobile/res/drawable-hdpi/alerts_and_states_warning.png b/mobile/res/drawable-hdpi/alerts_and_states_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fefdd8bd8a8c674bd81ffb2bca82ae9acb6673b
GIT binary patch
literal 1618
zcmaJ<Yfuwc7+oR+45%H2fC9Q*tW+ZV$crWtG%o}+K#>YsQ9`mnfX%L(4Fsk?B;}P#
zt5fR~wD_W+wU(;j+mWQ>XjPyp>QsCXTOFqrB~u;IVznCt><{hE+`adHbI$o5_c+p1
z7fs^L-~j+IDLF}#!S1Mc1#sDa7Ux+lyG>`b+00ThpDEMRIG{9=c{rF%=nL=+TyHF2
za~6*WfC;lrnb}OXZi(DL60qKjfo%lEvH>7|fsN7|ig5<a!wXDi1vGfP69P>}1(YSx
zp*l*97n+hPXnbi!YNny0*dQ}P3lhM1o17IOa7GW>h!V3!Zc{)bx^njH4I>aZ0%3|3
z(5s@db?Km*q;XIJqp=25ih)uwjEPa1ST+w7q8N%`LIjPA#Zb8<PL5*W=m)XcXk)%S
zLz6g~i@hnJLWZH_2vSy72A7Fok}g0nnM{VDLPRKxWf8HKax<g1#hNWqV+tDFVxUbF
zV<OF<S5cowS{VhzR{E+1f*O}KTSmvk4h*sBDFlO2Z%bo9o$mjk1Tl`bFd6vkdfzB)
z$t<UEBm=jQR@%TmTz-@{6(v{GxSk>DOp+`an__w)$&i*pk^<FBB`^l+^ahjJ8yR8f
zbn;}gh0&W0c(O(Tu^O<+WRz=EYOU}Cl~AHW6ERGS$;6mUD^{tMi4rVMtir~)8q#1T
za5FQ;HNNJG-pciwfuPvT8k{zj;>JXpB*2lT<)$~*A{J>-q3W%Aqg>+~YZ>9H-^xYU
zVi51s{^zO3Lacwh$8qDbmvQUkX4daCYwS%mU$p`N=Tx#rnQ7}AXh<u*yfEx^`%UTf
zb1QrW?`QM-)<IVnPl19fXryI(-Ia{*LU_uHY2a>mboz-Rza6~1PJ8slEs#Apm}j^1
zpqAq~y{8J?vZ{BtENR_X!V`HuEh!Za#)}4rd$y&7)%2`_Lj+FVKF(f1uzfFQB~|$g
zqKpm|s1~Mn*@ui$WPW+KQ|XC_xIH-Np8AyNOJAM(u-!LNxuyQEn_KHD4eq&y+}goC
z^_5!B(E$+^8MH_~=qYb_xv7HN>YCt5yW@Y29|jzD-WT%1I0CotKM8F?_B3});im3t
z*zTz6ng5)$TNg_v)Vf4eoh!zE2)=U7IIqtAVj|zU{y@Ny?#aY~N1aZ=+`uOPs86zX
zxrgz0C|-R225yA@_PwuLD!#8@KRG8W>?Akgv5>3TrQlNF!TTx0J9q!Ew%=CLT)^3!
zn<8rNcuKTqasG^Op>ysD9z;1pr+KOa8vM_=p1^&-=7&Gh1{SUr)bN}6*NcMZ<~GXu
z<3MM@$LF;Z8+=8%f|gYm?#kLq_IIB>;dkW5hsStLdzkWvbEJKx=D=&Rwyh7Ux_Zxq
zJZtWly3KfK;#A)$^hc}DtDQdZ%SqK;8#_W%VkG-q#MxQB9J4)qAZhdcfXaTTefF(L
z+`l)7cYD24y^(WT_P3hXc;@c@H4gvqTK~rAcynvckB>zMKU@AZFQ!g$Y(r6B(DdlY
zOFjEm40qgZJg3U*q@};_3_1OcquscUPo&Cty)9o#hoc^Dzw~VL9k^}h%SF9KpC9Uf
z?`Y17psvc}D+_<B7lDB@e?DU6TZb;b2#oaE<x<>g`{PFOvX=h&Gl;szX@@JyoY(ha
z7mPha%Mrnjs?_j=;R}}?mDZUjhl;=0>d3%nUA3-Ey76t3kD;ctNv;j@WO=yHV}HwU
n^W^zu`z%`<lIu6H=Xq!@P>IzHgoi(2{R{xf+Eh)OD%bumGAd+p

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-mdpi/alerts_and_states_warning.png b/mobile/res/drawable-mdpi/alerts_and_states_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..a39f97d4ae7cb75ea89dd4f0b747cf285174bde1
GIT binary patch
literal 1362
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsViq$=TJ&!pY3k$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1POzUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1=
zG!Lpb1-DyFaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z{{3gSF#`kR5l<J#
zkcwMxrrUZS4iIS*o_)b-qL_|fsN+H_POq0&4tjERm5CKj3Df;$925J8lkXo(;j1vK
z9acB@uKuR&+xxzCyMUA3Y&F*xjqH;S?|i<`^7*rSE@nK=QA^f(aBo}MP_O@><xGxO
z$HvzW8n5SG=-tg^y1_N8aC?G$$U**<m&CgnB=0ne{7}{W^~8cD#6gnBXCGtj)D^5t
z9A#g`9LQXBA^dr53X`5=<I=n)w#-Z62|g-JpB`}WG;&!zm|OBf+DJ{ll_Bt+>9ku9
zT7rXLUX~1=zr8`pg4I@jqwO)V=c)<^?X+vW^o=EMKe%y$>72vKPq#Q{Tg3RspB6ga
zCNzQddP2^}?z8IbWuAR@n|m$IUhi66Su^Qwv-F3z1rt^-J6SS&M(78gd1-<hc;g%{
zEjyC*$p6E^-^?4*gEcp@xjkU2Va+|Ld*X(VUSJ5f%_OnfNoTE28iX$}RrvNb`9gW*
zOU~1it)^}|ACtOYUd8kB$!AkS-c-0JT)whyVfT%foVU`vV_4@jJJ0*<Cn}^}$Nc6)
zT=M_9k4&G5?2O;bl46nY=wnyk8vn<MQpMHV9`veCu6<WiXP?CLjBg9S&VTM{OiJ7B
a8QB<|9;ZjdCOz>2m2#f0elF{r5}E+$0qRl!

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xhdpi/action_settings.png b/mobile/res/drawable-xhdpi/action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b01483454788c435acf715c57d92fc0ead0a7c
GIT binary patch
literal 1641
zcmaJ>c~BE~6yA_XI1DNx4tQ;2tWqJn8xu$(;Yb1`lrR)Bl4(0iNS3f-vN2hb;JJmd
z#e)&FR;g4iRmP*XT4ijNk*%drb?kVQ0WT1(fI@*<)JP3>gMj^`bZ2&dzxU>S-@Crq
z%^B$_oPh8E001~@l`@k)6TGjVFa14=t!|@_Fd|7uWZ`*)Q*T3oL?fPyf@-tggl3|8
zW6|o1Xe<CQd6-s5=rn0k18(N)y)k^3*-E1UAU57*)f);>0?b8Cm_^3zKUdEMF{6x|
zEz-ams{+l(RBLQ#)|zy!VNHQSV&ulhfw3+rO<+a|J?Jv8ve>0A8Fz$NO5eS1hzpK{
z5Ct;s>!Ng;3{ZjFP*B8&qYQ8~0!9n@h!B<tC6S;2MqmgLKyXYH0!u|PQWyb8A1<BE
zX3UdjDw9WZ(Uy#xPY_lq1Ua2fzH<p5x0xVBB9TC_01^nI=!htLk%iE^qAd3LV+=~v
zZm?li0>dq!mr<XK7ZNfqUFqu<%+_&Qi+yxV^uQpO-U=an*xS-rpholmp=R@Vw4KOA
z-_-k`#CC0w6@@ZUJ6>or(2L8P?@eWuDr~5pz-?L_Uo|$xjC`EH?fJMBRAh<x2&mB;
zFpJkSg3xHBYKxuFTMVdLDdW-{d<-*6lMsn8CP@H`<Zv>Acr8SdB$O)>lSN33P>zgY
zmAIkMj9Q2>tnm#NnGow0gV{=FR-!h{ff|!-xEUO2T8d3r3z9S;-ze5NVJ%4Vgjk3!
z2J)`<U#lK-(faXT$AwE9<I+bhwBBvBuxAHEm;k`%wpy8}b=~UyKvpm#G31N8Gv~cX
z2&`bqc?W|}PRpJ5id+_2Gcfa@s`OBV=7_R%7?@>lzL5DxWNsL*#xGc<^7H2{+TnJ{
zn9h!qy-js@D_1+Zf@Zt^eugYr>*#8enEC_ni$mkiWVqV)0B@821LruRoDEr&aLy~1
z<D-2L>yB?9b0<;9u46|NoT=ivDSMdve5O<F=Vv)sv5dIdN}%XVoZL(8|Lq6;y`=*g
zO_^4a-}36F;n)XNFZ-l$+q1~2yQ=CRuMOX}ZXuN#Ud8BppO@O!?4+Pg?U%ae0NY9a
z9MjY1VXa3}DNatMZ|UR}>r{-s#V3xd64*MQMnUK9!80p9AxYmyS4}rq+OUQAhE&h4
zX#*VHi8_`8yD#tP{AE3r`(r=4ac`lYnAd8VzlGIsx=|A7RwcALd@gl5dIb#qmGh8l
z$g$+t!ibEOn>A-W<kHUv&wX0ov)(4|3tY!0(zixbX9aaVa!NX8+<P}k-p}}ocsa{`
zulg<SUjw&;J#p<RX+7UjVr($h6Q>TZuf<NJ?M=CGt!67=g36u6q8kT3ynQC1^znPd
z_8I$kTn@Qu-g4|pwM-GlI7OYB9S`yz<Swfq=T5q``!mm`CMspQ&&MyxxrskFbYBg1
zbi_w89&AWB;8yMP*WiRWP@J65y_C_US)giZ2#TN{K6);@?k>CRb5xU8oK3xBjZy@C
zo2@M_tN7_Gr{Z*dd9?EAP++6K3Oatcap%qMA@XqNvfVvQRtvlJPf$0xd61cQr@5@E
zcE3fvo~l~3QL?gO3Vf)29uObmUp{kK9@4@N8Db~`N_ab3gp7;2lFo;9FCw01CsUyV
zcb)``r<OFczutU5xbnD^)mvKpB)G&}K18-uO^RJW_Aqayk+nlWw!i8zGo4)gJA2#p
zuB<0>tBy^9uMtCmWjxBgBF|^IYf(S*waUKtOwR#oHr;e<Jt2F%KYw*ny7C)&PVql;
CUvD@7

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xhdpi/alerts_and_states_warning.png b/mobile/res/drawable-xhdpi/alerts_and_states_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f11628f30c73f4c0752a627ebd1a67eb895f064
GIT binary patch
literal 1813
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=IlZmm5fsv)DlYyI|p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaLa!rEy`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<)
zX&zK>3U0Sp;MA)Rbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3beb}q!DKNjZd%8G=
zRNQ(q%RBo@fXH!SclTole=S<nx>8qU_lBm@u&Yfsy1MOFC`}8x-B^}YzK-RufL=_;
z4^9^Qh9+)T0l}DV?xR~f7HC_qKc_O!`TxS{6JE}kJ=<r}PVqW}$;bDq|9>*?xUbLc
zZM|`M%fuYG7qDJn%3$2W5XGR|0OSf(T6>;(_}%+axOvZw`>r3~3vd2m>t*w%P4M@w
zl8@UvDi<+6+qhPp<%N0}=jo$b-<HNTxY~R&O^oKfEp}P&0LR8ByD9=(RAnYdF`9J>
zyPQsr=l*SWS?hpGVeg9fg+8*!eU|w)@Dxrzv2Ew?N5K=0Zk%btdEngI8xP-g`#TzH
zwM(=zEbmM`#5Q+U@g1XczIzz7KfEcGe}1L#oYy5*3wNE0mc7m{@`Vy#5@%cM=q>0!
za*gRVM{cy=M^^Xm^L{8>Slug|v!f$-n}FE$Kywv82EO#mE?2)E`S^eNk@V{ypLeFa
z#C3>-emPjX*YlFd3C@LQK1p2uqIK5x&BhjiS>BTvws#uN@5|S3w`j8yR&-!gT(fk;
zd9hzQDvk|8g>0q!R$X(LzjOz;f#011OS{muUHgtd)?)Y`+9tl;N#KCf{nV*tt3?vp
zc3fI^E&OVhM6y~Q(}%e?4a%l(Ka}P7Us}T0jOjzwy~rf%rdvtU$!m|fHY6T-k=D|!
z?b~B1!_IiEgHb;5{IomI`MQ}UcCX%gK-FT&s{ZchSIQ3Eh-5m?C2pc5;`Coytn$tE
zBkni3IX-2*QTTY|M&$n08dabESOw@Uv={iEa`~M?aDrHQklM>aE_uOVBg<I^W$_zb
z)eZzMS-P#?{hI7~ZM~FF?CF1ma=Om2Z}==JDrWVE<J{-Jf*)BgpIG^$;^}k7KTY#j
zUTDzGx%^mz<$**^@TMDuVJ-WF<85oayo<C<5-w{$ioOxNfQMgi_Lmuxep{)!|J|S)
zB5&XtGyTJ_z%5)kv$?z*Y@S7iUHZ7vr{&h%*{!`l4Qd$bj|A{UyuK|l`S&gd83DP6
zOy5`q7qUt3{4cI0tQa@1&Tmf8l+Vv&BIiGr3DsG$p~Jq@`bfTLa018E=MxS!wd;S;
zKlDPZZgrGv)~*~r9ftaorB?%X9}_RjKJd&^)GlFyMcb1jJ{=5VIdUP22dp1)6k0yH
zDmS%v{cGVI{x>YfEA}p*xc2DZ%R#~`zeYc5zxeQP%fFB?^ek{;@!R<f%nb8)vHBi#
S{PYD>QF*%hxvX<aXaWEXV!~kn

literal 0
HcmV?d00001

diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml
index 20de94d0..06d7bdb8 100644
--- a/mobile/res/menu/main.xml
+++ b/mobile/res/menu/main.xml
@@ -90,10 +90,11 @@
                 android:title="@string/cache_clear">
             </item>
             <item
-                android:id="@+id/menu_exit"
-                android:orderInCategory="200"
+                android:id="@+id/menu_debug"
+                android:icon="@drawable/alerts_and_states_warning"
+                android:orderInCategory="190"
                 android:showAsAction="never"
-                android:title="@string/menu_exit">
+                android:title="@string/menu_debug">
             </item>
             </menu>
     </item>
diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index 8fd875cd..3e4f40a2 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -53,5 +53,5 @@
     <string name="menu_public">Public</string>
     <string name="menu_faction">Faction</string>
     <string name="menu_info">Info</string>
-    <string name="menu_exit">Exit</string>
+    <string name="menu_debug">Debug</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index f34e1fab..a08acf7b 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -239,11 +239,11 @@ public class IITC_Mobile extends Activity {
         // Handle item selection
         switch (item.getItemId()) {
         case android.R.id.home:
-        	iitc_view.loadUrl("javascript: window.smartphone.mapButton.click();");
+        	iitc_view.loadUrl("javascript: window.show('map');");
         	actionBar.setTitle(getString(R.string.menu_map));
         	return true;
         case R.id.menu_map:
-        	iitc_view.loadUrl("javascript: window.smartphone.mapButton.click();");
+        	iitc_view.loadUrl("javascript: window.show('map');");
         	actionBar.setTitle(getString(R.string.menu_map));
         	return true;
         case R.id.reload_button:
@@ -281,7 +281,7 @@ public class IITC_Mobile extends Activity {
             return true;
         // get the users current location and focus it on map
         case R.id.locate:
-        	iitc_view.loadUrl("javascript: window.smartphone.mapButton.click();");
+        	iitc_view.loadUrl("javascript: window.show('map');");
             iitc_view.loadUrl("javascript: window.map.locate({setView : true, maxZoom: 13});");
         	actionBar.setTitle(getString(R.string.menu_map));
             return true;
@@ -292,27 +292,28 @@ public class IITC_Mobile extends Activity {
             startActivity(intent);
             return true;
         case R.id.menu_info:
-        	iitc_view.loadUrl("javascript: window.smartphone.sideButton.click();");
+        	iitc_view.loadUrl("javascript: window.show('info');");
             actionBar.setTitle(getString(R.string.menu_info));
         	return true;
         case R.id.menu_full:
-        	iitc_view.loadUrl("javascript: window.chat.choose('full');");
+        	iitc_view.loadUrl("javascript: window.show('full');");
             actionBar.setTitle(getString(R.string.menu_full));
         	return true;
         case R.id.menu_compact:
-        	iitc_view.loadUrl("javascript: window.chat.choose('compact');");
+        	iitc_view.loadUrl("javascript: window.show('compact');");
             actionBar.setTitle(getString(R.string.menu_compact));
         	return true;
         case R.id.menu_public:
-        	iitc_view.loadUrl("javascript: window.chat.choose('public');");
+        	iitc_view.loadUrl("javascript: window.show('public');");
             actionBar.setTitle(getString(R.string.menu_public));
         	return true;
         case R.id.menu_faction:
-        	iitc_view.loadUrl("javascript: window.chat.choose('faction');");
+        	iitc_view.loadUrl("javascript: window.show('faction');");
             actionBar.setTitle(getString(R.string.menu_faction));
         	return true;
-        case R.id.menu_exit:
-        	super.onBackPressed();
+        case R.id.menu_debug:
+        	iitc_view.loadUrl("javascript: window.show('debug')");        	
+            actionBar.setTitle(getString(R.string.menu_debug));            
         	return true;
         default:
             return super.onOptionsItemSelected(item);