March 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r13044 - trunk/samples/colorPickerDemo/src/main/webapp/pages.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-19 18:39:50 -0400 (Thu, 19 Mar 2009) New Revision: 13044 Modified: trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp Log: colorPicker sample was fixed Modified: trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp 2009-03-19 20:53:07 UTC (rev 13043) +++ trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp 2009-03-19 22:39:50 UTC (rev 13044) @@ -1,24 +1,33 @@ <%@ page contentType="application/xhtml+xml; charset=ISO-8859-1" %> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/colorPicker" prefix="colorPicker"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<html> - <head> - <title>ColorPicker sample page</title> - </head> - <body> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/colorPicker" prefix="colorPicker"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<html> + <head> + <title>ColorPicker sample page</title> + </head> + <body> <f:view> - <a4j:log popup="false" level="ALL" style="width: 800px; height: 300px;"></a4j:log> <h:form> - - - - <colorPicker:colorPicker id="cp"></colorPicker:colorPicker> - <a4j:commandButton value="submit" reRender="cp"></a4j:commandButton> - - </h:form> - </f:view> - </body> -</html> + <colorPicker:colorPicker id="cp"></colorPicker:colorPicker> + <a4j:commandButton value="submit" reRender="cp"></a4j:commandButton> + <br /><br /><br /><br /><br /><br /><br /><br /><br /> + <br /><br /><br /><br /><br /> + <colorPicker:colorPicker value="#{bean.color2}" flat="true" colorMode="rgb"> + <f:facet name="icon"> + <f:verbatim> + <h:graphicImage value="/pages/colorPicker_ico.png" width="18px" height="18px"/> + </f:verbatim> + </f:facet> + <f:facet name="arrows"> + <f:verbatim> + <div style="width: 30px; height: 5px; border: 1px solid gray; background:none;"></div> + </f:verbatim> + </f:facet> + </colorPicker:colorPicker> + </h:form> + </f:view> + </body> +</html>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13043 - trunk/samples/colorPickerDemo/src/main/webapp/pages.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-19 16:53:07 -0400 (Thu, 19 Mar 2009) New Revision: 13043 Modified: trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp Log: colorPicker: bug with ajax rerender fixed Modified: trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp 2009-03-19 20:36:06 UTC (rev 13042) +++ trunk/samples/colorPickerDemo/src/main/webapp/pages/index.jsp 2009-03-19 20:53:07 UTC (rev 13043) @@ -1,29 +1,23 @@ +<%@ page contentType="application/xhtml+xml; charset=ISO-8859-1" %> + <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/colorPicker" prefix="colorPicker"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> <title>ColorPicker sample page</title> </head> <body> - <f:view> - <h:form> - <colorPicker:colorPicker value="#{bean.color}" flat="false" colorMode="hex" disabled="false"/> - <h:commandButton value="Submit" /> - <br /><br /><br /><br /><br /><br /><br /><br /><br /> - <br /><br /><br /><br /><br /> - <colorPicker:colorPicker value="#{bean.color2}" flat="true" colorMode="rgb"> - <f:facet name="icon"> - <f:verbatim> - <h:graphicImage value="/pages/colorPicker_ico.png" width="18px" height="18px"/> - </f:verbatim> - </f:facet> - <f:facet name="arrows"> - <f:verbatim> - <div style="width: 30px; height: 5px; border: 1px solid gray; background:none;"></div> - </f:verbatim> - </f:facet> - </colorPicker:colorPicker> + <f:view> + <a4j:log popup="false" level="ALL" style="width: 800px; height: 300px;"></a4j:log> + <h:form> + + + + <colorPicker:colorPicker id="cp"></colorPicker:colorPicker> + <a4j:commandButton value="submit" reRender="cp"></a4j:commandButton> + </h:form> </f:view> </body>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13042 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-03-19 16:36:06 -0400 (Thu, 19 Mar 2009) New Revision: 13042 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: https://jira.jboss.org/jira/browse/RF-6555 Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-03-19 20:26:10 UTC (rev 13041) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-03-19 20:36:06 UTC (rev 13042) @@ -341,21 +341,34 @@ UIDataTable table = (UIDataTable) holder.getTable(); ResponseWriter writer = context.getResponseWriter(); Iterator<UIComponent> iter = table.columns(); - boolean first = holder.getRowCounter() == 0; + boolean firstColumn = true; + boolean firstRow = (holder.getRowCounter() == 0); int currentColumn = 0; UIComponent column = null; while (iter.hasNext()) { column = (UIComponent) iter.next(); // Start new row for first column - expect a case of the detail // table, wich will be insert own row. - if (first && !(column instanceof Row)) { - encodeRowStart(context, getFirstRowSkinClass(), + if (firstColumn && !(column instanceof Row)) { + String rowSkinClass = getRowSkinClass(); + if (firstRow) { + String firstRowSkinClass = getFirstRowSkinClass(); + if (firstRowSkinClass != null && firstRowSkinClass.length() != 0) { + if (rowSkinClass != null && rowSkinClass.length() != 0) { + rowSkinClass += " " + firstRowSkinClass; + } else { + rowSkinClass = firstRowSkinClass; + } + } + } + + encodeRowStart(context, rowSkinClass, holder.getRowClass(), table, writer); } if (column instanceof Column) { boolean breakBefore = ((Column) column).isBreakBefore() || column instanceof Row; - if (breakBefore && !first) { + if (breakBefore && !firstColumn) { // close current row writer.endElement(HTML.TR_ELEMENT); // reset columns counter. @@ -369,7 +382,7 @@ } encodeCellChildren(context, column, - first ? getFirstRowSkinClass() : null, + firstRow ? getFirstRowSkinClass() : null, getRowSkinClass(), holder.getRowClass(), getCellSkinClass(), holder.getColumnClass(currentColumn)); // renderChild(context, column); @@ -392,10 +405,10 @@ writer.endElement(HTML.td_ELEM); } currentColumn++; - first = false; + firstColumn = false; } // Close row if then is open. - if (!first && !(column instanceof Row)) { + if (!firstColumn && !(column instanceof Row)) { writer.endElement(HTML.TR_ELEMENT); } }

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13041 - in trunk/ui/colorPicker/src/main: java/org/richfaces and 7 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-19 16:26:10 -0400 (Thu, 19 Mar 2009) New Revision: 13041 Removed: trunk/ui/colorPicker/src/main/config/component/README trunk/ui/colorPicker/src/main/java/org/richfaces/component/README trunk/ui/colorPicker/src/main/java/org/richfaces/ui/ trunk/ui/colorPicker/src/main/resources/org/richfaces/ui/ trunk/ui/colorPicker/src/main/templates/README Modified: trunk/ui/colorPicker/src/main/config/component/colorPicker.xml trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx Log: colorPicker: bug in Safari was fixed Deleted: trunk/ui/colorPicker/src/main/config/component/README =================================================================== Modified: trunk/ui/colorPicker/src/main/config/component/colorPicker.xml =================================================================== --- trunk/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/config/component/colorPicker.xml 2009-03-19 20:26:10 UTC (rev 13041) @@ -21,47 +21,41 @@ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase </superclass> </tag> - <property> - <name>flat</name> - <classname>java.lang.Boolean</classname> - <description> - Defines whether the component will be rendered flat. - </description> - <defaultvalue>false</defaultvalue> - </property> - <property> - <name>colorMode</name> - <classname>java.lang.String</classname> - <description> - Defines a color mode for the component input. Possible values are hex, rgb. - </description> - <defaultvalue><![CDATA["hex"]]></defaultvalue> - </property> - <property> - <name>showEvent</name> - <classname>java.lang.String</classname> - <description> - Defines the event that triggers the colorPicker. - Default value is "onclick". - </description> - <defaultvalue><![CDATA["onclick"]]></defaultvalue> - </property> - <property> - <name>value</name> - <classname>java.lang.String</classname> - <description> - The value of the component. You can define value as hex, RGB or HSB. - </description> - </property> <property> - <name>disabled</name> + <name>flat</name> <classname>java.lang.Boolean</classname> <description> - Defines whether the component is disabled. + Defines whether the component will be rendered flat. </description> - </property> - &ui_component_attributes; - &html_events; - &ui_input_attributes; + <defaultvalue>false</defaultvalue> + </property> + <property> + <name>colorMode</name> + <classname>java.lang.String</classname> + <description> + Defines a color mode for the component input. Possible values are hex, rgb. + </description> + <defaultvalue><![CDATA["hex"]]></defaultvalue> + </property> + <property> + <name>showEvent</name> + <classname>java.lang.String</classname> + <description> + Defines the event that triggers the colorPicker. + Default value is "onclick". + </description> + <defaultvalue><![CDATA["onclick"]]></defaultvalue> + </property> + <property> + <name>value</name> + <classname>java.lang.String</classname> + <description> + The value of the component. You can define value as hex, RGB or HSB. + </description> + <defaultvalue><![CDATA["#ffffff"]]></defaultvalue> + </property> + &ui_component_attributes; + &html_events; + &ui_input_attributes; </component> </components> Deleted: trunk/ui/colorPicker/src/main/java/org/richfaces/component/README =================================================================== Modified: trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java =================================================================== --- trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/java/org/richfaces/renderkit/ColorPickerRendererBase.java 2009-03-19 20:26:10 UTC (rev 13041) @@ -1,11 +1,12 @@ package org.richfaces.renderkit; -import java.io.IOException; import java.util.Map; +import java.util.Set; import javax.faces.component.UIComponent; import javax.faces.component.UIInput; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.renderkit.HeaderResourcesRendererBase; import org.ajax4jsf.util.InputUtils; import org.richfaces.component.UIColorPicker; @@ -39,4 +40,13 @@ return inputValue; } + public void addPopupToAjaxRendered(FacesContext context, UIColorPicker component) { + AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context); + Set<String> ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas(); + String clientId = component.getClientId(context); + if (ajaxContext.isAjaxRequest() && ajaxRenderedAreas.contains(clientId)) { + ajaxRenderedAreas.add(clientId + "-colorPicker-popup"); + ajaxRenderedAreas.add(clientId + "-colorPicker-script"); + } + } } \ No newline at end of file Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-03-19 20:26:10 UTC (rev 13041) @@ -7,11 +7,11 @@ .rich-colorPicker-wrapper{ display:none; height:176px; - !height:166px; overflow:hidden; position:absolute; width:350px; margin-top: 2px; + !margin-top: 0px; } .rich-colorPicker-ext{ border: 1px solid; @@ -144,7 +144,6 @@ position:absolute; right:75px; top:144px; - border: 1px solid; } .rich-colorPicker-cancel{ right:7px; @@ -218,4 +217,14 @@ <f:resource f:key="org/richfaces/renderkit/html/images/rangearrows.gif" /> </u:style> </u:selector> + <u:selector name=".rich-colorPicker-submit"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="color" skin="controlTextColor" /> + </u:selector> + <u:selector name=".rich-colorPicker-cancel"> + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + <u:style name="color" skin="controlTextColor" /> + </u:selector> </f:template> \ No newline at end of file Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-03-19 20:26:10 UTC (rev 13041) @@ -22,7 +22,7 @@ this.patternDec.compile("[^0-9]+"); this.charMin = 65; var o = this.options, self = this, - tpl = $(o.clientId.toString()+"-popup"); + tpl = $(o.clientId.toString()+"-colorPicker-popup"); if(o.color.indexOf('hsb') > -1){ this.color = this._fixHSB(this._fixColors(o.color, 'hsb')); @@ -41,7 +41,7 @@ this.showEvent = o.showEvent; this.origColor = this.color; this.picker = $(tpl); - + this.picker[0].component = this; this.fields = this.picker.find('input') .bind('keydown', function(e) { return self._keyDown.call(self, e); }) @@ -83,10 +83,10 @@ this.picker.css({ position: 'absolute' }); - this.picker.show(); $(this.element).bind(this.showEvent+".colorPicker", function(e) { return self._show.call(self, e); }); + self._show(); } else { - this.picker.hide(); + $(this.element).bind(this.showEvent+".colorPicker", function(e) { return self._show.call(self, e); }); } @@ -95,6 +95,7 @@ destroy: function() { this.picker.remove(); + this.picker[0].component = undefined; this.element.removeData("colorPicker").unbind(".colorPicker"); }, @@ -298,12 +299,12 @@ var RGBCol = this._HSBToRGB(col); this._trigger("submit", e, { options: this.options, hex: '#'+this._HSBToHex(col), rgb: 'rgb('+RGBCol.r+', '+RGBCol.g+', '+RGBCol.b+')' }); this.picker.hide(); - $(window).unbind('mousedown.colorPicker'); + $(document).unbind('mousedown.colorPicker'); return false; }, _clickCancel: function(e) { this.picker.hide(); - $(window).unbind('mousedown.colorPicker'); + $(document).unbind('mousedown.colorPicker'); return false; }, _show: function(e) { @@ -332,7 +333,7 @@ } var self = this; - $(window).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); + $(document).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); return false; }, @@ -375,7 +376,7 @@ if (parentEl == el) { return true; } - if (parentEl.contains && !$.browser.safari) { + if (parentEl.contains) { return parentEl.contains(el); } if ( parentEl.compareDocumentPosition ) { @@ -466,18 +467,14 @@ return this._RGBToHex(this._HSBToRGB(hsb)); }, setColor: function(col) { - if(o.color.indexOf('hsb') > -1){ - this.color = this._fixHSB(this._fixColors(o.color, 'hsb')); - - } else if(o.color.indexOf('rgb') > -1){ - this.color = this._RGBToHSB(this._fixColors(o.color, 'rgb')); - - } else if(o.color.indexOf('#') > -1){ - this.color = this._HexToHSB(o.color); - - } else{ + if (typeof col == 'string') { + col = this._HexToHSB(col); + } else if (col.r != undefined && col.g != undefined && col.b != undefined) { + col = this._RGBToHSB(col); + } else if (col.h != undefined && col.s != undefined && col.b != undefined) { + col = this._fixHSB(col); + } else { return this; - } this.color = col; Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-03-19 20:26:10 UTC (rev 13041) @@ -7,4 +7,4 @@ * * http://docs.jquery.com/UI */ -jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUM! PAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","no! ne").bind("selectstart.ui",function(){return false})},scrollParent:fun ction(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focus! able")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)! }}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData( p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for! (var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.c! ancel=="string"?c(l.target).parents().add(l.target).filter(this.option s.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseSt! arted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery); \ No newline at end of file +jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUM! PAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","no! ne").bind("selectstart.ui",function(){return false})},scrollParent:fun ction(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focus! able")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)! }}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData( p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for! (var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.c! ancel=="string"?c(l.target).parents().add(l.target).filter(this.option s.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari);l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return undefined;}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}retu! rn !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery); \ No newline at end of file Deleted: trunk/ui/colorPicker/src/main/templates/README =================================================================== Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx =================================================================== --- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-19 18:56:03 UTC (rev 13040) +++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-19 20:26:10 UTC (rev 13041) @@ -21,61 +21,10 @@ <c:object var="colorMode" type="java.lang.String" /> <c:object var="value" type="java.lang.String" /> - <div style="display: none;" id="#{clientId}-colorPickerScript"> - <script type="text/javascript"> - jQuery(document).ready(function(){ - - if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 7.0") == -1){ - jQuery('div.rich-colorPicker-color').pngFix(); - } + <f:call name="addPopupToAjaxRendered" /> - <jsp:scriptlet><![CDATA[ - Boolean flat = (Boolean) component.getAttributes().get("flat"); - colorMode = (String) component.getAttributes().get("colorMode"); - showEvent = (String) component.getAttributes().get("showEvent"); - value = (String) component.getAttributes().get("value"); - - if (value == null || value == ""){ - value = "#ffffff"; - } - - if(showEvent.startsWith("on")){ - showEvent = showEvent.substring(2); - } - clientIdJquery = convertToString(clientId); - clientIdJquery = clientIdJquery.replace(":", "\\\\:"); - - colorMode = colorMode.toLowerCase(); - java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\\s+"); - colorMode = pattern.matcher(colorMode).replaceAll(""); - - boolean disabled = getUtils().isBooleanAttribute(component, "disabled"); - variables.setVariable("disabled",new Boolean(disabled)); - ]]></jsp:scriptlet> - - jQuery('\##{clientIdJquery}colorPicker').colorPicker({ - flat: #{component.attributes['flat']}, - color: "#{value}", - showEvent: "#{showEvent}", - clientId: '\##{clientIdJquery}colorPicker', - submit: function(e, ui) { - switch("#{colorMode}"){ - case "hex": - jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); - break; - case "rgb": - jQuery('\##{clientIdJquery}colorPicker input').val(ui.rgb); - break; - default: - jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); - } - } - }); - }); - </script> - </div> - <span id="#{clientId}colorPicker" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> - <input readonly="readonly" disabled="#{disabled}" type="text" name="#{clientId}" value="#{this:getInputValue(context, component)}"/> + <span id="#{clientId}" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> + <input readonly="readonly" type="text" name="#{clientId}" value="#{this:getInputValue(context, component)}"/> <jsp:scriptlet> <![CDATA[if(component.getFacet("icon")!=null && component.getFacet("icon").isRendered()) {]]> </jsp:scriptlet> @@ -93,7 +42,7 @@ </jsp:scriptlet> </span> -<div id="#{clientId}colorPicker-popup" class="rich-colorPicker-wrapper"> +<div id="#{clientId}-colorPicker-popup" class="rich-colorPicker-wrapper"> <div class="rich-colorPicker-ext"> <div class="rich-colorPicker-color"> <div> @@ -154,4 +103,58 @@ <button type="button" class="rich-colorPicker-cancel" name="cancel">Cancel</button> </div> </div> + <div style="display: none;" id="#{clientId}-colorPicker-script"> + <script type="text/javascript"> + + + if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 7.0") == -1){ + jQuery('div.rich-colorPicker-color').pngFix(); + } + + <jsp:scriptlet><![CDATA[ + Boolean flat = (Boolean) component.getAttributes().get("flat"); + colorMode = (String) component.getAttributes().get("colorMode"); + showEvent = (String) component.getAttributes().get("showEvent"); + value = (String) component.getAttributes().get("value"); + + if (value == null || value == ""){ + value = "#ffffff"; + } + + if(showEvent.startsWith("on")){ + showEvent = showEvent.substring(2); + } + clientIdJquery = convertToString(clientId); + clientIdJquery = clientIdJquery.replace(":", "\\\\:"); + + colorMode = colorMode.toLowerCase(); + java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\\s+"); + colorMode = pattern.matcher(colorMode).replaceAll(""); + + boolean disabled = getUtils().isBooleanAttribute(component, "disabled"); + variables.setVariable("disabled",new Boolean(disabled)); + ]]></jsp:scriptlet> + + jQuery('\##{clientIdJquery}').colorPicker({ + flat: #{component.attributes['flat']}, + color: "#{value}", + showEvent: "#{showEvent}", + clientId: '\##{clientIdJquery}', + submit: function(e, ui) { + switch("#{colorMode}"){ + case "hex": + jQuery('\##{clientIdJquery} input').val(ui.hex); + break; + case "rgb": + jQuery('\##{clientIdJquery} input').val(ui.rgb); + break; + default: + jQuery('\##{clientIdJquery} input').val(ui.hex); + } + } + }); + + </script> + </div> + </f:root>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13040 - in trunk/test-applications/realworld2/web/src/main/webapp/includes: search/result and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2009-03-19 14:56:03 -0400 (Thu, 19 Mar 2009) New Revision: 13040 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml Log: Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-19 18:47:10 UTC (rev 13039) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-19 18:56:03 UTC (rev 13040) @@ -28,7 +28,7 @@ </h:outputText> </h:panelGroup> <h:panelGroup layout="block" styleClass="photo_data"> - <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedAlbums(user)}" ><h:outputText value="#{userManager.countSharedAlbums(user)} shared albums "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(user)}"><h:outputText value="#{userManager.countSharedImages(user)} shared photos"/></a4j:commandLink> + <a4j:commandLink reRender="tree, mainArea" actionListener="#{controller.showSharedAlbums(user)}" ><h:outputText value="#{userManager.countSharedAlbums(user)} albums "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(user)}"><h:outputText value="#{userManager.countSharedImages(user)} photos"/></a4j:commandLink> </h:panelGroup> </h:panelGroup> </a4j:repeat>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13039 - in trunk/test-applications/realworld2: ejb/src/main/java/org/richfaces/realworld/service and 14 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2009-03-19 14:47:10 -0400 (Thu, 19 Mar 2009) New Revision: 13039 Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java trunk/test-applications/realworld2/ejb/src/main/resources/import.sql trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml trunk/test-applications/realworld2/web/src/main/webapp/includes/album.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/directImage.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/index/tree.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/slideShowPooler.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml Log: Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -39,6 +39,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.persistence.Transient; import org.hibernate.validator.Length; import org.hibernate.validator.NotEmpty; @@ -91,6 +92,12 @@ @Temporal(TemporalType.TIMESTAMP) private Date created; + + @Transient + private List<Image> unvisitedImages = new ArrayList<Image>(); + + @Transient + private Long countUnvisitedImages; // ********************** Accessor Methods ********************** // @@ -240,5 +247,27 @@ public void setCreated(Date created) { this.created = created; } - + + public Long getCountUnvisitedImages() { + return countUnvisitedImages; + } + + public void setCountUnvisitedImages(Long countUnvisitedImages) { + this.countUnvisitedImages = countUnvisitedImages; + } + + public List<Image> getUnvisitedImages() { + return unvisitedImages; + } + + public void setUnvisitedImages(List<Image> unvisitedImages) { + this.unvisitedImages = unvisitedImages; + } + + public void visitImage(Image image) { + if(unvisitedImages.contains(image)){ + unvisitedImages.remove(image); + countUnvisitedImages--; + } + } } Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -17,6 +17,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.persistence.Transient; import org.hibernate.validator.Length; import org.hibernate.validator.NotEmpty; @@ -54,13 +55,17 @@ @OneToMany(mappedBy = "shelf", cascade = { CascadeType.ALL }) @org.hibernate.annotations.OrderBy(clause = "NAME asc") private List<Album> albums = new ArrayList<Album>(); - + @Transient + private List<Image> unvisitedImages = new ArrayList<Image>(); @NotNull private boolean shared; @Temporal(TemporalType.TIMESTAMP) private Date created; + @Transient + private Long countUnvisitedImages; + /** * Getter for property id * @@ -173,4 +178,33 @@ this.shared = shared; } + public Long getCountUnvisitedImages() { + return countUnvisitedImages; + } + + public void setCountUnvisitedImages(Long countUnvisitedImages) { + this.countUnvisitedImages = countUnvisitedImages; + } + + public List<Image> getUnvisitedImages() { + return unvisitedImages; + } + + public void setUnvisitedImages(List<Image> unvisitedImages) { + this.unvisitedImages = unvisitedImages; + } + + public void visitImage(Image image) { + if(unvisitedImages.contains(image)){ + unvisitedImages.remove(image); + countUnvisitedImages--; + } + } + + public Album getFirstAlbum() { + if(this.albums.size() > 0){ + return this.albums.get(0); + } + return null; + } } Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/AlbumAction.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -20,6 +20,11 @@ */ package org.richfaces.realworld.service; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; + import javax.ejb.Stateless; import javax.persistence.EntityManager; @@ -27,6 +32,8 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.richfaces.realworld.domain.Album; +import org.richfaces.realworld.domain.Image; +import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; @Name("albumAction") @@ -67,4 +74,18 @@ public void flush(){ em.flush(); } + + public Long getCountUnvisitedImages(Album album){ + return (Long)em.createQuery("select count(i) from Image i where i.album=:album and i.created >= :date").setParameter("album", album).setParameter("date", getDate()).getSingleResult(); + } + + public List<Image> getUnvisitedImages(Album album){ + return (List<Image>)em.createQuery("from Image i where i.album=:album and i.created >= :date").setParameter("album", album).setParameter("date", getDate()).getResultList(); + } + + private Date getDate() { + Calendar c = new GregorianCalendar(); + c.add(Calendar.DAY_OF_YEAR, -15); + return c.getInstance().getTime(); + } } Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IAlbumAction.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -20,9 +20,12 @@ */ package org.richfaces.realworld.service; +import java.util.List; + import javax.ejb.Local; import org.richfaces.realworld.domain.Album; +import org.richfaces.realworld.domain.Image; @Local public interface IAlbumAction { @@ -34,5 +37,9 @@ public void editAlbum(Album album, boolean isFlushNeeded); public abstract void flush(); + + public Long getCountUnvisitedImages(Album album); + public List<Image> getUnvisitedImages(Album album); + } \ No newline at end of file Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IShelfAction.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -1,10 +1,13 @@ package org.richfaces.realworld.service; +import java.util.Date; import java.util.List; import javax.ejb.Local; +import org.richfaces.realworld.domain.Album; +import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; @@ -18,4 +21,8 @@ public void editShelf(Shelf shelf, boolean isFlushNeeded); public List<Shelf> getShelfs(User user); + + public Long getCountUnvisitedImages(Shelf shelf); + + public List<Image> getUnvisitedImages(Shelf shelf); } Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/IUserAction.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -20,8 +20,12 @@ */ package org.richfaces.realworld.service; +import java.util.List; + import javax.ejb.Local; +import org.richfaces.realworld.domain.Album; +import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.User; @Local @@ -34,4 +38,8 @@ public void loginAnonymous(); public Long countAlbums(User user); public Long countImages(User user); + public Long countSharedImages(User u); + public Long countSharedAlbums(User user); + public List<Album> getSharedAlbums(User user); + public List<Image> getSharedImages(User user); } \ No newline at end of file Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ShelfAction.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -20,6 +20,9 @@ */ package org.richfaces.realworld.service; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -30,6 +33,8 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; +import org.richfaces.realworld.domain.Album; +import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.Shelf; import org.richfaces.realworld.domain.User; @@ -75,4 +80,18 @@ shelfs.addAll(sh); return shelfs; } + + public Long getCountUnvisitedImages(Shelf shelf){ + return (Long)em.createQuery("select count(i) from Image i where i.album.shelf=:shelf and i.uploaded > :date").setParameter("shelf", shelf).setParameter("date", getDate()).getSingleResult(); + } + + public List<Image> getUnvisitedImages(Shelf shelf){ + return (List<Image>)em.createQuery("from Image i where i.album.shelf=:shelf and i.uploaded > :date").setParameter("shelf", shelf).setParameter("date", getDate()).getResultList(); + } + + private Date getDate() { + Calendar c = new GregorianCalendar(); + c.add(Calendar.DAY_OF_YEAR, -15); + return c.getInstance().getTime(); + } } Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/UserAction.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -83,11 +83,27 @@ user = new User(); } + public List<Album> getSharedAlbums(User user){ + return (List<Album>)em.createQuery("from Album a where a.owner=:user and a.shelf.shared=true").setParameter("user", user).getResultList(); + } + + public List<Image> getSharedImages(User user){ + return (List<Image>)em.createQuery("from Image i where i.album.owner=:user and i.album.shelf.shared=true").setParameter("user", user).getResultList(); + } + public Long countAlbums(User user){ return (Long)em.createQuery("select count(a) from Album a where a.owner=:user").setParameter("user", user).getSingleResult(); } + public Long countSharedAlbums(User user){ + return (Long)em.createQuery("select count(a) from Album a where a.owner=:user and a.shelf.shared=true").setParameter("user", user).getSingleResult(); + } + public Long countImages(User user){ return (Long)em.createQuery("select count(i) from Image i where i.album.owner=:user").setParameter("user", user).getSingleResult(); } + + public Long countSharedImages(User user){ + return (Long)em.createQuery("select count(i) from Image i where i.album.owner=:user and i.album.shelf.shared=true").setParameter("user", user).getSingleResult(); + } } \ No newline at end of file Modified: trunk/test-applications/realworld2/ejb/src/main/resources/import.sql =================================================================== --- trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/ejb/src/main/resources/import.sql 2009-03-19 18:47:10 UTC (rev 13039) @@ -2,111 +2,111 @@ INSERT INTO Users(user_id, firstname, secondname, email, login, passwordHash, birthdate, sex, doNotShowMail, informAboutNews, hasAvatar) VALUES (2, 'Nick', 'Curtis', 'nkurtis(a)iba.com', 'Viking', '8cb2237d0679ca88db6464eac60da96345513964', '1978-01-08', 1, 1, 1, 0); INSERT INTO Users(user_id, firstname, secondname, email, login, passwordHash, birthdate, sex, doNotShowMail, informAboutNews, hasAvatar) VALUES (3, 'John', 'Smith', 'jsmith(a)jboss.com', 'Noname', '8cb2237d0679ca88db6464eac60da96345513964', '1970-01-08', 1, 1, 1, 0); -INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created, shared) VALUES (1, 'Nature', 'Nature pictures', 1, '2008-12-18', true); -INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (2, 'Sport', 'Nature pictures', 1, '2008-12-18', false); -INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (3, 'Water', 'Nature pictures', 2, '2008-12-18', true); -INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (4, 'Flowers', 'Nature pictures', 3, '2008-12-18', true); -INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (15, 'Water', 'Rivers pictures', 2, 3, '2008-12-18'); +INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created, shared) VALUES (1, 'Nature', 'Nature pictures', 1, '2009-12-18', true); +INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (2, 'Sport', 'Nature pictures', 1, '2009-12-18', false); +INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (3, 'Water', 'Nature pictures', 2, '2009-12-18', true); +INSERT INTO shelfs(shelf_id, name, description, shelf_user_id, created,shared) VALUES (4, 'Flowers', 'Nature pictures', 3, '2009-12-18', true); +INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (15, 'Water', 'Rivers pictures', 2, 3, '2009-12-18'); -INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (20, 'Sport', 'Nature pictures', 1, 1, '2008-12-18'); +INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (20, 'Sport', 'Nature pictures', 1, 1, '2009-12-18'); -INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (26, 'Flowers', 'Fun pictures', 1, 2, '2008-12-18'); -INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (25, 'Beach', 'Fun pictures', 1, 1, '2008-12-18'); -INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (23, 'Travel', 'Fun pictures', 3, 4, '2008-12-18'); -INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (27, 'Very very very very very very very long album name ', 'Long name test', 1, 2, '2008-12-18'); +INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (26, 'Flowers', 'Fun pictures', 1, 2, '2009-12-18'); +INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (25, 'Beach', 'Fun pictures', 1, 1, '2009-12-18'); +INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (23, 'Travel', 'Fun pictures', 3, 4, '2009-12-18'); +INSERT INTO albums(album_id, name, description, album_user_id, parent_shelf_id, created) VALUES (27, 'Very very very very very very very long album name ', 'Long name test', 1, 2, '2009-12-18'); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (1, 'korana', 'Viking/15/korana.jpg', 'korana', '2008-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (2, 'korana2', 'Viking/15/korana2.jpg', 'korana2', '2008-12-18', 15, 'Canon S3', 1024, 949.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (3, 'Re4ka', 'Viking/15/Re4ka.jpg', 'Re4ka', '2008-12-18', 15, 'Canon S3', 1024, 412.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (4, 'river10', 'Viking/15/river10.jpg', 'river10', '2008-12-18', 15, 'Canon S3', 1024, 276.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (5, 'river11', 'Viking/15/river11.jpg', 'river11', '2008-12-18', 15, 'Canon S3', 1024, 187.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (6, 'river12', 'Viking/15/river12.jpg', 'river12', '2008-12-18', 15, 'Canon S3', 1024, 265.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (7, 'river13', 'Viking/15/river13.jpg', 'river13', '2008-12-18', 15, 'Canon S3', 1024, 106.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (8, 'river2', 'Viking/15/river2.jpg', 'river2', '2008-12-18', 15, 'Canon S3', 1024, 130.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (9, 'river3', 'Viking/15/river3.jpg', 'river3', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (10, 'river4', 'Viking/15/river4.jpg', 'river4', '2008-12-18', 15, 'Canon S3', 1024, 267.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (11, 'river5', 'Viking/15/river5.jpg', 'river5', '2008-12-18', 15, 'Canon S3', 1024, 176.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (12, 'river6', 'Viking/15/river6.jpg', 'river6', '2008-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (13, 'river7', 'Viking/15/river7.jpg', 'river7', '2008-12-18', 15, 'Canon S3', 1024, 201.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (14, 'river8', 'Viking/15/river8.jpg', 'river8', '2008-12-18', 15, 'Canon S3', 1024, 278.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (15, 'river9', 'Viking/15/river9.jpg', 'river9', '2008-12-18', 15, 'Canon S3', 1024, 210.000000, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (16, 'river_and_torrents', 'Viking/15/river_and_torrents.jpg', 'river_and_torrents', '2008-12-18', 15, 'Canon S3', 1024, 161.000000, 768, '2008-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (1, 'korana', 'Viking/15/korana.jpg', 'korana', '2009-12-18', 15, 'Canon S3', 1024, 1917.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (2, 'korana2', 'Viking/15/korana2.jpg', 'korana2', '2009-12-18', 15, 'Canon S3', 1024, 949.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (3, 'Re4ka', 'Viking/15/Re4ka.jpg', 'Re4ka', '2009-12-18', 15, 'Canon S3', 1024, 412.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (4, 'river10', 'Viking/15/river10.jpg', 'river10', '2009-12-18', 15, 'Canon S3', 1024, 276.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (5, 'river11', 'Viking/15/river11.jpg', 'river11', '2009-12-18', 15, 'Canon S3', 1024, 187.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (6, 'river12', 'Viking/15/river12.jpg', 'river12', '2009-12-18', 15, 'Canon S3', 1024, 265.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (7, 'river13', 'Viking/15/river13.jpg', 'river13', '2009-12-18', 15, 'Canon S3', 1024, 106.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (8, 'river2', 'Viking/15/river2.jpg', 'river2', '2009-12-18', 15, 'Canon S3', 1024, 130.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (9, 'river3', 'Viking/15/river3.jpg', 'river3', '2009-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (10, 'river4', 'Viking/15/river4.jpg', 'river4', '2009-12-18', 15, 'Canon S3', 1024, 267.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (11, 'river5', 'Viking/15/river5.jpg', 'river5', '2009-12-18', 15, 'Canon S3', 1024, 176.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (12, 'river6', 'Viking/15/river6.jpg', 'river6', '2009-12-18', 15, 'Canon S3', 1024, 126.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (13, 'river7', 'Viking/15/river7.jpg', 'river7', '2009-12-18', 15, 'Canon S3', 1024, 201.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (14, 'river8', 'Viking/15/river8.jpg', 'river8', '2009-12-18', 15, 'Canon S3', 1024, 278.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (15, 'river9', 'Viking/15/river9.jpg', 'river9', '2009-12-18', 15, 'Canon S3', 1024, 210.000000, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (16, 'river_and_torrents', 'Viking/15/river_and_torrents.jpg', 'river_and_torrents', '2009-12-18', 15, 'Canon S3', 1024, 161.000000, 768, '2009-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (17, 'Sport1', 'amarkhel/20/sport.jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (18, 'Sport1', 'amarkhel/20/sport (1).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', false); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (19, 'Sport1', 'amarkhel/20/sport (2).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (20, 'Sport1', 'amarkhel/20/sport (3).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (21, 'Sport1', 'amarkhel/20/sport (4).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (22, 'Sport1', 'amarkhel/20/sport (5).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (23, 'Sport1', 'amarkhel/20/sport (6).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (24, 'Sport1', 'amarkhel/20/sport (7).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (25, 'Sport1', 'amarkhel/20/sport (8).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (26, 'Sport1', 'amarkhel/20/sport (9).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (27, 'Sport1', 'amarkhel/20/sport (10).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (28, 'Sport1', 'amarkhel/20/sport (11).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (29, 'Sport1', 'amarkhel/20/sport (12).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (30, 'Sport1', 'amarkhel/20/sport (13).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (31, 'Sport1', 'amarkhel/20/sport (14).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (32, 'Sport1', 'amarkhel/20/sport (15).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (33, 'Sport1', 'amarkhel/20/sport (16).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (34, 'Sport1', 'amarkhel/20/sport (17).jpg', 'Where is the Batman?', '2008-12-18', 20, 'Canon S3', 1280, 20, 1024, '2008-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (17, 'Sport1', 'amarkhel/20/sport.jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (18, 'Sport1', 'amarkhel/20/sport (1).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', false); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (19, 'Sport1', 'amarkhel/20/sport (2).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (20, 'Sport1', 'amarkhel/20/sport (3).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (21, 'Sport1', 'amarkhel/20/sport (4).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (22, 'Sport1', 'amarkhel/20/sport (5).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (23, 'Sport1', 'amarkhel/20/sport (6).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (24, 'Sport1', 'amarkhel/20/sport (7).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (25, 'Sport1', 'amarkhel/20/sport (8).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (26, 'Sport1', 'amarkhel/20/sport (9).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (27, 'Sport1', 'amarkhel/20/sport (10).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (28, 'Sport1', 'amarkhel/20/sport (11).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (29, 'Sport1', 'amarkhel/20/sport (12).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (30, 'Sport1', 'amarkhel/20/sport (13).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (31, 'Sport1', 'amarkhel/20/sport (14).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (32, 'Sport1', 'amarkhel/20/sport (15).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (33, 'Sport1', 'amarkhel/20/sport (16).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (34, 'Sport1', 'amarkhel/20/sport (17).jpg', 'Where is the Batman?', '2009-12-18', 20, 'Canon S3', 1280, 20, 1024, '2009-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (35, 'Fun', 'amarkhel/23/travel.jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 627, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (36, 'Fun', 'amarkhel/23/travel (1).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1200, 20, 800, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (37, 'Fun', 'amarkhel/23/travel (2).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1200, 20, 800, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (38, 'Fun', 'amarkhel/23/travel (3).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 747, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (39, 'Fun', 'amarkhel/23/travel (4).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (40, 'Fun', 'amarkhel/23/travel (5).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1075, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (41, 'Fun', 'amarkhel/23/travel (6).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 760, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (42, 'Fun', 'amarkhel/23/travel (7).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 1023, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (43, 'Fun', 'amarkhel/23/travel (8).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1024, 20, 723, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (44, 'Fun', 'amarkhel/23/travel (9).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1028, 20, 967, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (45, 'Fun', 'amarkhel/23/travel (10).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 622, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (46, 'Fun', 'amarkhel/23/travel (11).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (47, 'Fun', 'amarkhel/23/travel (12).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (48, 'Fun', 'amarkhel/23/travel (13).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (49, 'Fun', 'amarkhel/23/travel (14).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 625, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (50, 'Fun', 'amarkhel/23/travel (15).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 1036, 20, 1036, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (51, 'Fun', 'amarkhel/23/travel (16).jpg', 'Where is the Batman?', '2008-12-18', 23, 'Canon S3', 940, 20, 627, '2008-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (35, 'Fun', 'amarkhel/23/travel.jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 627, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (36, 'Fun', 'amarkhel/23/travel (1).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1200, 20, 800, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (37, 'Fun', 'amarkhel/23/travel (2).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1200, 20, 800, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (38, 'Fun', 'amarkhel/23/travel (3).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1024, 20, 747, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (39, 'Fun', 'amarkhel/23/travel (4).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1024, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (40, 'Fun', 'amarkhel/23/travel (5).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1024, 20, 1075, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (41, 'Fun', 'amarkhel/23/travel (6).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1024, 20, 760, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (42, 'Fun', 'amarkhel/23/travel (7).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1024, 20, 1023, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (43, 'Fun', 'amarkhel/23/travel (8).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1024, 20, 723, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (44, 'Fun', 'amarkhel/23/travel (9).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1028, 20, 967, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (45, 'Fun', 'amarkhel/23/travel (10).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 622, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (46, 'Fun', 'amarkhel/23/travel (11).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 625, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (47, 'Fun', 'amarkhel/23/travel (12).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 625, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (48, 'Fun', 'amarkhel/23/travel (13).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 625, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (49, 'Fun', 'amarkhel/23/travel (14).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 625, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (50, 'Fun', 'amarkhel/23/travel (15).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 1036, 20, 1036, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (51, 'Fun', 'amarkhel/23/travel (16).jpg', 'Where is the Batman?', '2009-12-18', 23, 'Canon S3', 940, 20, 627, '2009-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (52, 'Fun', 'amarkhel/25/beach (1).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 850, 20, 600, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (53, 'Fun', 'amarkhel/25/beach (2).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 800, 20, 600, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (54, 'Fun', 'amarkhel/25/beach (3).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 768, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (55, 'Fun', 'amarkhel/25/beach (4).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1600, 20, 1200, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (56, 'Fun', 'amarkhel/25/beach (5).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1000, 20, 807, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (57, 'Fun', 'amarkhel/25/beach (6).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 608, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (58, 'Fun', 'amarkhel/25/beach (7).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 768, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (59, 'Fun', 'amarkhel/25/beach (8).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 668, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (60, 'Fun', 'amarkhel/25/beach (9).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 800, 20, 553, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (61, 'Fun', 'amarkhel/25/beach (10).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 603, 20, 900, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (62, 'Fun', 'amarkhel/25/beach (11).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1023, 20, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (63, 'Fun', 'amarkhel/25/beach (12).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 732, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (64, 'Fun', 'amarkhel/25/beach (13).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 1024, 20, 660, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (65, 'Fun', 'amarkhel/25/beach (14).jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 681, 20, 1025, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (66, 'Fun', 'amarkhel/25/beach.jpg', 'Where is the Batman?', '2008-12-18', 25, 'Canon S3', 940, 20, 625, '2008-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (52, 'Fun', 'amarkhel/25/beach (1).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 850, 20, 600, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (53, 'Fun', 'amarkhel/25/beach (2).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 800, 20, 600, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (54, 'Fun', 'amarkhel/25/beach (3).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 768, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (55, 'Fun', 'amarkhel/25/beach (4).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1600, 20, 1200, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (56, 'Fun', 'amarkhel/25/beach (5).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1000, 20, 807, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (57, 'Fun', 'amarkhel/25/beach (6).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1024, 20, 608, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (58, 'Fun', 'amarkhel/25/beach (7).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 768, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (59, 'Fun', 'amarkhel/25/beach (8).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1024, 20, 668, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (60, 'Fun', 'amarkhel/25/beach (9).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 800, 20, 553, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (61, 'Fun', 'amarkhel/25/beach (10).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 603, 20, 900, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (62, 'Fun', 'amarkhel/25/beach (11).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1023, 20, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (63, 'Fun', 'amarkhel/25/beach (12).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1024, 20, 732, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (64, 'Fun', 'amarkhel/25/beach (13).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 1024, 20, 660, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (65, 'Fun', 'amarkhel/25/beach (14).jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 681, 20, 1025, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (66, 'Fun', 'amarkhel/25/beach.jpg', 'Where is the Batman?', '2009-12-18', 25, 'Canon S3', 940, 20, 625, '2009-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (67, 'Fun', 'Noname/26/flowers (1).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (68, 'Fun', 'Noname/26/flowers (2).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 683, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (69, 'Fun', 'Noname/26/flowers (3).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (70, 'Fun', 'Noname/26/flowers (4).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 900, 20, 602, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (71, 'Fun', 'Noname/26/flowers (5).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 686, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (72, 'Fun', 'Noname/26/flowers (6).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 800, 20, 600, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (73, 'Fun', 'Noname/26/flowers (7).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1200, 20, 969, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (74, 'Fun', 'Noname/26/flowers (8).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 821, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (75, 'Fun', 'Noname/26/flowers (9).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (76, 'Fun', 'Noname/26/flowers (10).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 912, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (77, 'Fun', 'Noname/26/flowers (11).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 663, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (78, 'Fun', 'Noname/26/flowers (12).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (79, 'Fun', 'Noname/26/flowers (13).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 700, 20, 1052, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (80, 'Fun', 'Noname/26/flowers (14).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 906, 20, 1024, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (81, 'Fun', 'Noname/26/flowers (15).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1024, 20, 768, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (82, 'Fun', 'Noname/26/flowers (16).jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 1206, 20, 868, '2008-12-01', true); -INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (83, 'Fun', 'Noname/26/flowers.jpg', 'Where is the Batman?', '2008-12-18', 26, 'Canon S3', 582, 20, 800, '2008-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (67, 'Fun', 'Noname/26/flowers (1).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (68, 'Fun', 'Noname/26/flowers (2).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 683, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (69, 'Fun', 'Noname/26/flowers (3).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (70, 'Fun', 'Noname/26/flowers (4).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 900, 20, 602, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (71, 'Fun', 'Noname/26/flowers (5).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 686, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (72, 'Fun', 'Noname/26/flowers (6).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 800, 20, 600, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (73, 'Fun', 'Noname/26/flowers (7).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1200, 20, 969, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (74, 'Fun', 'Noname/26/flowers (8).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 821, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (75, 'Fun', 'Noname/26/flowers (9).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (76, 'Fun', 'Noname/26/flowers (10).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 912, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (77, 'Fun', 'Noname/26/flowers (11).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 663, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (78, 'Fun', 'Noname/26/flowers (12).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (79, 'Fun', 'Noname/26/flowers (13).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 700, 20, 1052, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (80, 'Fun', 'Noname/26/flowers (14).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 906, 20, 1024, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (81, 'Fun', 'Noname/26/flowers (15).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1024, 20, 768, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (82, 'Fun', 'Noname/26/flowers (16).jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 1206, 20, 868, '2009-12-01', true); +INSERT INTO images(image_id, name, path, description, created, img_album_id, cameraModel, width, size, height, uploaded, allowComments) VALUES (83, 'Fun', 'Noname/26/flowers.jpg', 'Where is the Batman?', '2009-12-18', 26, 'Canon S3', 582, 20, 800, '2009-12-01', true); INSERT INTO metatags(metatag_id, tag) VALUES (1, 'Beach'); INSERT INTO metatags(metatag_id, tag) VALUES (2, 'Cool'); Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/AlbumManager.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -60,7 +60,7 @@ public void addAlbum(Album album){ if(album.getShelf() == null){ - facesMessages.addToControl("form2:shelf", "Shelf must be not-null", null); + facesMessages.add("Shelf must be not-null", null); return; } albumAction.addAlbum(album, flushStrategy.isDatabaseStoreStrategy()); @@ -94,6 +94,14 @@ Events.instance().raiseEvent("albumDeleted"); Events.instance().raiseEvent("clearTree"); } + + public Long getCountUnvisitedImages(Album album){ + if(album.getCountUnvisitedImages() == null){ + album.setCountUnvisitedImages(albumAction.getCountUnvisitedImages(album)); + album.setUnvisitedImages(albumAction.getUnvisitedImages(album)); + } + return album.getCountUnvisitedImages(); + } private void setOncomplete() { oncomplete = "$('albumModalPanel').component.hide()"; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/Controller.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -34,6 +34,8 @@ import org.jboss.seam.annotations.Synchronized; import org.jboss.seam.core.Events; import org.richfaces.component.UIDatascroller; +import org.richfaces.event.DataScrollerEvent; +import org.richfaces.event.scroll.ScrollEvent; import org.richfaces.realworld.domain.Album; import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.domain.MetaTag; @@ -68,24 +70,6 @@ model.resetModel(NavigationEnum.ALL_IMAGES, user, null, null, null, null ); } - public void incrementSlideShowIndex(){ - Integer index = model.getSelectedAlbum().getIndex(model.getSelectedImage()); - if(index == -1){ - if(model.getSelectedAlbum().getImages() != null && model.getSelectedAlbum().getImages().size() > 1){ - index = model.getSelectedAlbum().getIndex(model.getSelectedAlbum().getImages().get(1)); - }else{ - pushEvent("stopSlideshow"); - return; - } - } - updateDataScroller(index, Constants.DATASCROLLER2_ID); - if(index == model.getSelectedAlbum().getImages().size() - 1){ - index=-1; - } - model.setSelectedImageIndex(index+1); - model.setSelectedImage(model.getSelectedAlbum().getImages().get(index + 1)); - } - public void startEditShelf(Shelf shelf){ if(!canViewShelf(shelf)){ pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); @@ -111,11 +95,19 @@ pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); return; } - model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), null, null ); + model.resetModel(NavigationEnum.ALBUM_IMAGE_PREVIEW, image.getAlbum().getOwner(), image.getAlbum().getShelf(), image.getAlbum(), image, null ); + model.setSelectedImageIndex(model.getSelectedAlbum().getIndex(model.getSelectedImage())+1); + image.getAlbum().getShelf().visitImage(image); + image.getAlbum().visitImage(image); + } + + public void scroll(DataScrollerEvent e){ + Integer index = e.getPage(); + model.setSelectedImageIndex(index); + Image image = model.getSelectedAlbum().getImages().get(index - 1); model.setSelectedImage(image); - Integer index = model.getSelectedAlbum().getIndex(model.getSelectedImage()); - updateDataScroller(index, Constants.DATASCROLLER_ID); - model.setSelectedImageIndex(index+1); + image.getAlbum().visitImage(image); + image.getAlbum().getShelf().visitImage(image); } public void startEditImage(Image image){ @@ -130,6 +122,17 @@ model.setMainArea(NavigationEnum.ALBUM_IMAGE_PREVIEW); } + public void showShelf(Shelf shelf){ + model.resetModel(NavigationEnum.SHELF_PREVIEW, shelf.getOwner(), shelf, null, null, null); + } + + public boolean isUserImage(Image image){ + if(image == null || image.getAlbum() == null || image.getAlbum().getOwner() == null){ + return false; + } + return image.getAlbum().getOwner().equals(user); + } + public void startEditAlbum(Album album){ if(!album.getOwner().equals(user)){ pushEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); @@ -146,6 +149,14 @@ model.setMainArea(NavigationEnum.FILE_UPLOAD); } + public void showSharedAlbums(User user){ + model.resetModel(NavigationEnum.USER_SHARED_ALBUMS, user, null, null, null, null); + } + + public void showSharedImages(User user){ + model.resetModel(NavigationEnum.USER_SHARED_IMAGES, user, null, null, null, null); + } + public boolean isAccessToAlbumGranted(Album album){ return album.getOwner().equals(user) || album.getShelf().isShared(); } @@ -153,6 +164,7 @@ public boolean isUserShelf(Shelf shelf){ return shelf.getOwner()!=null && shelf.getOwner().getId().equals(user.getId()); } + public boolean isUserAlbum(Album album){ if(album == null || album.getOwner() == null){ return false; @@ -161,21 +173,20 @@ } public void showUser(User user){ - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.USER_PREFS); - model.setSelectedUser(user); + model.resetModel(NavigationEnum.USER_PREFS, user, null, null, null, null); } - public void showTag(MetaTag metatag){ - model.setMainArea(NavigationEnum.TAGS); - model.setSelectedTag(metatag); + public void showUnvisitedImages(Shelf shelf){ + model.resetModel(NavigationEnum.SHELF_UNVISITED, shelf.getOwner(), shelf, shelf.getFirstAlbum(), null, null); } - private void updateDataScroller(Integer index, String dataScrollerId) { - UIComponent component = FacesContext.getCurrentInstance().getViewRoot(); - UIDatascroller scroller = (UIDatascroller)component.findComponent(dataScrollerId); - Map<String, Object> attributes = scroller.getDataTable().getAttributes(); - attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+1); + public void showUnvisitedImages(Album album){ + model.resetModel(NavigationEnum.ALBUM_UNVISITED, album.getOwner(), album.getShelf(), album, null, null); } + + public void showTag(MetaTag metatag){ + model.resetModel(NavigationEnum.TAGS, model.getSelectedUser(), model.getSelectedShelf(), model.getSelectedAlbum(), model.getSelectedImage(), metatag); + } private boolean canViewShelf(Shelf shelf) { return shelf.getOwner().equals(user); Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/DnDManager.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -20,10 +20,6 @@ */ package org.richfaces.realworld.manager; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - -import org.ajax4jsf.context.AjaxContext; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.core.Events; @@ -60,7 +56,7 @@ } handleImage((Image)dragValue, (Album)dropValue); }else if(dragValue instanceof Album){ - handleShelf((Album)dragValue, (Shelf)dropValue); + handleAlbum((Album)dragValue, (Shelf)dropValue); }else if(dragValue instanceof FileItem){ if(!((Album)dropValue).getOwner().equals(user)){ Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception("You can't add photo's to that album")); @@ -70,7 +66,7 @@ } } - private void addTreeToRerender() { + /*private void addTreeToRerender() { try { FacesContext fc = FacesContext.getCurrentInstance(); AjaxContext ac = AjaxContext.getCurrentInstance(); @@ -79,9 +75,9 @@ } catch (Exception e) { System.err.print(e.getMessage()); } - } + }*/ - private void handleShelf(Album dragValue, Shelf dropValue) { + private void handleAlbum(Album dragValue, Shelf dropValue) { if(dragValue.getShelf() != null ){ if(dragValue.getShelf().equals(dropValue)){ //Parent album contain this album @@ -94,7 +90,7 @@ Events.instance().raiseEvent("clearTree"); } } - addTreeToRerender(); + //addTreeToRerender(); } private void handleImage(Image dragValue, Album dropValue) { Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/NavigationEnum.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -34,7 +34,11 @@ ALL_IMAGES("/includes/images.xhtml"), ALBUM_IMAGE_EDIT("/includes/imageEdit.xhtml"), ALBUM_EDIT("/includes/albumEdit.xhtml"), - SHELF_EDIT("/includes/shelfEdit.xhtml"); + SHELF_EDIT("/includes/shelfEdit.xhtml"), + SHELF_UNVISITED("/includes/shelfUnvisited.xhtml"), + USER_SHARED_ALBUMS("/includes/userSharedAlbums.xhtml"), + USER_SHARED_IMAGES("/includes/userSharedImages.xhtml"), + ALBUM_UNVISITED("/includes/albumInvisited.xhtml"); private NavigationEnum(String t){ template=t; Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/ShelfManager.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -119,4 +119,12 @@ public void setOncomplete(String oncomplete) { this.oncomplete = oncomplete; } + + public Long getCountUnvisitedImages(Shelf shelf){ + if(shelf.getCountUnvisitedImages() == null){ + shelf.setCountUnvisitedImages(shelfAction.getCountUnvisitedImages(shelf)); + shelf.setUnvisitedImages(shelfAction.getUnvisitedImages(shelf)); + } + return shelf.getCountUnvisitedImages(); + } } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/SlideshowManager.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -21,24 +21,22 @@ package org.richfaces.realworld.manager; import java.io.Serializable; +import java.util.List; import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; +import org.richfaces.realworld.domain.Image; import org.richfaces.realworld.service.Constants; -import org.richfaces.realworld.ui.SlideshowHelper; @Name("slideshow") @Scope(ScopeType.CONVERSATION) public class SlideshowManager implements Serializable{ private static final long serialVersionUID = 7801877176558409702L; - - @In(required=false) @Out(required=false) - SlideshowHelper slideshowHelper; - + private Integer slideshowIndex; + private Image selectedImage; + private List<Image> images; private boolean active; private int interval = Constants.INITIAL_DELAY; @@ -59,15 +57,51 @@ this.active = active; } - public void startSlideshow(){ + public void startSlideshow(List<Image> images){ active = true; + this.images = images; + this.slideshowIndex = 0; + this.selectedImage = this.images.get(this.slideshowIndex); + this.selectedImage.getAlbum().visitImage(selectedImage); + this.selectedImage.getAlbum().getShelf().visitImage(selectedImage); } public void stopSlideshow(){ active = false; + this.images = null; + this.selectedImage = null; + this.slideshowIndex = 0; } - public void updateInterval(){ - this.setInterval((int)(Constants.DELAY * Long.valueOf(slideshowHelper.getInputSlider().getValue().toString()))); + public Integer getSlideshowIndex() { + return slideshowIndex; } -} + + public void setSlideshowIndex(Integer slideshowIndex) { + this.slideshowIndex = slideshowIndex; + } + + public Image getSelectedImage() { + return selectedImage; + } + + public void setSelectedImage(Image selectedImage) { + this.selectedImage = selectedImage; + } + + public List<Image> getImages() { + return images; + } + + public void setImages(List<Image> images) { + this.images = images; + } + + public void showNextImage(){ + if(slideshowIndex == images.size() - 1){ + slideshowIndex = -1; + } + slideshowIndex++; + selectedImage = images.get(slideshowIndex); + } +} \ No newline at end of file Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/TreeManager.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -48,21 +48,4 @@ } return null; } - - @SuppressWarnings("unchecked") - public void processSelection(NodeSelectedEvent event) { - HtmlTree tree = (HtmlTree) event.getComponent(); - Object currentNode = tree.getRowData(); - if(currentNode instanceof Album){ - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); - model.setSelectedAlbum((Album)currentNode); - model.setSelectedShelf(((Album)currentNode).getShelf()); - }else if(currentNode instanceof Shelf){ - Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SHELF_PREVIEW); - model.setSelectedAlbum(null); - model.setSelectedShelf((Shelf)currentNode); - } - model.setSelectedUser(user); - model.setSelectedImage(null); - } } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/manager/UserManager.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -47,6 +47,8 @@ private Long countImages; private Long countAlbums; + private Long countSharedImages; + private Long countSharedAlbums; @In(create=true, required=true) private IUserAction userAction; @@ -56,7 +58,21 @@ } return countImages; } + + public Long countSharedImages(User u) { + if(null == countSharedImages ){ + countSharedImages = userAction.countSharedImages(u); + } + return countSharedImages; + } + public Long countSharedAlbums(User u) { + if(null == countSharedAlbums ){ + countSharedAlbums = userAction.countSharedAlbums(user); + } + return countSharedAlbums; + } + public Long countAlbums(User u) { if(null == countAlbums ){ countAlbums = userAction.countAlbums(user); @@ -64,6 +80,14 @@ return countAlbums; } + public List<Album> getSharedAlbums(User user){ + return userAction.getSharedAlbums(user); + } + + public List<Image> getSharedImages(User user){ + return userAction.getSharedImages(user); + } + @Observer(value = "imageAdded", create = false) public void onImageAdded() { updateStatistics(countAlbums, countImages + 1); Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -31,11 +32,12 @@ ISearchOption selectedOption; List<ISearchOption> options; - private boolean searchSuccess; String selectedTab; String searchQuery; + List<String> keywords = new ArrayList<String>(); + boolean seachInMyAlbums; boolean searchInShared = true; @@ -59,19 +61,36 @@ } public void search() { + keywords = new ArrayList<String>(); Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.SEARCH); + keywords = parse(searchQuery); Iterator<ISearchOption> it = options.iterator(); - setSearchSuccess(false); while (it.hasNext()) { ISearchOption option = it.next(); if (option.getSelected()) { - option.search(searchAction, searchQuery, seachInMyAlbums, searchInShared); + option.search(searchAction, keywords.get(0).trim(), seachInMyAlbums, searchInShared); }else { option.setSearchResult(null); } } } + public void search(String keyword) { + Iterator<ISearchOption> it = options.iterator(); + while (it.hasNext()) { + ISearchOption option = it.next(); + if (option.getSelected()) { + option.search(searchAction, keyword.trim(), seachInMyAlbums, searchInShared); + }else { + option.setSearchResult(null); + } + } + } + + private List<String> parse(String searchQuery2) { + return Arrays.asList(searchQuery2.split(",")); + } + boolean isOptionSelected() { return selectedOption != null; } @@ -86,10 +105,6 @@ } } } - @Observer("searchSuccess") - public void setSearchSuccess(){ - setSearchSuccess(true); - } @Out public String getTemplate() { @@ -137,12 +152,12 @@ this.searchInShared = searchInShared; } - public boolean isSearchSuccess() { - return searchSuccess; + public List<String> getKeywords() { + return keywords; } - public void setSearchSuccess(boolean searchSuccess) { - this.searchSuccess = searchSuccess; + public void setKeywords(List<String> keywords) { + this.keywords = keywords; } } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -27,9 +27,6 @@ @Override public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { List<Image> searchByAlbum = action.searchByAlbum(q, searchInMyAlbums, searchInShared); - if(searchByAlbum.size() > 0){ - Events.instance().raiseEvent("searchSuccess"); - } setSearchResult(searchByAlbum); } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -34,9 +34,6 @@ @Override public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { List<Image> searchByImage = action.searchByImage(q, searchInMyAlbums, searchInShared); - if(searchByImage.size() > 0){ - Events.instance().raiseEvent("searchSuccess"); - } setSearchResult(searchByImage); } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByTag.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -55,9 +55,6 @@ public void search(ISearchAction action, String searchQuery, boolean searchInMyAlbums, boolean searchInShared) { List<Image> searchByTags = action.searchByTags(searchQuery, searchInMyAlbums, searchInShared); - if(searchByTags.size() > 0){ - Events.instance().raiseEvent("searchSuccess"); - } setSearchResult(searchByTags); } Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByUser.java 2009-03-19 18:47:10 UTC (rev 13039) @@ -53,9 +53,6 @@ @Override public void search(ISearchAction action, String q, boolean searchInMyAlbums, boolean searchInShared) { List<Image> searchByUsers = action.searchByUsers(q, searchInMyAlbums, searchInShared); - if(searchByUsers.size() > 0){ - Events.instance().raiseEvent("searchSuccess"); - } setSearchResult(searchByUsers); } Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/web.xml 2009-03-19 18:47:10 UTC (rev 13039) @@ -4,8 +4,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - - <listener> <listener-class> org.jboss.seam.servlet.SeamListener @@ -93,18 +91,12 @@ <param-name>facelets.LIBRARIES</param-name> <param-value>/WEB-INF/tags/realWorld-taglib.xml</param-value> </context-param> - + <context-param> - <param-name>facelets.REFRESH_PERIOD</param-name> - <param-value>-1</param-value> - </context-param> - - <context-param> <param-name>org.richfaces.LoadScriptStrategy</param-name> <param-value>ALL</param-value> </context-param> - <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/albumUnvisited.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/directImage.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/fileUploader.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/fileUpload/uploadResult.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/tree.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/slideShowPooler.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-03-19 18:47:10 UTC (rev 13039) @@ -39,7 +39,7 @@ </h:outputText> </h:panelGroup> <h:panelGroup layout="block" styleClass="album_data"> - <a href="#">#{album.owner.firstName} #{album.owner.secondName}</a> + <a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(album.owner)}" value="#{album.owner.firstName} #{album.owner.secondName}" /> </h:panelGroup> </h:panelGroup> </a4j:repeat> Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-03-19 18:47:10 UTC (rev 13039) @@ -29,7 +29,7 @@ </h:outputText> </h:panelGroup> <h:panelGroup layout="block" styleClass="photo_data"> - <a href="#">#{image.album.owner.firstName} #{image.album.owner.secondName}</a> + <a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(image.album.owner)}" value="#{image.album.owner.firstName} #{image.album.owner.secondName}" /> </h:panelGroup> </h:panelGroup> </a4j:repeat> Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-19 18:31:59 UTC (rev 13038) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-03-19 18:47:10 UTC (rev 13039) @@ -28,7 +28,7 @@ </h:outputText> </h:panelGroup> <h:panelGroup layout="block" styleClass="photo_data"> - <a href="#"><h:outputText value="#{userManager.countAlbums(user)} albums "/></a> | <a href="#"><h:outputText value="#{userManager.countImages(user)} photos"/></a> + <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedAlbums(user)}" ><h:outputText value="#{userManager.countSharedAlbums(user)} shared albums "/></a4j:commandLink> | <a4j:commandLink reRender="mainArea" actionListener="#{controller.showSharedImages(user)}"><h:outputText value="#{userManager.countSharedImages(user)} shared photos"/></a4j:commandLink> </h:panelGroup> </h:panelGroup> </a4j:repeat> Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfPreview.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelfUnvisited.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedAlbums.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userSharedImages.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ)

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13038 - trunk/test-applications/realworld2/web/src/main/webapp/includes/image.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2009-03-19 14:31:59 -0400 (Thu, 19 Mar 2009) New Revision: 13038 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml Log: Fix error on delete comment Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml =================================================================== (Binary files differ)

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13037 - trunk/docs/faq/en/src/main/docbook/module.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-03-19 14:25:03 -0400 (Thu, 19 Mar 2009) New Revision: 13037 Modified: trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml Log: https://jira.jboss.org/jira/browse/RF-6023 Demonstrative pronouns as links, some area changed Modified: trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml =================================================================== --- trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-03-19 18:16:55 UTC (rev 13036) +++ trunk/docs/faq/en/src/main/docbook/module/RFCfaq.xml 2009-03-19 18:25:03 UTC (rev 13037) @@ -150,7 +150,7 @@ <title>What is the structure of RichFaces SVN repository?</title> <para>RichFaces repository structure overview can be found <ulink url="http://labs.jboss.com/wiki/RichFacesRepositoryStructureOverview" - >here</ulink>.</para> + >in this Wiki article</ulink>.</para> </section> <section> @@ -159,7 +159,7 @@ <para>How to build and how to use richfaces-samples applications in Eclipse is described <ulink url="http://labs.jboss.com/wiki/RichFacesRepositoryStructureOverview" - >here</ulink>.</para> + >in this Wiki article</ulink>.</para> </section> <section> @@ -168,7 +168,7 @@ <para>Online demo Web applications that show the most important functionality of RichFaces components are available <ulink url="http://livedemo.exadel.com/richfaces-demo/" - >here</ulink>.</para> + >on this LiveDemo page</ulink>.</para> <para>War file of a nightly build can be found <ulink url="http://maven.exadel.com/org/richfaces/samples/richfaces-demo/3.1.0-SNAPSHOT/" >here</ulink>.</para> @@ -195,7 +195,7 @@ <para>Also, the effect of predefined skins on the application whole look-and-feel could be seen <ulink url="http://livedemo.exadel.com/richfaces-demo/" - >here</ulink>.</para> + >on this LiveDemo page</ulink>.</para> </section> <section> @@ -218,13 +218,13 @@ <property><rich:dataTable></property> </emphasis> flexibility can be found <ulink url="http://labs.jboss.com/wiki/RichFacesArticleDataTable" - >here</ulink>.</para> + >in this Wiki article</ulink>.</para> <para>Source code (SVN) could be found <ulink url="http://anonsvn.jboss.org/repos/richfaces/trunk/samples/richfaces-art-data..." >here</ulink>.</para> <para> Online demo for a Web application is available <ulink url=" http://livedemo.exadel.com/richfaces-art-datatable/" - >here</ulink>.</para> + >on this page</ulink>.</para> </section> <section id="Organizewizards"> @@ -1905,7 +1905,8 @@ } </script> ...]]></programlisting> - <para>Then you could use <emphasis role="bold"> + <para>Then you could use +<emphasis role="bold"> <property><a4j:support></property> </emphasis> with <emphasis> <property>"event"</property> @@ -2493,7 +2494,7 @@ <para>The following order, in which filters are defined and mapped in web.xml, is important for <emphasis role="bold"> <property><rich:fileUpload></property> </emphasis> component proper work with MyFaces. - Note that the extention filter should be mapped on faces servlet not to *.jsf (!) to provide this sequence work correctly. + Note that the extension filter should be mapped on faces servlet not to *.jsf (!) to provide this sequence work correctly. </para> <para> <emphasis role="bold">Example:</emphasis>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13036 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-03-19 14:16:55 -0400 (Thu, 19 Mar 2009) New Revision: 13036 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java Log: Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2009-03-19 18:16:07 UTC (rev 13035) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2009-03-19 18:16:55 UTC (rev 13036) @@ -89,14 +89,6 @@ } @Test - public void testAjaxSingleWithExternalValidation(Template template) { - AutoTester autoTester = getAutoTester(this); - autoTester.renderPage(template, RESET_METHOD); - - autoTester.testAjaxSingleWithInternalValidationFailed(); - } - - @Test public void testAjaxSingle(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); @@ -125,7 +117,6 @@ public void testImmediateWithExternalValidation(Template template) { AutoTester autoTester = getAutoTester(this); autoTester.renderPage(template, RESET_METHOD); - autoTester.testImmediateWithExternalValidationFailed(); } @@ -432,5 +423,4 @@ return "pages/contextMenu/contextMenu.xhtml"; } - }

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r13035 - trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-03-19 14:16:07 -0400 (Thu, 19 Mar 2009) New Revision: 13035 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml Log: move ajax attributes to the menu item Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml 2009-03-19 18:12:02 UTC (rev 13034) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/contextMenu/contextMenuAutoTest.xhtml 2009-03-19 18:16:07 UTC (rev 13035) @@ -9,20 +9,21 @@ <ui:composition template="#{templateBean.autoTestTemplate}"> <ui:define name="component"> <rich:contextMenu id="componentId" - immediate="#{autoTestBean.immediate}" - ajaxSingle="#{autoTestBean.ajaxSingle}" - reRender="#{autoTestBean.reRender}" - limitToList="#{autoTestBean.limitToList}" - bypassUpdates="#{autoTestBean.bypassUpdate}" - actionListener="#{autoTestBean.actionListener}" rendered="#{autoTestBean.rendered}" - submitMode="ajax" - > + submitMode="ajax"> <rich:menuItem id="item1" + immediate="#{autoTestBean.immediate}" + ajaxSingle="#{autoTestBean.ajaxSingle}" + reRender="#{autoTestBean.reRender}" + limitToList="#{autoTestBean.limitToList}" + bypassUpdates="#{autoTestBean.bypassUpdate}" + actionListener="#{autoTestBean.actionListener}" value="Item1" - oncomplete="#{autoTestBean.oncomplete}" /> - <f:param name="parameter1" value="value1" /> - <f:param name="parameter2" value="value2" /> + oncomplete="#{autoTestBean.oncomplete}"> + <f:param name="parameter1" value="value1" /> + <f:param name="parameter2" value="value2" /> + </rich:menuItem> + </rich:contextMenu> <a href="#" id="showMenu" onclick="$(getParentId() + 'autoTestForm:componentId').component.show(event)">Show</a> <a href="#" onclick="$(getParentId() + 'autoTestForm:componentId').component.hide()">Hide</a>

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2009