kune-commits

Download

[email protected]

November 2011

1 participants
57 discussions

r1583 - in intro: src/cc/kune/intro/client war war/kuneintro
by Vicente J. Ruiz Jurado 05 Nov '11

05 Nov '11

Author: vjrj_ Date: 2011-11-05 16:56:18 +0100 (Sat, 05 Nov 2011) New Revision: 1583 Added: intro/src/cc/kune/intro/client/kune-intro-group-p.png intro/src/cc/kune/intro/client/kune-intro-orgs-p.png intro/src/cc/kune/intro/client/kune-intro-user-p.png intro/src/cc/kune/intro/client/kune-intro-world-p.png intro/war/kuneintro/1157B6D0301D610D2B774F4840D35FC7.cache.png intro/war/kuneintro/18742509B4F8ACC05E1557C5D0BAE0D7.cache.html intro/war/kuneintro/293F5A98B3165DC705484F5B59479977.cache.png intro/war/kuneintro/362B87BD68C58AA797CA1F09FE7F5B1C.cache.html intro/war/kuneintro/3A95475FA1272469B37A2A76E25EBA8E.cache.html intro/war/kuneintro/BDEC3720C6109917A2700D3F75E4B18A.cache.html intro/war/kuneintro/D393D7DBCCC53E734D4F022785A1E124.cache.html Modified: intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml intro/src/cc/kune/intro/client/kune-intro-logo.png intro/war/about.html intro/war/frame-def.css intro/war/kuneintro/kuneintro.nocache.js Log: intro smaller Modified: intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-11-05 15:51:49 UTC (rev 1582) +++ intro/src/cc/kune/intro/client/IntroTabPanel.ui.xml 2011-11-05 15:56:18 UTC (rev 1583) @@ -2,9 +2,9 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:style> - @external .k-home-summary .litext .liimg .tabUsers .tabGroups .tabOrgs .tabPublic .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTab-selected; + @external .k-home-summary .litext .liimg .tabUsers .tabGroups .tabOrgs .tabPublic .gwt-TabLayoutPanelTab, .gwt-TabLayoutPanelTabs, .gwt-TabLayoutPanelTab-selected; .parent { - width: 605px; + width: 455px; } .child { @@ -17,7 +17,7 @@ } .header { - height: 123px; + height: 103px; } .tabscontainer { @@ -38,17 +38,17 @@ -webkit-border-bottom-left-radius: 0px; -moz-border-radius-bottomleft: 0px; border-bottom-left-radius: 0px; - height: 380px; + height: 280px; } .tab { line-height: 1.4em; - font-size: 21px; + font-size: 16px; margin: 2px; } .title { - font-size: 31px; + font-size: 24px; color: #69312f; font-weight: bold; text-align: left; @@ -59,7 +59,7 @@ .k-home-summary { margin: 0 auto; position: absolute; - top: 26%; + top: 140px; } .k-home-summary ul { @@ -73,19 +73,22 @@ color: #dd8a3d; white-space: nowrap; font-weight: bold; - font-size: 37px; + font-size: 26px; line-height: 55px; } .litext { - top: -7px; position: relative } .liimg { - padding: 0px 45px !important; + padding: 0px 45px 10px 45px !important; } + .gwt-TabLayoutPanelTabs { + margin-left: 5px; + } + .gwt-TabLayoutPanelTab { background-color: #F3D4AE; -webkit-border-top-right-radius: 9px; @@ -97,7 +100,7 @@ font-weight: bold; font-size: 2px; padding: 3px 3px; - margin: 0 0 0 10px; + margin: 0 0 0 5px; cursor: pointer; } @@ -106,15 +109,15 @@ } .gwt-TabLayoutPanelTab-selected { - background-color: #F9EFCB; + background-color: #FFF; color: #69312f; } .tabPanel { - font-size: 23px; + font-size: 16px; line-height: 1.1em; color: #69312f; - background-color: #F9EFCB; + background-color: #FFF; height: 84%; padding: 16px; -webkit-border-top-right-radius: 10px; @@ -170,6 +173,26 @@ padding: 1px 3px; } + @sprite .tabUsersSmall { + gwt-image: "usersLogoSmall"; + padding: 1px 3px; + } + + @sprite .tabGroupsSmall { + gwt-image: "groupsLogoSmall"; + padding: 1px 3px; + } + + @sprite .tabPublicSmall { + gwt-image: "publicLogoSmall"; + padding: 1px 3px; + } + + @sprite .tabOrgsSmall { + gwt-image: "orgsLogoSmall"; + padding: 1px 3px; + } + @sprite .arrowLeft { gwt-image: "arrowLeft"; } @@ -199,7 +222,7 @@ border-top-left-radius: 10px; background-color: #C28D66; width: 67px; - margin-left: 479px; + margin-left: 329px; margin-top: 5px; } @@ -223,6 +246,10 @@ <ui:image field="groupsLogo" src="kune-intro-group.png"></ui:image> <ui:image field="publicLogo" src="kune-intro-world.png"></ui:image> <ui:image field="orgsLogo" src="kune-intro-orgs.png"></ui:image> + <ui:image field="usersLogoSmall" src="kune-intro-user-p.png"></ui:image> + <ui:image field="groupsLogoSmall" src="kune-intro-group-p.png"></ui:image> + <ui:image field="publicLogoSmall" src="kune-intro-world-p.png"></ui:image> + <ui:image field="orgsLogoSmall" src="kune-intro-orgs-p.png"></ui:image> <ui:image field="arrowLeft" src="arrow-left.png"></ui:image> <ui:image field="arrowRight" src="arrow-right.png"></ui:image> @@ -235,7 +262,7 @@ <g:FlowPanel addStyleNames="{style.child}" ui:field="childPanel"> <g:FlowPanel addStyleNames="{style.header}" ui:field="header"> <g:InlineLabel addStyleNames="{style.logo} {style.right}" - ui:field="logo" /> + ui:field="logo"/> <g:Label addStyleNames="{style.title}" ui:field="title">Why do we need</g:Label> @@ -243,82 +270,82 @@ <g:DeckPanel ui:field="deck" addStyleNames="{style.tabscontainer}"> <g:SimplePanel ui:field="intro"> <g:HTML wordWrap="true" ui:field="htmlIntro" - addStyleNames="{style.k-home-summary}" /> + addStyleNames="{style.k-home-summary}"/> </g:SimplePanel> - <g:TabLayoutPanel barHeight="56" barUnit="PX" - width="100%" height="380px" ui:field="tabPanel"> + <g:TabLayoutPanel barHeight="47" barUnit="PX" + width="100%" height="280px" ui:field="tabPanel"> <g:tab> <g:header> <div class="{style.tab}"> - <span class="{style.tabUsers} {style.left}"></span> + <span class="{style.tabUsersSmall} {style.left}"></span> <span>Users</span> </div> </g:header> <g:FlowPanel ui:field="usersPanel" addStyleNames="{style.tabPanel}"> - <g:HTML wordWrap="true" ui:field="usersField" /> + <g:HTML wordWrap="true" ui:field="usersField"/> </g:FlowPanel> </g:tab> <g:tab> <g:header> <div class="{style.tab}"> - <span class="{style.tabGroups} {style.left}"></span> + <span class="{style.tabGroupsSmall} {style.left}"></span> <span>Groups</span> </div> </g:header> <g:FlowPanel ui:field="groupsPanel"> <g:HTML wordWrap="true" ui:field="groupsField" - addStyleNames="{style.tabPanel}" /> + addStyleNames="{style.tabPanel}"/> </g:FlowPanel> </g:tab> <g:tab> <g:header> <div class="{style.tab}"> - <span class="{style.tabPublic} {style.left}"></span> + <span class="{style.tabPublicSmall} {style.left}"></span> <span>Public</span> </div> </g:header> <g:FlowPanel ui:field="publicPanel"> <g:HTML wordWrap="true" ui:field="publicField" - addStyleNames="{style.tabPanel}" /> + addStyleNames="{style.tabPanel}"/> </g:FlowPanel> </g:tab> <g:tab> <g:header> <div class="{style.tab}"> - <span class="{style.tabOrgs} {style.left}"></span> + <span class="{style.tabOrgsSmall} {style.left}"></span> <span>Institutions</span> </div> </g:header> <g:FlowPanel ui:field="orgsPanel"> <g:HTML wordWrap="true" ui:field="orgsField" - addStyleNames="{style.tabPanel}" /> + addStyleNames="{style.tabPanel}"/> </g:FlowPanel> </g:tab> </g:TabLayoutPanel> <g:FlowPanel ui:field="credits"> - <g:Frame ui:field="creditsHtml" addStyleNames="{style.credits}" /> + <g:Frame ui:field="creditsHtml" addStyleNames="{style.credits}"/> </g:FlowPanel> </g:DeckPanel> <g:HorizontalPanel ui:field="btnPanel" styleName="{style.arrowbtns} "> <g:PushButton ui:field='leftBtn' enabled='true' addStyleNames="{style.arrowbtn}"> - <g:upFace image='{arrowLeft}' /> - <g:upHoveringFace image='{arrowLeftHover}' /> - <g:downFace image='{arrowLeftDown}' /> - <g:downHoveringFace image='{arrowLeftDown}' /> - <g:upDisabledFace image='{arrowLeftDown}' /> - <g:downDisabledFace image='{arrowLeftDown}' /> + <g:upFace image='{arrowLeft}'/> + <g:upHoveringFace image='{arrowLeftHover}'/> + <g:downFace image='{arrowLeftDown}'/> + <g:downHoveringFace image='{arrowLeftDown}'/> + <g:upDisabledFace image='{arrowLeftDown}'/> + <g:downDisabledFace image='{arrowLeftDown}'/> </g:PushButton> <g:PushButton ui:field='rightBtn' enabled='true' addStyleNames="{style.arrowbtn}"> - <g:upFace image='{arrowRight}' /> - <g:upHoveringFace image='{arrowRightHover}' /> - <g:downFace image='{arrowRightDown}' /> - <g:downHoveringFace image='{arrowRightDown}' /> - <g:upDisabledFace image='{arrowRightDown}' /> - <g:downDisabledFace image='{arrowRightDown}' /> + <g:upFace image='{arrowRight}'/> + <g:upHoveringFace image='{arrowRightHover}'/> + <g:downFace image='{arrowRightDown}'/> + <g:downHoveringFace image='{arrowRightDown}'/> + <g:upDisabledFace image='{arrowRightDown}'/> + <g:downDisabledFace image='{arrowRightDown}'/> </g:PushButton> </g:HorizontalPanel> </g:FlowPanel> Added: intro/src/cc/kune/intro/client/kune-intro-group-p.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-group-p.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: intro/src/cc/kune/intro/client/kune-intro-logo.png =================================================================== (Binary files differ) Added: intro/src/cc/kune/intro/client/kune-intro-orgs-p.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-orgs-p.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-user-p.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-user-p.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/src/cc/kune/intro/client/kune-intro-world-p.png =================================================================== (Binary files differ) Property changes on: intro/src/cc/kune/intro/client/kune-intro-world-p.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: intro/war/about.html =================================================================== --- intro/war/about.html 2011-11-05 15:51:49 UTC (rev 1582) +++ intro/war/about.html 2011-11-05 15:56:18 UTC (rev 1583) @@ -20,7 +20,7 @@ rel='stylesheet' type='text/css'> <h2><a name="section_1_1">Authors</a></h2> -<p>Daniel Gómez Blasco<br/> +<p>Daniel Gómez Blasco<br/> Samer Hassan<br/> Vicente J. Ruiz Jurado </p> @@ -37,6 +37,7 @@ </li><li>Javier de la Cueva and Leovigildo García-Bobadilla for the legal support </li><li>Jonathan Araña Cruz, Roxu and all the <a href="http://xsto.info">http://xsto.info</a> staff for their help with the infrastructure + </li><li>Juan Pablo Zafra Delgado for his research and support for the integration of additional modules </li><li>Daniel Jiménez for the initial help and coordination </li><li>Johnattan Rupire, William Austen Bradbury and Rana Hassan for their web contributions and translations @@ -217,7 +218,15 @@ <p>Copyright 2002-2007 Sun Microsystems, Inc. This product is made available subject to the terms of GNU Lesser General Public License Version 2.1. A copy of the LGPL license can be found -<a href="http://www.openoffice.org/project/www/license.html">http://www.openoffice.org/project/www/license.html</a></p> +<a href="http://www.openoffice.org/project/www/license.html">http://www.openoffice.org/project/www/license.html</a> +</p> +<p><strong>Default background of Public Space</strong> +</p> +<p>Jean-Pol GRANDMONT<br/> +<a href="http://creativecommons.org/licenses/by/3.0/deed.en">http://creativecommons.org/licenses/by/3.0/deed.en</a> +Creative Commons Attribution 3.0 Unported license +<a href="https://secure.wikimedia.org/wikipedia/commons/wiki/File:Acer_japonicum_Vit…">https://secure.wikimedia.org/wikipedia/commons/wiki/File:Acer_japonicum_Vit…</a> +</p> </body> </html> Modified: intro/war/frame-def.css =================================================================== --- intro/war/frame-def.css 2011-11-05 15:51:49 UTC (rev 1582) +++ intro/war/frame-def.css 2011-11-05 15:56:18 UTC (rev 1583) @@ -18,11 +18,11 @@ body { color: brown; font-family: 'Ubuntu', Arial; - font-size: 17px; + font-size: 16px; background-color: transparent; padding: 0px 15px; } -a { +a { color: #69312F; } \ No newline at end of file Added: intro/war/kuneintro/1157B6D0301D610D2B774F4840D35FC7.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/1157B6D0301D610D2B774F4840D35FC7.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/18742509B4F8ACC05E1557C5D0BAE0D7.cache.html =================================================================== --- intro/war/kuneintro/18742509B4F8ACC05E1557C5D0BAE0D7.cache.html (rev 0) +++ intro/war/kuneintro/18742509B4F8ACC05E1557C5D0BAE0D7.cache.html 2011-11-05 15:56:18 UTC (rev 1583) @@ -0,0 +1,566 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '18742509B4F8ACC05E1557C5D0BAE0D7';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/293F5A98B3165DC705484F5B59479977.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/293F5A98B3165DC705484F5B59479977.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: intro/war/kuneintro/362B87BD68C58AA797CA1F09FE7F5B1C.cache.html =================================================================== --- intro/war/kuneintro/362B87BD68C58AA797CA1F09FE7F5B1C.cache.html (rev 0) +++ intro/war/kuneintro/362B87BD68C58AA797CA1F09FE7F5B1C.cache.html 2011-11-05 15:56:18 UTC (rev 1583) @@ -0,0 +1,595 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '362B87BD68C58AA797CA1F09FE7F5B1C';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/3A95475FA1272469B37A2A76E25EBA8E.cache.html =================================================================== --- intro/war/kuneintro/3A95475FA1272469B37A2A76E25EBA8E.cache.html (rev 0) +++ intro/war/kuneintro/3A95475FA1272469B37A2A76E25EBA8E.cache.html 2011-11-05 15:56:18 UTC (rev 1583) @@ -0,0 +1,566 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = '3A95475FA1272469B37A2A76E25EBA8E';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/BDEC3720C6109917A2700D3F75E4B18A.cache.html =================================================================== --- intro/war/kuneintro/BDEC3720C6109917A2700D3F75E4B18A.cache.html (rev 0) +++ intro/war/kuneintro/BDEC3720C6109917A2700D3F75E4B18A.cache.html 2011-11-05 15:56:18 UTC (rev 1583) @@ -0,0 +1,573 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'BDEC3720C6109917A2700D3F75E4B18A';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Added: intro/war/kuneintro/D393D7DBCCC53E734D4F022785A1E124.cache.html =================================================================== --- intro/war/kuneintro/D393D7DBCCC53E734D4F022785A1E124.cache.html (rev 0) +++ intro/war/kuneintro/D393D7DBCCC53E734D4F022785A1E124.cache.html 2011-11-05 15:56:18 UTC (rev 1583) @@ -0,0 +1,559 @@ +<html><head><meta charset="UTF-8" /><script>var $gwt_version = "2.1.1";var $wnd = parent;var $doc = $wnd.document;var $moduleName, $moduleBase;var $strongName = 'D393D7DBCCC53E734D4F022785A1E124';var $stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null;$stats && $stats({moduleName:'kuneintro',sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});</script></head><body><script></script> +<script></script> +<script></script> +<script></script></body></html> \ No newline at end of file Modified: intro/war/kuneintro/kuneintro.nocache.js =================================================================== --- intro/war/kuneintro/kuneintro.nocache.js 2011-11-05 15:51:49 UTC (rev 1582) +++ intro/war/kuneintro/kuneintro.nocache.js 2011-11-05 15:56:18 UTC (rev 1583) @@ -1,4 +1,4 @@ -function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='8B01046A8B6B48C021F16014E3001256',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',Pb='B8B794821A774C30A8B35A7CFFCBCE68',Qb='BC32383DAE666B729770CB11901E7650',tb='Bad handler "',Rb='CDAA5D6A4A17CAAF3621D29D7CEA5CDD',Sb='D35E124009A6CC80A241E277C8F5C92C',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} +function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='18742509B4F8ACC05E1557C5D0BAE0D7',Pb='362B87BD68C58AA797CA1F09FE7F5B1C',Qb='3A95475FA1272469B37A2A76E25EBA8E',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',Rb='BDEC3720C6109917A2700D3F75E4B18A',tb='Bad handler "',Sb='D393D7DBCCC53E734D4F022785A1E124',Vb='DOMContentLoaded',eb='SCRIPT',bb='__gwt_marker_kuneintro',ib='base',$='baseUrl',U='begin',T='bootstrap',kb='clear.cache.gif',qb='content',Z='end',Ib='gecko',Jb='gecko1_8',V='gwt.codesvr=',W='gwt.hosted=',X='gwt.hybrid',vb='gwt:onLoadErrorFn',sb='gwt:onPropertyErrorFn',pb='gwt:property',Mb='hosted.html?kuneintro',Hb='ie6',Gb='ie8',xb='iframe',jb='img',yb="javascript:''",R='kuneintro',ab='kuneintro.nocache.js',nb='kuneintro::',Lb='loadExternalRefs',lb='meta',Ab='moduleRequested',Y='moduleStartup',Fb='msie',mb='name',Cb='opera',zb='position:absolute;width:0;height:0;border:none',Eb='safari',_='script',Nb='selectingPermutation',S='startup',Kb='unknown',Bb='user.agent',Db='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=Q,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:U});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(V)!=-1||(c.indexOf(W)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(X)==-1}catch(a){}B=function(){return b};return b} function C(){if(q&&r){var b=n.getElementById(R);var c=b.contentWindow;if(B()){c.__gwt_getProperty=function(a){return I(a)}}kuneintro=null;c.gwtOnLoad(z,R,t,y);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Z})}} function D(){if(u[$]){t=u[$];return t}var e;var f=n.getElementsByTagName(_);for(var g=0;g<f.length;++g){if(f[g].src.indexOf(ab)!=-1){e=f[g]}}if(!e){var h=bb;var i;n.write(cb+h+db);i=n.getElementById(h);e=i&&i.previousSibling;while(e&&e.tagName!=eb){e=e.previousSibling}}function j(a){var b=a.lastIndexOf(fb);if(b==-1){b=a.length}var c=a.indexOf(gb);if(c==-1){c=a.length}var d=a.lastIndexOf(hb,Math.min(c,b));return d>=0?a.substring(0,d+1):Q} ;if(e&&e.src){t=j(e.src)}if(t==Q){var k=n.getElementsByTagName(ib);if(k.length>0){t=k[k.length-1].href}else{t=j(n.location.href)}}else if(t.match(/^\w+:\/\//)){}else{var l=n.createElement(jb);l.src=t+kb;t=j(l.src)}if(i){i.parentNode.removeChild(i)}return t} @@ -6,6 +6,6 @@ function H(a,b){var c=x;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])}c[a[e]]=b} function I(a){var b=w[a](),c=v[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(A){A(a,d,b)}throw null} var J;function K(){if(!J){J=true;var a=n.createElement(xb);a.src=yb;a.id=R;a.style.cssText=zb;a.tabIndex=-1;n.body.appendChild(a);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Y,millis:(new Date).getTime(),type:Ab});a.contentWindow.location.replace(t+M)}} -w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Hb],Ob);H([Cb],Pb);H([Eb],Qb);H([Gb],Rb);H([Jb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} +w[Bb]=function(){var b=navigator.userAgent.toLowerCase();var c=function(a){return parseInt(a[1])*1000+parseInt(a[2])};if(b.indexOf(Cb)!=-1){return Cb}else if(b.indexOf(Db)!=-1){return Eb}else if(b.indexOf(Fb)!=-1){if(document.documentMode>=8){return Gb}else{var d=/msie ([0-9]+)\.([0-9]+)/.exec(b);if(d&&d.length==3){var e=c(d);if(e>=6000){return Hb}}}}else if(b.indexOf(Ib)!=-1){return Jb}return Kb};v[Bb]={gecko1_8:0,ie6:1,ie8:2,opera:3,safari:4};kuneintro.onScriptLoad=function(){if(J){r=true;C()}};kuneintro.onInjectionDone=function(){q=true;o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:Z});C()};E();D();var L;var M;if(B()){if(m.external&&(m.external.initModule&&m.external.initModule(R))){m.location.reload();return}M=Mb;L=Q}o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Nb});if(!B()){try{H([Gb],Ob);H([Hb],Pb);H([Jb],Qb);H([Eb],Rb);H([Cb],Sb);L=x[I(Bb)];var N=L.indexOf(Tb);if(N!=-1){y=Number(L.substring(N+1));L=L.substring(0,N)}M=L+Ub}catch(a){return}}var O;function P(){if(!s){s=true;C();if(n.removeEventListener){n.removeEventListener(Vb,P,false)}if(O){clearInterval(O)}}} if(n.addEventListener){n.addEventListener(Vb,function(){K();P()},false)}var O=setInterval(function(){if(/loaded|complete/.test(n.readyState)){K();P()}},50);o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:T,millis:(new Date).getTime(),type:Z});o&&o({moduleName:R,sessionId:p,subSystem:S,evtGroup:Lb,millis:(new Date).getTime(),type:U});n.write(Wb)} kuneintro(); \ No newline at end of file

1 0

r1582 - wp-theme/kune
by Vicente J. Ruiz Jurado 05 Nov '11

05 Nov '11

Author: vjrj_ Date: 2011-11-05 16:51:49 +0100 (Sat, 05 Nov 2011) New Revision: 1582 Modified: wp-theme/kune/onecolumn-page.php Log: Modified: wp-theme/kune/onecolumn-page.php =================================================================== --- wp-theme/kune/onecolumn-page.php 2011-11-05 13:54:45 UTC (rev 1581) +++ wp-theme/kune/onecolumn-page.php 2011-11-05 15:51:49 UTC (rev 1582) @@ -7,9 +7,6 @@ * The "Template Name:" bit above allows this to be selectable * from a dropdown menu on the edit page screen. * - * @package WordPress - * @subpackage Twenty_Ten - * @since Twenty Ten 1.0 */ get_header(); ?>

1 0

r1581 - trunk
by Vicente J. Ruiz Jurado 05 Nov '11

05 Nov '11

Author: vjrj_ Date: 2011-11-05 14:54:45 +0100 (Sat, 05 Nov 2011) New Revision: 1581 Modified: trunk/.classpath trunk/pom.xml Log: Replies in waves margin and more descriptive Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-11-04 11:48:28 UTC (rev 1580) +++ trunk/.classpath 2011-11-05 13:54:45 UTC (rev 1581) @@ -12,19 +12,19 @@ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.4/box-0.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.4/box-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.5/box-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.5/box-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.4/client-0.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.4/client-common-0.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.4/client-common-src-0.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.4/client-scheduler-src-0.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.4/client-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.5/client-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.5/client-common-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.5/client-common-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.5/client-scheduler-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.5/client-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.4/common-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.5/common-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -33,8 +33,8 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.4/communication-src-0.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.4/concurrencycontrol-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.5/communication-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.5/concurrencycontrol-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -55,7 +55,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.4/gwt-util-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.5/gwt-util-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -110,16 +110,16 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.4/media-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.5/media-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.4/model-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.5/model-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.4/proto-msg-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.5/proto-msg-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.8.0/selenium-android-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.8.0/selenium-android-driver-2.8.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.8.0/selenium-api-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.8.0/selenium-api-2.8.0-sources.jar"/> @@ -143,9 +143,9 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.4/util-src-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.5/util-src-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.4/waveinabox-server-0.3-0.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.5/waveinabox-server-0.3-0.3.5.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> @@ -153,4 +153,4 @@ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> -</classpath> \ No newline at end of file +</classpath> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-04 11:48:28 UTC (rev 1580) +++ trunk/pom.xml 2011-11-05 13:54:45 UTC (rev 1581) @@ -528,12 +528,12 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>proto-msg</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -543,52 +543,52 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>model-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>waveinabox-server-0.3</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>proto-msg</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -598,67 +598,67 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>model-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>common-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>util-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>concurrencycontrol-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-scheduler-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>media-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>communication-src</artifactId> - <version>0.3.4</version> + <version>0.3.5</version> </dependency> <dependency> <groupId>net.sourceforge.findbugs</groupId>

1 0

r1580 - in trunk/src/main/java: cc/kune cc/kune/core/client/groups/newgroup cc/kune/core/client/sitebar cc/kune/core/client/sitebar/spaces cc/kune/core/client/sn cc/kune/core/client/state cc/kune/core/server/rpc cc/kune/docs/server cc/kune/gallery cc/kune/gallery/server cc/kune/gallery/shared cc/kune/gspace/client cc/kune/gspace/client/resources cc/kune/gspace/client/tool/selector org org/ourproject org/ourproject/kune
by Vicente J. Ruiz Jurado 04 Nov '11

04 Nov '11

Author: vjrj_ Date: 2011-11-04 12:48:28 +0100 (Fri, 04 Nov 2011) New Revision: 1580 Added: trunk/src/main/java/cc/kune/gallery/ trunk/src/main/java/cc/kune/gallery/client/ trunk/src/main/java/cc/kune/gallery/server/ trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/cc/kune/gallery/shared/ trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java trunk/src/main/java/org/ourproject/ trunk/src/main/java/org/ourproject/kune/ trunk/src/main/java/org/ourproject/kune/gallery/ Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml Log: Some fixes (with sizes, group creation, etc) Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -149,11 +149,11 @@ public void onCancel() { getView().hide(); + stateManager.redirectOrRestorePreviousToken(); } public void onClose() { reset(); - stateManager.redirectOrRestorePreviousToken(); } private void onRegister() { @@ -196,14 +196,14 @@ @Override public void onSuccess(final StateAbstractDTO state) { - getView().hide(); + stateManager.setRetrievedStateAndGo(state); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { - stateManager.setRetrievedStateAndGo(state); groupOptions.showTooltip(); } }); + getView().hide(); reset(); getView().unMask(); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -40,14 +40,14 @@ super(); this.stateManager = stateManager; putValue(Action.NAME, i18n.t("Create New Group")); - putValue(Action.TOOLTIP, - i18n.t("Create a new group for your initiative or organization " - + "(NGO, collective, academic group...)")); + putValue(Action.TOOLTIP, i18n.t("Create a new group for your initiative or organization " + + "(NGO, collective, academic group...)")); } @Override public void actionPerformed(final ActionEvent event) { - stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.NEWGROUP); + stateManager.gotoHistoryToken(SiteTokens.NEWGROUP); + // stateManager.gotoHistoryTokenButRedirectToCurrent(SiteTokens.NEWGROUP); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -19,6 +19,7 @@ */ package cc.kune.core.client.sitebar.spaces; +import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.core.client.auth.SignIn; @@ -269,6 +270,7 @@ } private void restoreToken(final String token) { + Log.info("Restoring token from SpaceSelector: " + token); stateManager.gotoHistoryToken(token); } Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPanel.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -57,6 +57,7 @@ private final static int AVATARLABELMAXSIZE = 4; private final static int AVATARSIZE = 22; private final static String CATEG_HEIGHT = "84px"; + private final static String CATEG_MIN_HEIGHT = "55px"; private static AbstractSNPanelUiBinder uiBinder = GWT.create(AbstractSNPanelUiBinder.class); protected final ActionSimplePanel actions; protected final GSpaceArmor armor; @@ -173,22 +174,22 @@ return bottomActionsToolbar; } - public void setFirstCategoryVisible(final boolean visible) { + public void setFirstCategoryVisible(final boolean visible, final boolean big) { firstCategoryPanel.setVisible(visible); - firstCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + firstCategoryPanel.setHeight(visible ? (big ? CATEG_HEIGHT : CATEG_MIN_HEIGHT) : "0px"); } - public void setSndCategoryVisible(final boolean visible) { + public void setSndCategoryVisible(final boolean visible, final boolean big) { sndCategoryPanel.setVisible(visible); - sndCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + sndCategoryPanel.setHeight(visible ? (big ? CATEG_HEIGHT : CATEG_MIN_HEIGHT) : "0px"); } protected void setTooltip(final Widget widget, final String title) { Tooltip.to(widget, title); } - public void setTrdCategoryVisible(final boolean visible) { + public void setTrdCategoryVisible(final boolean visible, final boolean big) { trdCategoryPanel.setVisible(visible); - trdCategoryPanel.setHeight(visible ? CATEG_HEIGHT : "0px"); + trdCategoryPanel.setHeight(visible ? (big ? CATEG_HEIGHT : CATEG_MIN_HEIGHT) : "0px"); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/AbstractSNPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -35,6 +35,8 @@ public abstract class AbstractSNPresenter<V extends View, Proxy_ extends Proxy<?>> extends Presenter<View, Proxy<?>> { + private static final int MAX_NUM_AVATAR_IN_A_ROW = 6; + protected final Provider<FileDownloadUtils> downloadProvider; public AbstractSNPresenter(final EventBus eventBus, final View view, final Proxy<?> proxy, @@ -43,6 +45,10 @@ this.downloadProvider = downloadProvider; } + protected boolean areMany(final int numAvatars) { + return numAvatars > MAX_NUM_AVATAR_IN_A_ROW; + } + protected GuiActionDescCollection createMenuItems(final Object target, final AbstractSNMembersActionsRegistry registry, final String title) { final GuiActionDescCollection items = new GuiActionDescCollection(); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -92,13 +92,18 @@ } @Override + public void setAdminsVisible(final boolean visible, final boolean areMany) { + super.setFirstCategoryVisible(visible, areMany); + } + + @Override public void setCollabsCount(final int count) { sndCategoryCount.setText(new StringBuffer("(").append(count).append(")").toString()); } @Override - public void setCollabsVisible(final boolean visible) { - super.setSndCategoryVisible(visible); + public void setCollabsVisible(final boolean visible, final boolean areMany) { + super.setSndCategoryVisible(visible, areMany); } @Override @@ -107,8 +112,8 @@ } @Override - public void setPendingVisible(final boolean visible) { - super.setTrdCategoryVisible(visible); + public void setPendingVisible(final boolean visible, final boolean areMany) { + super.setTrdCategoryVisible(visible, areMany); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -74,13 +74,15 @@ void setAdminsCount(int count); + void setAdminsVisible(boolean visible, boolean big); + void setCollabsCount(int count); - void setCollabsVisible(boolean visible); + void setCollabsVisible(boolean visible, boolean big); void setPendingsCount(int count); - void setPendingVisible(boolean visible); + void setPendingVisible(boolean visible, boolean big); void setVisible(boolean visible); @@ -198,28 +200,28 @@ } else { final boolean userIsAdmin = rights.isAdministrable(); final boolean userCanView = rights.isVisible(); - + getView().setAdminsVisible(true, areMany(numAdmins)); if (userCanView) { for (final GroupDTO admin : adminsList) { final String avatar = getAvatar(admin); getView().addAdmin(admin, avatar, admin.getLongName(), "", createMenuItems(admin, adminsMenuItemsRegistry, admin.getLongName())); } - getView().setCollabsVisible(numCollabs > 0); + getView().setCollabsVisible(numCollabs > 0, areMany(numCollabs)); for (final GroupDTO collab : collabList) { final String avatar = getAvatar(collab); getView().addCollab(collab, avatar, collab.getLongName(), "", createMenuItems(collab, collabsMenuItemsRegistry, collab.getLongName())); } if (userIsAdmin) { - getView().setPendingVisible(numPendings > 0); + getView().setPendingVisible(numPendings > 0, areMany(numPendings)); for (final GroupDTO pendingCollab : pendingCollabsList) { final String avatar = getAvatar(pendingCollab); getView().addPending(pendingCollab, avatar, pendingCollab.getLongName(), "", createMenuItems(pendingCollab, pendingsMenuItemsRegistry, pendingCollab.getLongName())); } } else { - getView().setPendingVisible(false); + getView().setPendingVisible(false, false); } getView().showMembers(); } Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -58,7 +58,7 @@ setTooltip(sndCategoryLabel, i18n.t("Groups which this user Joined")); trdCategoryLabel.setText("NOT USED"); setTooltip(trdCategoryLabel, "NOT USED"); - super.setTrdCategoryVisible(false); + super.setTrdCategoryVisible(false, false); sndDeckLabel.setText("NOT USED"); bottomActionsToolbar = new ActionFlowPanel(guiProvider); bottomPanel.add(bottomActionsToolbar); @@ -94,8 +94,8 @@ } @Override - public void setBuddiesVisible(final boolean visible) { - super.setFirstCategoryVisible(visible); + public void setBuddiesVisible(final boolean visible, final boolean areMany) { + super.setFirstCategoryVisible(visible, areMany); } @Override @@ -109,8 +109,8 @@ } @Override - public void setParticipationVisible(final boolean visible) { - super.setSndCategoryVisible(visible); + public void setParticipationVisible(final boolean visible, final boolean areMany) { + super.setSndCategoryVisible(visible, areMany); } @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPresenter.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -73,13 +73,13 @@ void setBuddiesCount(int count); - void setBuddiesVisible(boolean visible); + void setBuddiesVisible(boolean visible, boolean areMany); void setNoBuddies(); void setParticipationCount(int count); - void setParticipationVisible(boolean visible); + void setParticipationVisible(boolean visible, boolean areMany); void setVisible(boolean visible); @@ -143,7 +143,8 @@ if (state.getSocialNetworkData().isBuddiesVisible()) { // In fact now we show the user network or not. setBuddiesState(state); - getView().setBuddiesVisible(true); + getView().setBuddiesVisible(true, + areMany(state.getSocialNetworkData().getUserBuddies().getBuddies().size())); // getView().setVisible(buddies + participeIn > 0); } else { getView().showBuddiesNotPublic(); @@ -219,7 +220,7 @@ } final int totalGroups = numAdmins + numCollaborators; // getView().setParticipationCount(totalGroups); - getView().setParticipationVisible(totalGroups > 0); + getView().setParticipationVisible(totalGroups > 0, areMany(totalGroups)); return totalGroups; } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -43,7 +43,7 @@ this.eventBus = eventBus; this.cacheMap = new HashMap<StateToken, StateAbstractDTO>(); // Don't use while we don't check changes in the server - useCache = false; + useCache = true; } @Override Modified: trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -107,7 +107,8 @@ // This is necessary? contentManager.save(newGroup.getDefaultContent()); // contentManager.setTags(user, defContentId, tags); - return contentRPC.getContent(userHash, newGroup.getDefaultContent().getStateToken()); + return contentRPC.getContent(userHash, + newGroup.getDefaultContent().getStateToken().copy().clearDocument()); }; @Override Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerModule.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -23,7 +23,8 @@ import com.google.inject.Module; public class DocumentServerModule implements Module { - public void configure(final Binder binder) { - binder.bind(DocumentServerTool.class).asEagerSingleton(); - } + @Override + public void configure(final Binder binder) { + binder.bind(DocumentServerTool.class).asEagerSingleton(); + } } Added: trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerModule.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -0,0 +1,30 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gallery.server; + +import com.google.inject.Binder; +import com.google.inject.Module; + +public class GalleryServerModule implements Module { + @Override + public void configure(final Binder binder) { + binder.bind(GalleryServerTool.class).asEagerSingleton(); + } +} Added: trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -0,0 +1,61 @@ +/* + * + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gallery.server; + +import static cc.kune.gallery.shared.GalleryConstants.NAME; +import static cc.kune.gallery.shared.GalleryConstants.ROOT_NAME; +import static cc.kune.gallery.shared.GalleryConstants.TYPE_ALBUM; +import static cc.kune.gallery.shared.GalleryConstants.TYPE_ROOT; +import static cc.kune.gallery.shared.GalleryConstants.TYPE_UPLOADEDFILE; + +import java.util.Arrays; + +import cc.kune.core.server.AbstractServerTool; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Container; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +import com.google.inject.Inject; + +public class GalleryServerTool extends AbstractServerTool { + + @Inject + public GalleryServerTool(final ContentManager contentManager, final ContainerManager containerManager, + final ToolConfigurationManager configurationManager, final I18nTranslationService i18n) { + super(NAME, ROOT_NAME, TYPE_ROOT, Arrays.asList(TYPE_UPLOADEDFILE), Arrays.asList(TYPE_ROOT, + TYPE_ALBUM), Arrays.asList(TYPE_ALBUM), Arrays.asList(TYPE_ROOT, TYPE_ALBUM), contentManager, + containerManager, configurationManager, i18n, ServerToolTarget.forBoth); + } + + @Override + public Group initGroup(final User user, final Group group, final Object... otherVars) { + final Container rootFolder = createRoot(group); + + containerManager.createFolder(group, rootFolder, i18n.t("Album sample"), user.getLanguage(), + TYPE_ALBUM); + return group; + } + +} Added: trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java 2011-11-04 11:48:28 UTC (rev 1580) @@ -0,0 +1,33 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.gallery.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class GalleryConstants { + public static final String NAME = "gallery"; + public static final String ROOT_NAME = "gallery"; + public static final String TYPE_ALBUM = NAME + "." + "album"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private GalleryConstants() { + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-04 11:48:28 UTC (rev 1580) @@ -42,9 +42,9 @@ <g:center size="1.0"> <g:DockLayoutPanel unit="PX" ui:field="splitCenter" styleName="{res.style.entityCentralContainer}"> - <g:north size="168"> + <g:north size="153"> <g:VerticalPanel width="100%" - height="168px"> + height="153px"> <g:FlowPanel height="70px" width="100%" styleName="{res.style.entityHeader}" ui:field="entityHeader">  @@ -54,7 +54,7 @@ </g:FlowPanel> <g:HTMLPanel ui:field="arrow" styleName="{res.style.docSubheaderArrow}"/> - <g:FlowPanel width="100%" height="60px" + <g:FlowPanel width="100%" height="45px" styleName="{res.style.docSubheader}" ui:field="docSubheader"> </g:FlowPanel> </g:VerticalPanel> Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-04 11:48:28 UTC (rev 1580) @@ -104,7 +104,7 @@ overflow: hidden; border-collapse: separate; margin: -14px 0 0; - padding: 15px 0 0; + padding: 10px 0 0; } .docSubheader button.k-fr { @@ -219,7 +219,7 @@ } .entityToolsCenter span { - font-size: 22px; + font-size: 16px; font-weight: bold; } Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-11-04 11:48:28 UTC (rev 1580) @@ -67,10 +67,10 @@ .k-tool-item-focus span { color: c4; + font-size: 16px; } .k-tool-item-nofocus { - } .k-tool-item-nofocus span { @@ -83,6 +83,7 @@ .k-tool-item-selected span { color: c3; + font-size: 22px; } /* Derived from: from http://jonrohan.me/guide/css/creating-triangles-in-css/ */ Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-11-03 00:51:21 UTC (rev 1579) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-11-04 11:48:28 UTC (rev 1580) @@ -4,7 +4,7 @@ <ui:style> .label { text-decoration: none; - font-size: 22px; + font-size: 16px; color: white; /* text-shadow: 1px 1px 6px grey; */ @@ -19,7 +19,7 @@ } .flow { - min-height: 30px; + /* min-height: 30px; */ padding: 1px 10px; -moz-user-select: none; -khtml-user-select: none;

1 0

r1579 - trunk/src/main/webapp
by Vicente J. Ruiz Jurado 03 Nov '11

03 Nov '11

Author: vjrj_ Date: 2011-11-03 01:51:21 +0100 (Thu, 03 Nov 2011) New Revision: 1579 Modified: trunk/src/main/webapp/ws.html Log: NEW - # 147: Add again the multimedia gallery tool http://kune.ourproject.org/issues/ticket/147 Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2011-11-02 22:41:46 UTC (rev 1578) +++ trunk/src/main/webapp/ws.html 2011-11-03 00:51:21 UTC (rev 1579) @@ -166,13 +166,18 @@ margin: 50px 0 22px 0; } -#k-home-summary { +#k-home-summary,#k-home-summary a { font-size: 28px; color: #dd8a3d; font-weight: bold; white-space: nowrap; + text-decoration: none; } +#k-home-summary a:hover { + text-decoration: underline; +} + #k-home-summary li { padding-left: 41px; background-repeat: no-repeat; @@ -314,14 +319,18 @@ <div id="k-home-summary"> <ul> <li - style="background-image: url(ws/images/kune-intro-user.png);">Comunicate - with others</li> + style="background-image: url(ws/images/kune-intro-user.png);"> + <a href="#inbox">Comunicate with others</a> + </li> <li - style="background-image: url(ws/images/kune-intro-group.png);">Work - in collaboration</li> + style="background-image: url(ws/images/kune-intro-group.png);"> +  + <a href="#site">Work in collaboration</a> + </li> <li - style="background-image: url(ws/images/kune-intro-world.png);">And - share with the world</li> + style="background-image: url(ws/images/kune-intro-world.png);"> + <a href="#preview()">And share with the world</a> + </li> </ul> </div>

1 0

r1578 - in trunk/src/main/java/cc/kune: barters/client blogs/client chat/client docs/client events/client gspace/client gspace/client/tool gspace/client/tool/selector lists/client tasks/client wiki/client
by Vicente J. Ruiz Jurado 02 Nov '11

02 Nov '11

Author: vjrj_ Date: 2011-11-02 23:41:46 +0100 (Wed, 02 Nov 2011) New Revision: 1578 Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java Log: NEW - # 114: Explain properly the tools http://kune.ourproject.org/issues/ticket/114 CLOSED - # 146: General Home page should now be # instead of #home http://kune.ourproject.org/issues/ticket/146 Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -36,7 +36,7 @@ @Inject public BartersClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t("barters"), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t("barters"), i18n.t(""), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_BARTER); Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -38,7 +38,8 @@ @Inject public BlogsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(BlogsConstants.ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(BlogsConstants.ROOT_NAME), i18n.t(""), toolSelector, cntCapRegistry, i18n, + navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_POST, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -40,7 +40,7 @@ final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, final ChatResources res) { // FIXME: change this in ChatConstants and in db via migration - super(NAME, i18n.t("chatrooms"), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t("chatrooms"), i18n.t(""), toolSelector, cntCapRegistry, i18n, navResources); this.res = res; registerIcons(); } Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -38,7 +38,8 @@ @Inject public DocsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(DocsConstants.ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(DocsConstants.ROOT_NAME), i18n.t(""), toolSelector, cntCapRegistry, i18n, + navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -36,7 +36,7 @@ @Inject public EventsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(ROOT_NAME), i18n.t(""), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_MEETING); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -262,7 +262,7 @@ @Override public void setBackImage(final String url) { - final String bodyProp = "#FFFFFF url('" + url + "') fixed no-repeat top left"; + final String bodyProp = "#FFFFFF url('" + url + "') fixed top left"; // final String bodyProp = "#FFFFFF url('" + url + // "') fixed no-repeat top left"; DOM.setStyleAttribute(groupSpaceWrapper.getElement(), CSS.A.BACKGROUND, bodyProp); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -25,11 +25,13 @@ public abstract class AbstractClientTool { - public AbstractClientTool(final String shortName, final String longName, final ToolSelector toolSelector) { - final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, toolSelector); - final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(); - presenter.init(panel); - } + public AbstractClientTool(final String shortName, final String longName, final String tooltip, + final ToolSelector toolSelector) { + final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, + tooltip, toolSelector); + final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(); + presenter.init(panel); + } - public abstract String getName(); + public abstract String getName(); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -35,10 +35,10 @@ protected final I18nTranslationService i18n; protected final NavResources navResources; - public FoldableAbstractClientTool(final String shortName, final String longName, + public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip, final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry, final I18nTranslationService i18n, final NavResources navResources) { - super(shortName, longName, toolSelector); + super(shortName, longName, tooltip, toolSelector); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; this.i18n = i18n; this.navResources = navResources; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -19,6 +19,7 @@ */ package cc.kune.gspace.client.tool.selector; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter.ToolSelectorItemView; import com.google.gwt.core.client.GWT; @@ -113,6 +114,11 @@ } @Override + public void setTooltip(final String tooltip) { + Tooltip.to(this, tooltip); + } + + @Override public void setVisible(final boolean visible) { setVisibleImpl(visible); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -37,6 +37,8 @@ void setSelected(boolean selected); + void setTooltip(String tooltip); + void setVisible(boolean visible); } @@ -44,12 +46,14 @@ private final String shortName; private StateToken token; private final ToolSelector toolSelector; + private final String tooltip; private ToolSelectorItemView view; - public ToolSelectorItemPresenter(final String shortName, final String longName, + public ToolSelectorItemPresenter(final String shortName, final String longName, final String tooltip, final ToolSelector toolSelector) { this.shortName = shortName; this.longName = longName; + this.tooltip = tooltip; this.toolSelector = toolSelector; } @@ -73,6 +77,7 @@ } }); view.getLabel().setText(longName); + view.setTooltip(tooltip); } @Override Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -37,7 +37,7 @@ @Inject public ListsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(ROOT_NAME), i18n.t(""), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_POST); Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -38,7 +38,7 @@ @Inject public TasksClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(ROOT_NAME), i18n.t(""), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_TASK); Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2011-11-02 22:01:44 UTC (rev 1577) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2011-11-02 22:41:46 UTC (rev 1578) @@ -37,7 +37,7 @@ @Inject public WikiClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t("wiki"), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t("wiki"), i18n.t(""), toolSelector, cntCapRegistry, i18n, navResources); registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE);

1 0

r1577 - in trunk/src/main/java/cc/kune: core/client/auth core/client/errors core/client/sitebar/spaces core/client/state core/public gspace/client gspace/client/resources gspace/client/style
by Vicente J. Ruiz Jurado 02 Nov '11

02 Nov '11

Author: vjrj_ Date: 2011-11-02 23:01:44 +0100 (Wed, 02 Nov 2011) New Revision: 1577 Modified: trunk/src/main/java/cc/kune/core/client/auth/Register.java trunk/src/main/java/cc/kune/core/client/auth/SignIn.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java Log: CLOSED - # 146: General Home page should now be # instead of #home http://kune.ourproject.org/issues/ticket/146 Modified: trunk/src/main/java/cc/kune/core/client/auth/Register.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/Register.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/auth/Register.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -27,4 +27,6 @@ void hide(); + void setGotoTokenOnCancel(String gotoTokenOnCancel); + } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignIn.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignIn.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/auth/SignIn.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -31,6 +31,8 @@ void setErrorMessage(String message, NotifyLevel level); + void setGotoTokenOnCancel(String gotoToken); + void showSignInDialog(); } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -37,6 +37,7 @@ protected final UserPassAutocompleteManager autocomplete; protected final CookiesManager cookiesManager; + private String gotoTokenOnCancel; protected final I18nUITranslationService i18n; protected final Session session; protected final StateManager stateManager; @@ -52,6 +53,10 @@ this.autocomplete = autocomplete; } + public String getGotoTokenOnCancel() { + return gotoTokenOnCancel; + } + @Override public SignInAbstractView getView() { return (SignInAbstractView) super.getView(); @@ -71,7 +76,12 @@ getView().reset(); getView().hideMessages(); if (!session.isLogged()) { - stateManager.redirectOrRestorePreviousToken(); + if (gotoTokenOnCancel != null) { + stateManager.gotoHistoryToken(gotoTokenOnCancel); + gotoTokenOnCancel = null; + } else { + stateManager.redirectOrRestorePreviousToken(); + } } } @@ -97,4 +107,7 @@ autocomplete.clickFormLogin(); } + public void setGotoTokenOnCancel(final String gotoTokenOnCancel) { + this.gotoTokenOnCancel = gotoTokenOnCancel; + } } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -174,7 +174,6 @@ } }); getView().getClose().addCloseHandler(new CloseHandler<PopupPanel>() { - @Override public void onClose(final CloseEvent<PopupPanel> event) { Log.debug("Closing signin presenter"); @@ -182,7 +181,6 @@ } }); getView().getAccountRegister().addClickHandler(new ClickHandler() { - @Override public void onClick(final ClickEvent event) { onAccountRegister(); @@ -238,6 +236,7 @@ @Override public void showSignInDialog() { registerProvider.get().hide(); + registerProvider.get().setGotoTokenOnCancel(this.getGotoTokenOnCancel()); if (session.isLogged()) { stateManager.restorePreviousToken(); } else { Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -29,7 +29,6 @@ import cc.kune.core.client.notify.msgs.UserNotifyEvent; import cc.kune.core.client.notify.spiner.ProgressHideEvent; import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.SiteTokens; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.wave.client.WaveClientProvider; @@ -63,7 +62,7 @@ } private void goHome() { - stateManager.gotoHistoryToken(SiteTokens.GROUP_HOME); + stateManager.gotoDefaultHomepage(); } private void logException(final Throwable caught) { @@ -147,12 +146,14 @@ logException(caught, true); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Oops! Something has gone wrong with our servers. Retry later, please."))); - final String error = "Other kind of exception in StateManagerDefault/processErrorException"; + final String error = "Other kind of exception received in ErrorHandler"; Log.error(error, caught); waveClient.get().getStackTraceAsync(caught, new Accessor<SafeHtml>() { @Override public void use(final SafeHtml stack) { - NotifyUser.logError(stack.asString().replace("<br>", "\n")); + final String stackAsString = stack.asString().replace("<br>", "\n"); + NotifyUser.logError(stackAsString); + Log.error("Stack: " + stackAsString); } }); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -20,6 +20,7 @@ package cc.kune.core.client.sitebar.spaces; import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.common.client.ui.BlinkAnimation; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; import cc.kune.core.client.state.Session; @@ -32,6 +33,7 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.ToggleButton; +import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; import com.google.inject.Inject; import com.gwtplatform.mvp.client.ViewImpl; @@ -86,7 +88,32 @@ return panel; } + private void blink(final UIObject btn) { + final BlinkAnimation anim = new BlinkAnimation(btn, 400); + anim.animate(3); + } + @Override + public void blinkGroupBtn() { + blink(groupButton); + } + + @Override + public void blinkHomeBtn() { + blink(homeButton); + } + + @Override + public void blinkPublicBtn() { + blink(publicButton); + } + + @Override + public void blinkUserBtn() { + blink(userButton); + } + + @Override public HasClickHandlers getGroupBtn() { return groupButton; } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -61,6 +61,14 @@ public static String PUBLIC_SPACE_ID = "k-space-public-id"; public static String USER_SPACE_ID = "k-space-user-id"; + void blinkGroupBtn(); + + void blinkHomeBtn(); + + void blinkPublicBtn(); + + void blinkUserBtn(); + HasClickHandlers getGroupBtn(); HasClickHandlers getHomeBtn(); @@ -84,6 +92,7 @@ void showPublicSpaceTooltip(); void showUserSpaceTooltip(); + } private final GSpaceArmor armor; @@ -92,11 +101,11 @@ private String groupToken; private String homeToken; private final I18nTranslationService i18n; + private String inboxToken; private String publicToken; private final Session session; private final Provider<SignIn> signIn; private final StateManager stateManager; - private String userToken; @Inject public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, @@ -112,7 +121,7 @@ this.i18n = i18n; currentSpace = null; homeToken = SiteTokens.HOME; - userToken = SiteTokens.WAVEINBOX; + inboxToken = SiteTokens.WAVEINBOX; groupToken = SiteTokens.GROUP_HOME; publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME); view.getHomeBtn().addClickHandler(new ClickHandler() { @@ -125,8 +134,11 @@ view.getUserBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - restoreToken(userToken); - setDown(Space.userSpace); + signIn.get().setGotoTokenOnCancel(stateManager.getCurrentToken()); + restoreToken(inboxToken); + if (session.isLogged()) { + setDown(Space.userSpace); + } } }); view.getGroupBtn().addClickHandler(new ClickHandler() { @@ -156,7 +168,7 @@ @ProxyEvent public void onAppStart(final AppStartEvent event) { - // showTooltipWithDelay(); + showTooltipWithDelay(); } private void onGroupSpaceSelect(final boolean shouldRestoreToken) { @@ -176,7 +188,7 @@ } private void onPublicSpaceSelect(final boolean shouldRestoreToken) { - restoreToken(shouldRestoreToken, userToken); + restoreToken(shouldRestoreToken, inboxToken); armor.selectPublicSpace(); backManager.restoreBackImage(); setDown(Space.publicSpace); @@ -192,7 +204,7 @@ homeToken = token; break; case userSpace: - userToken = token; + inboxToken = token; break; case groupSpace: groupToken = token; @@ -232,12 +244,12 @@ if (currentSpace == Space.userSpace) { restoreToken(homeToken); } - userToken = SiteTokens.WAVEINBOX; + inboxToken = SiteTokens.WAVEINBOX; } private void onUserSpaceSelect(final boolean shouldRestoreToken) { if (session.isLogged()) { - restoreToken(shouldRestoreToken, userToken); + restoreToken(shouldRestoreToken, inboxToken); armor.selectUserSpace(); backManager.clearBackImage(); setDown(Space.userSpace); @@ -245,7 +257,7 @@ } else { signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"), NotifyLevel.info); - stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken)); + stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, inboxToken)); getView().setUserBtnDown(false); } } @@ -277,15 +289,19 @@ switch (currentSpace) { case homeSpace: getView().showHomeSpaceTooltip(); + getView().blinkHomeBtn(); break; case userSpace: getView().showUserSpaceTooltip(); + getView().blinkUserBtn(); break; case groupSpace: getView().showGroupSpaceTooltip(); + getView().blinkGroupBtn(); break; case publicSpace: getView().showPublicSpaceTooltip(); + getView().blinkPublicBtn(); break; } } Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -30,7 +30,7 @@ public final class SiteTokens { public static final String ABOUTKUNE = "about"; public final static String GROUP_HOME = ""; - public final static String HOME = "home"; + public final static String HOME = ""; public final static String NEWGROUP = "newgroup"; public static final String PREVIEW = "preview"; public final static String REGISTER = "register"; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -30,6 +30,10 @@ void addSiteToken(String token, HistoryTokenCallback historyTokenCallback); + String getCurrentToken(); + + void gotoDefaultHomepage(); + void gotoHistoryToken(String newToken); void gotoHistoryTokenButRedirectToCurrent(String signin); Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -54,7 +54,8 @@ private final ContentCache contentCache; private final EventBus eventBus; private final HistoryWrapper history; - private StateToken previousToken; + private StateToken previousGroupToken; + private final StateToken previousToken; /** * When a historyChanged is interrupted (for instance because you are editing * something), the new history token is stored here @@ -73,6 +74,7 @@ this.contentCache = contentProvider; this.session = session; this.history = history; + this.previousGroupToken = null; this.previousToken = null; this.resumedHistoryToken = null; tokenMatcher.init(GwtWaverefEncoder.INSTANCE); @@ -122,17 +124,50 @@ } } + private void getContent(final StateToken newState) { + getContent(newState, false); + } + + private void getContent(final StateToken newState, final boolean setBrowserHistory) { + // NotifyUser.info("loading: " + newState + " because current:" + + // session.getCurrentStateToken()); + contentCache.getContent(session.getUserHash(), newState, + new AsyncCallbackSimple<StateAbstractDTO>() { + @Override + public void onSuccess(final StateAbstractDTO newState) { + setState(newState); + final String currentToken = newState.getStateToken().toString(); + SpaceConfEvent.fire(eventBus, Space.groupSpace, currentToken); + SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(currentToken)); + if (setBrowserHistory) { + history.newItem(currentToken, false); + SpaceSelectEvent.fire(eventBus, Space.groupSpace); + } + } + }); + } + + @Override + public String getCurrentToken() { + return history.getToken(); + } + private String getPreviousGroup() { - final String previousGroup = startingUp() ? "" : previousToken.getGroup(); + final String previousGroup = startingUp() ? "" : previousGroupToken.getGroup(); return previousGroup; } private String getPreviousTool() { - final String previousTool = startingUp() ? "" : previousToken.getTool(); + final String previousTool = startingUp() ? "" : previousGroupToken.getTool(); return previousTool; } @Override + public void gotoDefaultHomepage() { + getContent(new StateToken(SiteTokens.GROUP_HOME), true); + } + + @Override public void gotoHistoryToken(final String token) { Log.debug("StateManager: history goto-string-token: " + token); history.newItem(token); @@ -146,7 +181,7 @@ @Override public void gotoStateToken(final StateToken newToken) { - Log.debug("StateManager: history goto-token: " + newToken + ", previous: " + previousToken); + Log.debug("StateManager: history goto-token: " + newToken + ", previous: " + previousGroupToken); history.newItem(newToken.getEncoded()); } @@ -169,18 +204,6 @@ } - private void onHistoryChanged(final StateToken newState) { - // NotifyUser.info("loading: " + newState + " because current:" + - // session.getCurrentStateToken()); - contentCache.getContent(session.getUserHash(), newState, - new AsyncCallbackSimple<StateAbstractDTO>() { - @Override - public void onSuccess(final StateAbstractDTO newState) { - setState(newState); - } - }); - } - @Override public void onSocialNetworkChanged(final boolean fireNow, final SocialNetworkChangedHandler handler) { eventBus.addHandler(SocialNetworkChangedEvent.getType(), handler); @@ -242,7 +265,7 @@ SpaceSelectEvent.fire(eventBus, Space.publicSpace); SpaceConfEvent.fire(eventBus, Space.groupSpace, sndToken); SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(sndToken)); - onHistoryChanged(new StateToken(sndToken)); + getContent(new StateToken(sndToken)); } else if (firstToken.equals(SiteTokens.SUBTITLES)) { siteTokens.get(SiteTokens.SUBTITLES).onHistoryToken( tokenMatcher.getRedirect(newHistoryToken).getRight()); @@ -258,37 +281,37 @@ siteTokens.get(SiteTokens.SIGNIN).onHistoryToken(newHistoryToken); } } - } else if (tokenMatcher.isWaveToken(newHistoryToken)) { + } else + // No redirection + if (tokenMatcher.isWaveToken(newHistoryToken)) { if (session.isLogged()) { SpaceConfEvent.fire(eventBus, Space.userSpace, newHistoryToken); SpaceSelectEvent.fire(eventBus, Space.userSpace); ClientEvents.get().fireEvent( new WaveSelectionEvent(HistorySupport.waveRefFromHistoryToken(newHistoryToken))); } else { + // Wave, but don't logged history.newItem(TokenUtils.addRedirect(SiteTokens.SIGNIN, newHistoryToken)); if (startingUp()) { - // Starting application (with Wave url???) - onHistoryChanged(new StateToken(SiteTokens.GROUP_HOME)); + // Starting application (with Wave) + getContent(new StateToken(SiteTokens.GROUP_HOME), false); } } } else if (tokenMatcher.isGroupToken(newHistoryToken)) { SpaceConfEvent.fire(eventBus, Space.groupSpace, newHistoryToken); SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(newHistoryToken)); SpaceSelectEvent.fire(eventBus, Space.groupSpace); - onHistoryChanged(new StateToken(newHistoryToken)); + getContent(new StateToken(newHistoryToken)); } else { - // While we don't redefine token "" as home: - SpaceConfEvent.fire(eventBus, Space.groupSpace, SiteTokens.GROUP_HOME); - SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(SiteTokens.GROUP_HOME)); - SpaceSelectEvent.fire(eventBus, Space.groupSpace); - onHistoryChanged(new StateToken(SiteTokens.GROUP_HOME)); + gotoDefaultHomepage(); } } else { // token is one of #newgroup #signin #translate ... if (startingUp()) { // Starting with some token like "signin": load defContent // also - processHistoryToken(SiteTokens.GROUP_HOME); + getContent(new StateToken(SiteTokens.GROUP_HOME), false); + // processHistoryToken(SiteTokens.GROUP_HOME); // SpaceSelectEvent.fire(eventBus, Space.groupSpace); } // Fire the listener of this #hash token @@ -339,7 +362,7 @@ processCurrentHistoryToken(); } else { contentCache.removeContent(currentStateToken); - onHistoryChanged(currentStateToken); + getContent(currentStateToken); } } @@ -355,8 +378,8 @@ @Override public void restorePreviousToken() { - if (previousToken != null) { - gotoStateToken(previousToken); + if (previousGroupToken != null) { + gotoStateToken(previousGroupToken); } } @@ -404,11 +427,11 @@ // history.newItem(newToken.toString(), false); StateChangedEvent.fire(eventBus, newState); checkGroupAndToolChange(newState); - previousToken = newToken.copy(); + previousGroupToken = newToken.copy(); eventBus.fireEvent(new ProgressHideEvent()); } private boolean startingUp() { - return previousToken == null; + return previousGroupToken == null; } } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-11-02 22:01:44 UTC (rev 1577) @@ -324,6 +324,15 @@ float: left; } +.k-space-sel-btn-blink { +/* kfilter: alpha(opacity = */ +/* 30); */ +/* -moz-opacity: 0.30; */ +/* -khtml-opacity: 0.30; */ +/* opacity: 0.30; */ + visibility: hidden; +} + .k-space-sel-inbox-count { border: none 5px #000000; -moz-border-radius: 5px; Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -79,6 +79,8 @@ FlowPanel entityToolsSouth; @UiField SplitLayoutPanel groupSpace; + @UiField + SimplePanel groupSpaceWrapper; private final ActionFlowPanel headerToolbar; @UiField SimplePanel homeSpace; @@ -240,7 +242,7 @@ @Override public void selectGroupSpace() { - tabs.selectTab(groupSpace); + tabs.selectTab(groupSpaceWrapper); } @Override @@ -261,7 +263,9 @@ @Override public void setBackImage(final String url) { final String bodyProp = "#FFFFFF url('" + url + "') fixed no-repeat top left"; - DOM.setStyleAttribute(mainpanel.getElement(), CSS.A.BACKGROUND, bodyProp); + // final String bodyProp = "#FFFFFF url('" + url + + // "') fixed no-repeat top left"; + DOM.setStyleAttribute(groupSpaceWrapper.getElement(), CSS.A.BACKGROUND, bodyProp); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-11-02 22:01:44 UTC (rev 1577) @@ -3,7 +3,7 @@ xmlns:co="urn:import:cc.kune.core.client" xmlns:kp="urn:import:cc.kune.pspace.client" xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:with field='res' - type='cc.kune.gspace.client.resources.GSpaceArmorResources' /> + type='cc.kune.gspace.client.resources.GSpaceArmorResources'/> <ui:style> .frame { border: 0px; @@ -21,94 +21,103 @@ <g:TabLayoutPanel width="100%" height="100%" barUnit='PX' barHeight='0' ui:field="tabs"> <g:tab> - <g:header size='0' /> - <g:SimplePanel styleName="k-space" ui:field="homeSpace" width="100%" - height="100%"></g:SimplePanel> + <g:header size='0'/> + <g:SimplePanel styleName="k-space" ui:field="homeSpace" + width="100%" height="100%"></g:SimplePanel> </g:tab> <g:tab> - <g:header size='0' /> - <g:FlowPanel ui:field="userSpace" styleName="k-space" width="100%" - height="100%"> + <g:header size='0'/> + <g:FlowPanel ui:field="userSpace" styleName="k-space" + width="100%" height="100%">   </g:FlowPanel> </g:tab> <g:tab> - <g:header size='0' /> - <g:SplitLayoutPanel width="100%" height="100%" styleName="k-space" - ui:field="groupSpace"> - <g:center size="1.0"> - <g:DockLayoutPanel unit="PX" ui:field="splitCenter" styleName="{res.style.entityCentralContainer}"> - <g:north size="168"> - <g:VerticalPanel width="100%" height="168px"> - <g:FlowPanel height="70px" width="100%" - styleName="{res.style.entityHeader}" ui:field="entityHeader"> -  + <g:header size='0'/> + <g:SimplePanel + ui:field="groupSpaceWrapper" styleName="k-group-space"> + <g:SplitLayoutPanel width="100%" height="100%" + styleName="k-space" ui:field="groupSpace"> + <g:center size="1.0"> + <g:DockLayoutPanel unit="PX" ui:field="splitCenter" + styleName="{res.style.entityCentralContainer}"> + <g:north size="168"> + <g:VerticalPanel width="100%" + height="168px"> + <g:FlowPanel height="70px" width="100%" + styleName="{res.style.entityHeader}" ui:field="entityHeader"> +  + </g:FlowPanel> + <g:FlowPanel width="100%" height="38px" + styleName="{res.style.docHeader}" ui:field="docHeader"> + </g:FlowPanel> + <g:HTMLPanel ui:field="arrow" + styleName="{res.style.docSubheaderArrow}"/> + <g:FlowPanel width="100%" height="60px" + styleName="{res.style.docSubheader}" ui:field="docSubheader"> + </g:FlowPanel> + </g:VerticalPanel> + </g:north> + <g:center> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.docEditorMargin}" ui:field="docContainerParent"> + <g:west size="10"> + <g:SimplePanel/> + </g:west> + <g:east size="10"> + <g:SimplePanel/> + </g:east> + <g:center> + <g:ScrollPanel ui:field="centerScroll" + styleName="{res.style.docEditor}"> + <g:FlowPanel width="auto" height="auto" + styleName="{res.style.docEditorContainer}" + ui:field="docContainer"/> + </g:ScrollPanel> + </g:center> + <g:south size="33.0"> + <g:VerticalPanel height="33px" + width="100%" styleName="{res.style.docFooter}"> + <g:FlowPanel width="100%" height="33" + ui:field="docFooter"> + </g:FlowPanel> + </g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:south size="36"> + <g:FlowPanel height="36px" width="100%" + styleName="{res.style.entityFooter}" ui:field="entityFooter"> </g:FlowPanel> - <g:FlowPanel width="100%" height="38px" - styleName="{res.style.docHeader}" ui:field="docHeader"> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:west size="200.0"> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.entityTools}" ui:field="splitEast"> + <g:center> + <g:FlowPanel ui:field="entityToolsContainer"> + <g:FlowPanel width="100%" ui:field="entityToolsNorth" + styleName="{res.style.entityToolsNorth}"></g:FlowPanel> + <g:FlowPanel width="100%" ui:field="entityToolsCenter" + styleName="{res.style.entityToolsCenter}"> + </g:FlowPanel> </g:FlowPanel> - <g:HTMLPanel ui:field="arrow" - styleName="{res.style.docSubheaderArrow}" /> - <g:FlowPanel width="100%" height="60px" - styleName="{res.style.docSubheader}" ui:field="docSubheader"> - </g:FlowPanel> - </g:VerticalPanel> - </g:north> - <g:center> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.docEditorMargin}" ui:field="docContainerParent"> - <g:west size="10"> - <g:SimplePanel /> - </g:west> - <g:east size="10"> - <g:SimplePanel /> - </g:east> - <g:center> - <g:ScrollPanel ui:field="centerScroll" styleName="{res.style.docEditor}"> - <g:FlowPanel width="auto" height="auto" styleName="{res.style.docEditorContainer}" ui:field="docContainer" /> - </g:ScrollPanel> - </g:center> - <g:south size="33.0"> - <g:VerticalPanel height="33px" - width="100%" styleName="{res.style.docFooter}"> - <g:FlowPanel width="100%" height="33" - ui:field="docFooter"> - </g:FlowPanel> - </g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:south size="36"> - <g:FlowPanel height="36px" width="100%" - styleName="{res.style.entityFooter}" ui:field="entityFooter"> - </g:FlowPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:west size="200.0"> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.entityTools}" ui:field="splitEast"> - <g:center> - <g:FlowPanel ui:field="entityToolsContainer"> - <g:FlowPanel width="100%" ui:field="entityToolsNorth" - styleName="{res.style.entityToolsNorth}"></g:FlowPanel> - <g:FlowPanel width="100%" - ui:field="entityToolsCenter" styleName="{res.style.entityToolsCenter}"> - </g:FlowPanel> - </g:FlowPanel> - </g:center> - <g:south size="98"> - <g:FlowPanel styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth" width="100%" /> - </g:south> - </g:DockLayoutPanel> - </g:west> - </g:SplitLayoutPanel> + </g:center> + <g:south size="98"> + <g:FlowPanel styleName="{res.style.entityToolsSouth}" + ui:field="entityToolsSouth" width="100%"/> + </g:south> + </g:DockLayoutPanel> + </g:west> + </g:SplitLayoutPanel> + </g:SimplePanel> </g:tab> <g:tab> - <g:header size='0' /> - <g:SimplePanel ui:field="publicSpace" width="100%" styleName="k-space" - height="100%"></g:SimplePanel> + <g:header size='0'/> + <g:SimplePanel ui:field="publicSpace" width="100%" + styleName="k-space" height="100%"></g:SimplePanel> </g:tab> </g:TabLayoutPanel> </g:center> Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-11-02 22:01:44 UTC (rev 1577) @@ -13,10 +13,15 @@ } .k-spaces { - margin: 5px 17px 7px 17px; - border-collapse: separate; } +.k-group-space { + border-top: 7px solid transparent; + border-right: 20px solid transparent; + border-bottom: 7px solid transparent; + border-left: 20px solid transparent; +} + .k-space { } Modified: trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java 2011-10-26 22:18:14 UTC (rev 1576) +++ trunk/src/main/java/cc/kune/gspace/client/style/GSpaceBackManagerImpl.java 2011-11-02 22:01:44 UTC (rev 1577) @@ -22,6 +22,7 @@ import javax.annotation.Nonnull; import cc.kune.core.client.services.FileDownloadUtils; +import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.gspace.client.GSpaceArmor; @@ -33,11 +34,14 @@ private final FileDownloadUtils downloadUtils; private final GSpaceArmor gSpaceArmor; private StateToken lastToken; + private final StateManager stateManager; @Inject - public GSpaceBackManagerImpl(final FileDownloadUtils downloadUtils, final GSpaceArmor gSpaceArmor) { + public GSpaceBackManagerImpl(final FileDownloadUtils downloadUtils, final GSpaceArmor gSpaceArmor, + final StateManager stateManager) { this.downloadUtils = downloadUtils; this.gSpaceArmor = gSpaceArmor; + this.stateManager = stateManager; lastToken = NO_TOKEN; }

1 0