Improve responsive design in TakePOS

This commit is contained in:
andreubisquerra 2018-12-17 22:43:02 +01:00
parent 9d5a91b6e8
commit bce696ee36
4 changed files with 30 additions and 19 deletions

View File

@ -48,7 +48,6 @@ if (is_numeric($type)) $type=Categorie::$MAP_ID_TO_CODE[$type]; // For backward
/* /*
* Actions * Actions
*/ */
print $action;
if ($action=="SavePrinter1"){ if ($action=="SavePrinter1"){
$printedcategories=";"; $printedcategories=";";
if (is_array($printer1)) foreach ($printer1 as $cat){ if (is_array($printer1)) foreach ($printer1 as $cat){

View File

@ -30,6 +30,8 @@ button.calcbutton {
overflow: visible; /* removes extra width in IE */ overflow: visible; /* removes extra width in IE */
width:24%; width:24%;
height:24%; height:24%;
font-weight: bold;
color: #555555;
} }
button.calcbutton2 { button.calcbutton2 {
@ -43,6 +45,8 @@ button.calcbutton2 {
overflow: visible; /* removes extra width in IE */ overflow: visible; /* removes extra width in IE */
width:24%; width:24%;
height:24%; height:24%;
font-weight: bold;
color: #555555;
} }
button.calcbutton3 { button.calcbutton3 {
@ -97,6 +101,11 @@ div.wrapper2{
text-align: center; text-align: center;
} }
button:active{
background:black;
color: white;
}
div.description{ div.description{
position:absolute; /* absolute position (so we can position it where we want)*/ position:absolute; /* absolute position (so we can position it where we want)*/
bottom:0px; /* position will be on bottom */ bottom:0px; /* position will be on bottom */

View File

@ -274,7 +274,7 @@ if ($action == "temp" and $placeid != 0) {
?> ?>
<style> <style>
.selected { .selected {
color: red; font-weight: bold;
} }
.order { .order {
color: limegreen; color: limegreen;

View File

@ -46,6 +46,10 @@ $langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter
// Title // Title
$title='TakePOS - Dolibarr '.DOL_VERSION; $title='TakePOS - Dolibarr '.DOL_VERSION;
if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE; if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $title='TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
$head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
?> ?>
@ -76,12 +80,12 @@ function PrintCategories(first){
function MoreCategories(moreorless){ function MoreCategories(moreorless){
if (moreorless=="more"){ if (moreorless=="more"){
$('#catimg15').animate({opacity: '0.5'}, 100); $('#catimg15').animate({opacity: '0.5'}, 1);
$('#catimg15').animate({opacity: '1'}, 100); $('#catimg15').animate({opacity: '1'}, 100);
pagecategories=pagecategories+1; pagecategories=pagecategories+1;
} }
if (moreorless=="less"){ if (moreorless=="less"){
$('#catimg14').animate({opacity: '0.5'}, 100); $('#catimg14').animate({opacity: '0.5'}, 1);
$('#catimg14').animate({opacity: '1'}, 100); $('#catimg14').animate({opacity: '1'}, 100);
if (pagecategories==0) return; //Return if no less pages if (pagecategories==0) return; //Return if no less pages
pagecategories=pagecategories-1; pagecategories=pagecategories-1;
@ -103,7 +107,7 @@ function MoreCategories(moreorless){
} }
function LoadProducts(position){ function LoadProducts(position){
$('#catimg'+position).animate({opacity: '0.5'}, 100); $('#catimg'+position).animate({opacity: '0.5'}, 1);
$('#catimg'+position).animate({opacity: '1'}, 100); $('#catimg'+position).animate({opacity: '1'}, 100);
currentcat=$('#catdiv'+position).data('rowid'); currentcat=$('#catdiv'+position).data('rowid');
if (currentcat=="") return; if (currentcat=="") return;
@ -125,12 +129,12 @@ function LoadProducts(position){
function MoreProducts(moreorless){ function MoreProducts(moreorless){
if (moreorless=="more"){ if (moreorless=="more"){
$('#proimg31').animate({opacity: '0.5'}, 100); $('#proimg31').animate({opacity: '0.5'}, 1);
$('#proimg31').animate({opacity: '1'}, 100); $('#proimg31').animate({opacity: '1'}, 100);
pageproducts=pageproducts+1; pageproducts=pageproducts+1;
} }
if (moreorless=="less"){ if (moreorless=="less"){
$('#proimg30').animate({opacity: '0.5'}, 100); $('#proimg30').animate({opacity: '0.5'}, 1);
$('#proimg30').animate({opacity: '1'}, 100); $('#proimg30').animate({opacity: '1'}, 100);
if (pageproducts==0) return; //Return if no less pages if (pageproducts==0) return; //Return if no less pages
pageproducts=pageproducts-1; pageproducts=pageproducts-1;
@ -155,7 +159,7 @@ function MoreProducts(moreorless){
} }
function ClickProduct(position){ function ClickProduct(position){
$('#proimg'+position).animate({opacity: '0.5'}, 100); $('#proimg'+position).animate({opacity: '0.5'}, 1);
$('#proimg'+position).animate({opacity: '1'}, 100); $('#proimg'+position).animate({opacity: '1'}, 100);
idproduct=$('#prodiv'+position).data('rowid'); idproduct=$('#prodiv'+position).data('rowid');
if (idproduct=="") return; if (idproduct=="") return;
@ -318,7 +322,7 @@ $( document ).ready(function() {
<div id="poslines" style="position:absolute; top:2%; left:0.5%; height:36%; width:31%; overflow: auto;"> <div id="poslines" style="position:absolute; top:2%; left:0.5%; height:36%; width:31%; overflow: auto;">
</div> </div>
<div style="position:absolute; top:1%; left:32.5%; height:37%; width:32.5%;"> <div style="position:absolute; top:1%; left:32.5%; height:37%; width:32.5%; font-size: 0;">
<button type="button" class="calcbutton" onclick="Edit(7);">7</button> <button type="button" class="calcbutton" onclick="Edit(7);">7</button>
<button type="button" class="calcbutton" onclick="Edit(8);">8</button> <button type="button" class="calcbutton" onclick="Edit(8);">8</button>
<button type="button" class="calcbutton" onclick="Edit(9);">9</button> <button type="button" class="calcbutton" onclick="Edit(9);">9</button>
@ -354,20 +358,19 @@ $menus[$r++]=array('title'=>$langs->trans("ValidateBill"),
$menus[$r++]=array('title'=>$langs->trans("Logout"), $menus[$r++]=array('title'=>$langs->trans("Logout"),
'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';'); 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
//BAR RESTAURANT specified menu //BAR RESTAURANT specified menu
if($conf->global->TAKEPOS_BAR_RESTAURANT){ if($conf->global->TAKEPOS_BAR_RESTAURANT){
$menus[$r++]=array('title'=>$langs->trans("Floors"), $menus[$r++]=array('title'=>$langs->trans("Floors"),
'action'=>'Floors();'); 'action'=>'Floors();');
if ($conf->global->TAKEPOS_ORDER_PRINTERS){ if ($conf->global->TAKEPOS_ORDER_PRINTERS){
$menus[$r++]=array('title'=>$langs->trans("Order"), $menus[$r++]=array('title'=>$langs->trans("Order"),
'action'=>'TakeposPrintingOrder();');} 'action'=>'TakeposPrintingOrder();');
}
//add temp ticket button //add temp ticket button
if ($conf->global->TAKEPOS_ORDER_PRINTERS){ if ($conf->global->TAKEPOS_ORDER_PRINTERS){
$menus[$r++]=array('title'=>$langs->trans("Temporary ticket"), $menus[$r++]=array('title'=>$langs->trans("Temporary ticket"),
'action'=>'TakeposPrintingTemp();');} 'action'=>'TakeposPrintingTemp();');
}
} }
if ($conf->global->TAKEPOSCONNECTOR){ if ($conf->global->TAKEPOSCONNECTOR){