(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 9ad468d0b3a59e1e7eb4330f8247e4cf36e7d6d6..c73615c3d35a8494710bc7c1aebf9e594fabf593 100644 (file)
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -78,6 +78,7 @@ class Bootstrap extends CubeIT_Bootstrap {
                 $casestudies->addColumn('technologies', 'text');
                 $casestudies->addColumn('tags_secondaires', 'text');
                 $casestudies->addColumn('online', 'boolean');
+                $casestudies->addColumn('propulse', 'boolean');
                 $casestudies->addColumn('annee', 'text');
 
                 // Réalisations

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studies.php b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
index 028e2a716becad7e7d385e606b09f056abfcfa27..fa7acaa65b7562b129a804170ffb4a89631d3ae9 100644 (file)
--- a/framework/application/forms/CMS/Sub/Casestudies/Studies.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Studies.php
@@ -14,6 +14,10 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List {
                 $online->setLabel('En ligne');
                 $this->addElement($online);
 
+                $propulse = new Zend_Form_Element_Checkbox('propulse');
+                $propulse->setLabel('Propulsée');
+                $this->addElement($propulse);
+
                 $annee = new Zend_Form_Element_Text('annee');
                 $annee->setLabel('Année');
                 $this->addElement($annee);

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index b375859018986a32250c570972e07fe09da2f90a..a4c278a09aacdceb6565a060389578e7721c3785 100644 (file)
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -6,12 +6,13 @@ $this->headScript()->addGSAP();
 $this->headScript()->addWebFont($fonts);\r
 \r
 if ($this->acl()->isAllowed('edition')) {\r
-    $this->headScript()->addCommonsAdmin();\r
+        $this->headScript()->addCommonsAdmin();\r
 }\r
 $this->headScript()->addIEConditionnals();\r
 $this->headScript()->appendFile('/js/common.js');\r
 $this->headLink()->appendStylesheet('/less/common.less', 'all');\r
 \r
+$this->headMeta()->setViewport(1080);\r
 \r
 profile(__FILE__, __LINE__, 'Before rendering body');\r
 $res = $this->htmlPage($this->render('common/body.phtml'));\r

diff --git a/framework/application/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php
index 9e9b1ebb65ab5c885e65ff4c27e97c268e8ff4ab..06e2b16ebf1cab27c06aa40792a25c40606ae475 100644 (file)
--- a/framework/application/views/helpers/CasestudiesDetail.php
+++ b/framework/application/views/helpers/CasestudiesDetail.php
@@ -2,100 +2,94 @@
 \r
 class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstract {\r
 \r
-    public function CasestudiesDetail($studie) {\r
+        public function CasestudiesDetail($studie) {\r
 \r
-       $visuel_detail = $this->view->imageProcess($studie->visuel_detail, $studie->titre, 980, 400);\r
+                $visuel_detail = $this->view->imageProcess($studie->visuel_detail, $studie->titre, 980, 400);\r
 \r
-       $res = '<div id="casestudies-detail-visuel">';\r
-       $res .= '<div class="visuel-holder">';\r
-       $res .= '<div class="visuel">' . $visuel_detail . '</div>';\r
+                $res = '<div id="casestudies-detail-visuel">';\r
+                $res .= '<div class="visuel-holder">';\r
+                $res .= '<div class="visuel">' . $visuel_detail . '</div>';\r
 \r
 \r
-       $res .= '<div class="legende">' . $studie->legende . '</div>';\r
+                $res .= '<div class="legende">' . $studie->legende . '</div>';\r
 \r
-       if ($studie->url != '') {\r
-           $res .= '<a href="' . $studie->url . '" style="float:right">' . __("Voir le site") . '</a>';\r
-       }\r
+                if ($studie->url != '') {\r
+                        $res .= '<a href="' . $studie->url . '" style="float:right">' . __("Voir le site") . '</a>';\r
+                }\r
 \r
-       $res .= '</div>';\r
-       $res .= '</div>';\r
+                $res .= '</div>';\r
+                $res .= '</div>';\r
 \r
-       $style = '';\r
-       if ($studie->couleur != '') {\r
-           $style = 'background-color:' . $studie->couleur;\r
-       }\r
+                $style = '';\r
+                if ($studie->couleur != '') {\r
+                        $style = 'background-color:' . $studie->couleur;\r
+                }\r
 \r
-       $res .= '<div id="casestudies-detail-content" style="' . $style . ';">';\r
+                $res .= '<div id="casestudies-detail-content" style="' . $style . ';">';\r
 \r
+                $blocs = $studie->blocs;\r
 \r
+                foreach ($blocs as $bloc) {\r
 \r
-       //$blocs = json_decode($studie->blocs[0], true);\r
-       $blocs = $studie->blocs;\r
-       fb($blocs);\r
-       foreach ($blocs as $bloc) {\r
+                        // fb($bloc);\r
+                        $margin = '';\r
+                        if ($bloc->margin != '') {\r
+                                $margin = 'margin-top:' . $bloc->margin . 'px;';\r
+                        }\r
 \r
-           // fb($bloc);\r
-           $margin = '';\r
-           if ($bloc->margin != '') {\r
-               $margin = 'margin-top:' . $bloc->margin . 'px;';\r
-           }\r
+                        $zindex = '';\r
+                        if ($bloc->zindex != 'default') {\r
+                                $zindex = 'z-index:' . $bloc->zindex . ';';\r
+                        }\r
 \r
-           $zindex = '';\r
-           if ($bloc->zindex != 'default') {\r
-               $zindex = 'z-index:' . $bloc->zindex . ';';\r
-           }\r
+                        if ($bloc->selectedtype == "text") {\r
 \r
-           if ($bloc->selectedtype == "text") {\r
+                                $res .= '<div class="detail-text" style="' . $margin . '' . $zindex . '" >';\r
+                                $res .= '<div class="titre">' . $bloc->titre . '</div>';\r
+                                $res .= '<div class="texte">' . $bloc->texte . '</div>';\r
+                                $res .= '</div>';\r
+                        }\r
 \r
-               $res .= '<div class="detail-text" style="' . $margin . '' . $zindex . '" >';\r
-               $res .= '<div class="titre">' . $bloc->titre . '</div>';\r
-               $res .= '<div class="texte">' . $bloc->texte . '</div>';\r
-               $res .= '</div>';\r
-           }\r
+                        if ($bloc->selectedtype == "visuel") {\r
+                                $visuel = $this->view->imageProcess()->imageProcessGetUrl($bloc->visuel, '', 1200, null);\r
+                                $width = -1;\r
+                                $height = -1;\r
+                                CubeIT_Image::getDimensions($visuel, $width, $height);\r
 \r
-           if ($bloc->selectedtype == "visuel") {\r
-               $visuel = $this->view->imageProcess()->imageProcessGetUrl($bloc->visuel, '', 1200, null);\r
-               $width = -1;\r
-               $height = -1;\r
-               CubeIT_Image::getDimensions($visuel, $width, $height);\r
+                                $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '' . $zindex . '"></div>';\r
+                        }\r
 \r
 \r
+                        $addVideoBackground = false;\r
+                        if ($bloc->video_background != false) {\r
+                                $addVideoBackground = true;\r
+                        }\r
 \r
-               $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '' . $zindex . '"></div>';\r
-           }\r
+                        if ($bloc->selectedtype == "video") {\r
 \r
+                                $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';\r
+                                $video = $this->view->videoWeb($bloc->video, 980);\r
 \r
-           $addVideoBackground = false;\r
-           if ($bloc->video_background != false) {\r
-               $addVideoBackground = true;\r
-           }\r
+                                if ($addVideoBackground) {\r
+                                        $background = $this->view->imageProcess()->imageProcessGetUrl($bloc->video_background, '', 1200, null);\r
+                                        $width = -1;\r
+                                        $height = -1;\r
+                                        CubeIT_Image::getDimensions($background, $width, $height);\r
+                                        $top = ($height - 550) / 2;\r
+                                        $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;top:' . $top . 'px;">';\r
+                                }\r
+                                if ($addVideoBackground) {\r
+                                        $res.= "</div>";\r
+                                }\r
 \r
-           if ($bloc->selectedtype == "video") {\r
+                                $res .= '<div style="z-index:10;position:relative">' . $video . '</div>';\r
+                                $res .= '</div>';\r
+                        }\r
+                }\r
+                $res .= '</div>';\r
 \r
-               $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';\r
-               $video = $this->view->videoWeb($bloc->video, 980);\r
-\r
-               if ($addVideoBackground) {\r
-                   $background = $this->view->imageProcess()->imageProcessGetUrl($bloc->video_background, '', 1200, null);\r
-                   $width = -1;\r
-                   $height = -1;\r
-                   CubeIT_Image::getDimensions($background, $width, $height);\r
-                   $top = ($height - 550) / 2;\r
-                   //fb($height);\r
-                   $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;top:' . $top . 'px;">';\r
-               }\r
-               if ($addVideoBackground) {\r
-                   $res.= "</div>";\r
-               }\r
-\r
-               $res .= '<div style="z-index:10;position:relative">' . $video . '</div>';\r
-               $res .= '</div>';\r
-           }\r
-       }\r
-       $res .= '</div>';\r
-\r
-       return $res;\r
-    }\r
+                return $res;\r
+        }\r
 \r
 }\r
 \r

diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php
index f62b603df86b45d81ac931faa6292f9a8251e292..e2f978afffc163257da1cbc708e405f244821897 100644 (file)
--- a/framework/application/views/helpers/CasestudiesList.php
+++ b/framework/application/views/helpers/CasestudiesList.php
@@ -2,20 +2,35 @@
 \r
 class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstract {\r
 \r
-        public function CasestudiesList($datas) {\r
+        public function CasestudiesList($datas, $currentStudie = null) {\r
+\r
+                $listStudies = array();\r
+                $listStudiesPropulsed = array();\r
+\r
+                if ($currentStudie != null) {\r
+                        // fb($currentStudie);\r
+                        $studieCategorie = $currentStudie->categories;\r
+                        $studieSecondaires = $currentStudie->tags_secondaires;\r
+                        $studieTechnologies = $currentStudie->technologies;\r
+                        $studieDomaines = $currentStudie->domaines;\r
+                        $studieDate = $currentStudie->annee;\r
+                }\r
 \r
                 $acl = Bootstrap::getInstance()->isAllowed("edition");\r
 \r
-\r
                 $db = Zend_Db_Table::getDefaultAdapter();\r
                 $s = $db->select()->from('casestudies')\r
                         ->order('id ASC');\r
 \r
-\r
                 if (!$acl) {\r
                         $s->where('online = ?', 1);\r
                 }\r
 \r
+                /* if ($currentStudie != null) {\r
+\r
+                  $s->where('categories = ?', $studieCategorie);\r
+                  } */\r
+\r
                 $q = $s->query();\r
 \r
                 $count = 1;\r
@@ -24,34 +39,178 @@ class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstrac
 \r
                 while ($r = $q->fetch()) {\r
 \r
-                        $r = CubeIT_Util_Cms::unserialize($r);\r
-\r
-                        $addSpacer = false;\r
-\r
-                        if ($count == 3) {\r
-                                $count = 1;\r
-                                $addClass = '';\r
-                        } else {\r
-                                $addClass = ' blocmargin';\r
-                                $count++;\r
+                        if ($r->id != $currentStudie->id) {\r
+                                $r = CubeIT_Util_Cms::unserialize($r);\r
+\r
+                                //fb($r);\r
+\r
+                                $r->point = 0;\r
+\r
+                                $addSpacer = false;\r
+\r
+                                if ($count == 3) {\r
+                                        $count = 1;\r
+                                        $addClass = '';\r
+                                } else {\r
+                                        $addClass = ' blocmargin';\r
+                                        $count++;\r
+                                }\r
+\r
+                                $addOffline = '';\r
+                                if ($acl && $r->online == 0) {\r
+                                        $addOffline = 'data-offline="1"';\r
+                                }\r
+\r
+                                if ($currentStudie != null) {\r
+                                        if ($r->propulse == 1)\r
+                                                $r->point += 10000;\r
+\r
+                                        if ($r->categories == $studieCategorie)\r
+                                                $r->point += 1000;\r
+\r
+                                        if (is_array($r->tags_secondaires) && is_array($currentStudie->tags_secondaires)) {\r
+                                                if (count($r->tags_secondaires) >= 1 && count($currentStudie->tags_secondaires) >= 1) {\r
+\r
+                                                        for ($i = 0; $i < count($studieSecondaires); $i++) {\r
+                                                                if (in_array($currentStudie->tags_secondaires[$i], $r->tags_secondaires))\r
+                                                                        $r->point += 100;\r
+                                                        }\r
+                                                }\r
+                                        }\r
+\r
+                                        if (is_array($r->technologies) && is_array($currentStudie->technologies)) {\r
+                                                if (count($r->technologies) >= 1 && count($currentStudie->technologies) >= 1) {\r
+\r
+                                                        for ($i = 0; $i < count($studieSecondaires); $i++) {\r
+                                                                if (in_array($currentStudie->technologies[$i], $r->technologies))\r
+                                                                        $r->point += 15;\r
+                                                        }\r
+                                                }\r
+                                        }\r
+\r
+                                        if ($r->domaines != '') {\r
+                                                if ($r->domaines == $currentStudie->domaines)\r
+                                                        $r->point += 10;\r
+                                        }\r
+\r
+                                        if ($r->annee != '') {\r
+                                                if ($r->annee == $currentStudie->annee)\r
+                                                        $r->point += 5;\r
+                                        }\r
+                                }\r
+\r
+\r
+                                /* if ($r->propulse == 1) {\r
+                                  array_push($listStudiesPropulsed, $r);\r
+                                  } else { */\r
+                                if (count($listStudies) < 3) {\r
+                                        array_push($listStudies, $r);\r
+                                } else {\r
+                                        if ($r->point > $listStudies[0]->point) {\r
+                                                $listStudies[2] = $listStudies[1];\r
+                                                $listStudies[1] = $listStudies[0];\r
+                                                $listStudies[0] = $r;\r
+                                        } else if ($r->point > $listStudies[1]->point) {\r
+                                                $listStudies[2] = $listStudies[1];\r
+                                                $listStudies[1] = $r;\r
+                                        } else if ($r->point > $listStudies[2]->point) {\r
+                                                $listStudies[2] = $r;\r
+                                        } else {\r
+\r
+                                        }\r
+                                }\r
+                                //}\r
+\r
+\r
+                                if ($currentStudie == null) {\r
+                                        $image = $this->view->imageProcess($r->visuel, $r->titre, 300, 225);\r
+                                        $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_stu']);\r
+                                        $res .= '<a href = "' . $url . '">';\r
+                                        $res .= '<div class = "bloc' . $addClass . '" data-categories = "' . $r->categories . '">';\r
+                                        $res .= '<div class = "project-photo">' . $image . ' </div>';\r
+                                        $res .= '<div ' . $addOffline . ' class = "project-title">' . $r->titre . ' </div>';\r
+                                        $res .= '<div ' . $addOffline . ' class = "project-description">' . $r->description . ' </div>';\r
+                                        $res .= '</div>';\r
+                                        $res .= '</a>';\r
+                                }\r
                         }\r
+                }\r
 \r
-                        $addOffline = '';\r
-                        if ($acl && $r->online == 0) {\r
-                                $addOffline = 'data-offline="1"';\r
+                if ($currentStudie != null) {\r
+\r
+                        $nbStudies = 0;\r
+                        $count = 1;\r
+\r
+                        $listStudies = array_reverse($listStudies);\r
+\r
+                        /* if (count($listStudiesPropulsed) > 0) {\r
+                          for ($k = 0; $k < count($listStudiesPropulsed); $k++) {\r
+\r
+                          $addSpacer = false;\r
+\r
+                          if ($count == 3) {\r
+                          $count = 1;\r
+                          $addClass = '';\r
+                          } else {\r
+                          $addClass = ' blocmargin';\r
+                          $count++;\r
+                          }\r
+\r
+                          $addOffline = '';\r
+                          if ($acl && $listStudiesPropulsed[$k]->online == 0) {\r
+                          $addOffline = 'data-offline="1"';\r
+                          }\r
+\r
+                          $image = $this->view->imageProcess($listStudiesPropulsed[$k]->visuel, $listStudiesPropulsed[$k]->titre, 300, 225);\r
+                          $url = CubeIT_Navigation_Page::generateAutoUri($listStudiesPropulsed[$k], $datas['seourl_stu']);\r
+                          $res .= '<a href = "' . $url . '">';\r
+                          $res .= '<div class = "bloc' . $addClass . '" data-categories = "' . $listStudiesPropulsed[$k]->categories . '">';\r
+                          $res .= '<div class = "project-photo">' . $image . ' </div>';\r
+                          $res .= '<div ' . $addOffline . ' class = "project-title">' . $listStudiesPropulsed[$k]->titre . ' </div>';\r
+                          $res .= '<div ' . $addOffline . ' class = "project-description">' . $listStudiesPropulsed[$k]->description . ' </div>';\r
+                          $res .= '</div>';\r
+                          $res .= '</a>';\r
+\r
+                          $nbStudies++;\r
+                          }\r
+                          } */\r
+\r
+\r
+                        for ($j = 0; $j < count($listStudies); $j++) {\r
+\r
+                                if ($nbStudies < 3) {\r
+                                        $addSpacer = false;\r
+\r
+                                        if ($count == 3) {\r
+                                                $count = 1;\r
+                                                $addClass = '';\r
+                                        } else {\r
+                                                $addClass = ' blocmargin';\r
+                                                $count++;\r
+                                        }\r
+\r
+                                        $addOffline = '';\r
+                                        if ($acl && $listStudies[$j]->online == 0) {\r
+                                                $addOffline = 'data-offline="1"';\r
+                                        }\r
+\r
+                                        $image = $this->view->imageProcess($listStudies[$j]->visuel, $listStudies[$j]->titre, 300, 225);\r
+                                        $url = CubeIT_Navigation_Page::generateAutoUri($listStudies[$j], $datas['seourl_stu']);\r
+                                        $res .= '<a href = "' . $url . '">';\r
+                                        $res .= '<div class = "bloc' . $addClass . '" data-categories = "' . $listStudies[$j]->categories . '">';\r
+                                        $res .= '<div class = "project-photo">' . $image . ' </div>';\r
+                                        $res .= '<div ' . $addOffline . ' class = "project-title">' . $listStudies[$j]->titre . ' </div>';\r
+                                        $res .= '<div ' . $addOffline . ' class = "project-description">' . $listStudies[$j]->description . ' </div>';\r
+                                        $res .= '</div>';\r
+                                        $res .= '</a>';\r
+\r
+                                        $nbStudies++;\r
+                                }\r
                         }\r
-\r
-                        $image = $this->view->imageProcess($r->visuel, $r->titre, 300, 225);\r
-                        $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_stu']);\r
-                        $res .= '<a href="' . $url . '">';\r
-                        $res .= '<div class="bloc' . $addClass . '" data-categories="' . $r->categories . '">';\r
-                        $res .= '<div class="project-photo">' . $image . '</div>';\r
-                        $res .= '<div ' . $addOffline . ' class="project-title">' . $r->titre . '</div>';\r
-                        $res .= '<div ' . $addOffline . ' class="project-description">' . $r->description . '</div>';\r
-                        $res .= '</div>';\r
-                        $res .= '</a>';\r
                 }\r
 \r
+                //fb($listStudies);\r
+\r
                 return $res;\r
         }\r
 \r

diff --git a/framework/application/views/helpers/CasestudiesTagsList.php b/framework/application/views/helpers/CasestudiesTagsList.php
index ceddc15e18f3633b7f096005dec6330225f2caa1..747b29f6885332928166812b92df34d139a6d549 100644 (file)
--- a/framework/application/views/helpers/CasestudiesTagsList.php
+++ b/framework/application/views/helpers/CasestudiesTagsList.php
@@ -2,44 +2,44 @@
 \r
 class Cubedesigners_View_Helper_CasestudiesTagsList extends Zend_View_Helper_Abstract {\r
 \r
-    public function CasestudiesTagsList($studies) {\r
+        public function CasestudiesTagsList($studies) {\r
 \r
-        $tagslist = Array();\r
+                $tagslist = Array();\r
 \r
-        $db0 = Zend_Db_Table::getDefaultAdapter();\r
-        $s0 = $db0->select()->from('casestudies')\r
-                ->order('id ASC');\r
-        $s0->where('online = ?', 1);\r
-        $q0 = $s0->query();\r
+                $db0 = Zend_Db_Table::getDefaultAdapter();\r
+                $s0 = $db0->select()->from('casestudies')\r
+                        ->order('id ASC');\r
+                $s0->where('online = ?', 1);\r
+                $q0 = $s0->query();\r
 \r
-        while ($r0 = $q0->fetch()) {\r
-            $temp = explode(',', $r0->tags);\r
+                while ($r0 = $q0->fetch()) {\r
+                        $temp = explode(',', $r0->tags);\r
 \r
-            for ($i = 0; $i < count($temp); $i++) {\r
-                if (!in_array($temp[$i], $tagslist)) {\r
-                    array_push($tagslist, $temp[$i]);\r
+                        for ($i = 0; $i < count($temp); $i++) {\r
+                                if (!in_array($temp[$i], $tagslist)) {\r
+                                        array_push($tagslist, $temp[$i]);\r
+                                }\r
+                        }\r
                 }\r
-            }\r
-        }\r
 \r
-        $db = Zend_Db_Table::getDefaultAdapter();\r
-        $s = $db->select()->from('tags')\r
-                ->order('name ASC');\r
-        $q = $s->query();\r
+                $db = Zend_Db_Table::getDefaultAdapter();\r
+                $s = $db->select()->from('tags')\r
+                        ->order('name ASC');\r
+                $q = $s->query();\r
 \r
-        $res = '<ul class="taglist">';\r
-        $res .= '<li class="tag active" data-id="0">' . __('TOUT VOIR') . '</li>';\r
+                $res = '<ul class="taglist">';\r
+                $res .= '<li class="tag active" data-id="0">' . __('TOUT VOIR') . '</li>';\r
 \r
-        while ($r = $q->fetch()) {\r
+                while ($r = $q->fetch()) {\r
 \r
-            if (in_array($r->id, $tagslist)) {\r
-                $res .= '<li class="tag" data-id="' . $r->id . '">' . $r->name . '</li>';\r
-            }\r
-        }\r
+                        if (in_array($r->id, $tagslist)) {\r
+                                $res .= '<li class="tag" data-id="' . $r->id . '">' . $r->name . '</li>';\r
+                        }\r
+                }\r
 \r
-        $res.='</ul>';\r
-        return $res;\r
-    }\r
+                $res.='</ul>';\r
+                return $res;\r
+        }\r
 \r
 }\r
 \r

diff --git a/framework/application/views/helpers/CategoriesList.php b/framework/application/views/helpers/CategoriesList.php
index 7b2bd09e045afe34f4a1c627d87408bcd6182ee4..07a3e4cc6b96658c2b5d80c84308dad77bebcd7c 100644 (file)
--- a/framework/application/views/helpers/CategoriesList.php
+++ b/framework/application/views/helpers/CategoriesList.php
@@ -11,7 +11,6 @@ class Cubedesigners_View_Helper_CategoriesList extends Zend_View_Helper_Abstract
                 $db0 = Zend_Db_Table::getDefaultAdapter();\r
                 $s0 = $db0->select()->from($rubrique)\r
                         ->order('id ASC');\r
-\r
                 if (!$acl) {\r
                         $s0->where('online = ?', 1);\r
                 }\r
@@ -34,6 +33,12 @@ class Cubedesigners_View_Helper_CategoriesList extends Zend_View_Helper_Abstract
                 $res .= '<li class="tag active" data-id="0">' . __('TOUT VOIR') . '</li>';\r
 \r
                 while ($r = $q->fetch()) {\r
+\r
+                        $addOffline = '';\r
+                        if ($acl && $r->online == 0) {\r
+                                $addOffline = 'data-offline="1"';\r
+                        }\r
+\r
                         if (in_array($r->id, $categorieslist)) {\r
 \r
                                 $res .= '<li class="tag" ' . $addOffline . ' data-id="' . $r->id . '">' . $r->name . '</li>';\r

diff --git a/framework/application/views/scripts/studies/index.phtml b/framework/application/views/scripts/studies/index.phtml
index 4e331c20b5f862e81f9b15863b9f0cf4adf2f49b..03ceb752a76f74b952d39b8fa2ea823edd78583f 100644 (file)
--- a/framework/application/views/scripts/studies/index.phtml
+++ b/framework/application/views/scripts/studies/index.phtml
@@ -1,6 +1,7 @@
 <?php\r
 $this->headScript()->addScriptAndStyle('casestudies');\r
 $this->headScript()->addScriptAndStyle('casestudies_detail');\r
+//fb($this->studie);\r
 ?>\r
 \r
 <div class="casestudies-detail-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
@@ -12,5 +13,5 @@ echo $this->CasestudiesDetail($this->studie);
 <div class="title"><?php echo $this->markupDotclear($this->casestudies_titre); ?></div>\r
 \r
 <div id="casestudies-list">\r
-    <?php echo $this->CasestudiesList($this->datas); ?>\r
+        <?php echo $this->CasestudiesList($this->datas, $this->studie); ?>\r
 </div>
\ No newline at end of file

diff --git a/framework/application/views/scripts/templates/realisations.phtml b/framework/application/views/scripts/templates/realisations.phtml
index da5ca4f8ee1b5d928119dd17d05c25a463acdeea..471c3ef8ecc034ad5765baceb219f141a5a4b280 100644 (file)
--- a/framework/application/views/scripts/templates/realisations.phtml
+++ b/framework/application/views/scripts/templates/realisations.phtml
@@ -1,7 +1,5 @@
 <?php\r
 $this->headScript()->addScriptAndStyle('realisations');\r
-//$datas = Bootstrap::getInstance()->getCMSDatasOfPage($this->id);\r
-//$this->headScriptVariables()->setVariable('realisations', $datas);\r
 ?>\r
 \r
 <div class="title"><?php echo $this->markupDotclear($this->titre); ?></div>\r

diff --git a/js/realisations.js b/js/realisations.js
index e88ea9b662ce07aae43fd42837568900edcc002f..1377ef2f6f44eb51fba7ee692f6cbd91a8707c33 100644 (file)
--- a/js/realisations.js
+++ b/js/realisations.js
@@ -111,22 +111,21 @@ function load_realisations() {
                            $("html, body").animate({ scrollTop: $('#detailContent').offset().top-100 }, 1000);\r
                            $('.close').css("top", $('#detailContent').offset().top);\r
                             \r
-                            \r
                            $( "#detail" ).slideDown( "slow", function() {\r
                                isAnim = false;\r
                                addCloseAction();\r
                                currentSlide = 1;\r
                                autoSlide = true;\r
                                 initSlideShow();\r
-                           \r
+                         \r
                            }).animate(\r
                                { opacity: 1  },\r
-                               { queue: false, duration: 'slow' }\r
+                               { queue: true, duration: 'slow' }\r
                              );\r
                       \r
                        }).animate(\r
                            { opacity: 1 },\r
-                           { queue: false, duration: 'slow' }\r
+                           { queue: true, duration: 'slow' }\r
                          );\r
                    }else{\r
                        $(cible.parent()).before(detail);\r
@@ -135,15 +134,16 @@ function load_realisations() {
                        $('.close').css("top", $('#detailContent').offset().top);\r
                         \r
                        $( "#detail" ).slideDown( "slow", function() {\r
-                           \r
+                          \r
                            isAnim = false;\r
                            addCloseAction();\r
                            currentSlide = 1;\r
                            autoSlide = true;\r
                            initSlideShow();\r
+                            \r
                        }).animate(\r
                            { opacity: 1 },\r
-                           { queue: false, duration: 'slow' }\r
+                           { queue: true, duration: 'slow' }\r
                          );\r
                    }\r
 \r
@@ -168,7 +168,7 @@ function load_realisations() {
 \r
 function addCloseAction() {\r
     $(".close").click(function() {\r
-        $("html, body").animate({ scrollTop: 0 }, 1000);\r
+        //$("html, body").animate({ scrollTop: 0 }, 1000);\r
        $( "#detail" ).slideUp( "slow", function() {\r
               $('#detailContent').remove();\r
               currentOpen = 0;\r
@@ -183,10 +183,10 @@ function addCloseAction() {
 }\r
 \r
 function initTagsLink() {\r
-    \r
+        \r
     $(".tag").click(function() {\r
        \r
-       $(".close").click();\r
+        $(".close").click();\r
        \r
         $(this).toggleClass('active');\r
         \r
@@ -201,7 +201,7 @@ function initTagsLink() {
             var index = $.inArray( $(this).attr("data-id"), showIds );\r
             showIds.splice(index, 1);\r
         }\r
-        \r
+       \r
         if( showIds.length > 0 ) {\r
             $(".tag:first").removeClass('active');\r
         }else{\r
@@ -254,7 +254,7 @@ function initSlideShow() {
 \r
            var total_lenght = totalWidth;\r
 \r
-           var t= setInterval(function(){\r
+           var t= setInterval(function(){\r
 \r
                var offset = $(le_div).offset();\r
 \r

diff --git a/less/agence.less b/less/agence.less
index cb0b0cca7b76c0c8a6864a3106a05ce0e0f1fc33..cfad1d8dbe45936f6c708f4b8b8320ce4c6e1b19 100644 (file)
--- a/less/agence.less
+++ b/less/agence.less
@@ -39,6 +39,7 @@
     width:30%;
     margin-right: 20px;
 }
+
 .agency-pictos .bloc-holder .blocs .spacer {
     clear:left;
     padding:25px 0;
@@ -55,8 +56,6 @@
     padding-right: 20px;
 }
 
-
-
 /* Agence photo */
 .agency-photo {
     overflow:hidden;
@@ -67,8 +66,6 @@
     }
 }
 
-
-
 /* Agence equipe */
 .agency-persons {
     background-color:#3885e0;
@@ -123,3 +120,8 @@
 }
 
 
+/* max-width pour faibles résolutions */
+@media screen and (max-width: 1009px) {
+       
+    
+}
\ No newline at end of file

diff --git a/less/casestudies.less b/less/casestudies.less
index 2015e039acd8b5995070a0cb53575985ebea0f9b..e42d7a1056db710d80fe72b0ca81f52ad4f9a26b 100644 (file)
--- a/less/casestudies.less
+++ b/less/casestudies.less
@@ -4,7 +4,6 @@
     margin: 0 auto;
     padding: 0 0 20px 0;
     
-    
     ul {
        list-style: none;
     }
@@ -74,4 +73,10 @@
 }
 #casestudies-detail-content {
     background-color: #3885E0;
+}
+
+/* max-width pour faibles résolutions */
+@media screen and (max-width: 1009px) {
+       
+    
 }
\ No newline at end of file

diff --git a/less/casestudies_detail.less b/less/casestudies_detail.less
index e68b199b90ef129818d329ef4beb75981a74bd1a..cbb3319e150534287b8d1ce8ab1a0211105dda03 100644 (file)
--- a/less/casestudies_detail.less
+++ b/less/casestudies_detail.less
@@ -38,7 +38,6 @@
         padding-bottom: 20px;\r
     }\r
 \r
-\r
     .visuel-holder .legende {\r
         font-size: 18px;\r
         float:left;\r
@@ -102,3 +101,8 @@
         position: relative;\r
     }\r
 }\r
+\r
+/* max-width pour faibles résolutions */\r
+@media screen and (max-width: 1009px) {\r
+       \r
+}\r

diff --git a/less/common.less b/less/common.less
index f607d2b5c777070318e6f9f88ea4b573abcae9b9..739e7be01efcdd9d8613eef3d6d10730c5751906 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -31,6 +31,7 @@ a:active {
     //min-width: 1024px;\r
     //max-width: 1200px;\r
     width:100%;\r
+    overflow:hidden;\r
 }\r
 \r
 #main .main-holder {\r

diff --git a/less/header.less b/less/header.less
index 5dfb5eba3dd15596d037f192f166caa8daaff822..eccbb1243d3c839a1cb0efd9eab01cd93488d660 100644 (file)
--- a/less/header.less
+++ b/less/header.less
@@ -64,7 +64,7 @@
         }
     
     #header .logo { 
-            background: url('../images/logo-mobile.png') no-repeat;
+            //background: url('../images/logo-mobile.png') no-repeat;
             width:212px;
             height:97px;
             float:left;

diff --git a/less/home.less b/less/home.less
index 8b330d7c4d6d51148c6a928c9a4fafb76c1ab41b..feeed601a23718c03df6db58298e3fd633133e3a 100644 (file)
--- a/less/home.less
+++ b/less/home.less
@@ -157,4 +157,10 @@
 #home-expertise .bloc-holder .sousbloc img {\r
     float:left;\r
     padding: 0 25px 0 0;\r
+}\r
+\r
+/* max-width pour faibles résolutions */\r
+@media screen and (max-width: 1009px) {\r
+       \r
+    \r
 }
\ No newline at end of file

diff --git a/less/realisations.less b/less/realisations.less
index 1ba97a2ffa333740a628e75bcda2ff18ac05497e..bcb1e34e2d7afcb896076683982f91cddbfd2b3b 100644 (file)
--- a/less/realisations.less
+++ b/less/realisations.less
@@ -104,6 +104,10 @@
        margin-bottom: 15px;
        width:10000px;
        white-space: nowrap;
+        -webkit-transform: translate3d(0,0,0);
+        -webkit-backface-visibility: hidden;
+       -webkit-perspective: 1000;
+        transform: translate3d(0,0,0);
     }
     
     #detailContent {
@@ -231,3 +235,9 @@
 
 }
 
+
+/* max-width pour faibles résolutions */
+@media screen and (max-width: 1009px) {
+       
+    
+}