JBoss Rich Faces SVN: r6408 - trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-28 08:48:05 -0500 (Thu, 28 Feb 2008)
New Revision: 6408
Modified:
trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
Log:
decrease progress bar height
Modified: trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-02-28 13:45:15 UTC (rev 6407)
+++ trunk/sandbox/samples/fileUploadDemo/src/main/webapp/pages/index.jsp 2008-02-28 13:48:05 UTC (rev 6408)
@@ -49,7 +49,7 @@
maxFilesQuantity="#{bean.maxFiles}"
acceptedTypes="#{bean.fileTypes}">
<f:facet name="progress">
- <progressBar:progressBar style="height: 10px; width: 300px;">
+ <progressBar:progressBar style="height: 5px; width: 250px;">
</progressBar:progressBar>
</f:facet>
<f:facet name="label">
16 years, 10 months
JBoss Rich Faces SVN: r6407 - in trunk/sandbox/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-28 08:45:15 -0500 (Thu, 28 Feb 2008)
New Revision: 6407
Modified:
trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
bugs fixing; cosmetics
Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 13:43:56 UTC (rev 6406)
+++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 13:45:15 UTC (rev 6407)
@@ -96,7 +96,7 @@
FileUploadEntry.LABELS[FileUploadEntry.READY] = '';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_IN_PROGRESS] = 'uploading';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_CANCELED] = '';
-FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SUCCESS] = 'done';
+FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SUCCESS] = '<b>Done</b>';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_TRANSFER_ERROR] = 'transfer_error';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SERVER_ERROR] = 'server_error';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SIZE_ERROR] = 'File size restricted';
@@ -634,10 +634,10 @@
var d1 = $(this.id + ":clean1");
var d2 = $(this.id + ":clean2");
if (disabled) {
- Element.hide(d1);
+ Element.hide(d1.parentNode);
return;
} else {
- Element.show(d1);
+ Element.show(d1.parentNode);
}
if(this.disabled) {
@@ -657,10 +657,10 @@
var d1 = $(this.id+":add1");
var d2 = $(this.id+":add2");
if (disabled) {
- Element.hide(d1);
+ Element.hide(d1.parentNode);
return;
} else {
- Element.show(d1);
+ Element.show(d1.parentNode);
}
d1.className = (this.disabled ? this.classes.ADD.DISABLED : this.classes.ADD.ENABLED);
d2.className = (this.disabled ? this.classes.ADD_CONTENT.DISABLED : this.classes.ADD_CONTENT.ENABLED);
@@ -671,9 +671,9 @@
var d1 = $(this.id + ":upload1");
var d2 = $(this.id + ":upload2");
if(disabled) {
- Element.hide(d1);
+ Element.hide(d1.parentNode);
} else {
- Element.show(d1);
+ Element.show(d1.parentNode);
}
if (this.disabled) {
d1.onclick = function() {return false;};
@@ -836,6 +836,8 @@
try {
var inputs = parentForm.elements;
var entryInput = entry.fileInput;
+
+ entryInput.name = this.id + ":file";
var l = inputs.length;
for (var i = 0; i < l; i++) {
Modified: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-28 13:43:56 UTC (rev 6406)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-28 13:45:15 UTC (rev 6407)
@@ -54,7 +54,7 @@
<td>
<div class="upload_button_border" style=" float:left;">
<div class="#{addButtonClass}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'" onmouseout="this.className='upload_button upload_font'"
- style="position: relative; overflow: hidden; width:70px"
+ style="position: relative; overflow: hidden; width:70px;"
id="#{clientId}:add1">
<div class="#{addButtonClassContent}"
id="#{clientId}:add2" style="direction: rtl;">Add...</div>
@@ -65,11 +65,10 @@
onchange="return $('#{clientId}').component.add(this);"/>
</div>
</div>
- <div class="upload_button_border" style=" float:left;">
+ <div class="upload_button_border" style=" float:left; display: none;">
<div class="upload_button upload_font #{component.attributes['uploadButtonClass']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
onmouseout="this.className='upload_button upload_font'"
id="#{clientId}:upload1"
- style="display: none"
onclick="return $('#{clientId}').component.upload();">
<a href="#" class="upload_button_selection">
<div class="upload_button_content upload_font upload_ico upload_ico_start #{component.attributes['uploadButtonClass']}"
@@ -84,12 +83,11 @@
<!-- -->
- <div class="upload_button_border" style=" float:right">
+ <div class="upload_button_border" style=" float:right; display: none;">
<div class="upload_button upload_font #{component.attributes['cleanButtonClass']}" onmouseover="this.className='upload_button_light upload_font'" onmousedown="this.className='upload_button_press upload_font'" onmouseup="this.className='upload_button upload_font'"
onmouseout="this.className='upload_button upload_font'"
onclick="return $('#{clientId}').component.clear();"
- id="#{clientId}:clean1"
- style="display: none">
+ id="#{clientId}:clean1">
<a href="#" class="upload_button_selection">
<div class="upload_button_content upload_font upload_ico upload_ico_clear_dis #{component.attributes['cleanButtonClass']}"
id="#{clientId}:clean2">Clear All</div>
16 years, 10 months
JBoss Rich Faces SVN: r6406 - in trunk/sandbox/ui/inplaceInput/src/main: java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-28 08:43:56 -0500 (Thu, 28 Feb 2008)
New Revision: 6406
Modified:
trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
Log:
user classes rendering
Modified: trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-28 13:07:51 UTC (rev 6405)
+++ trunk/sandbox/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2008-02-28 13:43:56 UTC (rev 6406)
@@ -148,7 +148,7 @@
<description></description>
</property>
<property>
- <name>changeClass</name>
+ <name>changedClass</name>
<classname>java.lang.String</classname>
<description></description>
</property>
@@ -163,7 +163,7 @@
<description></description>
</property>
<property>
- <name>changeHoverClass</name>
+ <name>changedHoverClass</name>
<classname>java.lang.String</classname>
<description></description>
</property>
Modified: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-28 13:07:51 UTC (rev 6405)
+++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-02-28 13:43:56 UTC (rev 6406)
@@ -170,12 +170,13 @@
private String buildCss(UIComponent component, int key, String suffix) {
Object value;
StringBuffer stringBuffer = new StringBuffer();
+
switch (key) {
case NORMAL_KEY:
stringBuffer.append(INPLACE_CSS_PUBLIC);
stringBuffer.append(" ");
stringBuffer.append(INPLACE_CSS_PUBLIC + "-" + suffix);
- value = component.getAttributes().get(suffix + "Class");
+ value = component.getAttributes().get(suffix + "Class");
if (value != null) {
stringBuffer.append(" ");
stringBuffer.append(value);
16 years, 10 months
JBoss Rich Faces SVN: r6405 - in trunk/sandbox/ui/fileUpload/src/main: java/org/richfaces/org/jboss/seam/ui/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-28 08:07:51 -0500 (Thu, 28 Feb 2008)
New Revision: 6405
Modified:
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java
trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
Smirnov's review notes implemented; server side checking for max files count
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-28 13:05:51 UTC (rev 6404)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/component/UIFileUpload.java 2008-02-28 13:07:51 UTC (rev 6405)
@@ -176,6 +176,14 @@
public void removeFileUploadListener(FileUploadListener listener) {
removeFacesListener(listener);
}
+
+ public void reset () {
+ this.localContentType = null;
+ this.localContentType = null;
+ this.localFileName = null;
+ this.localFileSize = null;
+ this.localInputStream = null;
+ }
public void broadcast(FacesEvent e) {
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-28 13:05:51 UTC (rev 6404)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2008-02-28 13:07:51 UTC (rev 6405)
@@ -28,6 +28,7 @@
import org.richfaces.component.UIProgressBar;
import org.richfaces.event.UploadEvent;
import org.richfaces.org.jboss.seam.ui.component.UIFileUpload;
+import org.richfaces.org.jboss.seam.web.FileUploadException;
import org.richfaces.org.jboss.seam.web.MultipartRequest;
import org.richfaces.renderkit.TemplateEncoderRendererBase;
@@ -71,6 +72,21 @@
}
}
+
+ /**
+ * Method checks if uploaded files count overflowed
+ * @param fileUpload
+ * @param map
+ * @return
+ */
+ private boolean checkFileCount (UIFileUpload fileUpload, Map<String, File> map) {
+ Integer max = fileUpload.getMaxFilesQuantity();
+ if (map != null && map.size() >= max) {
+ fileUpload.reset();
+ return false;
+ }
+ return true;
+ }
/**
* Put uploaded file into data attribute defined
@@ -85,7 +101,11 @@
Class clazz = data.getType(context.getELContext());
if (clazz.isAssignableFrom(Map.class)) {
Map<String, File> map = (Map<String, File>) data.getValue(context.getELContext());
- map.put(fileUpload.getLocalFileName(), file);
+ if (checkFileCount(fileUpload, map)) {
+ map.put(fileUpload.getLocalFileName(), file);
+ }else {
+ throw new FileUploadException("Files count overflow");
+ }
}
}
}
Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-28 13:05:51 UTC (rev 6404)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/web/MultipartRequest.java 2008-02-28 13:07:51 UTC (rev 6405)
@@ -147,7 +147,7 @@
return fileSize;
}
- public void createTempFile() {
+ public File createTempFile() {
try {
tempFile = File.createTempFile(new UID().toString().replace(
@@ -157,6 +157,7 @@
} catch (IOException ex) {
throw new FileUploadException("Could not create temporary file");
}
+ return tempFile;
}
@Override
@@ -288,6 +289,7 @@
encoding = request.getCharacterEncoding();
parameters = new HashMap<String, Param>();
+ File file = null;
this.percentMap = getProgressData();
try {
@@ -334,7 +336,7 @@
if (headers.containsKey(PARAM_FILENAME)) {
FileParam fp = new FileParam(paramName);
if (createTempFiles)
- fp.createTempFile();
+ file = fp.createTempFile();
fp.setContentType(headers
.get(PARAM_CONTENT_TYPE));
fp.setFilename(decodeFileName(headers
@@ -413,12 +415,18 @@
pos = 0;
fillProgressInfo();
} else {
+ if (file != null) {
+ file.delete();
+ }
return false;
}
}
return true;
} else {
+ if (file != null) {
+ file.delete();
+ }
return false;
}
} catch (IOException ex) {
Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 13:05:51 UTC (rev 6404)
+++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-28 13:07:51 UTC (rev 6405)
@@ -54,7 +54,7 @@
[
new E('td',{'className':function (context) { return 'upload_font upload_name upload_table_td ' + Richfaces.evalMacro("className", context);}},
[
- new E('div',{'className':'upload_name_padding'},
+ new E('div',{'className':'upload_name_padding','style':'overflow-x : hidden;'},
[
new ET(function (context) { return Richfaces.evalMacro("fileName", context)})
]),
@@ -73,7 +73,7 @@
]),
new E('td',{'className':'upload_table_td'},
[
- new E('div',{'className':'upload_font upload_scroll'})
+ new E('div',{'className':'upload_font upload_scroll'},[ new T ('\u00A0') ])
])
])
])
@@ -95,7 +95,7 @@
FileUploadEntry.LABELS[FileUploadEntry.INITIALIZED] = '';
FileUploadEntry.LABELS[FileUploadEntry.READY] = '';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_IN_PROGRESS] = 'uploading';
-FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_CANCELED] = 'canceled';
+FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_CANCELED] = '';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SUCCESS] = 'done';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_TRANSFER_ERROR] = 'transfer_error';
FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SERVER_ERROR] = 'server_error';
@@ -197,14 +197,11 @@
Element.insert(this.statusLabel, FileUploadEntry.LABELS[newState]);
if (newState == FileUploadEntry.UPLOAD_IN_PROGRESS) {
- //Element.insert(this.controlArea, FileUploadEntry.stopControlTemplate.getContent());
Element.update(this.controlArea, FileUploadEntry.stopControlTemplate.invoke('getContent',{'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
- } else if (newState == FileUploadEntry.READY) {
- //Element.insert(this.controlArea, FileUploadEntry.cancelControlTemplate.getContent());
+ } else if (newState == FileUploadEntry.UPLOAD_SUCCESS) {
+ Element.update(this.controlArea, FileUploadEntry.clearControlTemplate.invoke('getContent',{'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
+ } else {
Element.update(this.controlArea, FileUploadEntry.cancelControlTemplate.invoke('getContent',{'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
- } else {
- //Element.insert(this.controlArea, FileUploadEntry.clearControlTemplate.getContent());
- Element.update(this.controlArea, FileUploadEntry.clearControlTemplate.invoke('getContent',{'className': this.uploadObject.classes.FILE_ENTRY_CONTROL.ENABLED}).join(''));
}
if (newState == FileUploadEntry.UPLOAD_SUCCESS) {
@@ -316,7 +313,6 @@
},
onload: function() {
- //if (this.iframe && this.iframe.src == 'about:blank') return;
var iframeDocument = this.iframe.contentWindow.document;
var elt = iframeDocument.getElementById('_richfaces_file_upload_stopped');
var restr = iframeDocument.getElementById('_richfaces_file_upload_size_restricted');
@@ -375,6 +371,8 @@
events: null,
maxFileBatchSize: null,
+
+ uploadedCount: 0,
initialize: function(id, stopScript, getFileSizeScript, progressBarId, classes, label, maxFiles, events, disabled, acceptedTypes, options) {
this.id = id;
@@ -515,7 +513,7 @@
var l = this.entries.length;
for (var i = 0; i < l; i++) {
var entry = this.entries[i];
- if (entry.state == FileUploadEntry.READY || entry.state == FileUploadEntry.INITIALIZED) {
+ if (entry.state == FileUploadEntry.READY || entry.state == FileUploadEntry.INITIALIZED || entry.state == FileUploadEntry.UPLOAD_CANCELED) {
return entry;
}
@@ -588,12 +586,7 @@
cleanAllDisabled: function () {
if (this.options['autoclear']) return true;
- var c = 0;
- for (var i = 0; i < this.entries.length; i++) {
- if (this.entries[i].state == FileUploadEntry.UPLOAD_SUCCESS) {
- c++;
- }
- }
+ var c = this.getFileEntriesSumByState(FileUploadEntry.UPLOAD_SUCCESS);
return (c == 0);
},
@@ -601,21 +594,29 @@
if (this.runUpload) {
return false;
} else {
- var c = 0;
- for (var i = 0; i < this.entries.length; i++) {
- var e = this.entries[i];
- if (e.state == FileUploadEntry.READY || e.state == FileUploadEntry.INITIALIZED) {
- c++;
- }
- }
+ var c = this.getFileEntriesSumByState(FileUploadEntry.READY, FileUploadEntry.INITIALIZED, FileUploadEntry.UPLOAD_CANCELED);
return (c == 0);
}
},
+ getFileEntriesSumByState: function () {
+ var statuses = {}
+ var s = 0;
+ for (var i = 0; i < arguments.length; i++) {
+ statuses[arguments[i]] = true;
+ }
+ for (var i = 0; i < this.entries.length; i++) {
+ if (statuses[this.entries[i].state]) {
+ s++;
+ }
+ }
+ return s;
+ },
+
switchUploadButton: function () {
if (this.runUpload) {
var d = $(this.id + ":upload2");
- d.innerHTML = "<b>Cancel</b>";
+ d.innerHTML = "<b>Stop</b>";
d.onclick = function () {
this.stop();
}.bind(this);
@@ -651,7 +652,7 @@
},
disableAddButton: function() {
- var disabled = (this.maxFileBatchSize && this.entries.length >= this.maxFileBatchSize);
+ var disabled = ((this.getFileEntriesSumByState(FileUploadEntry.READY, FileUploadEntry.INITIALIZED, FileUploadEntry.UPLOAD_CANCELED) + this.uploadedCount) >= this.maxFileBatchSize);
this.currentInput.disabled = disabled || this.disabled;
var d1 = $(this.id+":add1");
var d2 = $(this.id+":add2");
@@ -751,9 +752,9 @@
if (newState == FileUploadEntry.UPLOAD_SUCCESS || newState == FileUploadEntry.UPLOAD_SIZE_ERROR) {
//todo clear completed
- //if (this.activeEntry) {
- // this.activeEntry.clear();
- //}
+ if (newState == FileUploadEntry.UPLOAD_SUCCESS) {
+ this.uploadedCount++;
+ }
this._endUpload();
16 years, 10 months
JBoss Rich Faces SVN: r6404 - trunk/framework/impl/src/main/resources/META-INF/skins.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-28 08:05:51 -0500 (Thu, 28 Feb 2008)
New Revision: 6404
Modified:
trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/NULL.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties
trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties
Log:
new skins
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/DEFAULT.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -62,3 +62,10 @@
calendarSpecBackgroundColor=#F1EEE9
calendarSpecTextColor=#000000
+
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/NULL.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/NULL.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/NULL.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -63,3 +63,10 @@
calendarSpecBackgroundColor=#F1EEE9
calendarSpecTextColor=#000000
+
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/blueSky.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -63,3 +63,10 @@
calendarSpecBackgroundColor=#E4F5E2
calendarSpecTextColor=#000000
+
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/classic.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -62,3 +62,10 @@
calendarSpecBackgroundColor=#E4F5E2
calendarSpecTextColor=#000000
+
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/deepMarine.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -62,3 +62,9 @@
calendarSpecBackgroundColor=#DFF8F8
calendarSpecTextColor=#000000
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/emeraldTown.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -62,3 +62,9 @@
calendarSpecBackgroundColor=#E2F6E2
calendarSpecTextColor=#000000
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/japanCherry.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -63,3 +63,9 @@
calendarSpecBackgroundColor=#f1f1f1
calendarSpecTextColor=#000000
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/plain.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -60,4 +60,11 @@
calendarCurrentTextColor=#{null}
calendarSpecBackgroundColor=#{null}
-calendarSpecTextColor=#{null}
\ No newline at end of file
+calendarSpecTextColor=#{null}
+
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/ruby.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -63,3 +63,9 @@
calendarSpecBackgroundColor=#f1f1f1
calendarSpecTextColor=#000000
+
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
Modified: trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
+++ trunk/framework/impl/src/main/resources/META-INF/skins/wine.skin.properties 2008-02-28 13:05:51 UTC (rev 6404)
@@ -64,3 +64,9 @@
calendarSpecTextColor=#000000
+warningColor=#FFE6E6
+warningBackgroundColor=#FF0000
+
+editorBackgroundColor=#F1F1F1
+editBackgroundColor=#FEFFDA
+
16 years, 10 months
JBoss Rich Faces SVN: r6403 - management/design/SKINS.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-02-28 07:30:43 -0500 (Thu, 28 Feb 2008)
New Revision: 6403
Modified:
management/design/SKINS/DEFAULT.skin.properties
management/design/SKINS/NULL.skin.properties
management/design/SKINS/blueSky.skin.properties
management/design/SKINS/classic.skin.properties
management/design/SKINS/deepMarine.skin.properties
management/design/SKINS/emeraldTown.skin.properties
management/design/SKINS/japanCherry.skin.properties
management/design/SKINS/plain.skin.properties
management/design/SKINS/ruby.skin.properties
management/design/SKINS/wine.skin.properties
Log:
Modified: management/design/SKINS/DEFAULT.skin.properties
===================================================================
--- management/design/SKINS/DEFAULT.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/DEFAULT.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -68,4 +68,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
\ No newline at end of file
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: management/design/SKINS/NULL.skin.properties
===================================================================
--- management/design/SKINS/NULL.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/NULL.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -69,4 +69,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
\ No newline at end of file
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: management/design/SKINS/blueSky.skin.properties
===================================================================
--- management/design/SKINS/blueSky.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/blueSky.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -69,4 +69,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
\ No newline at end of file
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: management/design/SKINS/classic.skin.properties
===================================================================
--- management/design/SKINS/classic.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/classic.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -68,4 +68,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
\ No newline at end of file
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: management/design/SKINS/deepMarine.skin.properties
===================================================================
--- management/design/SKINS/deepMarine.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/deepMarine.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -67,4 +67,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
+editBackgroundColor=#FEFFDA
Modified: management/design/SKINS/emeraldTown.skin.properties
===================================================================
--- management/design/SKINS/emeraldTown.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/emeraldTown.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -67,4 +67,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
+editBackgroundColor=#FEFFDA
Modified: management/design/SKINS/japanCherry.skin.properties
===================================================================
--- management/design/SKINS/japanCherry.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/japanCherry.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -68,4 +68,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
+editBackgroundColor=#FEFFDA
Modified: management/design/SKINS/plain.skin.properties
===================================================================
--- management/design/SKINS/plain.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/plain.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -67,4 +67,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
\ No newline at end of file
+editBackgroundColor=#FEFFDA
\ No newline at end of file
Modified: management/design/SKINS/ruby.skin.properties
===================================================================
--- management/design/SKINS/ruby.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/ruby.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -68,4 +68,4 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
+editBackgroundColor=#FEFFDA
Modified: management/design/SKINS/wine.skin.properties
===================================================================
--- management/design/SKINS/wine.skin.properties 2008-02-28 11:59:30 UTC (rev 6402)
+++ management/design/SKINS/wine.skin.properties 2008-02-28 12:30:43 UTC (rev 6403)
@@ -68,5 +68,5 @@
warningBackgroundColor=#FF0000
editorBackgroundColor=#F1F1F1
-editBackgroundColor=#FBFF8E
+editBackgroundColor=#FEFFDA
16 years, 10 months
JBoss Rich Faces SVN: r6402 - trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-28 06:59:30 -0500 (Thu, 28 Feb 2008)
New Revision: 6402
Modified:
trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
Log:
fix styles
Modified: trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
===================================================================
--- trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-28 11:39:08 UTC (rev 6401)
+++ trunk/sandbox/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-02-28 11:59:30 UTC (rev 6402)
@@ -41,6 +41,7 @@
.rich-inplace-select-field {
padding : 0px 0px 0px 0px;
border-width: 1px;
+ border-style: none;
margin : 0px;
background-position : center right;
background-repeat : no-repeat;
@@ -157,7 +158,7 @@
</u:selector>
<u:selector name=".rich-inplace-select-field">
- <u:style name="background-color" skin="editorBackgroundColor"/>
+ <u:style name="background-color" skin="editBackgroundColor"/>
<u:style name="border-color" skin="panelBorderColor"/>
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonDown"/>
@@ -182,7 +183,7 @@
<u:selector name=".rich-inplace-select-list-decoration">
<u:style name="border-color" skin="panelBorderColor"/>
- <u:style name="background-color" skin="tableBackgroundColor"/>
+ <u:style name="background-color" skin="editBackgroundColor"/>
</u:selector>
<u:selector name=".rich-inplace-select-font">
16 years, 10 months
JBoss Rich Faces SVN: r6401 - trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-28 06:39:08 -0500 (Thu, 28 Feb 2008)
New Revision: 6401
Modified:
trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
Log:
Modified: trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-02-28 11:38:44 UTC (rev 6400)
+++ trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.jsp 2008-02-28 11:39:08 UTC (rev 6401)
@@ -20,10 +20,7 @@
<h:outputText value="showControls (default: false): " />
<h:selectBooleanCheckbox value="#{bean.showControls}"/>
-
- <h:outputText value="applyFromControlsOnly (default: false): " />
- <h:selectBooleanCheckbox value="#{bean.applyFromControlsOnly}" />
-
+
<h:outputText value="selectOnEdit (default: false): " />
<h:selectBooleanCheckbox value="#{bean.selectOnEdit}" />
@@ -74,7 +71,6 @@
value="#{bean.value}"
selectOnEdit="#{bean.selectOnEdit}"
showControls="#{bean.showControls}"
- applyFromControlsOnly="#{bean.applyFromControlsOnly}"
defaultLabel="#{bean.defaultLabel}"
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
Modified: trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-02-28 11:38:44 UTC (rev 6400)
+++ trunk/sandbox/samples/inplaceInput-sample/src/main/webapp/pages/index.xhtml 2008-02-28 11:39:08 UTC (rev 6401)
@@ -24,9 +24,6 @@
<h:outputText value="showControls (default: false): " />
<h:selectBooleanCheckbox value="#{bean.showControls}"/>
- <h:outputText value="applyFromControlsOnly (default: false): " />
- <h:selectBooleanCheckbox value="#{bean.applyFromControlsOnly}" />
-
<h:outputText value="selectOnEdit (default: false): " />
<h:selectBooleanCheckbox value="#{bean.selectOnEdit}" />
@@ -81,7 +78,6 @@
value="#{bean.value}"
selectOnEdit="#{bean.selectOnEdit}"
showControls="#{bean.showControls}"
- applyFromControlsOnly="#{bean.applyFromControlsOnly}"
defaultLabel="#{bean.defaultLabel}"
inputWidth="#{bean.width}"
minInputWidth="#{bean.minInputWidth}"
16 years, 10 months
JBoss Rich Faces SVN: r6400 - trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-28 06:38:44 -0500 (Thu, 28 Feb 2008)
New Revision: 6400
Modified:
trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp
trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml
Log:
Modified: trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp 2008-02-28 11:38:27 UTC (rev 6399)
+++ trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.jsp 2008-02-28 11:38:44 UTC (rev 6400)
@@ -50,9 +50,6 @@
<h:outputText value="showControls (default: false): " />
<h:selectBooleanCheckbox value="#{bean.showControls}" />
- <h:outputText value="applyFromControlsOnly (default: false): " />
- <h:selectBooleanCheckbox value="#{bean.applyFromControlsOnly}" />
-
<h:outputText value="editOnTab (default: true): " />
<h:selectBooleanCheckbox value="#{bean.editOnTab}" />
@@ -76,7 +73,6 @@
listHeight="#{bean.listHeight}"
selectOnEdit="#{bean.selectOnEdit}"
showControls="#{bean.showControls}"
- applyFromControlsOnly="#{bean.applyFromControlsOnly}"
editOnTab="#{bean.editOnTab}"
openOnEdit="#{bean.openOnEdit}"
>
Modified: trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml 2008-02-28 11:38:27 UTC (rev 6399)
+++ trunk/sandbox/samples/inplaceSelect-sample/src/main/webapp/pages/index.xhtml 2008-02-28 11:38:44 UTC (rev 6400)
@@ -55,11 +55,7 @@
<h:outputText value="showControls (default: false): " />
<h:selectBooleanCheckbox value="#{bean.showControls}" />
-
- <h:outputText value="applyFromControlsOnly (default: false): " />
- <h:selectBooleanCheckbox value="#{bean.applyFromControlsOnly}" />
-
-
+
</h:panelGrid>
<div style="width: 300px">
@@ -77,8 +73,6 @@
listHeight="#{bean.listHeight}"
selectOnEdit="#{bean.selectOnEdit}"
showControls="#{bean.showControls}"
- applyFromControlsOnly="#{bean.applyFromControlsOnly}"
-
>
<f:selectItem itemLabel="option 1" itemValue="Kansas City"/>
<f:selectItem itemLabel="option 2" itemValue="Las Vegas"/>
16 years, 10 months
JBoss Rich Faces SVN: r6399 - in trunk/ui/dataTable/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-02-28 06:38:27 -0500 (Thu, 28 Feb 2008)
New Revision: 6399
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
Log:
Rendering of table headers. Some optimization.
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 11:37:24 UTC (rev 6398)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-28 11:38:27 UTC (rev 6399)
@@ -495,10 +495,11 @@
filterValueInput.setId(column.getId() + SORT_FILTER_PARAMETER);
filterValueInput.setImmediate(true);
column.getFacets().put(FILTER_INPUT_FACET_NAME, filterValueInput);
+ filterValueInput.getAttributes().put(HTML.onclick_ATTRIBUTE, "Event.stop(event);");
}
- String onkeydownEvent = inplaceInput ? "oninputkeydown" : "onkeydown";
+ String onkeydownEvent = inplaceInput ? "oninputkeydown" : HTML.onkeydown_ATTRIBUTE;
- filterValueInput.getAttributes().put("onchange", buffer.toString());
+ filterValueInput.getAttributes().put(HTML.onchange_ATTRIBUTE, buffer.toString());
filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);");
filterValueInput.setValue(column.getAttributes().get("filterValue"));
@@ -551,14 +552,15 @@
String clientId = col.getClientId(context) + facetName;
writer.writeAttribute("id", clientId, null);
+ if (sortableColumn && col.isSelfSorted()) {
+ writer.writeAttribute(HTML.onclick_ATTRIBUTE, buildAjaxFunction(context, column, true)
+ .toString(), null);
+ writer.writeAttribute(HTML.style_ATTRIBUTE, "cursor: pointer;", null);
+ }
+
writer.startElement(HTML.DIV_ELEM, column);
if (sortableColumn) {
- if (col.isSelfSorted()) {
- writer.writeAttribute(HTML.onclick_ATTRIBUTE, buildAjaxFunction(context, column, true)
- .toString(), null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "dr-table-cursor-pointer", null);
- }
writer.startElement(HTML.SPAN_ELEM, column);
String spanClass = "";
if (Ordering.ASCENDING.equals(col.getSortOrder())) {
Modified: trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss
===================================================================
--- trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2008-02-28 11:37:24 UTC (rev 6398)
+++ trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/css/table.xcss 2008-02-28 11:38:27 UTC (rev 6399)
@@ -111,6 +111,10 @@
.dr-table-cursor-pointer {
cursor: pointer;
}
+
+ .rich-inplace-edit, .rich-inplace-view {
+ cursor: default;
+ }
</f:verbatim>
<u:selector name=".dr-table-header-sort-down" >
16 years, 10 months