click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r727499 - in /incubator/click/trunk/click: build/build.xml documentation/docs/roadmap-changes.html extras/src/net/sf/click/extras/control/ColorPicker.java
Date Wed, 17 Dec 2008 20:05:44 GMT
Author: sabob
Date: Wed Dec 17 12:05:44 2008
New Revision: 727499

URL: http://svn.apache.org/viewvc?rev=727499&view=rev
Log:
doco

Modified:
    incubator/click/trunk/click/build/build.xml
    incubator/click/trunk/click/documentation/docs/roadmap-changes.html
    incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java

Modified: incubator/click/trunk/click/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/build/build.xml?rev=727499&r1=727498&r2=727499&view=diff
==============================================================================
--- incubator/click/trunk/click/build/build.xml (original)
+++ incubator/click/trunk/click/build/build.xml Wed Dec 17 12:05:44 2008
@@ -630,6 +630,8 @@
             todir="documentation/docs/click-api/net/sf/click/control"/>
       <copy file="documentation/images/inline-paginator.png"
             todir="documentation/docs/extras-api/net/sf/click/extras/control"/>
+      <copy file="extras/src/META-INF/web/click/colorpicker/images/color-picker.png"
+            todir="documentation/docs/extras-api/net/sf/click/extras/control/colorpicker"/>
       <copy file="documentation/images/tree.png"
             todir="documentation/docs/extras-api/net/sf/click/extras/tree"/>
       <copy file="documentation/images/checkbox-tree.png"

Modified: incubator/click/trunk/click/documentation/docs/roadmap-changes.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/documentation/docs/roadmap-changes.html?rev=727499&r1=727498&r2=727499&view=diff
==============================================================================
--- incubator/click/trunk/click/documentation/docs/roadmap-changes.html (original)
+++ incubator/click/trunk/click/documentation/docs/roadmap-changes.html Wed Dec 17 12:05:44
2008
@@ -169,6 +169,13 @@
           in replacements. See the project for more details.
       </li>
       <li class="change">
+          The ColorPicker was replaced by Sebo Zoltan's implementation, available from
+          <a target="blank" class="external" href="http://www.dhtmlgoodies.com/index.html?whichScript=submitted-color-picker">www.dhtmlgoodies.com</a>.
+          <p/>
+          Changes was only made to the JavaScript, CSS and
+          images. The ColorPicker API remains unchanged.
+      </li>
+      <li class="change">
           The RichTextArea, found in Click examples, was based upon the
           <a target="blank" class="external" href="http://tinymce.moxiecode.com/">TinyMCE</a>
           project (LGPL) and was replaced by the <a target="blank" class="external" href="">YUI
editor</a>

Modified: incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java?rev=727499&r1=727498&r2=727499&view=diff
==============================================================================
--- incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java (original)
+++ incubator/click/trunk/click/extras/src/net/sf/click/extras/control/ColorPicker.java Wed
Dec 17 12:05:44 2008
@@ -35,26 +35,25 @@
  * <table class='htmlHeader' cellspacing='6'>
  * <tr>
  * <td>Color Field</td>
- * <td><input type='text' size='7' title='ColorPicker Control' value='#ee0000'/>
- * <div style="background-color:'#ee0000">
- * <img align='middle' style='cursor:pointer' src='colorpicker/arrowdown.gif' title='choose
color'/>
- * </div>
+ * <td><input type='text' size='7' title='ColorPicker Control' value='#EE0000'/>
+ * <img align='top' style='cursor:pointer' src='colorpicker/color-picker.png' title='choose
color'/>
  * </td>
  * </tr>
  * </table>
  *
- * The ColorPicker control provides a popup DHTML color picker
- * &lt;div&gt; and a text input where users can enter the color in hex format. The
text input
- * field can be turned off by setting {@link #setShowTextField(boolean)} to false (default
is true).
+ * The ColorPicker control provides a popup DHTML color picker and a text input
+ * where users can enter the color in hex format. The text input field can be
+ * turned off by setting {@link #setShowTextField(boolean)} to false
+ * (default is true).
  * <p/>
  * The ColorPicker control will validate wheter the entered color is present (if required)
and that it
- * is a valid hex color either in 3-digit presentation (ie #eee) or 6-digit presentation
(ie #eeeee).
+ * is a valid hex color either in 3-digit presentation (ie #EEE) or 6-digit presentation
(ie #EEEEEE).
  * If the color is not required the color-picker popup will show a button for 'no-color'
on the top-left.
  * <p/>
- * The color picker popup is based on JS script code from liferay.com which in turn is based
on code
- * from http://typetester.maratz.com/. To enable the color
- * popup, reference the <span class="blue">$cssImports</span> and <span class="blue">$jsImports</span>
- * in the page template. For example:
+ * The color picker popup is based on JS script code from
+ * <a target="_blank" href="http://www.dhtmlgoodies.com/index.html?whichScript=submitted-color-picker">www.dhtmlgoodies.com</a>.
+ * To enable the color popup, reference the <span class="blue">$cssImports</span>
+ * and <span class="blue">$jsImports</span> in the page template. For example:
  *
  * <pre class="codeHtml">
  * &lt;html&gt;
@@ -281,11 +280,10 @@
 
         if (isColor(getValue())) {
             values.put("back_color", getValue());
-            values.put("value", getValue());
         } else {
-            values.put("back_color", "#ffffff");
-            values.put("value", "");
+            values.put("back_color", "#FFFFFF");
         }
+        values.put("value", getValue());
 
         HtmlStringBuffer textFieldAttributes = new HtmlStringBuffer(96);
         if (getShowTextField()) {



Mime
View raw message