Changeset 17814

Timestamp:

10/01/08 00:50:43 (2 months ago)

Author:

flack

Message:

formatting fixes

Files:

• trunk/midcom/midcom.helper.datamanager2/renderer/simple.php (modified) (28 diffs)

trunk/midcom/midcom.helper.datamanager2/renderer/simple.php

@@ -130 +130 @@
-    * @access   private
-    */
-
-
+
-
-   /**
@@ -138 +137 @@
-    * @access   private
-    */
-
+
+
-        'datamanager_table' => "<label id='{element_name}_label'<!-- BEGIN required --> class='required'<!-- END required -->> </label>\n\t\t
-        <span class=\"field_text\">
@@ -167 +167 @@
-    * @access   private
-    */
-
-
+
-
-   /**
@@ -251 +250 @@
-        $this->_html = '';
-        $this->_hiddenHtml = '';
- // end func startForm
+
-
-   /**
@@ -264 +263 @@
-    {
-        // add a required note, if one is needed
-
+
+
-            $this->_html .= str_replace('{requiredNote}', $form->getRequiredNote(), $this->_requiredNoteTemplate);
-        }
-        // add form attributes and content
-        $html = str_replace('{attributes}', $form->getAttributes(true), $this->_formTemplate);
-
+
+
-            $html = str_replace('{hidden}', $this->_hiddenHtml, $html);
-
+
+
+
-            $this->_html .= $this->_hiddenHtml;
-        }
-        $this->_html = str_replace('{content}', $this->_html, $html);
-        // add a validation script
-
+
+
-            $this->_html = $script . "\n" . $this->_html;
-        }
- // end func finishForm
+
-
-   /**
@@ -291 +295 @@
-    {
-        $name = $header->getName();
-
+
+
-            $this->_html .= str_replace('{header}', $header->toHtml(), $this->_templates[$name]);
-
+
+
+
-            $this->_html .= str_replace('{header}', $header->toHtml(), $this->_headerTemplate);
-        }
- // end func renderHeader
+
-
-   /**
@@ -306 +313 @@
-    * @param    string      Error message associated with the element
-    * @param    string      Element type (optional)
-
+â€
-    * @see      renderElement()
-    * @return   string      Html for element
@@ -312 +319 @@
-    function _prepareTemplate($name, $label, $required, $error, $type = false)
-    {
-
+
+
-            $nameLabel = array_shift($label);
-
+
+
+
-            $nameLabel = $label;
-        }
-
-
+
+
-            $html = str_replace('{label}', $nameLabel, $this->_templates[$name]);
-
+
+
+
-            /* rambo: I'm pretty sure this is never reached... */
-            $html = str_replace('{label}', $nameLabel, $this->_defaultGroupTemplate);
-
+
+
+
-            switch ($type)
-            {
@@ -336 +351 @@
-        }
-
-
+
+
-            $html = str_replace('<!-- BEGIN required -->', '', $html);
-            $html = str_replace('<!-- END required -->', '', $html);
-
+
+
+
-            $html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN required -->.*?<!-- END required -->([ \t\n\r]*)?/is", '', $html);
-        }
-
-
+
+
-            $html = str_replace('{error}', $error, $html);
-            $html = str_replace('<!-- BEGIN error -->', '', $html);
-            $html = str_replace('<!-- END error -->', '', $html);
-
+
+
+
-            //$html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN error -->.*?<!-- END error -->([ \t\n\r]*)?/is", '', $html);
-
@@ -353 +374 @@
-        }
-
-
-
+
+
+
+
-                $key  = is_int($key)? $key + 2: $key;
-                $html = str_replace("{label_{$key}}", $text, $html);
@@ -363 +386 @@
-
-        $html = str_replace('{element_name}', $name , $html);
-
+
+
-            $html = preg_replace('/\s*<!-- BEGIN label_(\S+) -->.*<!-- END label_\1 -->\s*/i', '', $html);
-        }
-
-        return $html;
- // end func _prepareTemplate
+
-
-   /**
@@ -382 +406 @@
-    function renderElement(&$element, $required, $error)
-    {
-
+
+
-            $html = $this->_prepareTemplate($element->getName(), $element->getLabel(), $required, $error, $element->getType());
-            $this->_html .= str_replace('{element}', $element->toHtml(), $html);
-
-
-
+
+
+
-
-            $html = str_replace('{label}', $element->getLabel(), $this->_groupElementTemplate);
-
+
+
-                $html = str_replace('<!-- BEGIN required -->', '', $html);
-                $html = str_replace('<!-- END required -->', '', $html);
-
+
+
+
-                $html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN required -->(\s|\S)*<!-- END required -->([ \t\n\r]*)?/i", '', $html);
-            }
-            $this->_groupElements[] = str_replace('{element}', $element->toHtml(), $html);
-
-
+
+
+
-            $this->_groupElements[] = $element->toHtml();
-        }
- // end func renderElement
+
-
-   /**
@@ -414 +446 @@
-    {
-        $this->_hiddenHtml .= $element->toHtml() . "\n";
- // end func renderHidden
+
-
-   /**
@@ -426 +458 @@
-    {
-        $this->_html .= $data->toHtml();
- // end func renderHtml
+
-
-   /**
@@ -441 +473 @@
-        $name = $group->getName();
-
-
+
+
-            // the rest of the variables are set in the other groups run of the startGroup function.
-
-
-
-
-
+
+
+
+
+
+
-            // '_groupTemplate'        => $this->_prepareTemplate($name, $group->getLabel(), $required, $error),
-            '_groupTemplate'        => $this->_prepareTemplate($name, $group->getLabel(), $required, $error, 'dummy:group'),
@@ -459 +493 @@
-        $this->_currentGroupName = $name;
-        $this->_currentGroups[] = $name;
- // end func startGroup
+
-
-
@@ -483 +517 @@
-    {
-        $separator = $group->_separator;
-
+
+
-            $count = count($separator);
-            $html  = '';
-
+
+
-                $html .= (0 == $i? '': $separator[($i - 1) % $count]) . $this->_groupElements[$i];
-
-            }
-
+
+
+
-            if (is_null($separator))
-            {
@@ -498 +536 @@
-        }
-
-
+
+
-            $html = str_replace('{content}', $html, $this->_groupWrap);
-        }
@@ -507 +546 @@
-
-        array_pop($this->_currentGroups);
--
+ - 
-        if ($currentGroupId > -1 )
-        {
@@ -515 +554 @@
-            $this->_setGroupTemplates($this->_currentGroupName);
-            $this->_inGroup = true;
-
+
+
-        {
-            $this->_currentGroupName = "";
@@ -522 +562 @@
-        }
-
- // end func finishGroup
+
-
-    /**
@@ -534 +574 @@
-    function setElementTemplate($html, $element = null)
-    {
-
+
+
-            $this->_elementTemplate = $html;
-
+
+
+
-            $this->_templates[$element] = $html;
-        }
- // end func setElementTemplate
+
-
-
@@ -557 +600 @@
-    {
-        $this->_groupWraps[$group] = $html;
- // end func setGroupTemplate
+
-
-    /**
@@ -570 +613 @@
-    {
-        $this->_groupTemplates[$group] = $html;
- // end func setGroupElementTemplate
+
-
-    /**
@@ -582 +625 @@
-    {
-        $this->_headerTemplate = $html;
- // end func setHeaderTemplate
+
-
-    /**
@@ -594 +637 @@
-    {
-        $this->_formTemplate = $html;
- // end func setFormTemplate
+
-
-    /**
@@ -606 +649 @@
-    {
-        $this->_requiredNoteTemplate = $html;
- // end func setRequiredNoteTemplate
+
-
-    /**
@@ -621 +664 @@
-        $this->setRequiredNoteTemplate('');
-        $this->_templates = array();
- // end func clearAllTemplates
- // end class HTML_QuickForm_Renderer_Default
+
+
-?>