From: Vincent Vanwaelscappel Date: Tue, 5 Dec 2023 11:55:57 +0000 (+0100) Subject: wip #6549 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9afb252f359ac87a1f4cfa2a92c68cc51a76d0f1;p=cubedesigners-v7.git wip #6549 @0.5 --- diff --git a/.gitignore b/.gitignore index 0bcfcd4..a22c2ac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ framework/backup less/min js/min css/*.css -css/min \ No newline at end of file +css/min +framework/data/temp/* \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/cubedesigners-v7.iml b/.idea/cubedesigners-v7.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/cubedesigners-v7.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..f0787ee --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,359 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b658e95 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..23f3feb --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.ovhconfig b/.ovhconfig deleted file mode 100644 index e976c42..0000000 --- a/.ovhconfig +++ /dev/null @@ -1,4 +0,0 @@ -app.engine=php -app.engine.version=5.5 -http.firewall=none -environment=development \ No newline at end of file diff --git a/framework/application/views/helpers/AlertMessage.php b/framework/application/views/helpers/AlertMessage.php index d9f23ce..e233170 100644 --- a/framework/application/views/helpers/AlertMessage.php +++ b/framework/application/views/helpers/AlertMessage.php @@ -3,7 +3,7 @@ class Cubedesigners_View_Helper_AlertMessage extends CubeIT_View_Helper_Abstract { public function alertMessage() { - + if (!Bootstrap::getInstance()->getOpt('alert_message_enabled', false) || Bootstrap::getInstance()->getSession()->hideAlertMessage) { return ''; } diff --git a/js/casestudies.js b/js/casestudies.js index 21d4a69..2a5f7a4 100644 --- a/js/casestudies.js +++ b/js/casestudies.js @@ -1,14 +1,14 @@ TO_LOAD_ONCE[TO_LOAD_ONCE.length] = 'load_casestudies();'; function load_casestudies() { - $('#casestudies-list-filter').selectric({ - maxHeight: 450, - arrowButtonMarkup: '', // Disable dropdown element since we are using an SVG in the background - disableOnMobile: true, - onChange: function(element) { - $(element).change(); // Trigger change on select box so isotope will update (see isotope-select.js) - }, - }); + $('#casestudies-list-filter').selectric({ + maxHeight: 450, + arrowButtonMarkup: '', // Disable dropdown element since we are using an SVG in the background + disableOnMobile: true, + onChange: function (element) { + $(element).change(); // Trigger change on select box so isotope will update (see isotope-select.js) + }, + }); } diff --git a/js/common.js b/js/common.js index de8f872..b8594c2 100644 --- a/js/common.js +++ b/js/common.js @@ -4,7 +4,7 @@ registerLoader(load_commons_once, true); function load_commons_once() { // Modify WOW.js to allow resetting animated status (see taglist.js) - WOW.prototype.addBox = function(element){ + WOW.prototype.addBox = function (element) { this.boxes.push(element); }; window.wow = new WOW(); @@ -77,7 +77,11 @@ function load_commons() { } function resize() { - + $('.detail-visuel iframe.oam').each(function () { + var ratio = parseInt($(this).attr('width')) / parseInt($(this).attr('height')); + var height = $(this).outerWidth() / ratio; + $(this).css('height', height); + }); } function orientationchange() { diff --git a/less/casestudies_detail.less b/less/casestudies_detail.less index 8d03bc1..a9798ea 100644 --- a/less/casestudies_detail.less +++ b/less/casestudies_detail.less @@ -135,6 +135,10 @@ // (caused by images being inline elements and having space for character descenders). // This is a better solution than setting it to display:block because images can still be aligned this way. } + + iframe.oam{ + max-width: 100%; + } } .detail-video-background { diff --git a/translations_en.xlsx b/translations_en.xlsx deleted file mode 100644 index a074fd9..0000000 Binary files a/translations_en.xlsx and /dev/null differ