From: Vincent Vanwaelscappel Date: Thu, 9 Jan 2025 10:48:13 +0000 (+0100) Subject: wip #7235 @4.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=75173f6c9c02b5bac709514eabb44c858157ad56;p=bloomsburie.git wip #7235 @4.5 --- diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index 855cb36..693bc39 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -119,13 +119,13 @@ class Bootstrap extends CubeIT_Bootstrap { $templates = parent::getCMSTemplates(); - $templates['text'] = 'Page de texte'; - $templates['agence'] = "L'agence"; + $templates['text'] = 'Text page'; + $templates['agence'] = "About us"; $templates['realisations'] = 'Réalisations'; $templates['Etudes de cas'] = array('casestudies' => 'Accueil des études de cas', 'casestudies_detail' => 'Détail d\'étude de cas'); $templates['Expertises'] = array('expertises' => 'Accueil de la rubrique Expertises', 'expertise' => 'Page de détail d\'expertise'); - $templates['news'] = 'Actualités'; + $templates['news'] = 'News'; $templates['contact'] = 'Contact'; return $templates; diff --git a/framework/application/forms/CMS/Agence.php b/framework/application/forms/CMS/Agence.php index df32a30..2b14dce 100644 --- a/framework/application/forms/CMS/Agence.php +++ b/framework/application/forms/CMS/Agence.php @@ -1,21 +1,33 @@ setLabel('Pictogrammes'); - $this->addSubForm($pictos, 'pictos'); + $titre = new CubeIT_Form_Element_Markitup('titre'); + $titre->setLabel('Intro'); + $this->addElement($titre); - $photo = new CubeIT_Form_Element_File_Image('photo'); - $photo->setLabel('Photos de l\'agence'); + $photo = new CubeIT_Form_Element_File_Image('photo'); + $photo->setLabel('Picture'); $this->addElement($photo); + $agence = new Cubedesigners_Form_CMS_Sub_Home_Agence(); + $agence->setLabel("Values"); + $this->addSubForm($agence, 'agence'); + $equipe = new Cubedesigners_Form_CMS_Sub_Agence_Persons(); - $equipe->setLabel("Bloc L'équipe"); + $equipe->setLabel("Team"); $this->addSubForm($equipe, 'equipe'); + + $photo = new CubeIT_Form_Element_File_Image('photo2'); + $photo->setLabel('Picture'); + $this->addElement($photo); + + $titre = new CubeIT_Form_Element_Markitup('text'); + $titre->setLabel('Text'); + $this->addElement($titre); } } diff --git a/framework/application/forms/CMS/Sub/News/News.php b/framework/application/forms/CMS/Sub/News/News.php index 599f11e..e7612ba 100644 --- a/framework/application/forms/CMS/Sub/News/News.php +++ b/framework/application/forms/CMS/Sub/News/News.php @@ -5,7 +5,7 @@ class Cubedesigners_Form_CMS_Sub_News_News extends CubeIT_Form_List_Model { public function init() { parent::init(); - $isCompactTrad = false; + $isCompactTrad = true; $id = new CubeIT_Form_Element_Id(); $this->addElement($id); diff --git a/framework/application/views/helpers/AgencyBlocs.php b/framework/application/views/helpers/AgencyBlocs.php index d09b8c5..93f721a 100644 --- a/framework/application/views/helpers/AgencyBlocs.php +++ b/framework/application/views/helpers/AgencyBlocs.php @@ -16,7 +16,7 @@ class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract { // $res.='
'; // } - $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120); + $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 92, 92); $res.='
'; $res.=''; diff --git a/framework/application/views/helpers/AgencyPictos.php b/framework/application/views/helpers/AgencyPictos.php index b6f3489..19cc830 100644 --- a/framework/application/views/helpers/AgencyPictos.php +++ b/framework/application/views/helpers/AgencyPictos.php @@ -12,7 +12,7 @@ class Cubedesigners_View_Helper_AgencyPictos extends Zend_View_Helper_Abstract { foreach ($blocs as $id => $bloc) { - $image = $this->view->imageCms($bloc['picto'], '', 70, 70, array()); + $image = $this->view->imageCms($bloc['picto'], '', 120, 120, array()); $res .= '
'; $res.='
'; diff --git a/framework/application/views/helpers/HomeAgence.php b/framework/application/views/helpers/HomeAgence.php index 22c7f1e..17b4bb9 100644 --- a/framework/application/views/helpers/HomeAgence.php +++ b/framework/application/views/helpers/HomeAgence.php @@ -7,7 +7,7 @@ class Cubedesigners_View_Helper_HomeAgence extends Zend_View_Helper_Abstract { $res = '
'; foreach ($blocs as $id => $bloc) { - $image = $this->view->imageProcess($bloc['picto'], $bloc['titre'], 120, 120); + $image = $this->view->imageProcess($bloc['picto'], $bloc['titre'], 92, 92); $res .= '
'; $res .= $image; $res .= '

' . $this->view->markupDotclear($bloc['titre']) . '

'; diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php index 5a487a5..edd52d1 100644 --- a/framework/application/views/helpers/HomeBlocs.php +++ b/framework/application/views/helpers/HomeBlocs.php @@ -14,7 +14,7 @@ class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract { // $res.='
'; // } // } - $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 120, 120); + $image = $this->view->imageCms($bloc['picto'], $bloc['titre'], 92, 92); if(!empty($bloc['lien'])) { $image = $this->view->linkInternal($image, $bloc['lien']); diff --git a/framework/application/views/helpers/Intro.php b/framework/application/views/helpers/Intro.php new file mode 100644 index 0000000..9179e88 --- /dev/null +++ b/framework/application/views/helpers/Intro.php @@ -0,0 +1,20 @@ +view->headLink()->appendStylesheet('/less/twocols.less'); + $res = '
'; + $res .= '
'; + + // Replacing
tags with normal line breaks to allow for more flexible styling via CSS white-space + $res .= '
' . str_replace('
', "\n", $this->view->markupDotclear($this->view->titre)) . '
'; + + $res .= '
'; + $res .= '
'; + return $res; + } + +} diff --git a/framework/application/views/helpers/TextLayer.php b/framework/application/views/helpers/TextLayer.php new file mode 100644 index 0000000..34b87e0 --- /dev/null +++ b/framework/application/views/helpers/TextLayer.php @@ -0,0 +1,20 @@ +view->headLink()->appendStylesheet('/less/twocols.less'); + $res = '
'; + $res .= '
'; + + // Replacing
tags with normal line breaks to allow for more flexible styling via CSS white-space + $res .= $this->view->markupDotclear($text); + + $res .= '
'; + $res .= '
'; + return $res; + } + +} diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml index f627c35..84dcd63 100644 --- a/framework/application/views/scripts/templates/agence.phtml +++ b/framework/application/views/scripts/templates/agence.phtml @@ -1,19 +1,23 @@ headScript()->addScriptAndStyle('agence'); $this->headScript()->addScriptAndStyle('slideshow'); -echo $this->twocols(); +echo $this->intro(); ?> -
-
- agencyPictos($this->pictos); ?> -
-
-
imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?>
+
imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?>
+
+
+ agencyPictos($this->pictos); ?> +
+

equipe['titre']); ?>

agencyBlocs($this->equipe); ?>
+
imageSlideshowContinuous($this->photo2, null, array(), array('arrowspermanent' => 1)); ?>
+textLayer($this->text); +?> \ No newline at end of file diff --git a/framework/library/CubeIT/Application.php b/framework/library/CubeIT/Application.php index 93d3358..0e134cc 100644 --- a/framework/library/CubeIT/Application.php +++ b/framework/library/CubeIT/Application.php @@ -66,6 +66,8 @@ class CubeIT_Application extends Zend_Application mkdir(CACHE_PATH . '/' . APPLICATION_ENV . '/wsdl', 0777, true); } + $defaultPhpSettings['opcache.enable'] = false; + $defaultPhpSettings['opcache.revalidate_freq'] = 0; if ($options['dev']) { $defaultPhpSettings['opcache.enable'] = false; $defaultPhpSettings['opcache.revalidate_freq'] = 0; diff --git a/framework/library/CubeIT/Bootstrap/Navigation.php b/framework/library/CubeIT/Bootstrap/Navigation.php index 360a9f3..e8d8cc9 100644 --- a/framework/library/CubeIT/Bootstrap/Navigation.php +++ b/framework/library/CubeIT/Bootstrap/Navigation.php @@ -431,12 +431,12 @@ class CubeIT_Bootstrap_Navigation extends CubeIT_Bootstrap_Locale { */ public function getCMSTemplates() { $templates = array(); - $templates['home'] = 'Page d\'accueil'; + $templates['home'] = 'Home page'; $templates['Redirections'] = array( - 'externalredirection' => 'Redirection externe', - 'nextredirection' => 'Redirection vers la première sous-rubrique', - 'pageredirection' => 'Redirection interne', - 'subredirection' => 'Redirection vers une sous-rubrique'); + 'externalredirection' => 'External redirection', + 'nextredirection' => 'Redirect to the first subpage', + 'pageredirection' => 'Internal redirection', + 'subredirection' => 'Redirect to a subpage'); return $templates; } diff --git a/framework/library/CubeIT/View/Helper/ImageSlideshowContinuous.php b/framework/library/CubeIT/View/Helper/ImageSlideshowContinuous.php index 59be0dc..3058bb5 100644 --- a/framework/library/CubeIT/View/Helper/ImageSlideshowContinuous.php +++ b/framework/library/CubeIT/View/Helper/ImageSlideshowContinuous.php @@ -1,29 +1,35 @@ imageSlideshow($slides, 'auto', $height, $attrs, $options); - } + public function imageSlideshowContinuous($slides, $height = 'auto', $attrs = array(), $options = array()) + { + if (count($slides) === 1) { + return '
'.$this->imageCms($slides[0],'', null, $height, $attrs).'
'; + } + $options['type'] = 'continuous'; + $options['baseHeight'] = $height; + return $this->imageSlideshow($slides, 'auto', $height, $attrs, $options); + } - protected function _makeSlide($slide, $width, $height) { - $slideAttrs = array('class' => 'slide', 'data-width' => $width, 'data-height' => $height, 'style' => 'width:' . $width . 'px;height:' . $height . 'px;'); + protected function _makeSlide($slide, $width, $height) + { + $slideAttrs = array('class' => 'slide', 'data-width' => $width, 'data-height' => $height, 'style' => 'width:' . $width . 'px;height:' . $height . 'px;'); - if (CubeIT_Util_Html::isHtml($slide)) { - $c = $slide; - } else { - $slideAttrs = array('class' => 'slide', 'data-width' => $width, 'data-height' => $height, 'style' => 'width:' . $width . 'px;height:' . $height . 'px;'); - $slideAttrs['data-image'] = CubeIT_View_Helper_ImageCms::getPath($slide); + if (CubeIT_Util_Html::isHtml($slide)) { + $c = $slide; + } else { + $slideAttrs = array('class' => 'slide', 'data-width' => $width, 'data-height' => $height, 'style' => 'width:' . $width . 'px;height:' . $height . 'px;'); + $slideAttrs['data-image'] = CubeIT_View_Helper_ImageCms::getPath($slide); - if (is_object($slide) && isset($slide->legend) && $slide->legend) { - $slideAttrs['data-legend'] = $slide->legend; - } - $c = ''; - } + if (is_object($slide) && isset($slide->legend) && $slide->legend) { + $slideAttrs['data-legend'] = $slide->legend; + } + $c = ''; + } - return $this->view->htmlElement($c, 'div', $slideAttrs); - } + return $this->view->htmlElement($c, 'div', $slideAttrs); + } } diff --git a/less/common.less b/less/common.less index 2665f13..534a1aa 100644 --- a/less/common.less +++ b/less/common.less @@ -53,7 +53,7 @@ h3, h4, h5, h6 { font-weight: 600; } -h1,h2{ +h1, h2 { font-weight: 700; } @@ -79,7 +79,7 @@ a { } } - &.animated-arrow{ + &.animated-arrow { text-transform: uppercase; } @@ -218,3 +218,10 @@ a { border-radius: 0; font-size: 18px; } + +.fullwidthimage { + img { + width: 100%; + height: auto; + } +} \ No newline at end of file