From 9b248922c76c1f663ac7b080fc0ecdb5bd7812ab Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 29 Dec 2014 14:07:53 +0000 Subject: [PATCH] --- framework/application/configs/application.ini | 2 +- framework/application/configs/settings.ini | 58 ++++++++++++------- .../application/forms/CMS/Sub/News/New.php | 26 +++++---- .../application/forms/CMS/Sub/News/News.php | 16 +++-- .../views/helpers/FooterActualites.php | 6 +- .../views/scripts/admin/index.phtml | 17 +++--- less/footer.less | 4 ++ 7 files changed, 78 insertions(+), 51 deletions(-) diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index 935f5ad..bfdf04b 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -1,5 +1,5 @@ [production] -dev = false +dev = true minify.js = true minify.css = true diff --git a/framework/application/configs/settings.ini b/framework/application/configs/settings.ini index 0a3683f..a8a77f7 100644 --- a/framework/application/configs/settings.ini +++ b/framework/application/configs/settings.ini @@ -1,10 +1,14 @@ [production] localesEnabled.0 = "fr" tags = "" -longTitle.fr = "Cubedesigners // Agence de design global // Graphisme, web, design produit // Paris Montpellier" +longTitle.fr = "Cubedesigners / Agence de design global / Graphisme, web, design produit / Paris Montpellier" longTitle.en = "" description.fr = "Cubedesigners est une agence de Design global : graphisme, sites internet et design produit située à Paris et Montpellier." description.en = "" +logoTitle.fr = "Cubedesigners" +logoTitle.en = "" +baseline.fr = "Agence de création sur mesure" +baseline.en = "" contact.fr.bloc = "Pour toute information, un email unique : [contact@cubedesigners.com|mailto:contact@cubedesigners.com] l’agence concernée vous répondra dans les plus brefs délais." @@ -113,22 +117,40 @@ contact.en.bureaux.1.markers.1.pays = "FR" contact.en.bureaux.1.markers.1.tel = "" contact.en.bureaux.1.markers.1.fax = "" contact.en.bureaux.1.markers.1.icon = false -actus.fr.actualites.0.date = "2014-11-21 00:00:00" -actus.fr.actualites.0.texte = "Bienvenue sur notre nouveau site !" -actus.fr.actualites.1.date = "2014-11-12 00:00:00" -actus.fr.actualites.1.texte = "Cubedesigners réalise les supports de communication de la Cité de l'espace pour la journée d’atterrissage de Philae sur la comète Tchouri." -actus.fr.actualites.2.date = "2014-04-26 00:00:00" -actus.fr.actualites.2.texte = "Nouvelle exposition pour la Cité de l’espace à Toulouse : Explorations extrêmes." -actus.en.actualites.0.date = "2014-01-20 12:19:32" +actus.fr.actualites.0.date = "2014-12-26 12:12:12" +actus.fr.actualites.0.texte = "Cubedesigners réalise le site internet Enko Running Shoes + +" +actus.fr.actualites.0.link.url = "http://www.enko-running-shoes.com/" +actus.fr.actualites.0.link.page = "" +actus.fr.actualites.1.date = "2014-11-21 12:12:12" +actus.fr.actualites.1.texte = "Bienvenue sur notre nouveau site !" +actus.fr.actualites.1.link.url = "" +actus.fr.actualites.1.link.page = "" +actus.fr.actualites.2.date = "2014-11-12 12:12:12" +actus.fr.actualites.2.texte = "Cubedesigners réalise les supports de communication de la Cité de l'espace pour la journée d’atterrissage de Philae sur la comète Tchouri." +actus.fr.actualites.2.link.url = "" +actus.fr.actualites.2.link.page = "3/139" +actus.en.actualites.0.date = "2014-01-20 12:12:12" actus.en.actualites.0.texte = "" -actus.en.actualites.1.date = "2014-01-20 12:19:32" +actus.en.actualites.0.link.url = "" +actus.en.actualites.0.link.page = "" +actus.en.actualites.1.date = "2014-01-20 12:12:12" actus.en.actualites.1.texte = "" -actus.en.actualites.2.date = "2014-01-20 12:19:32" +actus.en.actualites.1.link.url = "" +actus.en.actualites.1.link.page = "" +actus.en.actualites.2.date = "2014-01-20 12:12:12" actus.en.actualites.2.texte = "" -actus.en.actualites.3.date = "2014-01-20 12:19:32" +actus.en.actualites.2.link.url = "" +actus.en.actualites.2.link.page = "" +actus.en.actualites.3.date = "2014-01-20 12:12:12" actus.en.actualites.3.texte = "" -actus.en.actualites.4.date = "2014-01-20 12:19:32" +actus.en.actualites.3.link.url = "" +actus.en.actualites.3.link.page = "" +actus.en.actualites.4.date = "2014-01-20 12:12:12" actus.en.actualites.4.texte = "" +actus.en.actualites.4.link.url = "" +actus.en.actualites.4.link.page = "" followus.fr.reseauxsociaux.0.titre = "Facebook" followus.fr.reseauxsociaux.0.url = "https://facebook.com/Cubedesigners" followus.fr.reseauxsociaux.0.color = "#39599f" @@ -141,14 +163,10 @@ followus.fr.reseauxsociaux.2.titre = "Google Plus" followus.fr.reseauxsociaux.2.url = "https://www.google.com/+Cubedesigners" followus.fr.reseauxsociaux.2.color = "#e64405" followus.fr.reseauxsociaux.2.picto.0 = "52fa1db5-picto-gplus.svg" -followus.fr.reseauxsociaux.3.titre = "Pinterest" -followus.fr.reseauxsociaux.3.url = "https://www.pinterest.com/" -followus.fr.reseauxsociaux.3.color = "#ca111a" -followus.fr.reseauxsociaux.3.picto.0 = "52fa1dbc-picto-pi.svg" -followus.fr.reseauxsociaux.4.titre = "Youtube" -followus.fr.reseauxsociaux.4.url = "https://www.youtube.com/user/Cubedesigners" -followus.fr.reseauxsociaux.4.color = "#c22528" -followus.fr.reseauxsociaux.4.picto.0 = "546b73b4-546b63a0-youtube.svg" +followus.fr.reseauxsociaux.3.titre = "Youtube" +followus.fr.reseauxsociaux.3.url = "https://www.youtube.com/user/Cubedesigners" +followus.fr.reseauxsociaux.3.color = "#c22528" +followus.fr.reseauxsociaux.3.picto.0 = "546b73b4-546b63a0-youtube.svg" followus.en.reseauxsociaux.0.titre = "" followus.en.reseauxsociaux.0.url = "" followus.en.reseauxsociaux.0.color = false diff --git a/framework/application/forms/CMS/Sub/News/New.php b/framework/application/forms/CMS/Sub/News/New.php index fa5ed06..991983a 100644 --- a/framework/application/forms/CMS/Sub/News/New.php +++ b/framework/application/forms/CMS/Sub/News/New.php @@ -2,18 +2,22 @@ class Cubedesigners_Form_CMS_Sub_News_New extends CubeIT_Form_SubForm { - public function init() { - parent::init(); + public function init() { + parent::init(); - $date = new CubeIT_Form_Element_Date('date'); - $date->setLabel('Date'); - $this->addElement($date); + $date = new CubeIT_Form_Element_Date('date'); + $date->setLabel('Date'); + $date->setPrecision(CubeIT_Date::DAY); + $this->addElement($date); - $texte = new CubeIT_Form_Element_Markitup_Basic('texte'); - $texte->setLabel('Texte'); - $this->addElement($texte); - } + $texte = new CubeIT_Form_Element_Markitup_Basic('texte'); + $texte->setLabel('Texte'); + $this->addElement($texte); -} + $lien = new CubeIT_Form_Element_Link(); + $lien->setLabel('Lien'); + $lien->labelEnabled(false); + $this->addSubForm($lien, 'link'); + } -?> +} diff --git a/framework/application/forms/CMS/Sub/News/News.php b/framework/application/forms/CMS/Sub/News/News.php index 8ac4e85..0fc9364 100644 --- a/framework/application/forms/CMS/Sub/News/News.php +++ b/framework/application/forms/CMS/Sub/News/News.php @@ -2,15 +2,13 @@ class Cubedesigners_Form_CMS_Sub_News_News extends CubeIT_Form_Multi_SubForm { - public function init() { - parent::init(); + public function init() { + parent::init(); - $actu = new Cubedesigners_Form_CMS_Sub_News_New(); - $this->setBaseSubForm($actu); - $this->setBaseLegend("Edition de l'actualité du « $date »"); - $this->setNewLegend('Nouvelle actualité'); - } + $actu = new Cubedesigners_Form_CMS_Sub_News_New(); + $this->setBaseSubForm($actu); + $this->setBaseLegend('Edition de l\'actualité du « $date »'); + $this->setNewLegend('Nouvelle actualité'); + } } - -?> diff --git a/framework/application/views/helpers/FooterActualites.php b/framework/application/views/helpers/FooterActualites.php index 36fa77a..4d6eb5e 100644 --- a/framework/application/views/helpers/FooterActualites.php +++ b/framework/application/views/helpers/FooterActualites.php @@ -12,8 +12,10 @@ class Cubedesigners_View_Helper_FooterActualites extends Zend_View_Helper_Abstra $res.='

' . __('Actualités') . '

'; foreach ($actus as $id => $actu) { $res.='
'; - $res.= $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date')); - $res.='

' . nl2br($actu['texte']) . '

'; + $c = $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date')); + $c.= $this->view->markupDotclear($actu['texte']); + $actu['link']['label'] = $c; + $res.=$this->view->linkCMS($actu['link']); $res.='
'; } $res.= ''; diff --git a/framework/application/views/scripts/admin/index.phtml b/framework/application/views/scripts/admin/index.phtml index 411af7b..7c3f1d9 100644 --- a/framework/application/views/scripts/admin/index.phtml +++ b/framework/application/views/scripts/admin/index.phtml @@ -1,8 +1,9 @@ -'; -$this->headLink()->appendStylesheet('/CubeIT/less/admin/common.less', 'all'); -$this->headScript()->addScriptAndStyle('admin'); -echo '
'; -echo $this->form; -echo ''; +'; +$this->headLink()->appendStylesheet('/CubeIT/less/admin/common.less', 'all'); +$this->headScript()->addForm()->addScriptAndStyle('admin'); + +echo '
'; +echo $this->form; +echo ''; diff --git a/less/footer.less b/less/footer.less index eee0a7f..8e7a8b0 100644 --- a/less/footer.less +++ b/less/footer.less @@ -34,6 +34,10 @@ color:#6c6c6c; padding-bottom: 20px; + a{ + color:#6c6c6c; + } + h3 { width:90%; font-size:16px; -- 2.39.5