Changeset 1653

Timestamp:

01/24/2007 11:49:22 PM (23 months ago)

Author:

wei

Message:

Fixed #502

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• buildscripts/texbuilder/Page2Tex.php (modified) (3 diffs)
• framework/I18N/core/CultureInfo.php (modified) (2 diffs)
• framework/Web/UI/WebControls/TStyle.php (modified) (5 diffs)
• framework/Web/UI/WebControls/TWebControl.php (modified) (1 diff)
• tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.page (added)
• tests/FunctionalTests/active-controls/protected/pages/DisplayStyleTest.php (added)
• tests/FunctionalTests/validators/tests/DatePickerTestCase.php (modified) (1 diff)
• tests/simple_unit/I18N (added)
• tests/simple_unit/I18N/CultureInfoTest.php (added)

trunk/HISTORY

@@ -2 +2 @@
 =================================
 ENH: Added PRADO_CHMOD constant so that users can specify the permission of PRADO-created directories (Qiang)
+ENH: Ticket#519 - Update TActiveRecord implementation (Wei)
+ENH: Add Display property to TWebControl (Wei)
+BUG: Ticket#517 - Quickstart I18N sample: conflicting module ID (Wei)
+BUG: Ticket#521 - comment tag on TActiveButton stop callback (Wei)
 
 Version 3.1.0 alpha January 15, 2007

trunk/buildscripts/texbuilder/Page2Tex.php

@@ -212 +212 @@
 
                 $html = preg_replace('/<!--(.*)-->/', '', $html);
+                $html = preg_replace('/<div class="last-modified">((.|\n)*?)<\/div>/', '', $html);
 
 
@@ -301 +302 @@
                 return "<h3 id=\"".($page + (++self::$header_count))."\">";
         }
-        
+
         function set_block_content_id($content)
         {
@@ -323 +324 @@
                 }
                 else
-                {       
+                {
                         $changes = str_replace('"source"', '"source block-content" id="code-'.$id.'"', $matches[0]);
                         return $changes;

trunk/framework/I18N/core/CultureInfo.php

@@ -415 +415 @@
          * Returns <code>array('Language','Country');</code>
          * 'Country' is omitted if the culture is neutral.
-         * @return array array with language and country as elements.
+         * @return string language (country), it may locale code string if english name does not exist.
          */
         function getEnglishName()
@@ -424 +424 @@
 
                 $language = $culture->findInfo("Languages/{$lang}");
+                if(count($language) == 0)
+                        return $this->culture;
+
                 $region = $culture->findInfo("Countries/{$reg}");
                 if($region)

trunk/framework/Web/UI/WebControls/TStyle.php

@@ -44 +44 @@
          */
         private $_customStyle=null;
+        /**
+         * @var string display style
+         */
+        private $_displayStyle='Fixed';
 
         /**
@@ -174 +178 @@
                 return $this->_font;
         }
-        
+
         /**
          * @return boolean true if font is set.
@@ -181 +185 @@
         {
                 return $this->_font !== null;
+        }
+
+        /**
+         * @param TDisplayStyle control display style, default is TDisplayStyle::Fixed
+         */
+        public function setDisplayStyle($value)
+        {
+                $this->_displayStyle = TPropertyValue::ensureEnum($value, 'TDisplayStyle');
+                switch($this->_displayStyle)
+                {
+                        case TDisplayStyle::None:
+                                $this->_fields['display'] = 'none';
+                                break;
+                        case TDisplayStyle::Dynamic:
+                                $this->_fields['display'] = ''; //remove the display property
+                                break;
+                        case TDisplayStyle::Fixed:
+                                $this->_fields['visibility'] = 'visible';
+                                break;
+                        case TDisplayStyle::Hidden:
+                                $this->_fields['visibility'] = 'hidden';
+                                break;
+                }
+        }
+
+        /**
+         * @return TDisplayStyle display style
+         */
+        public function getDisplayStyle()
+        {
+                return $this->_displayStyle;
         }
 
@@ -363 +398 @@
                         $writer->addAttribute('class',$this->_class);
         }
-        
+
         /**
          * @return array list of style fields.
@@ -371 +406 @@
                 return $this->_fields;
         }
+}
+
+/**
+ * TDisplayStyle defines the enumerable type for the possible styles
+ * that a web control can display.
+ *
+ * The following enumerable values are defined:
+ * - None: the control is not displayed and not included in the layout.
+ * - Dynamic: the control is displayed and included in the layout, the layout flow is dependent on the control (equivalent to display:'' in css).
+ * - Fixed: Similar to Dynamic with CSS "visibility" set "shown".
+ * - Hidden: the control is not displayed and is included in the layout.
+ *
+ * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @version $Id$
+ * @package System.Web.UI.WebControls
+ * @since 3.1
+ */
+class TDisplayStyle extends TEnumerable
+{
+        const None='None';
+        const Dynamic='Dynamic';
+        const Fixed='Fixed';
+        const Hidden='Hidden';
 }
 

trunk/framework/Web/UI/WebControls/TWebControl.php

@@ -195 +195 @@
 
         /**
+         * @param TDisplayStyle display style of the control, default is TDisplayStyle::Fixed
+         */
+        public function setDisplay($value)
+        {
+                $this->getStyle()->setDisplayStyle($value);
+        }
+
+        /**
+         * @return TDisplayStyle display style of the control, default is TDisplayStyle::Fixed
+         */
+        public function getDisplay()
+        {
+                return $this->getStyle()->getDisplayStyle();
+        }
+
+        /**
          * @param string the css class of the control
          */

trunk/tests/FunctionalTests/validators/tests/DatePickerTestCase.php

@@ -30 +30 @@
                 $this->select("{$base}picker2_month", "label=9");
                 $this->select("{$base}picker2_day", "label=10");
+                $this->select("{$base}picker2_year", "label=2006");
                 $this->type("{$base}picker3", "14/4/2006");
                 $this->type("{$base}picker4", "7/4/2006");