Merge pull request #30 from j0k3r/partial

port changes from Propel to Doctrine

Author: cedriclombardot

data/generator/sfDoctrineModule/twitter/template/templates/_form.php

@@ -3,6 +3,29 @@
 
 <div class="sf_admin_form">
   [?php echo form_tag_for($form, '@<?php echo $this->params['route_prefix'] ?>') ?]
+
+<?php if($this->configuration->hasNewPartial()) : ?>
+  [?php if ($form->isNew()) : ?]
+  <div class="sf_admin_right_column">
+  <?php foreach($this->configuration->getNewPartial() as $partial): ?>
+    [?php include_partial('<?php echo $partial ?>', array('form' => $form, '<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'helper' => $helper, 'configuration' => $configuration)) ?]
+  <?php endforeach; ?>
+  </div>
+  <div class="sf_admin_with_right_colum">
+  [?php endif; ?]
+<?php endif; ?>
+
+<?php if($this->configuration->hasEditPartial()) : ?>
+  [?php if (!$form->isNew()) : ?]
+  <div class="sf_admin_right_column">
+  <?php foreach($this->configuration->getEditPartial() as $partial): ?>
+    [?php include_partial('<?php echo $partial ?>', array('form' => $form, '<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'helper' => $helper, 'configuration' => $configuration)) ?]
+  <?php endforeach; ?>
+  </div>
+  <div class="sf_admin_with_right_colum">
+  [?php endif; ?]
+<?php endif; ?>
+
     [?php echo $form->renderHiddenFields(false) ?]
 
     [?php if ($form->hasGlobalErrors()): ?]
@@ -13,6 +36,19 @@
       [?php include_partial('<?php echo $this->getModuleName() ?>/form_fieldset', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'fields' => $fields, 'fieldset' => $fieldset)) ?]
     [?php endforeach; ?]
 
+<?php if($this->configuration->hasEditPartial() && $this->configuration->hasNewPartial()) : ?>
+  </div>
+<?php elseif ($this->configuration->hasNewPartial()) : ?>
+  [?php if ($form->isNew()) : ?]
+  </div>
+  [?php endif; ?]
+<?php else : ?>
+  [?php if (!$form->isNew()) : ?]
+  </div>
+  [?php endif; ?]
+<?php endif; ?>
+
     [?php include_partial('<?php echo $this->getModuleName() ?>/form_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration, 'helper' => $helper)) ?]
+
   </form>
 </div>

data/generator/sfDoctrineModule/twitter/template/templates/editSuccess.php

@@ -3,15 +3,6 @@
 
 <div id="sf_admin_container">
 
-<?php if($this->configuration->hasEditPartial()) : ?>
-  <div class="sf_admin_right_column">
-  <?php foreach($this->configuration->getEditPartial() as $partial): ?>
-    [?php include_partial('<?php echo $partial ?>', array('form' => $form, '<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'helper' => $helper, 'configuration' => $configuration)) ?]
-  <?php endforeach; ?>
-  </div>
-  <div class="sf_admin_with_right_colum">
-<?php endif; ?>
-
   <h2 class="mbl">
     [?php echo <?php echo $this->getI18NString('edit.title') ?> ?]
 
@@ -38,7 +29,5 @@
   <div id="sf_admin_footer">
     [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
   </div>
-<?php if($this->configuration->hasEditPartial()) : ?>
-  </div>
-<?php endif; ?>
+
 </div>

data/generator/sfDoctrineModule/twitter/template/templates/newSuccess.php

@@ -3,15 +3,6 @@
 
 <div id="sf_admin_container">
 
-<?php if($this->configuration->hasNewPartial()) : ?>
-  <div class="sf_admin_right_column">
-  <?php foreach($this->configuration->getNewPartial() as $partial): ?>
-    [?php include_partial('<?php echo $partial ?>', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'helper' => $helper, 'configuration' => $configuration)) ?]
-  <?php endforeach; ?>
-  </div>
-  <div class="sf_admin_with_right_colum">
-<?php endif; ?>
-
   <h2 class="mbl">
     [?php echo <?php echo $this->getI18NString('new.title') ?> ?]
 
@@ -38,7 +29,5 @@
   <div id="sf_admin_footer">
     [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
   </div>
-<?php if($this->configuration->hasNewPartial()) : ?>
-  </div>
-<?php endif; ?>
+
 </div>

data/generator/sfPropelModule/twitter/template/templates/_form.php

@@ -36,7 +36,6 @@
       [?php include_partial('<?php echo $this->getModuleName() ?>/form_fieldset', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'fields' => $fields, 'fieldset' => $fieldset)) ?]
     [?php endforeach; ?]
 
-
 <?php if($this->configuration->hasEditPartial() && $this->configuration->hasNewPartial()) : ?>
   </div>
 <?php elseif ($this->configuration->hasNewPartial()) : ?>
@@ -48,6 +47,7 @@
   </div>
   [?php endif; ?]
 <?php endif; ?>
+
     [?php include_partial('<?php echo $this->getModuleName() ?>/form_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration, 'helper' => $helper)) ?]
 
   </form>

data/generator/sfPropelModule/twitter/template/templates/editSuccess.php

@@ -3,7 +3,6 @@
 
 <div id="sf_admin_container">
 
-
   <h2 class="mbl">
     [?php echo <?php echo $this->getI18NString('edit.title') ?> ?]
 
@@ -30,4 +29,5 @@
   <div id="sf_admin_footer">
     [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
   </div>
+
 </div>