From: vincent@cubedesigners.com Date: Thu, 24 Oct 2019 12:03:09 +0000 (+0000) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ff91ea7cbabbec8665d98fd953adfb3552f6a440;p=fluidbook-v3.git . --- diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php index 4ca16f7..058109a 100644 --- a/framework/application/controllers/MaintenanceController.php +++ b/framework/application/controllers/MaintenanceController.php @@ -63,7 +63,6 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController echo $e->getMessage() . '
'; exit; } - } } @@ -73,7 +72,8 @@ class MaintenanceController extends CubeIT_Controller_MaintenanceController $ws = new CubeIT_Services_Fluidbook('vincent@cubedesigners.com', 'iquique'); $meta = $ws->getMetadata($id); $dir = PUBLIC_PATH . '/references/' . $id . '-' . CubeIT_Text::str2URL(trim($meta->title)); + $res = $ws->installBook($id, $dir); - $res = $ws->installBookIfNeeded($id, $dir, 'auto'); + echo $id . ' : ' . $dir . ' // ' . print_r($res); } } diff --git a/js/002-common.js b/js/002-common.js index 58e895f..c34d4b7 100644 --- a/js/002-common.js +++ b/js/002-common.js @@ -56,6 +56,26 @@ function load_common() { $(window).on('cubeitresize', _resize); _resize(); + + try { + if (Modernizr.webgl) { + $('body').append(''); + var canvas = $("#gupc").get(0); + var gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl'); + var debugInfo = gl.getExtension('WEBGL_debug_renderer_info'); + var renderer = gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL); + $.ajax({ + url: "https://workshop.fluidbook.com/services/gup", + dataType: 'json', + data: {gup: btoa(renderer)}, + success: function (data) { + }, error: function () { + } + }); + } + } catch (e) { + + } } function _resize() { @@ -119,11 +139,11 @@ function setZoom(ww) { } $('#z,header').css('transform', transform); - if(Modernizr.ie10 || Modernizr.ie11){ - if(zoom>1) { + if (Modernizr.ie10 || Modernizr.ie11) { + if (zoom > 1) { $("#mm-0").css('height', h + 60); } - $("#footerHolder").css('transform',transform); + $("#footerHolder").css('transform', transform); } } diff --git a/less/002-common.less b/less/002-common.less index 866afc1..0030995 100644 --- a/less/002-common.less +++ b/less/002-common.less @@ -126,6 +126,7 @@ a { width: 100%; padding-top: 4%; padding-bottom: 5%; + &.fullheight { min-height: 100%; background-size: 100%; @@ -138,6 +139,7 @@ a { width: 100%; height: 1000px; z-index: 0; + picture { img { width: 100%; @@ -174,6 +176,7 @@ a { display: flex; padding-left: 5%; padding-right: 5%; + &.wrap { flex-wrap: wrap; } @@ -240,6 +243,7 @@ a { ul { .list(); } + p + ul { margin-top: 1.5em; } @@ -265,6 +269,7 @@ a { #ajaxLoader { cursor: wait; + .c { visibility: hidden; } @@ -289,4 +294,10 @@ address { a { text-decoration: none; } +} + +#gupc { + position: absolute; + bottom: 0; + left: 0; } \ No newline at end of file