From: bruno@cubedesigners.com Date: Fri, 14 Feb 2014 15:03:28 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b899fb0fed366914fc158b632108ed5408f243b3;p=cubedesigners-v7.git --- diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index 86e8e92..212b386 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -142,11 +142,9 @@ class Bootstrap extends CubeIT_Bootstrap { $p->setSitemap(true); $p->setEditable(false); - //fb($r->online); if ($r->online != 1) $p->setOnline(false); - $p->setDomain($page->getDomain()); $p->setLabel($r->titre); $page->addPage($p); diff --git a/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php index 90e1471..dfa2fab 100644 --- a/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php +++ b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php @@ -5,6 +5,8 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Content_Bloc extends CubeIT_Form_Su public function init() { parent::init(); + $isCompactTrad = false; + $select = new Cubedesigners_Form_Element_ContentType("selected-type"); $select->setAttrib('data-name', 'selected-type'); $this->addElement($select); @@ -24,20 +26,20 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Content_Bloc extends CubeIT_Form_Su $titre = new Zend_Form_Element_Text('titre'); $titre->setLabel('Titre'); - $this->addElement($titre); + $this->addElementLocalized($titre, $isCompactTrad); $texte = new CubeIT_Form_Element_Markitup_Basic('texte'); $texte->setLabel('Texte'); - $this->addElement($texte); + $this->addElementLocalized($texte, $isCompactTrad); $visuel = new CubeIT_Form_Element_File_Image('visuel'); $visuel->setLabel('Visuel'); $visuel->setMaxItems(1); - $this->addElement($visuel); + $this->addElementLocalized($visuel, $isCompactTrad); $video = new CubeIT_Form_Element_WebVideo('video'); $video->setLabel('URL de la vidéo'); - $this->addElement($video); + $this->addElementLocalized($video, $isCompactTrad); $video_background = new CubeIT_Form_Element_File_Image('video_background'); $video_background->setLabel('Fond de la vidéo'); diff --git a/framework/application/forms/CMS/Sub/Casestudies/Studies.php b/framework/application/forms/CMS/Sub/Casestudies/Studies.php index dcedda0..cd86907 100644 --- a/framework/application/forms/CMS/Sub/Casestudies/Studies.php +++ b/framework/application/forms/CMS/Sub/Casestudies/Studies.php @@ -4,6 +4,9 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List { public function init() { parent::init(); + + $isCompactTrad = false; + $id = new CubeIT_Form_Element_Id(); $this->addElement($id); @@ -13,29 +16,29 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List { $titre = new Zend_Form_Element_Text('titre'); $titre->setLabel('Titre'); - $this->addElement($titre); + $this->addElementLocalized($titre, $isCompactTrad); $description = new Zend_Form_Element_Text('description'); $description->setLabel('Description'); - $this->addElement($description); + $this->addElementLocalized($description, $isCompactTrad); $url = new CubeIT_Form_Element_Url('url'); $url->setLabel('URL du site'); - $this->addElement($url); + $this->addElementLocalized($url, $isCompactTrad); $visuel = new CubeIT_Form_Element_File_Image('visuel'); $visuel->setLabel('Visuel de la page Case Studies'); $visuel->setMaxItems(1); - $this->addElement($visuel); + $this->addElementLocalized($visuel, $isCompactTrad); $visuel_detail = new CubeIT_Form_Element_File_Image('visuel_detail'); $visuel_detail->setLabel('Visuel de la page de détail'); $visuel_detail->setMaxItems(1); - $this->addElement($visuel_detail); + $this->addElementLocalized($visuel_detail, $isCompactTrad); $legende = new Zend_Form_Element_Text('legende'); $legende->setLabel('Legende du visuel'); - $this->addElement($legende); + $this->addElementLocalized($legende, $isCompactTrad); $color = new Zend_Form_Element_Text('couleur'); $color->setLabel('Code couleur de la zone de contenu'); @@ -49,6 +52,7 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Studies extends CubeIT_Form_List { $tags->setLabel('Tags'); $this->addElement($tags); + $bootstrap = Bootstrap::getInstance(); $view = $bootstrap->getView(); diff --git a/framework/application/views/helpers/AgencyBlocs.php b/framework/application/views/helpers/AgencyBlocs.php index 85b8ff8..24edab4 100644 --- a/framework/application/views/helpers/AgencyBlocs.php +++ b/framework/application/views/helpers/AgencyBlocs.php @@ -16,14 +16,11 @@ class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract { $res.='
'; } - //$image = $this->view->imageProcess($bloc['picto'], $bloc['titre'], 120, 120); - //$image = $this->view->imageCms($bloc['photo'], $bloc['photo'], 120, 120); $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120); - $res.='
'; $res.=''; - $res.='

' . $bloc['titre'] . '

'; + $res.='

' . $bloc['titre'] . '

'; $res.='' . $bloc['poste'] . ''; $res.='' . $this->view->markupDotclear($bloc['texte']) . ''; $res.='
'; diff --git a/framework/application/views/helpers/CasestudiesList.php b/framework/application/views/helpers/CasestudiesList.php index 6d4a54f..f5ec0ce 100644 --- a/framework/application/views/helpers/CasestudiesList.php +++ b/framework/application/views/helpers/CasestudiesList.php @@ -4,17 +4,31 @@ class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstrac public function CasestudiesList($datas) { + // $acl = Bootstrap::getInstance()->getAcl(); + $acl = Bootstrap::getInstance()->isAllowed("edition"); + + + $db = Zend_Db_Table::getDefaultAdapter(); $s = $db->select()->from('casestudies') ->order('id ASC'); - $s->where('online = ?', 1); + + + if (!$acl) { + $s->where('online = ?', 1); + } + $q = $s->query(); $count = 1; + $res = ''; while ($r = $q->fetch()) { + + $r = CubeIT_Util_Cms::unserialize($r); + $addSpacer = false; if ($count == 3) { @@ -26,13 +40,18 @@ class Cubedesigners_View_Helper_CasestudiesList extends Zend_View_Helper_Abstrac $count++; } + $addOffline = ''; + if ($acl && $r->online == 0) { + $addOffline = 'data-offline="1"'; + } + $image = $this->view->imageProcess($r->visuel, $r->titre, 300, 225); $url = CubeIT_Navigation_Page::generateAutoUri($r, $datas['seourl_stu']); $res .= ''; $res .= '
'; $res .= '
' . $image . '
'; - $res .= '
' . $r->titre . '
'; - $res .= '
' . $r->description . '
'; + $res .= '
' . $r->titre . '
'; + $res .= '
' . $r->description . '
'; $res .= '
'; $res .= ''; diff --git a/framework/application/views/helpers/CasestudiesTagsList.php b/framework/application/views/helpers/CasestudiesTagsList.php index f130bf2..ceddc15 100644 --- a/framework/application/views/helpers/CasestudiesTagsList.php +++ b/framework/application/views/helpers/CasestudiesTagsList.php @@ -9,6 +9,7 @@ class Cubedesigners_View_Helper_CasestudiesTagsList extends Zend_View_Helper_Abs $db0 = Zend_Db_Table::getDefaultAdapter(); $s0 = $db0->select()->from('casestudies') ->order('id ASC'); + $s0->where('online = ?', 1); $q0 = $s0->query(); while ($r0 = $q0->fetch()) { diff --git a/framework/application/views/helpers/FooterSocials.php b/framework/application/views/helpers/FooterSocials.php index a0c5a7a..6169231 100644 --- a/framework/application/views/helpers/FooterSocials.php +++ b/framework/application/views/helpers/FooterSocials.php @@ -10,7 +10,7 @@ class Cubedesigners_View_Helper_FooterSocials extends Zend_View_Helper_Abstract $res = '
'; foreach ($socials as $id => $social) { - $image = $this->view->imageCms($social['picto'], $social['titre'], 30, 30); + $image = $this->view->imageCms($social['picto'], $social['titre'], 25, 25); $res.=''; } $res.= '
'; diff --git a/framework/application/views/helpers/HomeBlocs.php b/framework/application/views/helpers/HomeBlocs.php index 380d4c7..7c1b86e 100644 --- a/framework/application/views/helpers/HomeBlocs.php +++ b/framework/application/views/helpers/HomeBlocs.php @@ -23,7 +23,7 @@ class Cubedesigners_View_Helper_HomeBlocs extends Zend_View_Helper_Abstract { $res .= '
'; $res.='
'; $res.= $image; - $res.= '

' . $bloc['titre'] . '

'; + $res.= '

' . $bloc['titre'] . '

'; $res.= '' . $this->view->markupDotclear($bloc['texte']) . ''; $res.='
'; $res .= '
'; diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml index b3621e1..6c88215 100644 --- a/framework/application/views/scripts/common/header.phtml +++ b/framework/application/views/scripts/common/header.phtml @@ -13,7 +13,7 @@ if (!is_null($homepage)) { '; + echo ''; echo ''; } diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml index ae4a737..7ca7e7c 100644 --- a/framework/application/views/scripts/templates/agence.phtml +++ b/framework/application/views/scripts/templates/agence.phtml @@ -27,7 +27,7 @@ $this->headScript()->addScriptAndStyle('agence');
-

equipe['titre']); ?>

+

equipe['titre']); ?>

agencyBlocs($this->equipe); ?> diff --git a/framework/application/views/scripts/templates/contact.phtml b/framework/application/views/scripts/templates/contact.phtml index 94b6ebb..2675c25 100644 --- a/framework/application/views/scripts/templates/contact.phtml +++ b/framework/application/views/scripts/templates/contact.phtml @@ -4,7 +4,6 @@ $this->headScript()->addScriptAndStyle('contact'); $bureaux = $this->option('contact')['bureaux']; -//fb($bureaux); $i = 1; foreach ($bureaux as $bureau) { diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml index 7c948a5..49eabdc 100644 --- a/framework/application/views/scripts/templates/home.phtml +++ b/framework/application/views/scripts/templates/home.phtml @@ -19,7 +19,7 @@ fb($this->slideshow);
-

agence['titre']); ?>

+

agence['titre']); ?>

homeBlocs($this->agence, 'agence'); ?> @@ -31,7 +31,7 @@ fb($this->slideshow);
-

expertises['titre']); ?>

+

expertises['titre']); ?>

homeBlocs($this->expertises, 'expertises'); ?> diff --git a/images/logo.svg b/images/logo.svg new file mode 100644 index 0000000..e7aebfe --- /dev/null +++ b/images/logo.svg @@ -0,0 +1,321 @@ + + + + diff --git a/js/admin.js b/js/admin.js index 578e0d0..09ee701 100644 --- a/js/admin.js +++ b/js/admin.js @@ -20,26 +20,26 @@ function displayFormTypeElements( cible, choice ) { switch ( choice ) { case 'text' : - cible.children(".elementwrap-titre").css("display","block"); - cible.children(".elementwrap-texte").css("display","block"); - cible.children(".elementwrap-visuel").css("display","none"); - cible.children(".elementwrap-video").css("display","none"); + cible.children("#titre-element").css("display","block"); + cible.children("#texte-element").css("display","block"); + cible.children("#visuel-element").css("display","none"); + cible.children("#video-element").css("display","none"); cible.children(".elementwrap-video_background").css("display","none"); break; case 'visuel' : - cible.children(".elementwrap-titre").css("display","none"); - cible.children(".elementwrap-texte").css("display","none"); - cible.children(".elementwrap-visuel").css("display","block"); - cible.children(".elementwrap-video").css("display","none"); + cible.children("#titre-element").css("display","none"); + cible.children("#texte-element").css("display","none"); + cible.children("#visuel-element").css("display","block"); + cible.children("#video-element").css("display","none"); cible.children(".elementwrap-video_background").css("display","none"); break; case 'video' : - cible.children(".elementwrap-titre").css("display","none"); - cible.children(".elementwrap-texte").css("display","none"); - cible.children(".elementwrap-visuel").css("display","none"); - cible.children(".elementwrap-video").css("display","block"); + cible.children("#titre-element").css("display","none"); + cible.children("#texte-element").css("display","none"); + cible.children("#visuel-element").css("display","none"); + cible.children("#video-element").css("display","block"); cible.children(".elementwrap-video_background").css("display","block"); break; } diff --git a/js/home.js b/js/home.js index a1bd5df..3fad106 100644 --- a/js/home.js +++ b/js/home.js @@ -12,6 +12,20 @@ var time; function load_home() { slideShow(); preloadSlides(); + + $(".logo") + + .mouseenter(function() { + var img = $(this).children("img"); + //fb( $(img)); + //$(this).children().css('fill',"#6F216C"); + $('path, polygon, circle', this).attr('fill', '#ccc'); + $(this).children().find("Background").attr("fill", "#ccc"); + }) + + .mouseleave(function() { + $(this).children().css('fill','black'); + }); } function slideShow() { diff --git a/less/agence.less b/less/agence.less index 95bf6ba..cb0b0cc 100644 --- a/less/agence.less +++ b/less/agence.less @@ -83,11 +83,11 @@ overflow:hidden; } - .bloc-holder h1 { + .bloc-holder h2 { font-size:56px; } - .bloc-holder h2{ + .bloc-holder h3{ font-size:32px; padding: 0 0 20px 0; } diff --git a/less/footer.less b/less/footer.less index 9044cca..bc525cc 100644 --- a/less/footer.less +++ b/less/footer.less @@ -102,8 +102,8 @@ /* Footer Suivez-nous */ #footer .reseaux .social { float: left; - width: 50px; - height: 50px; + width: 42px; + height: 42px; text-align: center; margin-right: 20px; background-color: #191919; @@ -111,7 +111,7 @@ } #footer .reseaux .social img { - margin-top: 10px; + margin-top: 8px; } #footer .reseaux .Facebook:hover { diff --git a/less/header.less b/less/header.less index 5c28ff3..5dfb5eb 100644 --- a/less/header.less +++ b/less/header.less @@ -30,9 +30,9 @@ } .logo { - background: url('../images/logo.png') no-repeat; - width:317px; - height:130px; + //background: url('../images/logo.svg') no-repeat; + width:318px; + height:132px; float:left; } diff --git a/less/home.less b/less/home.less index 32f7fe7..8b330d7 100644 --- a/less/home.less +++ b/less/home.less @@ -104,13 +104,13 @@ overflow:hidden; } -.home-agency .bloc-holder h1, -.home-expertise .bloc-holder h1 { +#home-agency .bloc-holder h2, +#home-expertise .bloc-holder h2 { font-size:56px; } -#home-agency .bloc-holder h2, -#home-expertise .bloc-holder h2 { +#home-agency .bloc-holder h3, +#home-expertise .bloc-holder h3 { font-size:32px; padding: 0 0 20px 0; }