]> _ Git - bloomsburie.git/commitdiff
wip #7260 @3
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 16 Jan 2025 15:01:40 +0000 (16:01 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 16 Jan 2025 15:01:40 +0000 (16:01 +0100)
16 files changed:
framework/application/Bootstrap.php
framework/application/forms/CMS/Carrers.php
framework/application/forms/CMS/Element/Positions.php [new file with mode: 0644]
framework/application/forms/CMS/Element/Realisations.php [deleted file]
framework/application/forms/CMS/Sub/Positions/Positions.php [new file with mode: 0644]
framework/application/forms/CMS/Sub/Realisations/Realisations.php [deleted file]
framework/application/models/Position.php [new file with mode: 0644]
framework/application/models/Realisation.php [deleted file]
framework/application/views/helpers/CarrersPositions.php [new file with mode: 0644]
framework/application/views/helpers/RealisationsList.php [deleted file]
framework/application/views/helpers/TextLayer.php
framework/application/views/scripts/positions/index.phtml [new file with mode: 0644]
framework/application/views/scripts/realisations/index.phtml [deleted file]
framework/application/views/scripts/templates/carrers.phtml
less/carrers.less [new file with mode: 0644]
less/realisations.less [deleted file]

index 23dc2f0f057e64abfaa83733d62b6b18eaf00b8c..c29229611c120fb2e3fcec967815881731c28cef 100644 (file)
@@ -38,8 +38,8 @@ class Bootstrap extends CubeIT_Bootstrap
             $this->addStudiesPages($page, $locale, $isAdmin);
         }
 
-        if ($page->getTemplate() == 'realisations') {
-            $this->addRealisationsPages($page, $locale, $isAdmin);
+        if ($page->getTemplate() == 'carrers') {
+            $this->addCarrersPages($page, $locale, $isAdmin);
         }
     }
 
@@ -47,12 +47,12 @@ class Bootstrap extends CubeIT_Bootstrap
      *
      * @param CubeIT_Navigation_Page_Locale $page
      */
-    protected function addRealisationsPages($page, $locale, $isAdmin)
+    protected function addCarrersPages($page, $locale, $isAdmin)
     {
 
         $datas = $this->getCMSDatasOfNavigationPage($page);
         $db = Zend_Db_Table::getDefaultAdapter();
-        $s = $db->select()->from('realisations')
+        $s = $db->select()->from('positions')
             ->order('id ASC');
         $q = $s->query();
 
@@ -67,16 +67,16 @@ class Bootstrap extends CubeIT_Bootstrap
             }
 
             $p = new CubeIT_Navigation_Page_Locale();
-            $p->setController('Realisations');
+            $p->setController('Positions');
             $p->setId($page->getId() . '/' . $r->id);
-            $p->setUri(Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea'], $page->getLocale()));
+            $p->setUri(Cubedesigners_Util::generateAutoUri($r, 'Position/%title', $page->getLocale()));
             $p->setSitemap($online);
             $p->setEditable(false);
             $p->setOnline($online);
             $p->setDomain($page->getDomain());
             $p->setLabel($r->titre);
             $p->setTitle($r->titre);
-            $p->setParams(array('realisation_id' => $r->id));
+            $p->setParams(array('position_id' => $r->id));
             $page->addPage($p);
         }
     }
@@ -129,8 +129,7 @@ class Bootstrap extends CubeIT_Bootstrap
 
         $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['casestudies'] = 'Portfolio';
         $templates['services'] = 'Services';
         $templates['recommendation'] = 'Recommendation';
         $templates['recognition'] = 'Recognition';
@@ -148,104 +147,104 @@ class Bootstrap extends CubeIT_Bootstrap
      */
     public function handleRedirections($req)
     {
-        $res = parent::handleRedirections($req);
-        if ($res !== false) {
-
-            return $res;
-        }
-
-        $path = trim($req->getPathInfo(), '/ ');
-        $e = explode('/', $path);
-        $locale = array_shift($e);
-        fb($locale);
-
-        $res = '/';
-
-
-        if (!count($e)) {
-            return $res;
-        }
-
-        if ($locale == 'references_web') {
-            $res .= 'Portfolio';
-            return $res;
-        }
-
-        if ($locale != 'fr' && $locale != 'en') {
-            return false;
-        }
-
-        if ($locale == 'fr' && $_SERVER['HTTP_HOST'] == 'www.cubedesigners.com') {
-            return 'http://www.cubedesigners.fr/' . $_SERVER['REQUEST_URI'];
-        }
-        if ($locale == 'en' && $_SERVER['HTTP_HOST'] == 'www.cubedesigners.fr') {
-            return 'http://www.cubedesigners.com/' . $_SERVER['REQUEST_URI'];
-        }
-
-        if (count($e) == 1) {
-            $u = $e[0];
-            if ($u == 'en') {
-                return $res;
-            }
-            if ($u == '1-Sites-internet') {
-                $res .= 'Projets-Web';
-            } elseif ($u == '2-Design-graphique') {
-                $res .= 'Graphisme';
-            } elseif ($u == '3-Design-industriel') {
-                $res .= 'Design-industriel';
-            } elseif ($u == '4-Multimedia-Jeux') {
-                $res .= 'Multimedia';
-            } elseif ($u == '5-Films-Animation') {
-                $res .= 'Multimedia';
-            } elseif ($u == '6-Applications-mobiles') {
-                $res .= 'Projets-Web';
-            } elseif ($u == '7-En-attente') {
-                $res .= 'Graphisme';
-            } elseif ($u == '1-Websites') {
-                $res .= 'Web-projects';
-            } elseif ($u == '2-Graphic-design') {
-                $res .= 'Graphical-design';
-            } elseif ($u == '3-Industrial-design') {
-                $res .= 'Industrial-design';
-            } elseif ($u == '4-Multimedia-Games') {
-                $res .= 'Multimedia';
-            } elseif ($u == '5-Motion-Graphics') {
-                $res .= 'Multimedia';
-            } elseif ($u == '6-Mobile-applications') {
-                $res .= 'Web-projects';
-            } elseif ($u == '7-Waiting') {
-                $res .= 'Graphical-design';
-            }
-
-            return $res;
-        }
-
-        if (count($e) == 3) {
-            if ($e[0] == 'Sites-internet') {
-                $e[0] = 'Site-Web';
-            } elseif ($e[0] == 'Multimedia-Jeux' || $e[0] == 'Multimedia-Games') {
-                $e[0] = 'Multimedia';
-            } elseif ($e[0] == 'Motion-Graphics') {
-                $e[0] = 'Motion-graphics';
-            } elseif ($e[0] == 'Graphic-design') {
-                $e[0] = 'Graphic-Design';
-            } elseif ($e[0] == 'Mobile-applications') {
-                $e[0] = 'Websites';
-            }
-
-            // Projects
-            /// Mobile-applications/Heredis/114-Heredis-App => Applications-mobiles/Heredis-Heredis-App
-            $ee = explode('-', $e[2], 2);
-            $id = array_shift($ee);
-            /*$p=$this->getNavigation()->findOneBy('id',$locale.'/3/'.$id);
-            if(null!==$p){
-                //return $p->getHref();
-            }*/
-
-            $res .= $e[0] . '/' . $e[1] . '-' . implode('-', $ee);
-            return $res;
-        }
-
+//        $res = parent::handleRedirections($req);
+//        if ($res !== false) {
+//
+//            return $res;
+//        }
+//
+//        $path = trim($req->getPathInfo(), '/ ');
+//        $e = explode('/', $path);
+//        $locale = array_shift($e);
+//        fb($locale);
+//
+//        $res = '/';
+//
+//
+//        if (!count($e)) {
+//            return $res;
+//        }
+//
+//        if ($locale == 'references_web') {
+//            $res .= 'Portfolio';
+//            return $res;
+//        }
+//
+//        if ($locale != 'fr' && $locale != 'en') {
+//            return false;
+//        }
+//
+//        if ($locale == 'fr' && $_SERVER['HTTP_HOST'] == 'www.cubedesigners.com') {
+//            return 'http://www.cubedesigners.fr/' . $_SERVER['REQUEST_URI'];
+//        }
+//        if ($locale == 'en' && $_SERVER['HTTP_HOST'] == 'www.cubedesigners.fr') {
+//            return 'http://www.cubedesigners.com/' . $_SERVER['REQUEST_URI'];
+//        }
+//
+//        if (count($e) == 1) {
+//            $u = $e[0];
+//            if ($u == 'en') {
+//                return $res;
+//            }
+//            if ($u == '1-Sites-internet') {
+//                $res .= 'Projets-Web';
+//            } elseif ($u == '2-Design-graphique') {
+//                $res .= 'Graphisme';
+//            } elseif ($u == '3-Design-industriel') {
+//                $res .= 'Design-industriel';
+//            } elseif ($u == '4-Multimedia-Jeux') {
+//                $res .= 'Multimedia';
+//            } elseif ($u == '5-Films-Animation') {
+//                $res .= 'Multimedia';
+//            } elseif ($u == '6-Applications-mobiles') {
+//                $res .= 'Projets-Web';
+//            } elseif ($u == '7-En-attente') {
+//                $res .= 'Graphisme';
+//            } elseif ($u == '1-Websites') {
+//                $res .= 'Web-projects';
+//            } elseif ($u == '2-Graphic-design') {
+//                $res .= 'Graphical-design';
+//            } elseif ($u == '3-Industrial-design') {
+//                $res .= 'Industrial-design';
+//            } elseif ($u == '4-Multimedia-Games') {
+//                $res .= 'Multimedia';
+//            } elseif ($u == '5-Motion-Graphics') {
+//                $res .= 'Multimedia';
+//            } elseif ($u == '6-Mobile-applications') {
+//                $res .= 'Web-projects';
+//            } elseif ($u == '7-Waiting') {
+//                $res .= 'Graphical-design';
+//            }
+//
+//            return $res;
+//        }
+//
+//        if (count($e) == 3) {
+//            if ($e[0] == 'Sites-internet') {
+//                $e[0] = 'Site-Web';
+//            } elseif ($e[0] == 'Multimedia-Jeux' || $e[0] == 'Multimedia-Games') {
+//                $e[0] = 'Multimedia';
+//            } elseif ($e[0] == 'Motion-Graphics') {
+//                $e[0] = 'Motion-graphics';
+//            } elseif ($e[0] == 'Graphic-design') {
+//                $e[0] = 'Graphic-Design';
+//            } elseif ($e[0] == 'Mobile-applications') {
+//                $e[0] = 'Websites';
+//            }
+//
+//            // Projects
+//            /// Mobile-applications/Heredis/114-Heredis-App => Applications-mobiles/Heredis-Heredis-App
+//            $ee = explode('-', $e[2], 2);
+//            $id = array_shift($ee);
+//            /*$p=$this->getNavigation()->findOneBy('id',$locale.'/3/'.$id);
+//            if(null!==$p){
+//                //return $p->getHref();
+//            }*/
+//
+//            $res .= $e[0] . '/' . $e[1] . '-' . implode('-', $ee);
+//            return $res;
+//        }
+//
         return false;
     }
 
index a9b7b3143f7ad3e90716fe63f15e805e6aa5443d..5a62714e1be9e813a10c7adc24c2603fc9d0804d 100644 (file)
@@ -18,6 +18,14 @@ class Cubedesigners_Form_CMS_Carrers extends Cubedesigners_Form_CMS_Twocolumns
         $positions = new CubeIT_Form_Element_Markitup('positions');
         $positions->setLabel('Positions intro');
         $this->addElement($positions);
+
+        $positions = new Cubedesigners_Form_CMS_Element_Positions('positions_list');
+        $positions->setLabel('Manage positions');
+        $this->addElement($positions);
+
+        $positionsFooter=new CubeIT_Form_Element_Markitup('positions_footer');
+        $positionsFooter->setLabel('Positions footer');
+        $this->addElement($positionsFooter);
     }
 
 }
diff --git a/framework/application/forms/CMS/Element/Positions.php b/framework/application/forms/CMS/Element/Positions.php
new file mode 100644 (file)
index 0000000..e2b96bc
--- /dev/null
@@ -0,0 +1,12 @@
+<?php
+
+class Cubedesigners_Form_CMS_Element_Positions extends CubeIT_Form_Element_List {
+
+    public function init() {
+        parent::init();
+
+        $this->setBaseForm(new Cubedesigners_Form_CMS_Sub_Positions_Positions());
+        $this->clearDecorators();
+    }
+
+}
diff --git a/framework/application/forms/CMS/Element/Realisations.php b/framework/application/forms/CMS/Element/Realisations.php
deleted file mode 100644 (file)
index b8ec9eb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-class Cubedesigners_Form_CMS_Element_Realisations extends CubeIT_Form_Element_List {
-
-    public function init() {
-        parent::init();
-
-        $this->setBaseForm(new Cubedesigners_Form_CMS_Sub_Realisations_Realisations());
-        $this->clearDecorators();
-    }
-
-}
diff --git a/framework/application/forms/CMS/Sub/Positions/Positions.php b/framework/application/forms/CMS/Sub/Positions/Positions.php
new file mode 100644 (file)
index 0000000..8bfad16
--- /dev/null
@@ -0,0 +1,44 @@
+<?php
+
+class Cubedesigners_Form_CMS_Sub_Positions_Positions extends CubeIT_Form_List_Model {
+
+       public function init() {
+               parent::init();
+
+               $isCompactTrad = true;
+
+               $id = new CubeIT_Form_Element_Id();
+               $this->addElement($id);
+
+               $online = new Zend_Form_Element_Checkbox('online');
+               $online->setLabel('Online');
+               $this->addElement($online);
+
+               $titre = new Zend_Form_Element_Text('title');
+               $titre->setLabel('Title');
+        $this->addElementLocalized($titre,$isCompactTrad);
+
+               $left = new CubeIT_Form_Element_Markitup('columnleft');
+               $left->setLabel('Section 1 : Left column');
+               $this->addElementLocalized($left, $isCompactTrad);
+
+               $right = new CubeIT_Form_Element_Markitup('columnright');
+               $right->setLabel('Section 1 : Right column');
+               $this->addElementLocalized($right, $isCompactTrad);
+
+               $section_2 = new CubeIT_Form_Element_Markitup('responsabilities');
+               $section_2->setLabel('Responsabilities');
+               $this->addElementLocalized($section_2, $isCompactTrad);
+
+               $section_3 = new CubeIT_Form_Element_Markitup('requirements');
+               $section_3->setLabel('Requirements');
+               $this->addElementLocalized($section_3, $isCompactTrad);
+
+               $this->setListTitle('Positions')
+                       ->setNewTitle('Add a position')
+                       ->setEditTitle('Edit « $title »')
+                       ->setModel('Cubedesigners_Model_Position')
+                       ->setTitleColumn("title");
+       }
+
+}
diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
deleted file mode 100644 (file)
index 5352cc6..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_List_Model {
-
-       public function init() {
-               parent::init();
-
-               $isCompactTrad = true;
-
-               $id = new CubeIT_Form_Element_Id();
-               $this->addElement($id);
-
-               $online = new Zend_Form_Element_Checkbox('online');
-               $online->setLabel('En ligne');
-               $this->addElement($online);
-
-               $annee = new CubeIT_Form_Element_Date('date');
-               $annee->setPrecision(CubeIT_Date::MONTH);
-               $annee->setMinYear(1998);
-               $annee->setMaxYear('+1');
-               $annee->setLabel('Date');
-               $this->addElement($annee);
-
-               $titre = new Zend_Form_Element_Text('titre');
-               $titre->setLabel('Client');
-               $this->addElement($titre);
-
-               $legende = new Zend_Form_Element_Text('legende');
-               $legende->setLabel('Titre');
-               $this->addElementLocalized($legende, $isCompactTrad);
-
-               $agence = new Zend_Form_Element_Text('agence');
-               $agence->setLabel('Agence');
-               $this->addElement($agence);
-
-               $description = new CubeIT_Form_Element_Markitup_Basic('description');
-               $description->setLabel('Description');
-               $this->addElementLocalized($description, $isCompactTrad);
-
-               $url = new CubeIT_Form_Element_Link();
-               $url->setLegend('URL du site');
-               $this->addSubFormLocalized($url, 'url', $isCompactTrad);
-
-               $visuel = new CubeIT_Form_Element_File_Image('visuel');
-               $visuel->setLabel('Vignette');
-               $visuel->setMaxItems(1);
-               $this->addElement($visuel);
-
-               $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail');
-               $visuel_detail->setLabel('Images');
-               $this->addElement($visuel_detail);
-
-               $categories = new Cubedesigners_Form_Element_Categories('categories');
-               $categories->setLabel('Catégories');
-               $this->addElement($categories);
-
-               $tags = new Cubedesigners_Form_Element_Tags('tags_secondaires');
-               $tags->setLabel('Type de projet');
-               $this->addElement($tags);
-
-               $domaine = new Cubedesigners_Form_Element_Domaines('domaines');
-               $domaine->setLabel("Domaine d'activité");
-               $this->addElement($domaine);
-
-               $technologies = new Cubedesigners_Form_Element_Technologies('technologies');
-               $technologies->setLabel('Technologies');
-               $this->addElement($technologies);
-
-               $this->setListTitle('Réalisations')
-                       ->setNewTitle('Créer une réalisation')
-                       ->setEditTitle('Edition de la réalisation « $titre »')
-                       ->setModel('Cubedesigners_Model_Realisation')
-                       ->setTitleColumn("titre")
-                       ->setAdditionnalColumns(array('agence', 'date', 'categories', 'online'))
-                       ->setSearchColumns(array('titre', 'agence', 'date'));
-       }
-
-}
-
-?>
diff --git a/framework/application/models/Position.php b/framework/application/models/Position.php
new file mode 100644 (file)
index 0000000..51c7372
--- /dev/null
@@ -0,0 +1,24 @@
+<?php
+
+class Cubedesigners_Model_Position extends CubeIT_Model_Data_Table {
+
+       protected static $_table = 'positions';
+       protected $title;
+       protected $columnleft;
+       protected $columnright;
+       protected $responsabilities;
+       protected $requirements;
+       protected $online;
+
+       public static function getSchema($schema) {
+               $realisations = parent::getSchema($schema);
+               $realisations->addColumn('title', 'text');
+               $realisations->addColumn('columnleft', 'text');
+               $realisations->addColumn('columnright', 'text');
+               $realisations->addColumn('responsabilities', 'text');
+               $realisations->addColumn('requirements', 'text');
+               $realisations->addColumn('online', 'boolean');
+
+       }
+
+}
diff --git a/framework/application/models/Realisation.php b/framework/application/models/Realisation.php
deleted file mode 100644 (file)
index ef8e745..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-class Cubedesigners_Model_Realisation extends CubeIT_Model_Data_Table {
-
-       protected static $_table = 'realisations';
-       protected $titre;
-       protected $legende;
-       protected $agence;
-       protected $description;
-       protected $url;
-       protected $visuel;
-       protected $visuel_detail;
-       protected $categories;
-       protected $domaines;
-       protected $technologies;
-       protected $tags_secondaires;
-       protected $online;
-       protected $date;
-       protected $_types = array('date' => 'date');
-
-       public static function getSchema($schema) {
-               $realisations = parent::getSchema($schema);
-               $realisations->addColumn('titre', 'text');
-               $realisations->addColumn('legende', 'text');
-               $realisations->addColumn('agence', 'text');
-               $realisations->addColumn('description', 'text');
-               $realisations->addColumn('url', 'text');
-               $realisations->addColumn('visuel', 'string', array('length' => 128));
-               $realisations->addColumn('visuel_detail', 'text');
-               $realisations->addColumn('categories', 'text');
-               $realisations->addColumn('domaines', 'text');
-               $realisations->addColumn('technologies', 'text');
-               $realisations->addColumn('tags_secondaires', 'text');
-               $realisations->addColumn('online', 'boolean');
-               $realisations->addColumn('date', 'datetime');
-       }
-
-}
diff --git a/framework/application/views/helpers/CarrersPositions.php b/framework/application/views/helpers/CarrersPositions.php
new file mode 100644 (file)
index 0000000..689a287
--- /dev/null
@@ -0,0 +1,45 @@
+<?php
+
+class Cubedesigners_View_Helper_CarrersPositions extends CubeIT_View_Helper_Abstract
+{
+
+    public function carrersPositions($data)
+    {
+
+        $acl = Bootstrap::getInstance()->isAllowed("edition");
+
+        $db = Zend_Db_Table::getDefaultAdapter();
+        $s = $db->select()->from('positions');
+        //if (!$acl) {
+        $s->where('online = ?', 1);
+        //}
+
+        $q = $s->query();
+        if (!$q->rowCount()) {
+            return '';
+        }
+
+        $res = '<div class="contents positions">';
+
+
+        $positions = '';
+
+        while ($r = $q->fetch()) {
+            $r = CubeIT_Util_Cms::unserialize($r);
+
+            $attrs = [];
+            if ($acl && $r->online == 0) {
+                $attrs['data-offline'] = '1';
+            }
+
+            $url = Cubedesigners_Util::generateAutoUri($r, 'Position/%title%', $this->localeDefault());
+
+            $positions .= $this->link($r->title, $url, $attrs);
+        }
+        $res .= $this->textLayer($data->positions, 'blue pb-4vw pt-4vw', $positions);
+        $res .= '</div>';
+
+        return $res;
+    }
+
+}
diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php
deleted file mode 100644 (file)
index 8f46c4a..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abstract {
-
-       public function RealisationsList($datas) {
-
-               $acl = Bootstrap::getInstance()->isAllowed("edition");
-
-               $db = Zend_Db_Table::getDefaultAdapter();
-               $s = $db->select()->from('realisations')
-                       ->order('date DESC');
-               //if (!$acl) {
-                       $s->where('online = ?', 1);
-               //}
-
-               $q = $s->query();
-
-               $count = 1;
-
-               $res = '';
-
-               $test = 0;
-               while ($r = $q->fetch()) {
-                       $r = CubeIT_Util_Cms::unserialize($r);
-
-                       $addOffline = '';
-                       if ($acl && $r->online == 0) {
-                               $addOffline = 'data-offline="1"';
-                       }
-
-                       //$visuel = $this->view->imageProcess($r->visuel_detail, '', null, 440);
-
-            $rea = '<div class="img-wrapper">';
-            $rea .= $this->view->imageProcess($r->visuel, $r->titre, 284, 284);
-            $rea .= '</div>';
-//            fb($r, 'r');
-            $rea.= '<div class="details-positioner">';
-            $rea.= '<div class="details-holder">';
-            $rea.= '<div class="details">';
-            $rea.='<h2>' . $r->titre . '</h2>';
-            // replace last occurrence of space with nbsp; to prevent orphans (http://stackoverflow.com/a/18113904)
-            $rea.='<h3>' . strrev(implode(strrev('&nbsp;'), explode(' ', strrev($r->legende), 2)))  . '</h3>';
-            $rea.= '</div>'; // .details (display: table-cell)
-            $rea.= '</div>'; // .details-holder (display: table)
-            $rea.= '</div>'; // .details-positioner (display: block; position: absolute)
-
-                       $url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea'], $this->localeDefault());
-
-                       $res .= $this->link($rea, $url, array('data-id' => $r->id, 'data-cat' => $r->categories));
-               }
-
-               return $res;
-       }
-
-}
index 61c53254ca9087a0e3ada701a68072a4a06c24ae..99e84abc965f84b451d4e35a050f17c8b7559c83 100644 (file)
@@ -3,14 +3,15 @@
 class Cubedesigners_View_Helper_TextLayer extends Zend_View_Helper_Abstract
 {
 
-    public function textLayer($text,$class="")
+    public function textLayer($text, $class = "", $extraHTML = '')
     {
         $this->view->headLink()->appendStylesheet('/less/twocols.less');
-        $res = '<div class="title twocols content '.$class.'">';
+        $res = '<div class="title twocols content ' . $class . '">';
         $res .= '<section>';
 
         // Replacing <br /> tags with normal line breaks to allow for more flexible styling via CSS white-space
-        $res .=  $this->view->markupDotclear($text);
+        $res .= $this->view->markupDotclear($text);
+        $res .= $extraHTML;
 
         $res .= '</section>';
         $res .= '</div>';
diff --git a/framework/application/views/scripts/positions/index.phtml b/framework/application/views/scripts/positions/index.phtml
new file mode 100644 (file)
index 0000000..3fa1849
--- /dev/null
@@ -0,0 +1,9 @@
+<?php
+
+$r = CubeIT_Util_Cms::unserialize($this->realisation);
+$this->headTitle($r->titre . ' - ' . $r->legende . ' / ' . $this->currentPage->getParent()->getTitle(), 'SET');
+$this->headSeo()->setDescription($r->description);
+$this->headOpenGraph()->setDescription($r->description);
+
+$this->headScript()->addScriptAndStyle('realisations');
+echo $this->realisation($this->realisation);
diff --git a/framework/application/views/scripts/realisations/index.phtml b/framework/application/views/scripts/realisations/index.phtml
deleted file mode 100644 (file)
index 3fa1849..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$r = CubeIT_Util_Cms::unserialize($this->realisation);
-$this->headTitle($r->titre . ' - ' . $r->legende . ' / ' . $this->currentPage->getParent()->getTitle(), 'SET');
-$this->headSeo()->setDescription($r->description);
-$this->headOpenGraph()->setDescription($r->description);
-
-$this->headScript()->addScriptAndStyle('realisations');
-echo $this->realisation($this->realisation);
index f33f13780805f92247393be40f27acaf1e651a18..edb58fd39711b61fb9a1c6baf25e20bc7cda8b28 100644 (file)
@@ -5,9 +5,9 @@ echo $this->twocols();
 
 ?>
 <div class="agency-photo"><?php echo $this->imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?></div>
-<div class="contents positions">
-    <?php echo $this->textLayer($this->positions,'blue pb-4vw pt-4vw'); ?>
-</div>
+<?php
+echo $this->carrersPositions($this);
+?>
 <div class="contents howwework">
     <?php echo $this->textLayer($this->howwework); ?>
 </div>
\ No newline at end of file
diff --git a/less/carrers.less b/less/carrers.less
new file mode 100644 (file)
index 0000000..7ec0524
--- /dev/null
@@ -0,0 +1,14 @@
+@import "00-constants";
+
+.contents.positions{
+
+       .dotclear{
+               margin-bottom: 30px;
+       }
+       a{
+               color:#fff;
+               display: inline-block;
+               width: 45%;
+               margin-top: 8px;
+       }
+}
\ No newline at end of file
diff --git a/less/realisations.less b/less/realisations.less
deleted file mode 100644 (file)
index 40b820f..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-@import "00-constants";
-
-#realisations-list {
-       //max-width: 980px;
-       margin: 0 auto;
-       padding: 14px 0 50px 0;
-
-       display: none; // Hidden initially until Isotope activates
-
-       a {
-               color: #000;
-               display: inline-block;
-               margin: 0 0 60px 0;
-
-        .img-wrapper {
-          overflow: hidden; // Give blurred image hovers a sharp edge by hiding any blur bleed
-          position: relative;
-
-          &:before {
-            content: '';
-            display: block;
-            width: 100%;
-            height: 100%;
-            background-color: transparent;
-            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEIAAABCCAMAAADUivDaAAABp1BMVEUAAAD2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH2rgH5x1H967/84Z/////+9d/714D5zGH3sxH85q/++u/98M/4vTH4wkH3uCH60nH7249RxKUJAAAAfHRSTlMAIlmJsM/k8/LOrocCRJvjmEIeiOGGHCWc+ZkjDI77+lLlTgqdCB/QzBsy598mOO/qM/DtLejJBp6PU/5MDQ+NJIuCBd4BSj6R1Bdainmizcfg3ezx+NfGr6FRIRXSmkg76dx+GSDiTwnF2xYuKMsYn/aTHYUDQ5dBetmgCFBy9QAAArJJREFUeF6l1Plb01gYxfFTwKgD0gpYiaAFR8UqKhRwwKogBXVQlEVU3HBlAGdFcT3dV5Y/2oY+eabc5N4m8fN7v3lv3txCyldX37BP208e0A7+0ljngztNh5r9FPgDh5vgVEurRlttR4Jw4mi7Tin9WAdq6Tx+gkqh+k4odXWzpraTkPv1FB0JnIbEmR46dDYMW+fO07HeC7Bx8RJd6Ou3mSFCVwYGIQgO0SV/UNhFD127/BuqDdODEVS5Qi+iV2HCNY2eaNdhGqVHo2Zh7AQ9CvlQcYqeDWNXi04b8WQilUonMltU0YMw3KBVNp0yJZSRcZTF+ijK5VNVClnKTUwCuGktFFOGdCKfqERUjVsAminanSFfoiFbMBqblLoNQKMgXnlw9UjpHGV+BzooMt7ktnAs+VGiU7hDQcnYAqtslhNFSnXhLgUZy0ONMeQnmUaD3cvMCVHVC72H+xQYi+Qem8rEDGZrJ7LKxBzmKUiWE1ustqNMRKBTsF1OZCxbptQDLFCwZVyLnNDMUzHFPEX5vT8pFZTnoIZeWscwGuYccaOQoNxDcanm5KlCpkTm4pW7upMtUeYRHtMqmbLKUmIRjRSZV9xULCob06ijna2kGUlnmVTO8QRPKRHPlG2XzHPJGtFnQBtryRUVjecAXvCnGiMAlvhTjZcAYq/cNOJC4fUkylrpoiF+p29gCOrOG+JJ9LfYFaCC+p+8HRW+kLNGoiAWFt6hAvX06C5Mncv0ZPkaTPiDXkSXUCVAD+pRbeUsXVuNYY+gny6tvYdgcICu9I3Bor+PLgz9CRt/zdKxuTHYCv9Nh2b+gUTseJQORFtjkLuqsaaJJShdH9WppI+voBbfvyFK/bfeAic+fOymre7xKTi18enzHAVr61824E646+vi6rfuSET7tvp9uisMmR8A02/S/W9HBAAAAABJRU5ErkJggg==');
-            background-position: center;
-            background-repeat: no-repeat;
-            position: absolute;
-            top: 0;
-            left: 0;
-            z-index: 1;
-            opacity: 0;
-            transition: all 0.2s ease-out;
-            background-size: 33px;
-          }
-        }
-
-               img {
-                       display: block;
-            transition: transform 0.25s ease-out; // Speed of the hover-out animation
-                       max-width: 100%;
-                       height: auto;
-
-               }
-               h2, h3 {
-                       white-space: nowrap;
-                       overflow-x: hidden;
-                       overflow-y: visible;
-                       max-width: 100%;
-                       text-overflow: ellipsis;
-               }
-
-               h2 {
-                       font-size: 22px;
-            font-weight: 300;
-            text-transform: none;
-                       color: #1b1b1b;
-                       margin: 8px 0 0 0;
-                       line-height: 1.3;
-                       height: 1.35em;
-               }
-               h3 {
-                       font-size: 14px;
-                       line-height: 16px;
-                       color: #545454;
-                       height: 18px;
-                       margin: 0 0 0 0;
-               }
-               &.last {
-                       margin-right: 0;
-               }
-       }
-
-    a:hover {
-
-      .img-wrapper {
-
-        &:before {
-          opacity: 1;
-          background-size: 66px;
-        }
-      }
-
-      img {
-        //filter: blur(2.4px);
-        transform: scale(1.2);
-        transition-duration: 0.4s; // Speed of the hover animation
-      }
-    }
-
-       .bloc .project-photo {
-               background-color: #ccc;
-               margin: 0;
-       }
-
-       .bloc .gray {
-               filter: grayscale(100%);
-               -webkit-filter: grayscale(100%);
-               -moz-filter: grayscale(100%);
-               -o-filter: grayscale(100%);
-               -ms-filter: grayscale(100%);
-               filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 10+, Firefox on Android */
-               filter: gray; /* IE6-9 */
-
-       }
-
-       .bloc {
-               filter: grayscale(0%);
-               -webkit-filter: grayscale(0%);
-               -moz-filter: grayscale(0%);
-               -o-filter: grayscale(0%);
-               -ms-filter: grayscale(0%);
-               filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'1 0 0 0 0, 0 1 0 0 0, 0 0 1 0 0, 0 0 0 1 0\'/></filter></svg>#grayscale");
-               //filter: none; /* IE6-9 */
-               transition: all 500ms;
-       }
-
-       .bloc .project-title {
-               font-size: 14px;
-               padding: 0 0 20px 0;
-               color: #545454;
-       }
-
-       .blocmargin {
-               margin: 0 15px 15px 0;
-
-       }
-
-       .spacer {
-               clear: left;
-               height: 20px;
-       }
-
-       #detail {
-               height: 440px;
-               clear: both;
-               display: none;
-               margin-bottom: 15px;
-               width: 10000px;
-               white-space: nowrap;
-               transition: all .5s;
-       }
-
-       .showUp {
-               height: 0px !important;
-               overflow: hidden;
-               opacity: 0;
-       }
-
-       .showDown {
-               height: 440px !important;
-               opacity: 1;
-       }
-
-       #detailContent {
-               overflow: visible;
-               width: 100%;
-               height: auto;
-
-               .close {
-                       position: absolute;
-                       right: 0;
-                       //top: 0;
-                       background-image: url('../images/rea_close.jpg');
-                       width: 62px;
-                       height: 62px;
-                       cursor: pointer;
-               }
-       }
-
-       #detail .detailLeft {
-               vertical-align: top;
-               display: inline-block;
-               width: 230px;
-               min-width: 230px;
-               max-width: 230px;
-               padding-right: 15px;
-               white-space: normal;
-
-               div {
-                       max-width: 220px;
-               }
-
-               .titre {
-                       font-size: 32px;
-               }
-
-               .legende {
-                       font-size: 14px;
-                       color: #545454;
-               }
-
-               .agence {
-                       font-size: 14px;
-                       color: #545454;
-               }
-
-               ul {
-                       margin-top: 20px;
-                       list-style: none;
-               }
-
-               li {
-                       font-size: 14px;
-                       color: #6f6f6f;
-                       padding: 3px 6px;
-                       border-radius: 2px;
-                       background-color: #ededed;
-                       margin: 0 6px 6px 0;
-                       display: inline-block;
-               }
-
-               li:hover, li:active {
-                       cursor: default;
-                       color: #fff;
-                       background-color: #84ae1e;
-               }
-
-               .description {
-                       font-size: 14px;
-                       color: #545454;
-                       margin-bottom: 20px;
-                       margin-top: 20px;
-               }
-
-       }
-
-       .link {
-               background-color: @yellow;
-               border-radius: 2px;
-               padding: 5px 20px;
-               color: #fff;
-       }
-
-       .link:hover {
-               background-color: #84ae1e;
-               color: #fff;
-       }
-
-       #detail .detailRight {
-               display: inline-block;
-               vertical-align: top;
-               //position: absolute;
-               //right: 0;
-
-               .slides {
-                       overflow: hidden;
-                       width: 10000px;
-                       ul {
-                               position: relative;
-                               list-style-type: none;
-                               margin: 0px;
-                               padding: 0px;
-                               width: 9999px;
-                               li {
-                                       padding: 0px;
-                                       margin: 0px;
-                                       list-style: none;
-                                       display: inline-block;
-                               }
-                       }
-               }
-       }
-}