]> _ Git - bloomsburie.git/commitdiff
wait #7327 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 13 Feb 2025 10:01:31 +0000 (11:01 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 13 Feb 2025 10:01:31 +0000 (11:01 +0100)
files/voeux/index_en.html [deleted file]
files/voeux/index_fr.html [deleted file]
framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
framework/application/views/helpers/HomeSlideshow.php
less/home.less

diff --git a/files/voeux/index_en.html b/files/voeux/index_en.html
deleted file mode 100644 (file)
index 9cf6edb..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Happy New Year - Fluidbook and Cubedesigners!</title>
-    <style type="text/css">
-        * {
-            margin: 0;
-            padding: 0;
-        }
-
-        body, html {
-            height: 100%;
-        }
-
-        body {
-            background-color: #000000;
-            text-align: center;
-        }
-
-        videoWrapper {
-            position: relative;
-            padding-bottom: 66.66%; /* 16:9 */
-            padding-top: 0px;
-            height: 0;
-        }
-
-        .videoWrapper iframe {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-        }
-
-
-    </style>
-</head>
-<body>
-<div class="videoWrapper">
-    <iframe src="https://www.youtube.com/embed/CvqhEKsu_xM?autoplay=1&modestbranding=1&showinfo=0&rel=0&autohide=1"
-            frameborder="0"
-            allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-            allowfullscreen></iframe>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/files/voeux/index_fr.html b/files/voeux/index_fr.html
deleted file mode 100644 (file)
index 7941397..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Heureuse Nouvelle AnnĂ©e - Fluidbook et Cubedesigners !</title>
-<style type="text/css">
-*{margin:0;
-padding:0;
-}
-body,html {
-       height:100%;
-}
-body {
-      background-color:#000000;
-    text-align:center;
- }
-videoWrapper {
-       position: relative;
-       padding-bottom: 66.66%; /* 16:9 */
-       padding-top: 0px;
-       height: 0;
-}
-.videoWrapper iframe {
-       position: absolute;
-       top: 0;
-       left: 0;
-       width: 100%;
-       height: 100%;
-}
-</style>
-</head>
-<body>
-<div class="videoWrapper">
-    <iframe src="https://www.youtube.com/embed/8plWWGFw8qg?autoplay=1&modestbranding=1&showinfo=0&rel=0&autohide=1"
-            frameborder="0"
-            allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-            allowfullscreen></iframe>
-</div>
-</body>
-</html>
\ No newline at end of file
index 585c5082245eb53da774ab6843f3186febcc4b7d..da46f17b26aae6ecc57dde3f172d6a856c83939a 100644 (file)
@@ -1,26 +1,40 @@
 <?php
 
-class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide extends CubeIT_Form_SubForm {
+class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide extends CubeIT_Form_SubForm
+{
 
-       public function init() {
-               parent::init();
+    public function init()
+    {
+        parent::init();
 
-               $image = new CubeIT_Form_Element_File_Image('image');
-               $image->setLabel('Image');
-               $image->setMaxItems(1);
-               $this->addElement($image);
+        $image = new CubeIT_Form_Element_File_Image('image');
+        $image->setLabel('Image');
+        $image->setMaxItems(1);
+        $this->addElement($image);
 
-               $legend = new CubeIT_Form_Element_Markitup('legende');
-               $legend->setLabel('Legende');
-               $this->addElement($legend);
+        $overlay = new CubeIT_Form_Element_Color('overlay');
+        $overlay->setLabel('Overlay color');
+        $overlay->setValue('#065495');
+        $this->addElement($overlay);
 
-               $time = new Zend_Form_Element_Text('time');
-               $time->setLabel("Temps d'affichage (en secondes)");
-               $this->addElement($time);
+        $overlay = new CubeIT_Form_Element_Int('overlayOpacity');
+        $overlay->setLabel('Overlay opacity');
+        $overlay->setMax(100);
+        $overlay->setMin(0);
+        $overlay->setValue(80);
+        $this->addElement($overlay);
 
-               $link = new CubeIT_Form_Element_Link('lien');
-               $link->labelEnabled(false);
-               $this->addSubForm($link, 'lien');
-       }
+        $legend = new CubeIT_Form_Element_Markitup('legende');
+        $legend->setLabel('Legende');
+        $this->addElement($legend);
+
+        $time = new Zend_Form_Element_Text('time');
+        $time->setLabel("Temps d'affichage (en secondes)");
+        $this->addElement($time);
+
+        $link = new CubeIT_Form_Element_Link('lien');
+        $link->labelEnabled(false);
+        $this->addSubForm($link, 'lien');
+    }
 
 }
\ No newline at end of file
index 862e71b521469008a6844eb0af61c3f3422422fe..ea75bf6e6959df0f0658cb8713881310835057dd 100644 (file)
@@ -25,7 +25,8 @@ class Cubedesigners_View_Helper_HomeSlideshow extends CubeIT_View_Helper_Abstrac
                        }
 
             // Slide image is in a separate absolutely positioned div to allow it to be animated with the scale function
-            $image_attributes['style'] = 'background-image:url("' . CubeIT_View_Helper_ImageCms::getPath($slide['image']) . '");';
+            $bgc=CubeIT_Graphics_Color::colorToCSS($slide['overlay'], $slide['overlayOpacity']);
+            $image_attributes['style'] = 'background-image:url("' . CubeIT_View_Helper_ImageCms::getPath($slide['image']) . '");background-color:'.$bgc.';';
             $image_attributes['class'] = 'slide-bg';
             $slide_image = $this->view->htmlElement('', 'span', $image_attributes); // making it a span because of existing CSS that affects all divs in this context
 
index 6d8da196bbde3d053de88ded3cf7e9de1336e909..19d3ce38250c368631f097f6c4ddb5823e50ab6e 100644 (file)
@@ -1,26 +1,28 @@
 @import "00-constants";
 
 #headerPlaceholder {
-       display: none;
+  display: none;
 }
 
 /* Home Title */
 .home-title {
-       padding: 50px 0px 50px 0;
-       h1 {
-               font-weight: 300;
-               text-align: center;
-               font-size: 56px;
-       }
-       h2 {
-               font-weight: 300;
-               text-align: center;
-               font-size: 32px;
-       }
+  padding: 50px 0px 50px 0;
+
+  h1 {
+    font-weight: 300;
+    text-align: center;
+    font-size: 56px;
+  }
+
+  h2 {
+    font-weight: 300;
+    text-align: center;
+    font-size: 32px;
+  }
 }
 
 nav.active[role="navigation"] {
-       padding-bottom: 50px !important;
+  padding-bottom: 50px !important;
 }
 
 /* Home Slideshow */
@@ -49,143 +51,145 @@ nav.active[role="navigation"] {
 //}
 
 #home-slideshow {
-       overflow: visible;
-       //margin-top: -130px;
-       .slides-holder {
-               overflow: visible;
-               .slides {
-                       .slideshowmixin();
-                       .slide {
-                               //                              background-blend-mode: multiply;
-                               overflow: hidden;
-                               .slide-bg {
-                                       position: absolute;
-                                       top: 0;
-                                       left: 0;
-                                       width: 100%;
-                                       height: 100%;
-                                       background-color: @black; // Base colour needed so menu and text is readable before image loads
-                                       background-size: cover;
-                                       background-repeat: no-repeat;
-                                       background-position: 50% 0;
-                                       //                  -moz-animation: bg-anim 15s linear 1s infinite;
-                                       //                  -webkit-animation: bg-anim 15s linear 1s infinite;
-                                       //                  transform: scale(1);
-                                       display: block;
-                                       //z-index: -2; // Why was this here?? Doesn't seem to be needed and causes a bug with first slide display now
-                               }
-
-                               > div {
-
-                                       text-align: center;
-                                       color: #fff;
-                                       .content-center();
-                                       margin: 0 auto;
-
-                                       h1 {
-                                               font-size: 90px;
-                                               text-transform: none;
-                                               font-weight: 600;
-                                       }
-
-                                       h2 {
-                                               font-weight: 300;
-                                               text-transform: none;
-                                               font-size: 35px;
-                                       }
-
-                                       p {
-                                               margin: 45px 0 0 0;
-                                       }
-
-                                       img {
-                                               margin: 0 15px;
-                                       }
-                               }
-
-                               a {
-                                       display: block;
-                                       height: 100%;
-                                       left: 0;
-                                       position: absolute;
-                                       top: 0;
-                                       width: 100%;
-                                       opacity: 0;
-                               }
-                       }
-               }
-       }
-
-       .scrollarrow {
-               position: absolute;
-               bottom: 10px;
-               left: 0;
-               width: 100%;
-               height: 105px;
-               margin: 5px 0 0 0;
-               z-index: 11;
-
-               a {
-                       display: block;
-                       height: 105px;
-                       background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNS4wLjIsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4wLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSLzIwMDEvUkVDLVNWRy0yMDAxMDkwNC9EVEQvc3ZnMTAuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4wIiBpZD0iSXNvbGF0aW9uX01vZGUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCINCgkgeT0iMHB4IiB3aWR0aD0iNjcuMjE5cHgiIGhlaWdodD0iMzVweCIgdmlld0JveD0iMCAwIDY3LjIxOSAzNSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjcuMjE5IDM1IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0zMy42NzIsMzVjLTAuMzQxLDAtMC42ODEtMC4xMjktMC45NC0wLjM4OUwwLjM4OSwyLjI2OGMtMC41MTktMC41MTktMC41MTktMS4zNiwwLTEuODc5DQoJczEuMzYtMC41MTksMS44NzksMGwzMS40MDQsMzEuNDAzbDMxLjI4LTMxLjI4YzAuNTE5LTAuNTE5LDEuMzYtMC41MTksMS44NzksMGMwLjUxOCwwLjUxOSwwLjUxOCwxLjM2LDAsMS44NzlMMzQuNjEsMzQuNjExDQoJQzM0LjM1MSwzNC44NzEsMzQuMDExLDM1LDMzLjY3MiwzNXoiLz4NCjwvc3ZnPg0K');
-                       background-position: 50% -10px;
-                       opacity: 0;
-               }
-       }
+  overflow: visible;
+  //margin-top: -130px;
+  .slides-holder {
+    overflow: visible;
+
+    .slides {
+      .slideshowmixin();
+
+      .slide {
+        //                             background-blend-mode: multiply;
+        overflow: hidden;
+
+        .slide-bg {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          background-color: @black; // Base colour needed so menu and text is readable before image loads
+          background-size: cover;
+          background-repeat: no-repeat;
+          background-position: 50% 0;
+          display: block;
+          background-blend-mode: multiply;
+        }
+
+        > div {
+
+          text-align: center;
+          color: #fff;
+          .content-center();
+          margin: 0 auto;
+
+          h1 {
+            font-size: 90px;
+            text-transform: none;
+            font-weight: 600;
+          }
+
+          h2 {
+            font-weight: 300;
+            text-transform: none;
+            font-size: 35px;
+          }
+
+          p {
+            margin: 45px 0 0 0;
+          }
+
+          img {
+            margin: 0 15px;
+          }
+        }
+
+        a {
+          display: block;
+          height: 100%;
+          left: 0;
+          position: absolute;
+          top: 0;
+          width: 100%;
+          opacity: 0;
+        }
+      }
+    }
+  }
+
+  .scrollarrow {
+    position: absolute;
+    bottom: 10px;
+    left: 0;
+    width: 100%;
+    height: 105px;
+    margin: 5px 0 0 0;
+    z-index: 11;
+
+    a {
+      display: block;
+      height: 105px;
+      background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNS4wLjIsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4wLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSLzIwMDEvUkVDLVNWRy0yMDAxMDkwNC9EVEQvc3ZnMTAuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4wIiBpZD0iSXNvbGF0aW9uX01vZGUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCINCgkgeT0iMHB4IiB3aWR0aD0iNjcuMjE5cHgiIGhlaWdodD0iMzVweCIgdmlld0JveD0iMCAwIDY3LjIxOSAzNSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjcuMjE5IDM1IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0zMy42NzIsMzVjLTAuMzQxLDAtMC42ODEtMC4xMjktMC45NC0wLjM4OUwwLjM4OSwyLjI2OGMtMC41MTktMC41MTktMC41MTktMS4zNiwwLTEuODc5DQoJczEuMzYtMC41MTksMS44NzksMGwzMS40MDQsMzEuNDAzbDMxLjI4LTMxLjI4YzAuNTE5LTAuNTE5LDEuMzYtMC41MTksMS44NzksMGMwLjUxOCwwLjUxOSwwLjUxOCwxLjM2LDAsMS44NzlMMzQuNjEsMzQuNjExDQoJQzM0LjM1MSwzNC44NzEsMzQuMDExLDM1LDMzLjY3MiwzNXoiLz4NCjwvc3ZnPg0K');
+      background-position: 50% -10px;
+      opacity: 0;
+    }
+  }
 
 }
 
 #casestudies {
-       background-color: #fff;
-       color: @black;
-       font-size: 22px;
-       padding: 10px 0 70px 0;
-
-       .title {
-               font-size: 56px;
-               padding-top: 0;
-               color: @black;
-               display: inline-block;
-       }
-
-       .intro {
-               margin-bottom: 30px;
-       }
-
-       a:hover .title {
-               color: @yellow;
-       }
-
-       .casestudies-list {
-               h2, h3 {
-                       color: #fff;
-                       font-weight: 300;
-               }
-               h2 {
-                       font-size: 32px;
-                       text-transform: none;
-                       margin-top: 15px ;
-                       @media screen and (max-width: 1000px) {
-                               font-size: 24px;
-                       }
-               }
-               h3 {
-                       font-size: 16px;
-                       margin-top: 7px;
-               }
-
-               a {
-                       width: 32.5%;
-                       max-width: 318px;
-                       height: auto;
-
-                       @media screen and (max-width: 768px) {
-                               // Switch to 2 columns
-                               width: 49%;
-                       }
-
-               }
-       }
+  background-color: #fff;
+  color: @black;
+  font-size: 22px;
+  padding: 10px 0 70px 0;
+
+  .title {
+    font-size: 56px;
+    padding-top: 0;
+    color: @black;
+    display: inline-block;
+  }
+
+  .intro {
+    margin-bottom: 30px;
+  }
+
+  a:hover .title {
+    color: @yellow;
+  }
+
+  .casestudies-list {
+    h2, h3 {
+      color: #fff;
+      font-weight: 300;
+    }
+
+    h2 {
+      font-size: 32px;
+      text-transform: none;
+      margin-top: 15px;
+      @media screen and (max-width: 1000px) {
+        font-size: 24px;
+      }
+    }
+
+    h3 {
+      font-size: 16px;
+      margin-top: 7px;
+    }
+
+    a {
+      width: 32.5%;
+      max-width: 318px;
+      height: auto;
+
+      @media screen and (max-width: 768px) {
+        // Switch to 2 columns
+        width: 49%;
+      }
+
+    }
+  }
 
 }