diff --git a/public/include/pages/tacpop.inc.php b/public/include/pages/tacpop.inc.php new file mode 100644 index 00000000..86087ec0 --- /dev/null +++ b/public/include/pages/tacpop.inc.php @@ -0,0 +1,6 @@ + diff --git a/public/index.php b/public/index.php index db94059e..19852fc1 100644 --- a/public/index.php +++ b/public/index.php @@ -30,6 +30,9 @@ define("SECURITY", 1); // Include our configuration (holding defines for the requires) if (!include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load site configuration'); +// Our default template to load, pages can overwrite this later +$master_template = 'master.tpl'; + // Start a session session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']); session_start(); @@ -93,7 +96,7 @@ $smarty->assign('DebuggerInfo', $debug->getDebugInfo()); $smarty->assign('RUNTIME', (microtime(true) - $dStartTime) * 1000); // Display our page -if (!@$supress_master) $smarty->display("master.tpl", $smarty_cache_key); +if (!@$supress_master) $smarty->display($master_template, $smarty_cache_key); // Unset any temporary values here unset($_SESSION['POPUP']); diff --git a/public/site_assets/mpos/css/custom.css b/public/site_assets/mpos/css/custom.css index aa1ed6b0..eadbe7ac 100644 --- a/public/site_assets/mpos/css/custom.css +++ b/public/site_assets/mpos/css/custom.css @@ -249,7 +249,56 @@ footer.footer { footer.footer p { color:grey; margin: 0px 0 0 0; - } +} + .DebuggerConsole { z-index:500;position:absolute;display:none } + + +.tbox { + position:absolute; + display:none; + padding:14px 17px; + z-index:900 +} + +.tinner { + padding:0px 30px 0px 0px; + -moz-border-radius:5px; + border-radius:5px; + background:#fff 50% 50%; + border-right:1px solid #333; + border-bottom:1px solid #333 +} + +.tmask { + position:absolute; + display:none; top:0px; + left:0px; height:100%; + width:100%; + background:#000; + z-index:800 +} + +.tclose { + position:absolute; + top:0px; + right:0px; + width:30px; + height:30px; + cursor:pointer; + background:url(../images/close.png) no-repeat +} + +.tclose:hover { + background-position:0 -30px +} + +#frameless { + padding:0 +} + +#frameless .tclose { + left:6px +} diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css index e7b06b9d..2ba5a823 100644 --- a/public/site_assets/mpos/css/layout.css +++ b/public/site_assets/mpos/css/layout.css @@ -28,6 +28,7 @@ text-decoration: none; a:hover { text-decoration: underline; +cursor:pointer } diff --git a/public/site_assets/mpos/images/close.png b/public/site_assets/mpos/images/close.png new file mode 100644 index 00000000..81787731 Binary files /dev/null and b/public/site_assets/mpos/images/close.png differ diff --git a/public/site_assets/mpos/js/tinybox.js b/public/site_assets/mpos/js/tinybox.js new file mode 100644 index 00000000..f5e10670 --- /dev/null +++ b/public/site_assets/mpos/js/tinybox.js @@ -0,0 +1,134 @@ +TINY={}; + +TINY.box=function(){ + var j,m,b,g,v,p=0; + return{ + show:function(o){ + v={opacity:70,close:1,animate:1,fixed:1,mask:1,maskid:'',boxid:'',topsplit:2,url:0,post:0,height:0,width:0,html:0,iframe:0}; + for(s in o){v[s]=o[s]} + if(!p){ + j=document.createElement('div'); j.className='tbox'; + p=document.createElement('div'); p.className='tinner'; + b=document.createElement('div'); b.className='tcontent'; + m=document.createElement('div'); m.className='tmask'; + g=document.createElement('div'); g.className='tclose'; g.v=0; + document.body.appendChild(m); document.body.appendChild(j); j.appendChild(p); p.appendChild(b); + m.onclick=g.onclick=TINY.box.hide; window.onresize=TINY.box.resize + }else{ + j.style.display='none'; clearTimeout(p.ah); if(g.v){p.removeChild(g); g.v=0} + } + p.id=v.boxid; m.id=v.maskid; j.style.position=v.fixed?'fixed':'absolute'; + if(v.html&&!v.animate){ + p.style.backgroundImage='none'; b.innerHTML=v.html; b.style.display=''; + p.style.width=v.width?v.width+'px':'auto'; p.style.height=v.height?v.height+'px':'auto' + }else{ + b.style.display='none'; + if(!v.animate&&v.width&&v.height){ + p.style.width=v.width+'px'; p.style.height=v.height+'px' + }else{ + p.style.width=p.style.height='100px' + } + } + if(v.mask){this.mask(); this.alpha(m,1,v.opacity)}else{this.alpha(j,1,100)} + if(v.autohide){p.ah=setTimeout(TINY.box.hide,1000*v.autohide)}else{document.onkeyup=TINY.box.esc} + }, + fill:function(c,u,k,a,w,h){ + if(u){ + if(v.image){ + var i=new Image(); i.onload=function(){w=w||i.width; h=h||i.height; TINY.box.psh(i,a,w,h)}; i.src=v.image + }else if(v.iframe){ + this.psh('',a,w,h) + }else{ + var x=window.XMLHttpRequest?new XMLHttpRequest():new ActiveXObject('Microsoft.XMLHTTP'); + x.onreadystatechange=function(){ + if(x.readyState==4&&x.status==200){p.style.backgroundImage=''; TINY.box.psh(x.responseText,a,w,h)} + }; + if(k){ + x.open('POST',c,true); x.setRequestHeader('Content-type','application/x-www-form-urlencoded'); x.send(k) + }else{ + x.open('GET',c,true); x.send(null) + } + } + }else{ + this.psh(c,a,w,h) + } + }, + psh:function(c,a,w,h){ + if(typeof c=='object'){b.appendChild(c)}else{b.innerHTML=c} + var x=p.style.width, y=p.style.height; + if(!w||!h){ + p.style.width=w?w+'px':''; p.style.height=h?h+'px':''; b.style.display=''; + if(!h){h=parseInt(b.offsetHeight)} + if(!w){w=parseInt(b.offsetWidth)} + b.style.display='none' + } + p.style.width=x; p.style.height=y; + this.size(w,h,a) + }, + esc:function(e){e=e||window.event; if(e.keyCode==27){TINY.box.hide()}}, + hide:function(){TINY.box.alpha(j,-1,0,3); document.onkeypress=null; if(v.closejs){v.closejs()}}, + resize:function(){TINY.box.pos(); TINY.box.mask()}, + mask:function(){m.style.height=this.total(1)+'px'; m.style.width=this.total(0)+'px'}, + pos:function(){ + var t; + if(typeof v.top!='undefined'){t=v.top}else{t=(this.height()/v.topsplit)-(j.offsetHeight/2); t=t<20?20:t} + if(!v.fixed&&!v.top){t+=this.top()} + j.style.top=t+'px'; + j.style.left=typeof v.left!='undefined'?v.left+'px':(this.width()/2)-(j.offsetWidth/2)+'px' + }, + alpha:function(e,d,a){ + clearInterval(e.ai); + if(d){e.style.opacity=0; e.style.filter='alpha(opacity=0)'; e.style.display='block'; TINY.box.pos()} + e.ai=setInterval(function(){TINY.box.ta(e,a,d)},20) + }, + ta:function(e,a,d){ + var o=Math.round(e.style.opacity*100); + if(o==a){ + clearInterval(e.ai); + if(d==-1){ + e.style.display='none'; + e==j?TINY.box.alpha(m,-1,0,2):b.innerHTML=p.style.backgroundImage='' + }else{ + if(e==m){ + this.alpha(j,1,100) + }else{ + j.style.filter=''; + TINY.box.fill(v.html||v.url,v.url||v.iframe||v.image,v.post,v.animate,v.width,v.height) + } + } + }else{ + var n=a-Math.floor(Math.abs(a-o)*.5)*d; + e.style.opacity=n/100; e.style.filter='alpha(opacity='+n+')' + } + }, + size:function(w,h,a){ + if(a){ + clearInterval(p.si); var wd=parseInt(p.style.width)>w?-1:1, hd=parseInt(p.style.height)>h?-1:1; + p.si=setInterval(function(){TINY.box.ts(w,wd,h,hd)},20) + }else{ + p.style.backgroundImage='none'; if(v.close){p.appendChild(g); g.v=1} + p.style.width=w+'px'; p.style.height=h+'px'; b.style.display=''; this.pos(); + if(v.openjs){v.openjs()} + } + }, + ts:function(w,wd,h,hd){ + var cw=parseInt(p.style.width), ch=parseInt(p.style.height); + if(cw==w&&ch==h){ + clearInterval(p.si); p.style.backgroundImage='none'; b.style.display='block'; if(v.close){p.appendChild(g); g.v=1} + if(v.openjs){v.openjs()} + }else{ + if(cw!=w){p.style.width=(w-Math.floor(Math.abs(w-cw)*.6)*wd)+'px'} + if(ch!=h){p.style.height=(h-Math.floor(Math.abs(h-ch)*.6)*hd)+'px'} + this.pos() + } + }, + top:function(){return document.documentElement.scrollTop||document.body.scrollTop}, + width:function(){return self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth}, + height:function(){return self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight}, + total:function(d){ + var b=document.body, e=document.documentElement; + return d?Math.max(Math.max(b.scrollHeight,e.scrollHeight),Math.max(b.clientHeight,e.clientHeight)): + Math.max(Math.max(b.scrollWidth,e.scrollWidth),Math.max(b.clientWidth,e.clientWidth)) + } + } +}(); diff --git a/public/templates/mpos/master.tpl b/public/templates/mpos/master.tpl index dbf87e0b..f3783801 100644 --- a/public/templates/mpos/master.tpl +++ b/public/templates/mpos/master.tpl @@ -5,28 +5,29 @@ {$GLOBAL.website.title} I {$smarty.request.page|escape|default:"home"|capitalize} - - - + + + - - - - - - - - + + + + + + + + - - + + - + + {if $GLOBAL.statistics.analytics.enabled} {$GLOBAL.statistics.analytics.code} diff --git a/public/templates/mpos/register/default.tpl b/public/templates/mpos/register/default.tpl index f109d8e9..4d52a37a 100644 --- a/public/templates/mpos/register/default.tpl +++ b/public/templates/mpos/register/default.tpl @@ -1,43 +1,51 @@ -
+

Register new account

-
- + + {if $smarty.request.token|default:""} - § + § {/if} - -
- - -
-
- - - - -
-
- - - - -
-
- - (4 digit number. Remember this pin!) -
- {nocache}{$RECAPTCHA|default:""}{/nocache} -
-  Accept Terms and Conditions - - -
+ +
+ + +
+
+ + + + +
+
+ + + + +
+
+ + (4 digit number. Remember this pin!) +
+
+
+ Accept Terms and Conditions + + +
+
{nocache}{$RECAPTCHA|default:""}{/nocache}
+
+