diff --git a/htdocs/takepos/class/actions_takepos.class.php b/htdocs/takepos/class/actions_takepos.class.php index a3ac2e78646..d592a5afdc2 100644 --- a/htdocs/takepos/class/actions_takepos.class.php +++ b/htdocs/takepos/class/actions_takepos.class.php @@ -217,7 +217,4 @@ class ActionsTakePos return $ret; } - - /* Add here any other hooked methods... */ - } diff --git a/htdocs/takepos/css/colorbox.css b/htdocs/takepos/css/colorbox.css index 5e9d4b7a79e..e51a84c8282 100644 --- a/htdocs/takepos/css/colorbox.css +++ b/htdocs/takepos/css/colorbox.css @@ -15,44 +15,44 @@ .cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;} #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;} -/* +/* User Style: Change the following styles to modify the appearance of Colorbox. They are ordered & tabbed in a way that represents the nesting of the generated HTML. */ #cboxOverlay{background:#000; opacity: 0.9; filter: alpha(opacity = 90);} #colorbox{outline:0;} - #cboxTopLeft{width:14px; height:14px; background:url(images/controls.png) no-repeat 0 0;} - #cboxTopCenter{height:14px; background:url(images/border.png) repeat-x top left;} - #cboxTopRight{width:14px; height:14px; background:url(images/controls.png) no-repeat -36px 0;} - #cboxBottomLeft{width:14px; height:43px; background:url(images/controls.png) no-repeat 0 -32px;} - #cboxBottomCenter{height:43px; background:url(images/border.png) repeat-x bottom left;} - #cboxBottomRight{width:14px; height:43px; background:url(images/controls.png) no-repeat -36px -32px;} - #cboxMiddleLeft{width:14px; background:url(images/controls.png) repeat-y -175px 0;} - #cboxMiddleRight{width:14px; background:url(images/controls.png) repeat-y -211px 0;} - #cboxContent{background:#fff; overflow:visible;} - .cboxIframe{background:#fff;} - #cboxError{padding:50px; border:1px solid #ccc;} - #cboxLoadedContent{margin-bottom:5px;} - #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;} - #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;} - #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;} - #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;} +#cboxTopLeft{width:14px; height:14px; background:url(images/controls.png) no-repeat 0 0;} +#cboxTopCenter{height:14px; background:url(images/border.png) repeat-x top left;} +#cboxTopRight{width:14px; height:14px; background:url(images/controls.png) no-repeat -36px 0;} +#cboxBottomLeft{width:14px; height:43px; background:url(images/controls.png) no-repeat 0 -32px;} +#cboxBottomCenter{height:43px; background:url(images/border.png) repeat-x bottom left;} +#cboxBottomRight{width:14px; height:43px; background:url(images/controls.png) no-repeat -36px -32px;} +#cboxMiddleLeft{width:14px; background:url(images/controls.png) repeat-y -175px 0;} +#cboxMiddleRight{width:14px; background:url(images/controls.png) repeat-y -211px 0;} +#cboxContent{background:#fff; overflow:visible;} +.cboxIframe{background:#fff;} +#cboxError{padding:50px; border:1px solid #ccc;} +#cboxLoadedContent{margin-bottom:5px;} +#cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;} +#cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;} +#cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;} +#cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;} - /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */ - #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; position:absolute; bottom:-29px; background:url(images/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;} - - /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */ - #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;} +/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */ +#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; position:absolute; bottom:-29px; background:url(images/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;} - #cboxPrevious{left:0px; background-position: -51px -25px;} - #cboxPrevious:hover{background-position:-51px 0px;} - #cboxNext{left:27px; background-position:-75px -25px;} - #cboxNext:hover{background-position:-75px 0px;} - #cboxClose{right:0; background-position:-100px -25px;} - #cboxClose:hover{background-position:-100px 0px;} +/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */ +#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;} - .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;} - .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;} - .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;} - .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;} \ No newline at end of file +#cboxPrevious{left:0px; background-position: -51px -25px;} +#cboxPrevious:hover{background-position:-51px 0px;} +#cboxNext{left:27px; background-position:-75px -25px;} +#cboxNext:hover{background-position:-75px 0px;} +#cboxClose{right:0; background-position:-100px -25px;} +#cboxClose:hover{background-position:-100px 0px;} + +.cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;} +.cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;} +.cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;} +.cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;} diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php index 5670e0791dd..ff1b368b743 100644 --- a/htdocs/takepos/genimg/index.php +++ b/htdocs/takepos/genimg/index.php @@ -85,7 +85,8 @@ if ($query=="cat") } else if ($query=="pro") { - require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); + require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php"; + $objProd = new Product($db); $objProd->fetch($id); diff --git a/htdocs/takepos/test/phpunit/TakePosFunctionalTest.php b/test/phpunit/TakePosFunctionalTest.php similarity index 100% rename from htdocs/takepos/test/phpunit/TakePosFunctionalTest.php rename to test/phpunit/TakePosFunctionalTest.php