fixes FortAwesome#72 and FortAwesome#73 issues and features for bread…

…crumbs : Displays only the last element of a nested set model instead of displaying the element and ancestors / not display inactive ancestors pages Conflicts: dmFrontPlugin/lib/dmWidget/breadCrumb/dmWidgetNavigationBreadCrumbView.php
stephanemeron · Sep 6, 2011 · f59c864 · f59c864
1 parent 8ac5e72
commit f59c864
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/dmCorePlugin/data/dm/i18n/en_fr.yml b/dmCorePlugin/data/dm/i18n/en_fr.yml
@@ -517,4 +517,5 @@
 "Records": "Enregistrements"
 "Record": "Enregistrement"
 "Records Permissions": Permissions sur les Enregistrements
-"Records Permissions Associations": Associations sur les Permissions d'Enregistrements
+"Records Permissions Associations": Associations sur les Permissions d'Enregistrements
+"Include inactive pages": "Inclure les pages inactives"
diff --git a/dmFrontPlugin/lib/dmWidget/breadCrumb/dmWidgetNavigationBreadCrumbForm.php b/dmFrontPlugin/lib/dmWidget/breadCrumb/dmWidgetNavigationBreadCrumbForm.php
@@ -7,11 +7,14 @@ public function configure()
   {
     $this->widgetSchema['separator'] = new sfWidgetFormInputText();
     $this->widgetSchema['includeCurrent'] = new sfWidgetFormInputCheckBox();
+    $this->widgetSchema['includeInactivePages'] = new sfWidgetFormInputCheckBox();
 
     $this->validatorSchema['separator'] = new sfValidatorString(array('max_length' => 255, 'required' => false));
     $this->validatorSchema['includeCurrent']  = new sfValidatorBoolean();
-
+    $this->validatorSchema['includeInactivePages']  = new sfValidatorBoolean();
+
     $this->widgetSchema['includeCurrent']->setLabel('Include current page');
+    $this->widgetSchema['includeInactivePages']->setLabel('Include inactive pages');
 
     $this->setDefaults($this->getDefaultsFromLastUpdated(array('separator', 'includeCurrent')));
 
@@ -22,7 +25,8 @@ protected function getFirstDefaults()
   {
     return array_merge(parent::getFirstDefaults(), array(
       'separator'      => '>',
-      'includeCurrent' => true
+      'includeCurrent' => true,
+      'includeInactivePages' => true
     ));
   }
 }
diff --git a/dmFrontPlugin/lib/dmWidget/breadCrumb/dmWidgetNavigationBreadCrumbView.php b/dmFrontPlugin/lib/dmWidget/breadCrumb/dmWidgetNavigationBreadCrumbView.php
@@ -122,4 +122,4 @@ protected function doRender()
     return $html;
   }
 
-}
+}