March 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r12815 - trunk/framework/impl/src/main/javascript/ajaxjsf.

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

Author: nbelaevski Date: 2009-03-03 18:53:46 -0500 (Tue, 03 Mar 2009) New Revision: 12815 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js Log: https://jira.jboss.org/jira/browse/RF-1234 Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js 2009-03-03 18:22:16 UTC (rev 12814) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/sarissa.js 2009-03-03 23:53:46 UTC (rev 12815) @@ -481,7 +481,17 @@ if((typeof(document.importNode) == "undefined") && Sarissa._SARISSA_IS_IE){ try{ - /** + var importTable = { + TBODY: ['<table>', '</table>' ], + THEAD: ['<table>', '</table>' ], + TFOOT: ['<table>', '</table>' ], + TR: ['<table><tbody>', '</tbody></table>' ], + TH: ['<table><thead><tr>', '</tr></thead></table>'], + TD: ['<table><tbody><tr>', '</tr></tbody></table>'], + OPTION: ['<select>', '</select>' ] + }; + + /** * Implementation of importNode for the context window document in IE. * If <code>oNode</code> is a TextNode, <code>bChildren</code> is ignored. * @param oNode the Node to import @@ -494,33 +504,53 @@ return document.createTextNode(oNode.data); } else { - var tbody = false; - if(oNode.nodeName == "tbody" && oNode.parentNode){ - oNode = oNode.parentNode; - tbody = true; - } - else if(oNode.nodeName == "tbody" || oNode.nodeName == "tr"){ - tmp = document.createElement("tr"); - } - else if(oNode.nodeName == "td"){ - tmp = document.createElement("tr"); - } - else if(oNode.nodeName == "option"){ - tmp = document.createElement("select"); - } - if(!tmp){ - tmp = document.createElement("div"); - } - if(bChildren){ - tmp.innerHTML = oNode.xml ? oNode.xml : oNode.outerHTML; - }else{ - tmp.innerHTML = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; - } - if (tbody) { - return tmp.firstChild.tBodies[0]; + var tagName = oNode.nodeName.toUpperCase(); + var wrapper = importTable[tagName]; + + var nodeHtml; + if (bChildren) { + nodeHtml = oNode.xml ? oNode.xml : oNode.outerHTML; } else { - return tmp.getElementsByTagName("*")[0]; + nodeHtml = oNode.xml ? oNode.cloneNode(false).xml : oNode.cloneNode(false).outerHTML; } + + var wrapperElt = document.createElement("div"); + if (wrapper) { + nodeHtml = wrapper[0] + nodeHtml + wrapper[1]; + } + + wrapperElt.innerHTML = nodeHtml; + + //Breadth-first search + var stack = new Array(wrapperElt.firstChild); + var result; + + while (!result) { + var newStack = new Array(); + + for (var i = 0; i < stack.length && !result; i++) { + var elt = stack[i]; + while (elt) { + if (elt.tagName /* we can meet text nodes */ && + elt.tagName.toUpperCase() == tagName) { + + result = elt; + break; + } else { + if (elt.firstChild) { + newStack.push(elt.firstChild); + } + + elt = elt.nextSibling; + } + } + } + + stack = newStack; + } + //Breadth-first search end + + return result; } }; }catch(e){ }

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r12814 - in management/design/realWorldDemo/html: images/shell and 1 other directory.

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

Author: admitriev Date: 2009-03-03 13:22:16 -0500 (Tue, 03 Mar 2009) New Revision: 12814 Added: management/design/realWorldDemo/html/images/shell/button.png management/design/realWorldDemo/html/images/shell/icon_add_album.png management/design/realWorldDemo/html/images/shell/icon_add_photo.png management/design/realWorldDemo/html/images/shell/icon_add_shelf.png management/design/realWorldDemo/html/photo_edit.html Modified: management/design/realWorldDemo/html/album.html management/design/realWorldDemo/html/images/shell/arr_left.png management/design/realWorldDemo/html/images/shell/arr_right.png management/design/realWorldDemo/html/photo.html management/design/realWorldDemo/html/shelf.html Log: Modified: management/design/realWorldDemo/html/album.html =================================================================== --- management/design/realWorldDemo/html/album.html 2009-03-03 17:50:04 UTC (rev 12813) +++ management/design/realWorldDemo/html/album.html 2009-03-03 18:22:16 UTC (rev 12814) @@ -29,16 +29,22 @@ .preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;} .preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_album_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute;} .preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_album_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute;} .preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;} + .preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} @@ -46,17 +52,22 @@ .preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} .preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_photo_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute;} .preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_photo_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute;} .preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} - + .preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} @@ -146,7 +157,7 @@ </div> <div style="padding : 15px 35px 15px 15px;"> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_minus.png" width="25" height="16" alt="" border="0"><br> @@ -155,35 +166,29 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name :: <a href="#"><strong>7</strong> new</a> + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> @@ -191,87 +196,72 @@ </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + <strong>Album name'll be here. Maximal lenght is no limits</strong> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - <strong>Album name</strong> + Album name'll be here. </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -280,11 +270,11 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -293,11 +283,11 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name + Shelf name'll be here :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -347,239 +337,351 @@ </div> </div> <br><br> - - <div class="preview_box_album_80"> - <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> - <table cellpadding="0"> - <tr> - <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="80" alt="" border="0"></a><br> - </td> - </tr> - </table> - </div> +<style> - <div class="preview_box_photo_80"> +</style> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="90" height="120" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> - <div class="preview_box_photo_80"> + <div class="preview_box_photo_120"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> - </table> + </table> + <div class="photo_name"> + Photo name'll be here + </div> + <div class="photo_data"> + 3 Mar 2009 + </div> </div> + <div style="width : 90%; height : 10px; float : left;">   <div> Modified: management/design/realWorldDemo/html/images/shell/arr_left.png =================================================================== (Binary files differ) Modified: management/design/realWorldDemo/html/images/shell/arr_right.png =================================================================== (Binary files differ) Added: management/design/realWorldDemo/html/images/shell/button.png =================================================================== (Binary files differ) Property changes on: management/design/realWorldDemo/html/images/shell/button.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design/realWorldDemo/html/images/shell/icon_add_album.png =================================================================== (Binary files differ) Property changes on: management/design/realWorldDemo/html/images/shell/icon_add_album.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design/realWorldDemo/html/images/shell/icon_add_photo.png =================================================================== (Binary files differ) Property changes on: management/design/realWorldDemo/html/images/shell/icon_add_photo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design/realWorldDemo/html/images/shell/icon_add_shelf.png =================================================================== (Binary files differ) Property changes on: management/design/realWorldDemo/html/images/shell/icon_add_shelf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: management/design/realWorldDemo/html/photo.html =================================================================== --- management/design/realWorldDemo/html/photo.html 2009-03-03 17:50:04 UTC (rev 12813) +++ management/design/realWorldDemo/html/photo.html 2009-03-03 18:22:16 UTC (rev 12814) @@ -29,16 +29,22 @@ .preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;} .preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_album_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute;} .preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_album_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute;} .preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;} + .preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} @@ -46,20 +52,27 @@ .preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} .preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_photo_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute;} .preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_photo_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute;} .preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + - .preview_box_photo_nav {width : 50px; height : 50px; position : relative; float : left; margin : 0px 2px 0px 0px;} - .preview_box_photo_nav img.pr_photo_bg {width : 50px; height : 50px; position : absolute;} - .preview_box_photo_nav table{position : relative; width : 50px; height : 50px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;} + .preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} + .preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} .preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;} @@ -138,6 +151,18 @@ <a href="#" style="font-size : 11px; font-weight : bold; color : #ffffff; text-decoration : none;">My Album</a> </td> + <td style="vertical-align : top; padding : 8px 1px 0px 0px"> + <img src="images/shell/icon_add_shelf.png" width="33" height="22" alt="" border="0"><br> + </td> + + <td style="vertical-align : top; padding : 8px 1px 0px 0px"> + <img src="images/shell/icon_add_album.png" width="33" height="22" alt="" border="0"><br> + </td> + + <td style="vertical-align : top; padding : 8px 1px 0px 0px"> + <img src="images/shell/icon_add_photo.png" width="33" height="22" alt="" border="0"><br> + </td> + </tr> </table> </div> @@ -152,7 +177,7 @@ </div> <div style="padding : 15px 35px 15px 15px;"> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_minus.png" width="25" height="16" alt="" border="0"><br> @@ -161,35 +186,29 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - <strong>Shelf name</strong> :: <a href="#"><strong>7</strong> new</a> + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> @@ -197,87 +216,72 @@ </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + <strong>Album name'll be here. Maximal lenght is no limits</strong> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -286,11 +290,11 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -299,11 +303,11 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name + Shelf name'll be here :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -343,19 +347,14 @@ <p> This is a "Photo name..." description. - <div style="margin : 30px 0px 0px 0px; background : #f1f1f1; padding : 3px 4px 53px 2px;"> - <div style="float : right" onclick="window.location.href='#'" style="cursor : pointer"> - <img src="images/shell/tree_icon_slid.png" width="27" height="16" alt="" border="0" style="vertical-align : bottom; margin-right : 5px">Slideshow - </div> - <div> - <a href="#"><img src="images/shell/arr_left.png" width="16" height="50" alt="" border="0" style="float : left; margin-right : 4px"></a> + <div style="margin : 30px 0px 20px 30px; float : left; position : relative"> <div class="preview_box_photo_nav"> <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> </td> </tr> </table> @@ -365,7 +364,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="80" alt="" border="0"></a><br> </td> </tr> </table> @@ -375,7 +374,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="80" alt="" border="0"></a><br> </td> </tr> </table> @@ -385,7 +384,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> </td> </tr> </table> @@ -395,91 +394,59 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="80" alt="" border="0"></a><br> </td> </tr> </table> - </div> - <div class="preview_box_photo_nav"> - <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> - <table cellpadding="0"> - <tr> - <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> - </td> - </tr> - </table> - </div> - <div class="preview_box_photo_nav"> - <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> - <table cellpadding="0"> - <tr> - <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0" class="sel"></a><br> - </td> - </tr> - </table> - </div> - <div class="preview_box_photo_nav"> - <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> - <table cellpadding="0"> - <tr> - <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> - </td> - </tr> - </table> - </div> - <div class="preview_box_photo_nav"> - <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> - <table cellpadding="0"> - <tr> - <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> - </td> - </tr> - </table> - </div> - <div class="preview_box_photo_nav"> - <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> - <table cellpadding="0"> - <tr> - <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> - </td> - </tr> - </table> - </div> - <a href="#"><img src="images/shell/arr_right.png" width="16" height="50" alt="" border="0" style="float : left"></a> + </div> + <a href="#"><img src="images/shell/arr_left.png" width="56" height="34" alt="" border="0" style="position : absolute; top:81px; left : -33px"></a> + <a href="#"><img src="images/shell/arr_right.png" width="56" height="34" alt="" border="0" style="position : absolute; top:81px; right : -31px"></a> </div> - </div> + + <br clear="all"> <div style="padding-top : 10px;"> <table cellpadding="0" style="border-collapse : collapse; margin-bottom : 5px"> <tr> - <td style="padding-right : 10px" rowspan="2"> - <img src="images/examples/photo_200.jpg" width="600" height="400" alt="" border="0" style="border : 2px solid #FFFFFF;"> + <td style="padding-right : 10px; padding-left : 30px; text-align : right" rowspan="2"> + <div onclick="window.location.href='#'" style="cursor : pointer; margin-bottom : 7px"> + <img src="images/shell/tree_icon_slid.png" width="27" height="16" alt="" border="0" style="vertical-align : bottom; margin-right : 5px">Slideshow + </div> + + <img src="images/examples/photo_200.jpg" width="500" height="350" alt="" border="0" style="border : 3px solid #808080"> </td> <td valign="top"> - <div style="margin : 0px 0px 0px 0px; background : #f1f1f1; padding : 3px 4px 4px 4px;"> - <a href="#">Original size</a> + <div style="margin : 26px 0px 0px 0px; position : relative; width : 103px; height : 28px;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 16px"> + Original size + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> </div> </td> </tr> <tr> <td valign="bottom" style="padding-bottom : 5px"> - <div style="margin : 0px 0px 0px 0px; background : #f1f1f1; padding : 3px 4px 4px 4px;"> - <a href="#">Edit</a> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 39px"> + Edit + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> </div> - - <div style="margin : 3px 0px 0px 0px; background : #f1f1f1; padding : 3px 4px 4px 4px;"> - <a href="#">Delete</a> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 32px"> + Delete + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> </div> + </td> </tr> </table> </div> - + <br> <span style="color : #666666">Captured:</span> Samsung T1000<br> <span style="color : #666666">Uploaded:</span> 1 november 2008<br> <span style="color : #666666">Author:</span> <a href="#">Author Name</a> @@ -503,7 +470,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="60" alt="" border="0"></a><br> </td> </tr> </table> @@ -535,7 +502,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="60" alt="" border="0"></a><br> </td> </tr> </table> @@ -567,7 +534,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="60" alt="" border="0"></a><br> </td> </tr> </table> @@ -599,7 +566,7 @@ <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="40" height="40" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="60" alt="" border="0"></a><br> </td> </tr> </table> @@ -622,8 +589,14 @@ </td> </tr> </table> - - <a href="#">Add comment</a> + + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 11px"> + Add comment + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> </div> </div> Added: management/design/realWorldDemo/html/photo_edit.html =================================================================== --- management/design/realWorldDemo/html/photo_edit.html (rev 0) +++ management/design/realWorldDemo/html/photo_edit.html 2009-03-03 18:22:16 UTC (rev 12814) @@ -0,0 +1,618 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + +<html> +<head> + <title>Untitled</title> + <link rel="STYLESHEET" type="text/css" href="common.css"> +</head> +<style> + *{font-family : verdana; font-size : 11px} + body {margin : 0px; background : url(images/shell/page_bg.gif) repeat-x #D7D7D7; height : 100%} + h1{font-size : 175%; font-weight : normal; margin : 0px;} + .top_part {height : 116px;} + .header_box {height : 79px; position : relative;} + .auth_box {position : absolute; font-weight : bold; color : #ffffff; right : 8px; top : 42px} + .auth_data {vertical-align : top; padding : 0px 8px 0px 15px; font-weight : bold; color : #ffffff;} + .auth_data span {color : #FF7200;} + .about_toolbar {position : absolute; right : 8px; top : 12px;} + .about_toolbar_item {vertical-align : top; padding : 0px 8px 0px 15px;} + .about_toolbar_item a{font-size : 11px; color : #ffffff; text-decoration : none;} + .about_toolbar_item a:hover{font-size : 11px; color : #ffffff; text-decoration : underline;} + + .content_box {padding : 15px 35px 45px 35px;} + .content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX} + + a{color : #DF6400;} + + + .preview_box_album_80 {width : 100px; height : 100px; position : relative; float : left; margin : 0px 10px 20px 0px;} + .preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;} + .preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + .preview_box_album_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} + .preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute;} + .preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + .preview_box_album_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} + .preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute;} + .preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;} + .preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + + + .preview_box_photo_80 {width : 100px; height : 100px; position : relative; float : left; margin : 0px 10px 20px 0px;} + .preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} + .preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + .preview_box_photo_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} + .preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute;} + .preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + .preview_box_photo_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} + .preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute;} + .preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + + + .preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;} + .preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} + .preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} + .preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;} + + + + +</style> + +<body> + +<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%"> + <tr> + <td colspan="2"> + <div class="top_part"> + <div class="header_box"> + <a href="#"><img src="images/shell/logo_top.gif" width="290" height="79" alt="" border="0" style="position : absolute;"></a> + <div class="auth_box"> + <table cellpadding="0" cellspacing="0" border="0"> + <tr> + + <td class="auth_data"> + Welcome, <span>Jhon Smith</span> + </td> + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + + </tr> + </table> + </div> + + <div class="about_toolbar"> + <table cellpadding="0" cellspacing="0" border="0"> + <tr> + + <td class="about_toolbar_item"> + <a href="#">User guide</a> + </td> + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + + <td class="about_toolbar_item"> + <a href="#">F.A.Q.</a> + </td> + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + + <td class="about_toolbar_item"> + <a href="#">About Demo at JBossWiki</a> + </td> + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + + <td class="about_toolbar_item"> + <a href="#">About Demo at JBossForum</a> + </td> + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + + </tr> + </table> + </div> + </div> + <div style="height : 37px; position : relative; background : url(images/shell/general_panelbar_bg.gif) repeat-x #A84807; padding-left : 15px; "> + <table height="37px" cellpadding="0" cellspacing="0" border="0"> + <tr> + + <td valign="middle"> + <img src="images/shell/general_panelbar_bullet.gif" width="11" height="15" alt="" border="0"><br> + </td> + <td style="vertical-align : top; padding : 11px 25px 0px 8px"> + <a href="#" style="font-size : 11px; font-weight : bold; color : #ffffff; text-decoration : none;">My Album</a> + </td> + + <td style="vertical-align : top; padding : 8px 1px 0px 0px"> + <img src="images/shell/icon_add_shelf.png" width="33" height="22" alt="" border="0"><br> + </td> + + <td style="vertical-align : top; padding : 8px 1px 0px 0px"> + <img src="images/shell/icon_add_album.png" width="33" height="22" alt="" border="0"><br> + </td> + + <td style="vertical-align : top; padding : 8px 1px 0px 0px"> + <img src="images/shell/icon_add_photo.png" width="33" height="22" alt="" border="0"><br> + </td> + + </tr> + </table> + </div> + </div> + </td> + </tr> + <tr> + <td height="100%" valign="top"> + <div style="background : url(images/shell/general_panel_bg.gif) right top repeat-y; height : 100%;"> + <div style="height : 15px; background : url(images/shell/general_panel_header_bg.gif) right top; font-size : 1px;"> + <img src="images/shell/spacer.gif" width="300" height="1" alt="" border="0"> + </div> + + <div style="padding : 15px 35px 15px 15px;"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/tree_icon_minus.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Album name'll be here. Maximal lenght is no limits + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Album name + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + <strong>Album name'll be here. Maximal lenght is no limits</strong> + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Album name'll be here. + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Album name :: <a href="#"><strong>7</strong> new</a> + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Album name'll be here. + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Album name'll be here. Maximal lenght is no limits + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Shelf name'll be here :: <a href="#"><strong>7</strong> new</a> + </td> + </tr> + </table> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> + <tr> + <td valign="top"> + <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top"> + <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> + </td> + <td valign="top" style="padding-left : 4px"> + Shelf name + </td> + </tr> + </table> + + + </div> + + </div> + </td> + <td height="100%" width="100%" valign="top""> + <div style="background : url(images/shell/general_panel_bg.gif) right top repeat-y; height : 100%;"> + <div style="height : 15px; background : url(images/shell/general_panel_header_bg.gif) right top; font-size : 1px;"> + + </div> + <div class="content_box"> + + <table style="border-collapse : collapse; margin-bottom : 15px" cellpadding="0"> + <tr> + <td> + <h1 style="margin-bottom : 4px">Photo name (0-50 symb; first cann't be SPACE symb)</h1> + <span style="color : #666666">Album «Album name»</span> + </td> + <td style=" padding : 8px 0px 0px 20px; vertical-align : top; white-space : nowrap"> + </td> + </tr> + </table> + + <p> This is a "Photo name..." description. + + + + <div style="margin : 30px 0px 20px 30px; float : left; position : relative"> + <div class="preview_box_photo_nav"> + <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + </td> + </tr> + </table> + </div> + <div class="preview_box_photo_nav"> + <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="80" alt="" border="0"></a><br> + </td> + </tr> + </table> + </div> + <div class="preview_box_photo_nav"> + <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="80" alt="" border="0"></a><br> + </td> + </tr> + </table> + </div> + <div class="preview_box_photo_nav"> + <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="60" alt="" border="0"></a><br> + </td> + </tr> + </table> + </div> + <div class="preview_box_photo_nav"> + <img class="pr_photo_bg" src="images/shell/frame_photo_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="60" height="80" alt="" border="0"></a><br> + </td> + </tr> + </table> + </div> + <a href="#"><img src="images/shell/arr_left.png" width="56" height="34" alt="" border="0" style="position : absolute; top:81px; left : -33px"></a> + <a href="#"><img src="images/shell/arr_right.png" width="56" height="34" alt="" border="0" style="position : absolute; top:81px; right : -31px"></a> + </div> + + + <br clear="all"> + <div style="padding-top : 10px;"> + <table cellpadding="0" style="border-collapse : collapse; margin-bottom : 5px"> + <tr> + <td style="padding-right : 10px; padding-left : 30px; text-align : right" rowspan="2"> + <div onclick="window.location.href='#'" style="cursor : pointer; margin-bottom : 7px"> + <img src="images/shell/tree_icon_slid.png" width="27" height="16" alt="" border="0" style="vertical-align : bottom; margin-right : 5px">Slideshow + </div> + + <img src="images/examples/photo_200.jpg" width="500" height="350" alt="" border="0" style="border : 3px solid #808080"> + </td> + <td valign="top"> + <div style="margin : 26px 0px 0px 0px; position : relative; width : 103px; height : 28px; display : none;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 16px"> + Original size + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> + </td> + </tr> + <tr> + <td valign="bottom" style="padding-bottom : 5px"> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px; display : none;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 39px"> + Edit + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px; display : none;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : relative; color : #ffffff; top : 7px; left : 32px"> + Delete + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> + + </td> + </tr> + </table> + </div> + + + <div style="margin : 10px 0px 30px 30px; width : 504px; background : #f1f1f1"> + + <table style="border-collapse : collapse;" cellpadding="5" border="0"> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + Photo name + </td> + <td valign="top" colspan="2"> + <input type="text" style="border : 1px solid #999999; width : 350px"> + </td> + </tr> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + Upload date + </td> + <td valign="top"> + <input type="text" style="border : 1px solid #999999; width : 80px"> + </td> + <td width="200" valign="top"> + <input type="Checkbox" checked style="margin : 0px"> Show meta infornation + </td> + </tr> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + Description + </td> + <td valign="top" colspan="2"> + <textarea style="border : 1px solid #999999; width : 350px; height : 150px"></textarea> + </td> + </tr> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + Related tags + </td> + <td valign="top" colspan="2"> + <input type="text" style="border : 1px solid #999999; width : 150px; margin-bottom : 4px"><br> + <span style="color : #666666">breathtaking, bright, clouds, cloudy, day, grass, lens flare, low angle, view, nature, nobody, outdoor, peaceful, picturesque, serenity, sky, sunny, sun, sunshine </span> + </td> + </tr> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + Direct link + </td> + <td valign="top" colspan="2"> + <input type="text" style="border : 0px; background : none; width : 350px" readonly="readonly" value="L:\Projects\Potemkin\photoalbum\photoalbum_3\site\photo_edit.html"> + </td> + </tr> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + + </td> + <td valign="top" colspan="2"> + <input type="Checkbox" checked style="margin : 0px">Use thes photo like current album cover + </td> + </tr> + <tr> + <td valign="top" nowrap style="padding-top : 8px"> + + </td> + <td valign="top" colspan="2"> + <input type="Checkbox" checked style="margin : 0px">Share this photo<br> + <input type="Checkbox" checked style="margin-left : 15px">Allow commennts + </td> + </tr> + <tr> + <td valign="top"> + + + </td> + <td width="100%" valign="top" align="right" colspan="2" style="padding : 10px 10px 10px 10px;"> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px; float : left"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : absolute; color : #ffffff; top : 7px; left : 11px"> + Delete + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px; float : right"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : absolute; color : #ffffff; top : 7px; left : 11px"> + Cancel + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> + <div style="margin : 0px 0px 0px 0px; position : relative; width : 103px; height : 28px;"> + <img src="images/shell/button.png" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + <div style="position : absolute; color : #ffffff; top : 7px; left : 11px; font-weight : bold;"> + Save + </div> + <input type="Image" src="images/shell/spacer.gif" width="103" height="28" alt="" border="0" style="position : absolute; top : 0px; left : 0px;"> + </div> + </td> + </tr> + </table> + + + </div> + + </div> + + </div> + </td> + </tr> + <tr> + <td colspan="2"> + <div style="height : 82px; position : relative; background : url(images/shell/footer_bg.gif) repeat-x #000000;"> + <img src="images/shell/logo_bottom.gif" width="160" height="55" alt="" border="0" style="position : absolute; right : 0px; top : 27px"> + <div style="position : absolute; left : 8px; top : 51px"> + <table cellpadding="0" cellspacing="0" border="0"> + <tr> + + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + <td style="vertical-align : top; padding : 0px 15px 0px 8px"> + <a href="#" style="font-size : 11px; color : #ffffff; text-decoration : none;"> Terms And Conditions</a> + </td> + + <td valign="middle"> + <img src="images/shell/bullet.gif" width="3" height="15" alt="" border="0"><br> + </td> + <td style="vertical-align : top; padding : 0px 15px 0px 8px"> + <a href="#" style="font-size : 11px; color : #ffffff; text-decoration : none;">Privacy Statement</a> + </td> + + </tr> + </table> + </div> + </div> + </td> + </tr> +</table> + +<form style="margin : 0px"> + <div style="height : 65px; width: 339px; position : absolute; top : 64px; right : 0px; margin-right : 0px;"> + <img src="images/shell/search_bg.png" width="339" height="65" alt="" border="0" style="position : absolute; top : 0px; left: 0px"> + <div style="position : absolute; color : #FFFFFF; font-weight : bold; top : 22px; left : 20px"> + Search + </div> + <div style="position : absolute; color : #FFFFFF; font-weight : bold; top : 21px; left : 277px"> + Find + </div> + <input type="Text" style="width : 176px; height : 17px; border : 0px; position : absolute; top : 20px; left : 73px; background : none; font-weight : bold;"> + <input type="Image" src="images/shell/spacer.gif" border="0" style="width : 61px; height : 18px; position : absolute; top : 20px; left : 261px;"> + <div style="position : absolute; top : 41px; left : 197px"> + <a href="#" style="color : #FFFFFF; text-decoration : none">Options <img src="images/shell/bull_arr_down.gif" width="7" height="7" alt="" border="0"> </a> + </div> + </div> + <div style="height : 90px; width: 327px; position : absolute; top : 107px; right : 5px; background : none; display : none; overflow : hidden;"> + <img src="images/shell/search_option_bg.png" width="327" height="153" alt="" border="0" style="position : absolute; bottom : 0px; left: 0px"> + <div style="position : absolute; color : white; top : 7px; left : 45px"> + in <input type="checkbox">in My Album   <input type="checkbox">in Shared Albums + </div> + <div style="position : absolute; color : white; top : 32px; padding-top : 3px; left : 38px; border-top : 1px solid #383838"> + for <input type="checkbox">Tags  <input type="checkbox">Photos  <input type="checkbox">Albums  <input type="checkbox">Users + </div> + <div style="position : absolute; top : 70px; left : 163px"> + <a href="#" style="color : #FFFFFF; text-decoration : none">Hide options <img src="images/shell/bull_arr_up.gif" width="7" height="7" alt="" border="0"> </a> + </div> + </div> +</form> + +<div style="height : 52px; width: 79px; position : absolute; top : 0px; left : 278px; visibility : vidden;"> + <img src="images/shell/ai.png" width="52" height="79" alt="" border="0" style="position : absolute; top : 0px; left: 0px"> + <img src="images/shell/ai.gif" width="26" height="26" alt="" border="0" style="position : absolute; top : 26px; left: 13px"> +</div> +</body> +</html> Modified: management/design/realWorldDemo/html/shelf.html =================================================================== --- management/design/realWorldDemo/html/shelf.html 2009-03-03 17:50:04 UTC (rev 12813) +++ management/design/realWorldDemo/html/shelf.html 2009-03-03 18:22:16 UTC (rev 12814) @@ -29,16 +29,22 @@ .preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;} .preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_80 div.album_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_album_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute;} .preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + .preview_box_album_120 div.album_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_120 div.album_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_album_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute;} .preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;} + .preview_box_album_160 div.album_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_album_160 div.album_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} @@ -46,19 +52,25 @@ .preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} .preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_80 div.photo_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_80 div.photo_data {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_photo_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute;} .preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + .preview_box_photo_120 div.photo_name {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_120 div.photo_data {text-align : center; overflow : hidden; width : 140px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} .preview_box_photo_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} .preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute;} .preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} - + .preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} + .preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} + </style> @@ -146,7 +158,7 @@ </div> <div style="padding : 15px 35px 15px 15px;"> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_minus.png" width="25" height="16" alt="" border="0"><br> @@ -155,35 +167,29 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - <strong>Shelf name</strong> :: <a href="#"><strong>7</strong> new</a> + Shelf name'll be here. Maximal lenght is no limits :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> @@ -191,87 +197,72 @@ </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> </td> <td valign="top"> - <img src="images/shell/spacer.gif" width="25" height="16" alt="" border="0"><br> - </td> - <td valign="top"> <img src="images/shell/tree_icon_album.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Album name + Album name'll be here. Maximal lenght is no limits </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -280,11 +271,11 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name + <strong>Shelf name'll be here. Maximal lenght is no limits </strong>:: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -293,11 +284,11 @@ <img src="images/shell/tree_icon_shelf.png" width="25" height="16" alt="" border="0"><br> </td> <td valign="top" style="padding-left : 4px"> - Shelf name + Shelf name'll be here :: <a href="#"><strong>7</strong> new</a> </td> </tr> </table> - <table style="border-collapse : collapse; margin-bottom : 5px;" cellpadding="0"> + <table style="border-collapse : collapse; margin-bottom : 7px;" cellpadding="0"> <tr> <td valign="top"> <img src="images/shell/tree_icon_plus.png" width="25" height="16" alt="" border="0"><br> @@ -345,61 +336,168 @@ </div> <br><br> - <div class="preview_box_album_80"> + <div class="preview_box_album_120"> <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="80" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> </div> - - <div class="preview_box_album_80"> + <div class="preview_box_album_120"> <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="80" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="90" height="120" alt="" border="0"></a><br> </td> </tr> </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> </div> - - <div class="preview_box_album_80"> + <div class="preview_box_album_120"> <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="80" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> </div> - - <div class="preview_box_album_80"> + <div class="preview_box_album_120"> <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="80" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="90" height="120" alt="" border="0"></a><br> </td> </tr> </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> </div> - - <div class="preview_box_album_80"> + <div class="preview_box_album_120"> <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> <table cellpadding="0"> <tr> <td> - <a href="#"><img src="images/examples/photo_200.jpg" width="80" height="80" alt="" border="0"></a><br> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> </td> </tr> </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> </div> + <div class="preview_box_album_120"> + <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="90" height="120" alt="" border="0"></a><br> + </td> + </tr> + </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> + </div> + <div class="preview_box_album_120"> + <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> + </td> + </tr> + </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> + </div> + <div class="preview_box_album_120"> + <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> + </td> + </tr> + </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> + </div> + <div class="preview_box_album_120"> + <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="90" height="120" alt="" border="0"></a><br> + </td> + </tr> + </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> + </div> + <div class="preview_box_album_120"> + <img class="pr_album_bg" src="images/shell/frame_album_200.png" border="0"> + <table cellpadding="0"> + <tr> + <td> + <a href="#"><img src="images/examples/photo_200.jpg" width="120" height="90" alt="" border="0"></a><br> + </td> + </tr> + </table> + <div class="album_name"> + Album name'll be here + </div> + <div class="album_data"> + 3 Mar 2009 + </div> + </div> + <div style="width : 90%; height : 10px; float : left;">   <div>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r12813 - trunk/ui/extendedDataTable.

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

Author: nbelaevski Date: 2009-03-03 12:50:04 -0500 (Tue, 03 Mar 2009) New Revision: 12813 Modified: trunk/ui/extendedDataTable/generatescript.xml Log: Project build made compatible with Maven 2.0.10 Modified: trunk/ui/extendedDataTable/generatescript.xml =================================================================== --- trunk/ui/extendedDataTable/generatescript.xml 2009-03-03 17:49:05 UTC (rev 12812) +++ trunk/ui/extendedDataTable/generatescript.xml 2009-03-03 17:50:04 UTC (rev 12813) @@ -35,9 +35,9 @@ <property name="gen-script-full-name" value="${target-dir}/${script-path}/${gen-script-name}"></property> <concat append="false" binary="false" destfile="${gen-script-full-name}"> <filelist dir="${resources-dir}"> - <file name="/ClientUI/controls/datatable/ExtendedDataTable.js"/> - <file name="/ClientUI/controls/datatable/ExtendedDataTableHeader.js"/> - <file name="/ClientUI/controls/datatable/ExtendedDataTableSelection.js"/> + <file name="ClientUI/controls/datatable/ExtendedDataTable.js"/> + <file name="ClientUI/controls/datatable/ExtendedDataTableHeader.js"/> + <file name="ClientUI/controls/datatable/ExtendedDataTableSelection.js"/> </filelist> </concat> </target>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r12812 - trunk/ui/scrollableDataTable.

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

Author: nbelaevski Date: 2009-03-03 12:49:05 -0500 (Tue, 03 Mar 2009) New Revision: 12812 Modified: trunk/ui/scrollableDataTable/generatescript.xml Log: Project build made compatible with Maven 2.0.10 Modified: trunk/ui/scrollableDataTable/generatescript.xml =================================================================== --- trunk/ui/scrollableDataTable/generatescript.xml 2009-03-03 17:48:10 UTC (rev 12811) +++ trunk/ui/scrollableDataTable/generatescript.xml 2009-03-03 17:49:05 UTC (rev 12812) @@ -56,30 +56,30 @@ <concat append="false" binary="false" destfile="${target-dir}/${script-path}/common-${gen-script-name}"> <filelist dir="${resources-dir}"> <file name="ClientUILib.js"/> - <file name="/ClientUI/common/utils/Utils.js"/> - <file name="/ClientUI/common/utils/StringBuilder.js"/> - <file name="/ClientUI/common/utils/Validators.js"/> - <file name="/ClientUI/common/box/Box.js"/> - <file name="/ClientUI/common/box/InlineBox.js"/> - <file name="/ClientUI/common/box/ScrollableBox.js"/> - <file name="/ClientUI/common/box/Substrate.js"/> + <file name="ClientUI/common/utils/Utils.js"/> + <file name="ClientUI/common/utils/StringBuilder.js"/> + <file name="ClientUI/common/utils/Validators.js"/> + <file name="ClientUI/common/box/Box.js"/> + <file name="ClientUI/common/box/InlineBox.js"/> + <file name="ClientUI/common/box/ScrollableBox.js"/> + <file name="ClientUI/common/box/Substrate.js"/> </filelist> </concat> <concat append="false" binary="false" destfile="${target-dir}/${script-path}/controls-${gen-script-name}"> <filelist dir="${resources-dir}"> - <file name="/ClientUI/controls/grid/DataModel.js"/> - <file name="/ClientUI/controls/grid/ArrayDataModel.js"/> - <file name="/ClientUI/controls/grid/FakeArrayDataModel.js"/> - <file name="/ClientUI/layouts/LayoutManager.js"/> - <file name="/ClientUI/layouts/VLayoutManager.js"/> - <file name="/ClientUI/layouts/GridLayoutManager.js"/> - <file name="/ClientUI/controls/grid/GridHeader.js"/> - <file name="/ClientUI/controls/grid/DataCash.js"/> - <file name="/ClientUI/controls/grid/GridBody.js"/> - <file name="/ClientUI/controls/grid/GridFooter.js"/> - <file name="/ClientUI/controls/grid/Grid.js"/> - <file name="/ClientUI/controls/grid/Selection.js"/> - <file name="/ClientUI/controls/grid/ScrollableGrid.js"/> + <file name="ClientUI/controls/grid/DataModel.js"/> + <file name="ClientUI/controls/grid/ArrayDataModel.js"/> + <file name="ClientUI/controls/grid/FakeArrayDataModel.js"/> + <file name="ClientUI/layouts/LayoutManager.js"/> + <file name="ClientUI/layouts/VLayoutManager.js"/> + <file name="ClientUI/layouts/GridLayoutManager.js"/> + <file name="ClientUI/controls/grid/GridHeader.js"/> + <file name="ClientUI/controls/grid/DataCash.js"/> + <file name="ClientUI/controls/grid/GridBody.js"/> + <file name="ClientUI/controls/grid/GridFooter.js"/> + <file name="ClientUI/controls/grid/Grid.js"/> + <file name="ClientUI/controls/grid/Selection.js"/> + <file name="ClientUI/controls/grid/ScrollableGrid.js"/> </filelist> </concat> </target>

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r12811 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/ajaxOutputPanel and 1 other directories.

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

Author: konstantin.mishin Date: 2009-03-03 12:48:10 -0500 (Tue, 03 Mar 2009) New Revision: 12811 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxOutputPanel/ajaxOutputPanelTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java Log: RF-6196 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java 2009-03-03 16:50:11 UTC (rev 12810) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/A4JOutputPanelTestBean.java 2009-03-03 17:48:10 UTC (rev 12811) @@ -27,93 +27,28 @@ */ public class A4JOutputPanelTestBean { - private Boolean panel1VisibleFlag = true; - private Boolean panel2VisibleFlag = true; - private Boolean panel3VisibleFlag = true; - private Boolean panel4VisibleFlag = true; - - /** - * @return the panel1VisibleFlag - */ - public Boolean getPanel1VisibleFlag() { - return panel1VisibleFlag; - } - - /** - * @param panel1VisibleFlag the panel1VisibleFlag to set - */ - public void setPanel1VisibleFlag(Boolean panel1VisibleFlag) { - this.panel1VisibleFlag = panel1VisibleFlag; - } - - /** - * @return the panel2VisibleFlag - */ - public Boolean getPanel2VisibleFlag() { - return panel2VisibleFlag; - } - - /** - * @param panel2VisibleFlag the panel2VisibleFlag to set - */ - public void setPanel2VisibleFlag(Boolean panel2VisibleFlag) { - this.panel2VisibleFlag = panel2VisibleFlag; - } - - /** - * @return the panel3VisibleFlag - */ - public Boolean getPanel3VisibleFlag() { - return panel3VisibleFlag; - } - - /** - * @param panel3VisibleFlag the panel3VisibleFlag to set - */ - public void setPanel3VisibleFlag(Boolean panel3VisibleFlag) { - this.panel3VisibleFlag = panel3VisibleFlag; - } - - /** - * @return the panel4VisibleFlag - */ - public Boolean getPanel4VisibleFlag() { - return panel4VisibleFlag; - } - - /** - * @param panel4VisibleFlag the panel4VisibleFlag to set - */ - public void setPanel4VisibleFlag(Boolean panel4VisibleFlag) { - this.panel4VisibleFlag = panel4VisibleFlag; - } - - public String b1Action(){ - setPanel2VisibleFlag(false); - return null; - } - - public String b2Action(){ - setPanel1VisibleFlag(false); - setPanel2VisibleFlag(false); - return null; - } - - public String b3Action(){ - setPanel3VisibleFlag(false); - return null; - } - - public String b4Action(){ - setPanel4VisibleFlag(false); - return null; - } - - public String reset(){ - setPanel1VisibleFlag(true); - setPanel2VisibleFlag(true); - setPanel3VisibleFlag(true); - setPanel4VisibleFlag(true); - return null; - } + private String layout; + + private String outputText; + + public void init() { + layout = "inline"; + outputText = "text"; + } + + public void setOutputText(String outputText) { + this.outputText = outputText; + } + + public String getOutputText() { + return outputText; + } + + public void setLayout(String layout) { + this.layout = layout; + } + + public String getLayout() { + return layout; + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxOutputPanel/ajaxOutputPanelTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java 2009-03-03 16:50:11 UTC (rev 12810) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxOutputPanelTest.java 2009-03-03 17:48:10 UTC (rev 12811) @@ -33,276 +33,45 @@ */ public class AjaxOutputPanelTest extends SeleniumTestBase { - private final static String FORM_ID = "form:"; + private String layout; + + private String mainForm; + + private String outputPanel; + + private String outputText; + + private void init(Template template) { + renderPage(null, template, "#{a4jOutputPanelBean.init}"); + String attrForm = getParentId() + "attrForm"; + layout = attrForm + ":layout"; + mainForm = getParentId() + "mainForm"; + outputPanel = mainForm + ":outputPanel"; + outputText = mainForm + ":outputText"; + } - private final static String PANEL1_ID = "panel_1"; - - private final static String PANEL2_ID = "panel_2"; - - private final static String PANEL3_ID = "panel_3"; - - private final static String PANEL4_ID = "panel_4"; - - private final static String BUTTON1_ID = "b1"; - - private final static String BUTTON2_ID = "b2"; - - private final static String BUTTON3_ID = "b3"; - - private final static String BUTTON4_ID = "b4"; - - private final static String RESET_BUTTON_ID = "reset"; - - private final static String TEXT_SUFFIX = "_text"; - - private final static String RESULT_SUFFIX = "_result"; - - private final static String RESET_METHOD = "#{a4jOutputPanelBean.reset}"; - - @Test - public void testLayoutAttribute(Template template) throws Exception { - renderPage(template, RESET_METHOD); - // panel_1 has layout=inline(default) - // panel_2 has layout=block - // panel_3 has layout=none - writeStatus("Testing layout attribute..."); - - String panelId = getParentId() + FORM_ID + PANEL1_ID; - String panel2Id = getParentId() + FORM_ID + PANEL2_ID; - String panel3Id = getParentId() + FORM_ID + PANEL3_ID; - - Assert.assertTrue(isPresent(panelId)); - Number type = selenium.getXpathCount("//*[@id='" + panelId + "' and (name()='span' or name()='SPAN')]"); - Assert.assertTrue(type.intValue() == 1, "panel_1 has layout=inline(default) and should be 'span' element"); - - Assert.assertTrue(isPresent(panel2Id)); - type = selenium.getXpathCount("//*[@id='" + panel2Id + "' and (name()='DIV' or name()='div')]"); - Assert.assertTrue(type.intValue() == 1, "panel_2 has layout=block and should be 'div' element"); - - // panel_3 has layout=none and should not present if a child component - // is rendered - Assert.assertFalse(isPresent(panel3Id), - "panel_3 has layout=none and should not peresent if a child component is rendered "); - - // remove child component rendering - writeStatus("Click button 3"); - String buttonId = getParentId() + FORM_ID + BUTTON3_ID; - clickById(buttonId); - waitForAjaxCompletion(); - - // panel_3 has layout=none and should present if no child component is - // rendered with id of a child component and display:none style - Assert.assertTrue(isPresent(panel3Id + "_text"), - "panel_3 has layout=none and should peresent if no child component is rendered with id of a child component"); - Assert.assertFalse(isVisible(panel3Id + "_text"), - "panel_3 has layout=none and should peresent if no child component is rendered with display:none style"); - } - - @Test - public void testRenderedAttribute(Template template) throws Exception { - renderPage(template, RESET_METHOD); - writeStatus("Testing rendered attribute..."); - - String panelId = getParentId() + FORM_ID + PANEL4_ID; - - // panel_4 has rendered=true and should present on page - AssertRendered(panelId); - - // change rendered attribute to false - writeStatus("Click button 4"); - String buttonId = getParentId() + FORM_ID + BUTTON4_ID; - clickCommandAndWait(buttonId); - - // panel_4 has rendered=false and should not present on page - AssertNotRendered(panelId); - } - - @Test - public void testAjaxRenderedAttribute(Template template) throws Exception { - renderPage(template, RESET_METHOD); - // panel_1 has ajaxRendered=false and is reRender by b1 - // panel_2 has ajaxRendered=true - writeStatus("Testing ajaxRendered attribute..."); - - String parentId = getParentId() + FORM_ID; - String panelId = parentId + PANEL1_ID + TEXT_SUFFIX; - String panelId2 = parentId + PANEL2_ID + TEXT_SUFFIX; - String buttonId = parentId + BUTTON2_ID; - writeStatus("Click button 2"); - // set panel_1 text visible flag to false - clickById(buttonId); - waitForAjaxCompletion(); - // panel_1 text should be visible as it reRendered only by b1 - AssertPresentAndVisible(panelId, "panel_1 text should be visible as it reRendered only by b1"); - - // panel_2 text should not be visible as it has ajaxRendered=true - AssertNotPresentOrNotVisible(panelId2, "panel_2 text should not be visible as it has ajaxRendered=true"); - - buttonId = parentId + BUTTON1_ID; - writeStatus("Click button 1"); - clickById(buttonId); - waitForAjaxCompletion(); - // panel text should NOT be visible as it reRendered by b1 - AssertNotPresentOrNotVisible(panelId, "panel_1 text should not be visible as it reRendered by b1"); - } - - @Test - public void testAjaxRenderedAttributeWithLimitToList(Template template) throws Exception { - renderPage(template, RESET_METHOD); - // panel_1 has ajaxRendered=false and is reRender by b1 with - // limitToList=true - // panel_2 has ajaxRendered=true - writeStatus("Testing ajaxRendered attribute with limitToList=true..."); - - String parentId = getParentId() + FORM_ID; - String panelId2 = parentId + PANEL2_ID + TEXT_SUFFIX; - String buttonId = parentId + BUTTON1_ID; - String button2Id = parentId + BUTTON2_ID; - - Assert.assertTrue(isPresent(panelId2)); - writeStatus("Click button 1"); - // set panel_2 text visible flag to false - clickById(buttonId); - waitForAjaxCompletion(); - // panel_2 text should be visible as b1 has limitToList=true and - // rerender only panel_1 - Assert.assertTrue(isPresent(panelId2), - "panel_2 text should be visible as b1 has limitToList=true and rerender only panel_1"); - writeStatus("Click button 2"); - clickById(button2Id); - waitForAjaxCompletion(); - // panel_2 text should not be visible as it has ajaxRendered=true and b2 - // has limitToList=false - Assert.assertFalse(isPresent(panelId2), - "panel_2 text should not be visible as it has ajaxRendered=true and b2 has limitToList=false"); - } - - @Test - public void testOnDoubleClickEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_5"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check ondoubleclick event"); - AssertTextEquals(panelResultId, "No"); - selenium.doubleClick(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnKeyDownEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_6"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onkeydown event"); - AssertTextEquals(panelResultId, "No"); - selenium.keyDown(panelId, "1"); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnKeyPressEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_7"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onkeypress event"); - AssertTextEquals(panelResultId, "No"); - selenium.keyPress(panelId, "1"); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnKeyUpEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_8"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onkeyup event"); - AssertTextEquals(panelResultId, "No"); - selenium.keyUp(panelId, "1"); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnMouseDownEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_9"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onmousedown event"); - AssertTextEquals(panelResultId, "No"); - selenium.mouseDown(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnMouseMoveEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_10"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onmousemove event"); - AssertTextEquals(panelResultId, "No"); - selenium.mouseMove(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnMouseOutEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_11"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onmouseout event"); - AssertTextEquals(panelResultId, "No"); - selenium.mouseOut(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnMouseOverEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_12"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onmouseover event"); - AssertTextEquals(panelResultId, "No"); - selenium.mouseOver(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnMouseUpEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_13"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onmouseup event"); - AssertTextEquals(panelResultId, "No"); - selenium.mouseUp(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - @Test - public void testOnClickEvent(Template template) throws Exception { - renderPage(template); - String parentId = getParentId() + FORM_ID; - String panelId = parentId + "panel_14"; - String panelResultId = panelId + RESULT_SUFFIX; - writeStatus("Check onclick event"); - AssertTextEquals(panelResultId, "No"); - selenium.click(panelId); - AssertTextEquals(panelResultId, "Yes"); - } - - private void clickReset() { - String buttonId = getParentId() + FORM_ID + RESET_BUTTON_ID; - writeStatus("Click reset button"); - clickCommandAndWait(buttonId); - } - + /** + * output panel is present in browser together with nested elements + */ + @Test + public void testPresent(Template template) { + init(template); + Assert.assertTrue(selenium.isElementPresent(outputPanel)); + Assert.assertTrue(selenium.isElementPresent(outputText)); + } + + @Test + public void testLayoutAttribute(Template template) { + init(template); + Assert.assertEquals(selenium.getAttribute("xpath=id('" + mainForm + "')/span/span/span@id"), outputText); + selenium.type(layout, "block"); + waitForAjaxCompletion(); + Assert.assertEquals(selenium.getAttribute("xpath=id('" + mainForm + "')/span/div/span@id"), outputText); + selenium.type(layout, "none"); + waitForAjaxCompletion(); + Assert.assertEquals(selenium.getAttribute("xpath=id('" + mainForm + "')/span/span@id"), outputText); + } + @Override public String getTestUrl() { return "pages/ajaxOutputPanel/ajaxOutputPanelTest.xhtml";

15 years, 10 months

1
0
0 / 0

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

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

Author: mvitenkov Date: 2009-03-03 11:50:11 -0500 (Tue, 03 Mar 2009) New Revision: 12810 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java Log: testLocaleAttribute->testWeekDays method correction. Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-03-03 15:27:17 UTC (rev 12809) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-03-03 16:50:11 UTC (rev 12810) @@ -87,13 +87,13 @@ static final List<String> WEEK_DAYS_RU = new ArrayList<String>(); static { - WEEK_DAYS_RU.add("Пн"); - WEEK_DAYS_RU.add("Вт"); - WEEK_DAYS_RU.add("Ср"); - WEEK_DAYS_RU.add("Чт"); - WEEK_DAYS_RU.add("Пт"); - WEEK_DAYS_RU.add("Сб"); - WEEK_DAYS_RU.add("Вс"); + WEEK_DAYS_RU.add("\u041F\u043D"); + WEEK_DAYS_RU.add("\u0412\u0442"); + WEEK_DAYS_RU.add("\u0421\u0440"); + WEEK_DAYS_RU.add("\u0427\u0442"); + WEEK_DAYS_RU.add("\u041F\u0442"); + WEEK_DAYS_RU.add("\u0421\u0431"); + WEEK_DAYS_RU.add("\u0412\u0441"); } static final DateFormatSymbols symbolsUS = new DateFormatSymbols(Locale.US); @@ -411,7 +411,7 @@ for (String weekday : WEEK_DAYS_RU) { if (!weekDays.contains(weekday)) { - Assert.fail("Internationalization failed. Weekdays should contain ["+weekday+"] in case of RU locale. But was: " + weekDays.toArray()); + Assert.fail("Internationalization failed. Weekdays should contain ["+weekday+"] in case of RU locale. But was: " + weekDays.toArray()); } } } @@ -667,7 +667,8 @@ checkCurrentDate(date, "'today' JS API function does not work. Date should be swtiched to current date"); checkCurrentDate(c); - //Test 'getData' + + //Test 'getData' https://jira.jboss.org/jira/browse/RF-4806 c = Calendar.getInstance(); String data = invokeFromComponent(calendarId, "getData", new JSLiteral("new Date()")); String expectedData = "data" + c.get(Calendar.DATE);

15 years, 10 months

1
0
0 / 0

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

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

Author: alevkovsky Date: 2009-03-03 10:27:17 -0500 (Tue, 03 Mar 2009) New Revision: 12809 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml Log: Realworld: add user photo markup, apply new design Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml =================================================================== (Binary files differ)

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r12808 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/util and 4 other directories.

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

Author: alevkovsky Date: 2009-03-03 10:20:32 -0500 (Tue, 03 Mar 2009) New Revision: 12808 Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.gif trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_down.gif trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_up.gif trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_120.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_200.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_80.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_120.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_200.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_80.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_bg.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_option_bg.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/spacer.gif trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_album.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_minus.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_plus.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_shelf.png trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_slid.png trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css Log: Realworld: add user photo markup, apply new design Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-03 15:19:56 UTC (rev 12807) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/navigation/NavigationEnum.java 2009-03-03 15:20:32 UTC (rev 12808) @@ -26,7 +26,7 @@ USER_PREFS("includes/userPrefs.xhtml"), SEARCH("includes/search.xhtml"), WHAT_NEW("includes/recent.xhtml"), - ALBUM_PREVIEW("includes/albumPreview.xhtml"), + ALBUM_PREVIEW("includes/userImage.xhtml"), SHELF_PREVIEW("/includes/userAlbum.xhtml"), ALL_SHELFS("/includes/userShelfs.xhtml"), TAGS("includes/tags.xhtml"), Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java =================================================================== --- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-03 15:19:56 UTC (rev 12807) +++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ConversationState.java 2009-03-03 15:20:32 UTC (rev 12808) @@ -226,6 +226,24 @@ setSelectedShelf(album.getParent()); setSelectedUser(album.getOwner()); } + + public void showImageFromShelf(Image image){ + if(!image.getAlbum().isShared() && !image.getAlbum().getOwner().equals(user)){ + Events.instance().raiseEvent(Constants.ADD_ERROR_EVENT, new Exception(HAVENT_ACCESS)); + return; + } + Events.instance().raiseEvent(Constants.UPDATE_MAIN_AREA_EVENT, NavigationEnum.ALBUM_PREVIEW); + setSelectedAlbum(image.getAlbum()); + setSelectedImage(image); + Integer index = getSelectedAlbum().getIndex(getSelectedImage()); + setSelectedImageIndex(index); + UIComponent component = FacesContext.getCurrentInstance().getViewRoot(); + UIDatascroller scroller = (UIDatascroller)component.findComponent(Constants.DATASCROLLER_ID); + Map<String, Object> attributes = scroller.getDataTable().getAttributes(); + attributes.put(UIDatascroller.SCROLLER_STATE_ATTRIBUTE, index+1); + setSelectedImageIndex(index+1); + setSelectedUser(image.getAlbum().getOwner()); + } public void selectMyAlbums(){ setSelectedAlbum(null); Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/ai.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_left.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/arr_right.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_down.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_down.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_up.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/bull_arr_up.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_120.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_120.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_200.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_200.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_80.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_album_80.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_120.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_120.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_200.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_200.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_80.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/frame_photo_80.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_bg.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_bg.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_option_bg.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/search_option_bg.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/spacer.gif =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/spacer.gif ___________________________________________________________________ Name: svn:mime-type + image/gif Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_album.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_album.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_minus.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_minus.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_plus.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_plus.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_shelf.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_shelf.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_slid.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/tree_icon_slid.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfImagesPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/shelfsPreview.xhtml =================================================================== (Binary files differ) Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImage.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-03 15:19:56 UTC (rev 12807) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-03 15:20:32 UTC (rev 12808) @@ -288,6 +288,47 @@ color: black; } +a{color : #DF6400;} +h1{font-size : 175%; font-weight : normal; margin : 0px;} + +.preview_box_album_80 {width : 100px; height : 100px; position : relative; float : left; margin : 0px 10px 20px 0px;} +.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;} +.preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + +.preview_box_album_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} +.preview_box_album_120 img.pr_album_bg {width : 140px; height : 140px; position : absolute;} +.preview_box_album_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_album_120 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} + +.preview_box_album_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} +.preview_box_album_160 img.pr_album_bg {width : 180px; height : 180px; position : absolute;} +.preview_box_album_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_album_160 table img{margin: 0px 0px 1px 1px; border : 1px solid #FFFFFF;} + + + +.preview_box_photo_80 {width : 100px; height : 100px; position : relative; float : left; margin : 0px 10px 20px 0px;} +.preview_box_photo_80 img.pr_photo_bg {width : 100px; height : 100px; position : absolute;} +.preview_box_photo_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_80 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + +.preview_box_photo_120 {width : 140px; height : 140px; position : relative; float : left; margin : 0px 10px 20px 0px;} +.preview_box_photo_120 img.pr_photo_bg {width : 140px; height : 140px; position : absolute;} +.preview_box_photo_120 table{position : relative; width : 140px; height : 140px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_120 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + +.preview_box_photo_160 {width : 180px; height : 180px; position : relative; float : left; margin : 0px 10px 20px 0px;} +.preview_box_photo_160 img.pr_photo_bg {width : 180px; height : 180px; position : absolute;} +.preview_box_photo_160 table{position : relative; width : 180px; height : 180px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_160 table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} + +.preview_box_photo_nav {width : 50px; height : 50px; position : relative; float : left; margin : 0px 2px 0px 0px;} +.preview_box_photo_nav img.pr_photo_bg {width : 50px; height : 50px; position : absolute;} +.preview_box_photo_nav table{position : relative; width : 50px; height : 50px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} +.preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;} + .search-div { height: 65px; width: 339px; @@ -401,4 +442,4 @@ .dr-tree-h-text { white-space: normal; -} \ No newline at end of file +}

15 years, 10 months

1
0
0 / 0

JBoss Rich Faces SVN: r12807 - trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain.

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

Author: alevkovsky Date: 2009-03-03 10:19:56 -0500 (Tue, 03 Mar 2009) New Revision: 12807 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 Log: Realworld: add user photo markup, apply new design 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-03 14:55:13 UTC (rev 12806) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Album.java 2009-03-03 15:19:56 UTC (rev 12807) @@ -276,4 +276,16 @@ albumTags.remove(metatag); } } + + public Image getLastImage(){ + if(images != null && images.size() > 0){ + return images.get(images.size() - 1); + }else{ + return null; + } + } + + public boolean isEmpty() { + return images == null || images.size() == 0; + } } 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-03 14:55:13 UTC (rev 12806) +++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/domain/Shelf.java 2009-03-03 15:19:56 UTC (rev 12807) @@ -132,4 +132,15 @@ return this.getChildAlbums() != null ? this.getChildAlbums().size() : 0; } + + public int getCountImages() { + int result = 0; + if(getCountAlbums() > 0){ + for(Album album : getChildAlbums()){ + result += album.getCountImages(); + } + } + return result; + + } }

15 years, 10 months

1
0
0 / 0

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

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

Author: andrei_exadel Date: 2009-03-03 09:55:13 -0500 (Tue, 03 Mar 2009) New Revision: 12806 Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml Log: fix tag cloud Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml 2009-03-03 14:51:30 UTC (rev 12805) +++ trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml 2009-03-03 14:55:13 UTC (rev 12806) @@ -7,7 +7,7 @@ xmlns:rich="http://richfaces.org/rich"> <a4j:outputPanel layout="block" style="width: 200px"> <h:form> - <c:forEach items="#{tagList.tagMap}" var="tag"> + <c:forEach items="#{tagList}" var="tag"> <a4j:commandLink value="#{tag.key}" actionListener="#{tagCloudBean.processTagClick(tag.key)}" styleClass="#{tagCloudBean.getTagCssClass(tag.value)}"></a4j:commandLink>

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