wait #7260 @2

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index c29229611c120fb2e3fcec967815881731c28cef..ea088f51be53f075904ac39c5142937a41fdaf74 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -58,7 +58,7 @@ class Bootstrap extends CubeIT_Bootstrap
 
         while ($r = $q->fetch()) {
             $r = CubeIT_Util_Cms::unserialize($r, $locale);
-            if ($r->titre == '') {
+            if ($r->title == '') {
                 continue;
             }
             $online = boolval($r->online);
@@ -69,7 +69,7 @@ class Bootstrap extends CubeIT_Bootstrap
             $p = new CubeIT_Navigation_Page_Locale();
             $p->setController('Positions');
             $p->setId($page->getId() . '/' . $r->id);
-            $p->setUri(Cubedesigners_Util::generateAutoUri($r, 'Position/%title', $page->getLocale()));
+            $p->setUri(Cubedesigners_Util::generateAutoUri($r, 'Position/%title%', $page->getLocale()));
             $p->setSitemap($online);
             $p->setEditable(false);
             $p->setOnline($online);

diff --git a/framework/application/controllers/PositionsController.php b/framework/application/controllers/PositionsController.php
new file mode 100644 (file)
index 0000000..01585c1
--- /dev/null
+++ b/framework/application/controllers/PositionsController.php
@@ -0,0 +1,21 @@
+<?php
+
+class PositionsController extends CubeIT_Controller_PageController
+{
+
+    public function indexAction()
+    {
+        /** @var CubeIT_Navigation_Page_Locale $parent */
+        $parent = $this->view->currentPage->getParent();
+
+        $data = $this->getBootstrap()->getCMSDatasOfNavigationPage($parent);
+        $this->view->parent = $data;
+        $this->view->parentURL=$parent->getHref();
+
+        $r = new Cubedesigners_Model_Position();
+        $r->selectById($this->getParam('position_id'));
+        $r = $r->toObject();
+        $this->view->position = $r;
+    }
+
+}

diff --git a/framework/application/controllers/RealisationsController.php b/framework/application/controllers/RealisationsController.php
deleted file mode 100644 (file)
index 51539bd..0000000
--- a/framework/application/controllers/RealisationsController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-class RealisationsController extends CubeIT_Controller_PageController {
-
-       public function indexAction() {
-               $parent = $this->view->currentPage->getParent();
-
-               $datas = $this->getBootstrap()->getCMSDatasOfNavigationPage($parent);
-               $this->view->datas = $datas;
-
-
-               $r = new Cubedesigners_Model_Realisation();
-               $r->selectById($this->getParam('realisation_id'));
-               $r = $r->toObject();
-
-               $u = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea'], null);
-               $this->view->casestudies_titre = $datas["titre"];
-               $this->view->titre = $r->titre;
-               $this->view->realisation = $r;
-       }
-
-}

diff --git a/framework/application/views/helpers/Twocols.php b/framework/application/views/helpers/Twocols.php
index b63871148fe6a8b70594694f8d687810ee5ff329..fbd2f233e1f23ababfe2e48b8408f40e47c165f1 100644 (file)
--- a/framework/application/views/helpers/Twocols.php
+++ b/framework/application/views/helpers/Twocols.php
@@ -2,17 +2,18 @@
 
 class Cubedesigners_View_Helper_Twocols extends Zend_View_Helper_Abstract {
 
-       public function twocols($displayTitle = true) {
+       public function twocols($displayTitle = true,$title=null,$left=null,$right=null) {
                $this->view->headLink()->appendStylesheet('/less/twocols.less');
                $res = '<div class="twocols content">';
                $res.='<section>';
-               if ($displayTitle && trim($this->view->titre)) {
+        $t=$title??$this->view->titre;
+               if ($displayTitle && trim($t)) {
                        // Replacing <br /> tags with normal line breaks to allow for more flexible styling via CSS white-space
-            $res.= '<div class="title">' . str_replace('<br />', "\n", $this->view->markupDotclear($this->view->titre)) . '</div>';
+            $res.= '<div class="title">' . str_replace('<br />', "\n", $this->view->markupDotclear($t)) . '</div>';
                }
                $res.='<div class="cols">';
-               $res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnegauche) . '</div>';
-               $res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnedroite) . '</div>';
+               $res.='<div class="col">' . $this->view->markupDotclear($left??$this->view->colonnegauche) . '</div>';
+               $res.='<div class="col">' . $this->view->markupDotclear($right??$this->view->colonnedroite) . '</div>';
                $res.='</div>';
                $res.='</section>';
                $res.='</div>';

diff --git a/framework/application/views/scripts/positions/index.phtml b/framework/application/views/scripts/positions/index.phtml
index 3fa1849cf3bef14df6aadef2c67fff7133414824..d915d229c685e27a197ae13870c249e0cebb88da 100644 (file)
--- a/framework/application/views/scripts/positions/index.phtml
+++ b/framework/application/views/scripts/positions/index.phtml
@@ -1,9 +1,14 @@
 <?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);
+$r = CubeIT_Util_Cms::unserialize($this->position);
+$parent=CubeIT_Util_Cms::unserialize($this->parent);
+$this->headTitle($r->title . ' / ' . $this->currentPage->getParent()->getTitle(), 'SET');
+$this->headScript()->addScriptAndStyle('position');
 
-$this->headScript()->addScriptAndStyle('realisations');
-echo $this->realisation($this->realisation);
+echo '<div class="content">';
+echo '<a href="'.$this->parentURL.'" class="animated-arrow discreet revert">'.$this->linkArrow('Back').'</a>';
+echo '</div>';
+echo $this->twocols(true, '!!!!!Position: '.$r->title, $r->columnleft, $r->columnright);
+echo $this->textLayer($r->responsabilities,'blue pb-4vw pt-4vw');
+echo $this->textLayer($r->requirements,'mb-4vw mt-4vw');
+echo $this->textLayer($parent['positions_footer'],'positionfooter black pb-4vw pt-4vw');
\ No newline at end of file

diff --git a/js/position.js b/js/position.js
new file mode 100644 (file)
index 0000000..a16838d
--- /dev/null
+++ b/js/position.js
@@ -0,0 +1,9 @@
+TO_LOAD_ONCE[TO_LOAD_ONCE.length] = 'load_position();';
+
+function load_position() {
+    $('.positionfooter a').each(function () {
+        let t = $(this).text();
+        $(this).addClass('animated-arrow').addClass('discreet');
+        $(this).html('<span class="the-arrow -left"><span class="shaft"></span></span><span class="main"><span class="text">' + t + '</span><span class="the-arrow -right"><span class="shaft"></span></span>');
+    });
+}
\ No newline at end of file

diff --git a/less/common.less b/less/common.less
index 349f101d8ebe07709943f473dbe055f831bdf239..c2210a1481ae4b7fca92a01abbcd31ff953cd851 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -208,8 +208,13 @@ a {
   &.blue {
     background-color: @blue;
     color: #fff;
-    margin:0;
+    margin: 0;
+  }
 
+  &.black {
+    background-color: #000;
+    color: #fff;
+    margin: 0;
   }
 }
 

diff --git a/less/link-arrow.less b/less/link-arrow.less
index 6b47daa6f7d4decd2046941372eafb52aa95c3de..16c3bc0a5ccca885c72d67f22df79b57c61362eb 100644 (file)
--- a/less/link-arrow.less
+++ b/less/link-arrow.less
@@ -111,6 +111,13 @@
 .animated-arrow {
   text-transform: uppercase;
 
+  &.revert{
+    transform: scaleX(-1);
+    .main .text{
+      transform: scaleX(-1);
+    }
+  }
+
   &.discreet{
     text-transform: none;
     text-decoration: none;

diff --git a/less/position.less b/less/position.less
new file mode 100644 (file)
index 0000000..82bed67
--- /dev/null
+++ b/less/position.less
@@ -0,0 +1,18 @@
+@import "00-constants";
+
+h1{
+  margin-bottom: 30px !important;
+}
+
+h2{
+  font-weight: bold !important;
+  font-size: 30px !important;
+}
+
+h3{
+  font-size: 20px !important;
+}
+
+.black a{
+  color:#fff;
+}
\ No newline at end of file

diff --git a/less/realisation.less b/less/realisation.less
deleted file mode 100644 (file)
index 693b0ff..0000000
--- a/less/realisation.less
+++ /dev/null
@@ -1,77 +0,0 @@
-@import "00-constants";
-
-.realisation {
-       margin: 50px 0 0 0;
-       h1 {
-               font-size: 40px;
-               font-weight: 300;
-               text-transform: none;
-               margin-top: 40px;
-       }
-       h2 {
-               margin: 0 0 15px 0;
-       }
-
-       p {
-               margin: 1.5em 0;
-       }
-
-       .but {
-               margin: 0 0 80px 0;
-               float: right;
-               background-color: @yellow !important;
-       }
-
-       .dotclear {
-               clear: both;
-               margin: 30px 0 30px 0;
-       }
-
-       .close-holder {
-               min-height: 26px;
-               margin-bottom: 20px;
-       }
-
-       .content {
-               position: relative;
-
-               .close {
-                       display: inline-block;
-                       position: absolute;
-                       right: 34px;
-                       top: 0;
-                       background-image: url(../images/close-portfolio.png);
-                       background-repeat: no-repeat;
-                       background-position: right center;
-                       padding-right: 33px;
-                       color: #545454;
-                       font-size: 14px;
-                       line-height: 26px;
-
-                       &:hover {
-                               color: #000;
-                       }
-               }
-       }
-
-       .description {
-               margin-bottom: 100px;
-       }
-}
-
-ul.tags {
-       margin: 10px 0 -10px 0;
-       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;
-               &:before {
-                       content: "" !important;
-               }
-       }
-}
\ No newline at end of file