kune-commits

Download

[email protected]

1587 discussions

r1431 - donate/src/cc/kune/sandbox/donate/client
by Mauricio Rodriguez Serrano 28 Jun '11

28 Jun '11

Author: mrodrigs Date: 2011-06-28 23:27:50 +0200 (Tue, 28 Jun 2011) New Revision: 1431 Added: donate/src/cc/kune/sandbox/donate/client/DonateMessages.java donate/src/cc/kune/sandbox/donate/client/DonateMessages_en.properties donate/src/cc/kune/sandbox/donate/client/DonateMessages_es.properties Log: i18n Implemented english and spanish Added: donate/src/cc/kune/sandbox/donate/client/DonateMessages.java =================================================================== --- donate/src/cc/kune/sandbox/donate/client/DonateMessages.java (rev 0) +++ donate/src/cc/kune/sandbox/donate/client/DonateMessages.java 2011-06-28 21:27:50 UTC (rev 1431) @@ -0,0 +1,15 @@ +package cc.kune.sandbox.donate.client; + +import com.google.gwt.i18n.client.Messages; + +public interface DonateMessages extends Messages { + + String lnk1EUR(); + String lnk2EUR(); + String lnk3EUR(); + + String lnk1Dollar(); + String lnk2Dollar(); + String lnk3Dollar(); +} + Property changes on: donate/src/cc/kune/sandbox/donate/client/DonateMessages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: donate/src/cc/kune/sandbox/donate/client/DonateMessages_en.properties =================================================================== --- donate/src/cc/kune/sandbox/donate/client/DonateMessages_en.properties (rev 0) +++ donate/src/cc/kune/sandbox/donate/client/DonateMessages_en.properties 2011-06-28 21:27:50 UTC (rev 1431) @@ -0,0 +1,7 @@ +lnk1EUR = 10 \u20AC/month +lnk2EUR = 15 \u20AC/month +lnk3EUR = 20 \u20AC/month + +lnk1Dollar = 10 $/month +lnk2Dollar = 15 $/month +lnk3Dollar = 20 $/month \ No newline at end of file Property changes on: donate/src/cc/kune/sandbox/donate/client/DonateMessages_en.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: donate/src/cc/kune/sandbox/donate/client/DonateMessages_es.properties =================================================================== --- donate/src/cc/kune/sandbox/donate/client/DonateMessages_es.properties (rev 0) +++ donate/src/cc/kune/sandbox/donate/client/DonateMessages_es.properties 2011-06-28 21:27:50 UTC (rev 1431) @@ -0,0 +1,7 @@ +lnk1EUR = 10 \u20AC/mes +lnk2EUR = 15 \u20AC/mes +lnk3EUR = 20 \u20AC/mes + +lnk1Dollar = 10 $/mes +lnk2Dollar = 15 $/mes +lnk3Dollar = 20 $/mes \ No newline at end of file Property changes on: donate/src/cc/kune/sandbox/donate/client/DonateMessages_es.properties ___________________________________________________________________ Name: svn:mime-type + text/plain

1 0

r1430 - donate/src/cc/kune/sandbox/donate
by Mauricio Rodriguez Serrano 28 Jun '11

28 Jun '11

Author: mrodrigs Date: 2011-06-28 23:26:55 +0200 (Tue, 28 Jun 2011) New Revision: 1430 Modified: donate/src/cc/kune/sandbox/donate/Donate.gwt.xml Log: i18n Implemented english and spanish Modified: donate/src/cc/kune/sandbox/donate/Donate.gwt.xml =================================================================== --- donate/src/cc/kune/sandbox/donate/Donate.gwt.xml 2011-06-28 15:07:06 UTC (rev 1429) +++ donate/src/cc/kune/sandbox/donate/Donate.gwt.xml 2011-06-28 21:26:55 UTC (rev 1430) @@ -1,4 +1,11 @@ <module> <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.i18n.I18N"/> + <inherits name="com.google.gwt.i18n.CldrLocales"/> <entry-point class="cc.kune.sandbox.donate.client.Donate"/> + + <extend-property name="locale" values="en"/> + <extend-property name="locale" values="es"/> + + </module>

1 0

r1429 - trunk/src/test/java/cc/kune/core/client/actions/xml
by Vicente J. Ruiz Jurado 28 Jun '11

28 Jun '11

Author: vjrj_ Date: 2011-06-28 17:07:06 +0200 (Tue, 28 Jun 2011) New Revision: 1429 Modified: trunk/src/test/java/cc/kune/core/client/actions/xml/XMLKuneClientActionsTest.java Log: More tests in extensions Modified: trunk/src/test/java/cc/kune/core/client/actions/xml/XMLKuneClientActionsTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/actions/xml/XMLKuneClientActionsTest.java 2011-06-27 23:19:37 UTC (rev 1428) +++ trunk/src/test/java/cc/kune/core/client/actions/xml/XMLKuneClientActionsTest.java 2011-06-28 15:07:06 UTC (rev 1429) @@ -15,15 +15,18 @@ public class XMLKuneClientActionsTest { private XMLKuneClientActions actions; + private Map<String, XMLWaveExtension> extensions; + private List<XMLGuiActionDescriptor> guiActionDescriptors; @Before public void before() throws IOException { actions = new XMLActionReader().getActions(); + extensions = actions.getExtensions(); + guiActionDescriptors = actions.getGuiActionDescriptors(); } @Test public void testExtensions() { - final Map<String, XMLWaveExtension> extensions = actions.getExtensions(); assertTrue(extensions.size() > 0); for (final XMLWaveExtension extension : extensions.values()) { assertTrue(extension.getExtName().length() > 0); @@ -34,12 +37,13 @@ @Test public void testGuiActions() { - final List<XMLGuiActionDescriptor> guiActionDescriptors = actions.getGuiActionDescriptors(); assertTrue(guiActionDescriptors.size() > 0); for (final XMLGuiActionDescriptor descrip : guiActionDescriptors) { assertTrue(descrip.getDescName().length() > 0); assertTrue(descrip.getType().length() > 0); - assertTrue(descrip.getExtensionName().length() > 0); + final String extensionName = descrip.getExtensionName(); + assertTrue(extensionName.length() > 0); + assertNotNull(extensions.get(extensionName)); assertTrue(descrip.getPath().length() >= 0); assertTrue(descrip.isEnabled() || !descrip.isEnabled()); final List<XMLTypeId> typeIds = descrip.getTypeIds();

1 0

r1428 - intro/war/kuneintro
by Vicente J. Ruiz Jurado 27 Jun '11

27 Jun '11

Author: vjrj_ Date: 2011-06-28 01:19:37 +0200 (Tue, 28 Jun 2011) New Revision: 1428 Added: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png intro/war/kuneintro/8B01046A8B6B48C021F16014E3001256.cache.html intro/war/kuneintro/B8B794821A774C30A8B35A7CFFCBCE68.cache.html intro/war/kuneintro/BC32383DAE666B729770CB11901E7650.cache.html intro/war/kuneintro/CDAA5D6A4A17CAAF3621D29D7CEA5CDD.cache.html intro/war/kuneintro/D35E124009A6CC80A241E277C8F5C92C.cache.html intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png intro/war/kuneintro/clear.cache.gif intro/war/kuneintro/hosted.html intro/war/kuneintro/kuneintro.nocache.js Removed: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png intro/war/kuneintro/7C53E1A39CFDA5C824B150F3A9E700E1.cache.html intro/war/kuneintro/7E79F1900A7743924FD2472B5D32DC10.cache.html intro/war/kuneintro/86D03CA1AE57AF46EB7B12F8907BB9C8.cache.html intro/war/kuneintro/87ED8545481FEF8D6718AB0DCFA37DA6.cache.html intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png intro/war/kuneintro/F1CAAAA1A8F9263E23D82281D58750DF.cache.html intro/war/kuneintro/clear.cache.gif intro/war/kuneintro/hosted.html intro/war/kuneintro/kuneintro.nocache.js Log: Deleted: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/0A9476898799A150D840F0B1C3672921.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/365A1152800FA0737250805ADEAAFABF.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/396F806CD63ABD414BFBB9D57429F05B.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/409D47324359E3F14C463CFDFEAE25A4.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/7C53E1A39CFDA5C824B150F3A9E700E1.cache.html =================================================================== --- intro/war/kuneintro/7C53E1A39CFDA5C824B150F3A9E700E1.cache.html 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/7C53E1A39CFDA5C824B150F3A9E700E1.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,559 +0,0 @@ -<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 = '7C53E1A39CFDA5C824B150F3A9E700E1';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 Deleted: intro/war/kuneintro/7E79F1900A7743924FD2472B5D32DC10.cache.html =================================================================== --- intro/war/kuneintro/7E79F1900A7743924FD2472B5D32DC10.cache.html 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/7E79F1900A7743924FD2472B5D32DC10.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,573 +0,0 @@ -<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 = '7E79F1900A7743924FD2472B5D32DC10';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 Deleted: intro/war/kuneintro/86D03CA1AE57AF46EB7B12F8907BB9C8.cache.html =================================================================== --- intro/war/kuneintro/86D03CA1AE57AF46EB7B12F8907BB9C8.cache.html 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/86D03CA1AE57AF46EB7B12F8907BB9C8.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,566 +0,0 @@ -<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 = '86D03CA1AE57AF46EB7B12F8907BB9C8';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 Deleted: intro/war/kuneintro/87ED8545481FEF8D6718AB0DCFA37DA6.cache.html =================================================================== --- intro/war/kuneintro/87ED8545481FEF8D6718AB0DCFA37DA6.cache.html 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/87ED8545481FEF8D6718AB0DCFA37DA6.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,595 +0,0 @@ -<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 = '87ED8545481FEF8D6718AB0DCFA37DA6';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/8B01046A8B6B48C021F16014E3001256.cache.html =================================================================== --- intro/war/kuneintro/8B01046A8B6B48C021F16014E3001256.cache.html (rev 0) +++ intro/war/kuneintro/8B01046A8B6B48C021F16014E3001256.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -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 = '8B01046A8B6B48C021F16014E3001256';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/B8B794821A774C30A8B35A7CFFCBCE68.cache.html =================================================================== --- intro/war/kuneintro/B8B794821A774C30A8B35A7CFFCBCE68.cache.html (rev 0) +++ intro/war/kuneintro/B8B794821A774C30A8B35A7CFFCBCE68.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -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 = 'B8B794821A774C30A8B35A7CFFCBCE68';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/BC32383DAE666B729770CB11901E7650.cache.html =================================================================== --- intro/war/kuneintro/BC32383DAE666B729770CB11901E7650.cache.html (rev 0) +++ intro/war/kuneintro/BC32383DAE666B729770CB11901E7650.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -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 = 'BC32383DAE666B729770CB11901E7650';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/CDAA5D6A4A17CAAF3621D29D7CEA5CDD.cache.html =================================================================== --- intro/war/kuneintro/CDAA5D6A4A17CAAF3621D29D7CEA5CDD.cache.html (rev 0) +++ intro/war/kuneintro/CDAA5D6A4A17CAAF3621D29D7CEA5CDD.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -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 = 'CDAA5D6A4A17CAAF3621D29D7CEA5CDD';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/D35E124009A6CC80A241E277C8F5C92C.cache.html =================================================================== --- intro/war/kuneintro/D35E124009A6CC80A241E277C8F5C92C.cache.html (rev 0) +++ intro/war/kuneintro/D35E124009A6CC80A241E277C8F5C92C.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -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 = 'D35E124009A6CC80A241E277C8F5C92C';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 Deleted: intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/DF7764EEC1903CD03C9545B354D8D8E4.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/E44767377485D18D6B6864F65BA8EF73.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png =================================================================== (Binary files differ) Added: intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/EDC7827FEEA59EE44AD790B1C6430C45.cache.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/F1CAAAA1A8F9263E23D82281D58750DF.cache.html =================================================================== --- intro/war/kuneintro/F1CAAAA1A8F9263E23D82281D58750DF.cache.html 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/F1CAAAA1A8F9263E23D82281D58750DF.cache.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,566 +0,0 @@ -<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 = 'F1CAAAA1A8F9263E23D82281D58750DF';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 Deleted: intro/war/kuneintro/clear.cache.gif =================================================================== (Binary files differ) Added: intro/war/kuneintro/clear.cache.gif =================================================================== (Binary files differ) Property changes on: intro/war/kuneintro/clear.cache.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: intro/war/kuneintro/hosted.html =================================================================== --- intro/war/kuneintro/hosted.html 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/hosted.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,350 +0,0 @@ -<html> -<head><script> -var $wnd = parent; -var $doc = $wnd.document; -var $moduleName, $moduleBase, $entry -,$stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null -,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; -// Lightweight metrics -if ($stats) { - var moduleFuncName = location.search.substr(1); - var moduleFunc = $wnd[moduleFuncName]; - var moduleName = moduleFunc ? moduleFunc.moduleName : "unknown"; - $stats({moduleName:moduleName,sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); -} -var $hostedHtmlVersion="2.1"; - -var gwtOnLoad; -var $hosted = "localhost:9997"; - -function loadIframe(url) { - var topDoc = window.top.document; - - // create an iframe - var iframeDiv = topDoc.createElement("div"); - iframeDiv.innerHTML = "<iframe scrolling=no frameborder=0 src='" + url + "'>"; - var iframe = iframeDiv.firstChild; - - // mess with the iframe style a little - var iframeStyle = iframe.style; - iframeStyle.position = "absolute"; - iframeStyle.borderWidth = "0"; - iframeStyle.left = "0"; - iframeStyle.top = "0"; - iframeStyle.width = "100%"; - iframeStyle.backgroundColor = "#ffffff"; - iframeStyle.zIndex = "1"; - iframeStyle.height = "100%"; - - // update the top window's document's body's style - var hostBodyStyle = window.top.document.body.style; - hostBodyStyle.margin = "0"; - hostBodyStyle.height = iframeStyle.height; - hostBodyStyle.overflow = "hidden"; - - // insert the iframe - topDoc.body.insertBefore(iframe, topDoc.body.firstChild); -} - -var ua = navigator.userAgent.toLowerCase(); -if (ua.indexOf("gecko") != -1) { - // install eval wrapper on FF to avoid EvalError problem - var __eval = window.eval; - window.eval = function(s) { - return __eval(s); - } -} -if (ua.indexOf("chrome") != -1) { - // work around __gwt_ObjectId appearing in JS objects - var hop = Object.prototype.hasOwnProperty; - Object.prototype.hasOwnProperty = function(prop) { - return prop != "__gwt_ObjectId" && hop.call(this, prop); - }; - // do the same in our parent as well -- see issue 4486 - // NOTE: this will have to be changed when we support non-iframe-based DevMode - var hop2 = parent.Object.prototype.hasOwnProperty; - parent.Object.prototype.hasOwnProperty = function(prop) { - return prop != "__gwt_ObjectId" && hop2.call(this, prop); - }; -} - -// wrapper to call JS methods, which we need both to be able to supply a -// different this for method lookup and to get the exception back -function __gwt_jsInvoke(thisObj, methodName) { - try { - var args = Array.prototype.slice.call(arguments, 2); - return [0, window[methodName].apply(thisObj, args)]; - } catch (e) { - return [1, e]; - } -} - -var __gwt_javaInvokes = []; -function __gwt_makeJavaInvoke(argCount) { - return __gwt_javaInvokes[argCount] || __gwt_doMakeJavaInvoke(argCount); -} - -function __gwt_doMakeJavaInvoke(argCount) { - // IE6 won't eval() anonymous functions except as r-values - var argList = ""; - for (var i = 0; i < argCount; i++) { - argList += ",p" + i; - } - var argListNoComma = argList.substring(1); - - return eval( - "__gwt_javaInvokes[" + argCount + "] =\n" + - " function(thisObj, dispId" + argList + ") {\n" + - " var result = __static(dispId, thisObj" + argList + ");\n" + - " if (result[0]) {\n" + - " throw result[1];\n" + - " } else {\n" + - " return result[1];\n" + - " }\n" + - " }\n" - ); -} - -/* - * This is used to create tear-offs of Java methods. Each function corresponds - * to exactly one dispId, and also embeds the argument count. We get the "this" - * value from the context in which the function is being executed. - * Function-object identity is preserved by caching in a sparse array. - */ -var __gwt_tearOffs = []; -var __gwt_tearOffGenerators = []; -function __gwt_makeTearOff(proxy, dispId, argCount) { - return __gwt_tearOffs[dispId] || __gwt_doMakeTearOff(dispId, argCount); -} - -function __gwt_doMakeTearOff(dispId, argCount) { - return __gwt_tearOffs[dispId] = - (__gwt_tearOffGenerators[argCount] || __gwt_doMakeTearOffGenerator(argCount))(dispId); -} - -function __gwt_doMakeTearOffGenerator(argCount) { - // IE6 won't eval() anonymous functions except as r-values - var argList = ""; - for (var i = 0; i < argCount; i++) { - argList += ",p" + i; - } - var argListNoComma = argList.substring(1); - - return eval( - "__gwt_tearOffGenerators[" + argCount + "] =\n" + - " function(dispId) {\n" + - " return function(" + argListNoComma + ") {\n" + - " var result = __static(dispId, this" + argList + ");\n" + - " if (result[0]) {\n" + - " throw result[1];\n" + - " } else {\n" + - " return result[1];\n" + - " }\n" + - " }\n" + - " }\n" - ); -} - -function __gwt_makeResult(isException, result) { - return [isException, result]; -} - -function __gwt_disconnected() { - // Prevent double-invocation. - window.__gwt_disconnected = new Function(); - // Do it in a timeout so we can be sure we have a clean stack. - window.setTimeout(__gwt_disconnected_impl, 1); -} - -function __gwt_disconnected_impl() { - __gwt_displayGlassMessage('GWT Code Server Disconnected', - 'Most likely, you closed GWT Development Mode. Or, you might have lost ' - + 'network connectivity. To fix this, try restarting GWT Development Mode and ' - + '<a style="color: #FFFFFF; font-weight: bold;" href="javascript:location.reload()">' - + 'REFRESH</a> this page.'); -} - -// Note this method is also used by ModuleSpace.java -function __gwt_displayGlassMessage(summary, details) { - var topWin = window.top; - var topDoc = topWin.document; - var outer = topDoc.createElement("div"); - // Do not insert whitespace or outer.firstChild will get a text node. - outer.innerHTML = - '<div style="position:absolute;z-index:2147483646;left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=75);opacity:0.75;background-color:#000000;"></div>' + - '<div style="position:absolute;z-index:2147483647;left:50px;top:50px;width:600px;color:#FFFFFF;font-family:verdana;">' + - '<div style="font-size:30px;font-weight:bold;">' + summary + '</div>' + - '<p style="font-size:15px;">' + details + '</p>' + - '</div>' - ; - topDoc.body.appendChild(outer); - var glass = outer.firstChild; - var glassStyle = glass.style; - - // Scroll to the top and remove scrollbars. - topWin.scrollTo(0, 0); - if (topDoc.compatMode == "BackCompat") { - topDoc.body.style["overflow"] = "hidden"; - } else { - topDoc.documentElement.style["overflow"] = "hidden"; - } - - // Steal focus. - glass.focus(); - - if ((navigator.userAgent.indexOf("MSIE") >= 0) && (topDoc.compatMode == "BackCompat")) { - // IE quirks mode doesn't support right/bottom, but does support this. - glassStyle.width = "125%"; - glassStyle.height = "100%"; - } else if (navigator.userAgent.indexOf("MSIE 6") >= 0) { - // IE6 doesn't have a real standards mode, so we have to use hacks. - glassStyle.width = "125%"; // Get past scroll bar area. - // Nasty CSS; onresize would be better but the outer window won't let us add a listener IE. - glassStyle.setExpression("height", "document.documentElement.clientHeight"); - } - - $doc.title = summary + " [" + $doc.title + "]"; -} - -function findPluginObject() { - try { - return document.getElementById('pluginObject'); - } catch (e) { - return null; - } -} - -function findPluginEmbed() { - try { - return document.getElementById('pluginEmbed') - } catch (e) { - return null; - } -} - -function findPluginXPCOM() { - try { - return __gwt_HostedModePlugin; - } catch (e) { - return null; - } -} - -gwtOnLoad = function(errFn, modName, modBase){ - $moduleName = modName; - $moduleBase = modBase; - - // Note that the order is important - var pluginFinders = [ - findPluginXPCOM, - findPluginObject, - findPluginEmbed, - ]; - var topWin = window.top; - var url = topWin.location.href; - if (!topWin.__gwt_SessionID) { - var ASCII_EXCLAMATION = 33; - var ASCII_TILDE = 126; - var chars = []; - for (var i = 0; i < 16; ++i) { - chars.push(Math.floor(ASCII_EXCLAMATION - + Math.random() * (ASCII_TILDE - ASCII_EXCLAMATION + 1))); - } - topWin.__gwt_SessionID = String.fromCharCode.apply(null, chars); - } - var plugin = null; - for (var i = 0; i < pluginFinders.length; ++i) { - try { - var maybePlugin = pluginFinders[i](); - if (maybePlugin != null && maybePlugin.init(window)) { - plugin = maybePlugin; - break; - } - } catch (e) { - } - } - if (!plugin) { - // try searching for a v1 plugin for backwards compatibility - var found = false; - for (var i = 0; i < pluginFinders.length; ++i) { - try { - plugin = pluginFinders[i](); - if (plugin != null && plugin.connect($hosted, $moduleName, window)) { - return; - } - } catch (e) { - } - } - loadIframe("http://gwt.google.com/missing-plugin"); - } else { - if (plugin.connect(url, topWin.__gwt_SessionID, $hosted, $moduleName, - $hostedHtmlVersion)) { - window.onUnload = function() { - try { - // wrap in try/catch since plugins are not required to supply this - plugin.disconnect(); - } catch (e) { - } - }; - } else { - if (errFn) { - errFn(modName); - } else { - alert("Plugin failed to connect to hosted mode server at " + $hosted); - loadIframe("http://code.google.com/p/google-web-toolkit/wiki/TroubleshootingOOPHM"); - } - } - } -} - -window.onunload = function() { -}; - -// Lightweight metrics -window.fireOnModuleLoadStart = function(className) { - $stats && $stats({moduleName:$moduleName, sessionId:$sessionId, subSystem:'startup', evtGroup:'moduleStartup', millis:(new Date()).getTime(), type:'onModuleLoadStart', className:className}); -}; - -window.__gwt_module_id = 0; -</script></head> -<body> -<font face='arial' size='-1'>This html file is for hosted mode support.</font> -<script></script></body></html> Added: intro/war/kuneintro/hosted.html =================================================================== --- intro/war/kuneintro/hosted.html (rev 0) +++ intro/war/kuneintro/hosted.html 2011-06-27 23:19:37 UTC (rev 1428) @@ -0,0 +1,350 @@ +<html> +<head><script> +var $wnd = parent; +var $doc = $wnd.document; +var $moduleName, $moduleBase, $entry +,$stats = $wnd.__gwtStatsEvent ? function(a) {return $wnd.__gwtStatsEvent(a);} : null +,$sessionId = $wnd.__gwtStatsSessionId ? $wnd.__gwtStatsSessionId : null; +// Lightweight metrics +if ($stats) { + var moduleFuncName = location.search.substr(1); + var moduleFunc = $wnd[moduleFuncName]; + var moduleName = moduleFunc ? moduleFunc.moduleName : "unknown"; + $stats({moduleName:moduleName,sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'}); +} +var $hostedHtmlVersion="2.1"; + +var gwtOnLoad; +var $hosted = "localhost:9997"; + +function loadIframe(url) { + var topDoc = window.top.document; + + // create an iframe + var iframeDiv = topDoc.createElement("div"); + iframeDiv.innerHTML = "<iframe scrolling=no frameborder=0 src='" + url + "'>"; + var iframe = iframeDiv.firstChild; + + // mess with the iframe style a little + var iframeStyle = iframe.style; + iframeStyle.position = "absolute"; + iframeStyle.borderWidth = "0"; + iframeStyle.left = "0"; + iframeStyle.top = "0"; + iframeStyle.width = "100%"; + iframeStyle.backgroundColor = "#ffffff"; + iframeStyle.zIndex = "1"; + iframeStyle.height = "100%"; + + // update the top window's document's body's style + var hostBodyStyle = window.top.document.body.style; + hostBodyStyle.margin = "0"; + hostBodyStyle.height = iframeStyle.height; + hostBodyStyle.overflow = "hidden"; + + // insert the iframe + topDoc.body.insertBefore(iframe, topDoc.body.firstChild); +} + +var ua = navigator.userAgent.toLowerCase(); +if (ua.indexOf("gecko") != -1) { + // install eval wrapper on FF to avoid EvalError problem + var __eval = window.eval; + window.eval = function(s) { + return __eval(s); + } +} +if (ua.indexOf("chrome") != -1) { + // work around __gwt_ObjectId appearing in JS objects + var hop = Object.prototype.hasOwnProperty; + Object.prototype.hasOwnProperty = function(prop) { + return prop != "__gwt_ObjectId" && hop.call(this, prop); + }; + // do the same in our parent as well -- see issue 4486 + // NOTE: this will have to be changed when we support non-iframe-based DevMode + var hop2 = parent.Object.prototype.hasOwnProperty; + parent.Object.prototype.hasOwnProperty = function(prop) { + return prop != "__gwt_ObjectId" && hop2.call(this, prop); + }; +} + +// wrapper to call JS methods, which we need both to be able to supply a +// different this for method lookup and to get the exception back +function __gwt_jsInvoke(thisObj, methodName) { + try { + var args = Array.prototype.slice.call(arguments, 2); + return [0, window[methodName].apply(thisObj, args)]; + } catch (e) { + return [1, e]; + } +} + +var __gwt_javaInvokes = []; +function __gwt_makeJavaInvoke(argCount) { + return __gwt_javaInvokes[argCount] || __gwt_doMakeJavaInvoke(argCount); +} + +function __gwt_doMakeJavaInvoke(argCount) { + // IE6 won't eval() anonymous functions except as r-values + var argList = ""; + for (var i = 0; i < argCount; i++) { + argList += ",p" + i; + } + var argListNoComma = argList.substring(1); + + return eval( + "__gwt_javaInvokes[" + argCount + "] =\n" + + " function(thisObj, dispId" + argList + ") {\n" + + " var result = __static(dispId, thisObj" + argList + ");\n" + + " if (result[0]) {\n" + + " throw result[1];\n" + + " } else {\n" + + " return result[1];\n" + + " }\n" + + " }\n" + ); +} + +/* + * This is used to create tear-offs of Java methods. Each function corresponds + * to exactly one dispId, and also embeds the argument count. We get the "this" + * value from the context in which the function is being executed. + * Function-object identity is preserved by caching in a sparse array. + */ +var __gwt_tearOffs = []; +var __gwt_tearOffGenerators = []; +function __gwt_makeTearOff(proxy, dispId, argCount) { + return __gwt_tearOffs[dispId] || __gwt_doMakeTearOff(dispId, argCount); +} + +function __gwt_doMakeTearOff(dispId, argCount) { + return __gwt_tearOffs[dispId] = + (__gwt_tearOffGenerators[argCount] || __gwt_doMakeTearOffGenerator(argCount))(dispId); +} + +function __gwt_doMakeTearOffGenerator(argCount) { + // IE6 won't eval() anonymous functions except as r-values + var argList = ""; + for (var i = 0; i < argCount; i++) { + argList += ",p" + i; + } + var argListNoComma = argList.substring(1); + + return eval( + "__gwt_tearOffGenerators[" + argCount + "] =\n" + + " function(dispId) {\n" + + " return function(" + argListNoComma + ") {\n" + + " var result = __static(dispId, this" + argList + ");\n" + + " if (result[0]) {\n" + + " throw result[1];\n" + + " } else {\n" + + " return result[1];\n" + + " }\n" + + " }\n" + + " }\n" + ); +} + +function __gwt_makeResult(isException, result) { + return [isException, result]; +} + +function __gwt_disconnected() { + // Prevent double-invocation. + window.__gwt_disconnected = new Function(); + // Do it in a timeout so we can be sure we have a clean stack. + window.setTimeout(__gwt_disconnected_impl, 1); +} + +function __gwt_disconnected_impl() { + __gwt_displayGlassMessage('GWT Code Server Disconnected', + 'Most likely, you closed GWT Development Mode. Or, you might have lost ' + + 'network connectivity. To fix this, try restarting GWT Development Mode and ' + + '<a style="color: #FFFFFF; font-weight: bold;" href="javascript:location.reload()">' + + 'REFRESH</a> this page.'); +} + +// Note this method is also used by ModuleSpace.java +function __gwt_displayGlassMessage(summary, details) { + var topWin = window.top; + var topDoc = topWin.document; + var outer = topDoc.createElement("div"); + // Do not insert whitespace or outer.firstChild will get a text node. + outer.innerHTML = + '<div style="position:absolute;z-index:2147483646;left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=75);opacity:0.75;background-color:#000000;"></div>' + + '<div style="position:absolute;z-index:2147483647;left:50px;top:50px;width:600px;color:#FFFFFF;font-family:verdana;">' + + '<div style="font-size:30px;font-weight:bold;">' + summary + '</div>' + + '<p style="font-size:15px;">' + details + '</p>' + + '</div>' + ; + topDoc.body.appendChild(outer); + var glass = outer.firstChild; + var glassStyle = glass.style; + + // Scroll to the top and remove scrollbars. + topWin.scrollTo(0, 0); + if (topDoc.compatMode == "BackCompat") { + topDoc.body.style["overflow"] = "hidden"; + } else { + topDoc.documentElement.style["overflow"] = "hidden"; + } + + // Steal focus. + glass.focus(); + + if ((navigator.userAgent.indexOf("MSIE") >= 0) && (topDoc.compatMode == "BackCompat")) { + // IE quirks mode doesn't support right/bottom, but does support this. + glassStyle.width = "125%"; + glassStyle.height = "100%"; + } else if (navigator.userAgent.indexOf("MSIE 6") >= 0) { + // IE6 doesn't have a real standards mode, so we have to use hacks. + glassStyle.width = "125%"; // Get past scroll bar area. + // Nasty CSS; onresize would be better but the outer window won't let us add a listener IE. + glassStyle.setExpression("height", "document.documentElement.clientHeight"); + } + + $doc.title = summary + " [" + $doc.title + "]"; +} + +function findPluginObject() { + try { + return document.getElementById('pluginObject'); + } catch (e) { + return null; + } +} + +function findPluginEmbed() { + try { + return document.getElementById('pluginEmbed') + } catch (e) { + return null; + } +} + +function findPluginXPCOM() { + try { + return __gwt_HostedModePlugin; + } catch (e) { + return null; + } +} + +gwtOnLoad = function(errFn, modName, modBase){ + $moduleName = modName; + $moduleBase = modBase; + + // Note that the order is important + var pluginFinders = [ + findPluginXPCOM, + findPluginObject, + findPluginEmbed, + ]; + var topWin = window.top; + var url = topWin.location.href; + if (!topWin.__gwt_SessionID) { + var ASCII_EXCLAMATION = 33; + var ASCII_TILDE = 126; + var chars = []; + for (var i = 0; i < 16; ++i) { + chars.push(Math.floor(ASCII_EXCLAMATION + + Math.random() * (ASCII_TILDE - ASCII_EXCLAMATION + 1))); + } + topWin.__gwt_SessionID = String.fromCharCode.apply(null, chars); + } + var plugin = null; + for (var i = 0; i < pluginFinders.length; ++i) { + try { + var maybePlugin = pluginFinders[i](); + if (maybePlugin != null && maybePlugin.init(window)) { + plugin = maybePlugin; + break; + } + } catch (e) { + } + } + if (!plugin) { + // try searching for a v1 plugin for backwards compatibility + var found = false; + for (var i = 0; i < pluginFinders.length; ++i) { + try { + plugin = pluginFinders[i](); + if (plugin != null && plugin.connect($hosted, $moduleName, window)) { + return; + } + } catch (e) { + } + } + loadIframe("http://gwt.google.com/missing-plugin"); + } else { + if (plugin.connect(url, topWin.__gwt_SessionID, $hosted, $moduleName, + $hostedHtmlVersion)) { + window.onUnload = function() { + try { + // wrap in try/catch since plugins are not required to supply this + plugin.disconnect(); + } catch (e) { + } + }; + } else { + if (errFn) { + errFn(modName); + } else { + alert("Plugin failed to connect to hosted mode server at " + $hosted); + loadIframe("http://code.google.com/p/google-web-toolkit/wiki/TroubleshootingOOPHM"); + } + } + } +} + +window.onunload = function() { +}; + +// Lightweight metrics +window.fireOnModuleLoadStart = function(className) { + $stats && $stats({moduleName:$moduleName, sessionId:$sessionId, subSystem:'startup', evtGroup:'moduleStartup', millis:(new Date()).getTime(), type:'onModuleLoadStart', className:className}); +}; + +window.__gwt_module_id = 0; +</script></head> +<body> +<font face='arial' size='-1'>This html file is for hosted mode support.</font> +<script></script></body></html> Deleted: intro/war/kuneintro/kuneintro.nocache.js =================================================================== --- intro/war/kuneintro/kuneintro.nocache.js 2011-06-27 19:09:56 UTC (rev 1427) +++ intro/war/kuneintro/kuneintro.nocache.js 2011-06-27 23:19:37 UTC (rev 1428) @@ -1,11 +0,0 @@ -function kuneintro(){var Q='',wb='" for "gwt:onLoadErrorFn"',ub='" for "gwt:onPropertyErrorFn"',db='"><\/script>',fb='#',Ub='.cache.html',hb='/',Ob='7C53E1A39CFDA5C824B150F3A9E700E1',Pb='7E79F1900A7743924FD2472B5D32DC10',Qb='86D03CA1AE57AF46EB7B12F8907BB9C8',Rb='87ED8545481FEF8D6718AB0DCFA37DA6',Tb=':',ob='::',Wb='<script defer="defer">kuneintro.onInjectionDone(\'kuneintro\')<\/script>',cb='<script id="',rb='=',gb='?',tb='Bad handler "',Vb='DOMContentLoaded',Sb='F1CAAAA1A8F9263E23D82281D58750DF',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} -function E(){var b=document.getElementsByTagName(lb);for(var c=0,d=b.length;c<d;++c){var e=b[c],f=e.getAttribute(mb),g;if(f){f=f.replace(nb,Q);if(f.indexOf(ob)>=0){continue}if(f==pb){g=e.getAttribute(qb);if(g){var h,i=g.indexOf(rb);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=Q}u[f]=h}}else if(f==sb){g=e.getAttribute(qb);if(g){try{A=eval(g)}catch(a){alert(tb+g+ub)}}}else if(f==vb){g=e.getAttribute(qb);if(g){try{z=eval(g)}catch(a){alert(tb+g+wb)}}}}}} -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([Cb],Ob);H([Eb],Pb);H([Jb],Qb);H([Hb],Rb);H([Gb],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 Added: intro/war/kuneintro/kuneintro.nocache.js =================================================================== --- intro/war/kuneintro/kuneintro.nocache.js (rev 0) +++ intro/war/kuneintro/kuneintro.nocache.js 2011-06-27 23:19:37 UTC (rev 1428) @@ -0,0 +1,11 @@ +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 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} +function E(){var b=document.getElementsByTagName(lb);for(var c=0,d=b.length;c<d;++c){var e=b[c],f=e.getAttribute(mb),g;if(f){f=f.replace(nb,Q);if(f.indexOf(ob)>=0){continue}if(f==pb){g=e.getAttribute(qb);if(g){var h,i=g.indexOf(rb);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=Q}u[f]=h}}else if(f==sb){g=e.getAttribute(qb);if(g){try{A=eval(g)}catch(a){alert(tb+g+ub)}}}else if(f==vb){g=e.getAttribute(qb);if(g){try{z=eval(g)}catch(a){alert(tb+g+wb)}}}}}} +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)}}} +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

r1427 - intro/war
by Esteban Carreras Genis 27 Jun '11

27 Jun '11

Author: ecarrerasg Date: 2011-06-27 21:09:56 +0200 (Mon, 27 Jun 2011) New Revision: 1427 Modified: intro/war/about.html Log: IE view Fixed Modified: intro/war/about.html =================================================================== --- intro/war/about.html 2011-06-27 19:09:34 UTC (rev 1426) +++ intro/war/about.html 2011-06-27 19:09:56 UTC (rev 1427) @@ -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>

1 0

r1426 - intro/src/cc/kune/intro/client
by Esteban Carreras Genis 27 Jun '11

27 Jun '11

Author: ecarrerasg Date: 2011-06-27 21:09:34 +0200 (Mon, 27 Jun 2011) New Revision: 1426 Modified: intro/src/cc/kune/intro/client/IntroTabPanel.java Log: IE view Fixed Modified: intro/src/cc/kune/intro/client/IntroTabPanel.java =================================================================== --- intro/src/cc/kune/intro/client/IntroTabPanel.java 2011-06-27 01:10:49 UTC (rev 1425) +++ intro/src/cc/kune/intro/client/IntroTabPanel.java 2011-06-27 19:09:34 UTC (rev 1426) @@ -111,9 +111,9 @@ currentSlide = 0; deck.setAnimationEnabled(false); htmlIntro.setHTML("<ul>" - + "<li><span class=\"liimg tabUsers\"/><span class=\"litext\">Comunicate with others</span></li>" - + "<li><span class=\"liimg tabGroups\"/><span class=\"litext\">Work in collaboration</span></li>" - + "<li><span class=\"liimg tabPublic\"/><span class=\"litext\">And share with the world</span></li>" + + "<li><span class=\"liimg tabUsers\"><span class=\"litext\">Comunicate with others</span></span></li>" + + "<li><span class=\"liimg tabGroups\"><span class=\"litext\">Work in collaboration</span></span></li>" + + "<li><span class=\"liimg tabPublic\"><span class=\"litext\">And share with the world</span></span></li>" + "</ul>"); creditsHtml.setUrl("about.html"); showCurrentSlide(); @@ -192,4 +192,4 @@ setLeftEnabled(currentSlide > 0); setRightEnabled(currentSlide < 5); } -} +} \ No newline at end of file

1 0

27 Jun '11

Author: vjrj_ Date: 2011-06-27 03:10:49 +0200 (Mon, 27 Jun 2011) New Revision: 1425 Added: trunk/img/screenshots/ trunk/img/screenshots/apachewave-powered.png trunk/img/screenshots/chat-rooms.png trunk/img/screenshots/chat-with-buddies-2.png trunk/img/screenshots/chat-with-buddies.png trunk/img/screenshots/concurrent-edit-and-chat.png trunk/img/screenshots/creating-new-content.png trunk/img/screenshots/group-creation.png trunk/img/screenshots/group-just-created.png trunk/img/screenshots/group-public-space.png trunk/img/screenshots/group-style-2.png trunk/img/screenshots/group-style.png trunk/img/screenshots/group-styled.png trunk/img/screenshots/group-tools.png trunk/img/screenshots/inbox.png trunk/img/screenshots/license-wizard.png trunk/img/screenshots/managin-content.png trunk/img/screenshots/personal-options.png trunk/img/screenshots/personal-spaces.png trunk/img/screenshots/social-net-of-a-group.png trunk/img/screenshots/wave-gadgets.png Removed: trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/ trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/ trunk/src/main/java/org/ourproject/kune/wiki/public/ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/msg/ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/ trunk/src/main/java/org/ourproject/kune/workspace/client/title/ Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java Log: screenshots & deletions Added: trunk/img/screenshots/apachewave-powered.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/apachewave-powered.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/chat-rooms.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/chat-rooms.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/chat-with-buddies-2.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/chat-with-buddies-2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/chat-with-buddies.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/chat-with-buddies.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/concurrent-edit-and-chat.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/concurrent-edit-and-chat.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/creating-new-content.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/creating-new-content.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-creation.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-creation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-just-created.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-just-created.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-public-space.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-public-space.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-style-2.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-style-2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-style.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-style.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-styled.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-styled.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/group-tools.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/group-tools.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/inbox.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/inbox.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/license-wizard.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/license-wizard.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/managin-content.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/managin-content.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/personal-options.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/personal-options.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/personal-spaces.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/personal-spaces.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/social-net-of-a-group.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/social-net-of-a-group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/screenshots/wave-gadgets.png =================================================================== (Binary files differ) Property changes on: trunk/img/screenshots/wave-gadgets.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -26,8 +26,6 @@ import org.ourproject.kune.gallery.client.cnt.GalleryViewer; import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -53,15 +51,12 @@ final Provider<GroupServiceAsync> groupServiceProvider, final Provider<FileUploader> fileUploaderProvider, final ContentActionRegistry contentActionRegistry, - final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final GSpaceBackManager wsBackManager) { + final GalleryViewer documentViewer, final GSpaceBackManager wsBackManager) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, wsBackManager); + fileDownloadProvider, textEditorProvider, documentViewer, entityLogo, wsBackManager); } @Override Deleted: trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -1,37 +0,0 @@ -/* - * - * 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 org.ourproject.kune.gallery.client.ctx; - -import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; - -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class GalleryContextPresenter extends FoldableContextPresenter implements GalleryContext { - public GalleryContextPresenter(final StateManager stateManager, - final Provider<ContextNavigator> contextNavigatorProvider, - final Provider<ContextPropEditor> contextPropEditorProvider) { - super(GalleryClientTool.NAME, stateManager, contextNavigatorProvider, contextPropEditorProvider); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2011-06-27 01:10:49 UTC (rev 1425) @@ -1,7 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.Core" /> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> - <source path="client" /> -</module> \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -1,118 +0,0 @@ -/* - * - * 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 org.ourproject.kune.wiki.client; - -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_FOLDER; -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_ROOT; -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_UPLOADEDFILE; -import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE; - -import org.ourproject.kune.wiki.client.cnt.WikiViewer; -import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; -import org.ourproject.kune.workspace.client.editor.ContentEditor; -import org.ourproject.kune.workspace.client.entityheader.EntityHeader; -import org.ourproject.kune.workspace.client.upload.FileUploader; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.cnt.ContentActionRegistry; -import cc.kune.core.client.errors.ErrorHandler; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.rpcservices.GroupServiceAsync; -import cc.kune.core.client.services.FileDownloadUtils; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.gspace.client.style.GSpaceBackManager; - -import com.calclab.suco.client.ioc.Provider; - -public class WikiClientActions extends OldAbstractFoldableContentActions { - public WikiClientActions(final I18nUITranslationService i18n, final ContextNavigator contextNavigator, - final Session session, final StateManager stateManager, - final SchedulerManager deferredCommandWrapper, - final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<GroupServiceAsync> groupServiceProvider, - final Provider<FileUploader> fileUploaderProvider, - final ContentActionRegistry contentActionRegistry, - final ContextActionRegistry contextActionRegistry, - final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, - final Provider<ContentEditor> textEditorProvider, final ErrorHandler errorHandler, - final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, - final GSpaceBackManager wsBackManager) { - super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, - contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, - contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo, wsBackManager); - } - - @Override - protected void createActions() { - final String[] all = { TYPE_ROOT, TYPE_FOLDER, TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; - final String[] containers = { TYPE_ROOT, TYPE_FOLDER }; - // final String[] contentsModerated = { }; - final String[] containersNoRoot = { TYPE_FOLDER }; - final String[] contents = { TYPE_WIKIPAGE, TYPE_UPLOADEDFILE }; - - final String parentMenuTitle = i18n.t("Wikipage"); - final String parentMenuTitleCtx = i18n.t("Wiki"); - - createNewContainerAction(TYPE_FOLDER, "images/nav/folder_add.png", i18n.t("New folder"), - parentMenuTitleCtx, i18n.t("New"), i18n.t("New folder"), Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - createNewContentAction(TYPE_WIKIPAGE, "images/nav/wikipage_add.png", i18n.t("New wikipage"), - parentMenuTitleCtx, Position.ctx, TYPE_ROOT, TYPE_FOLDER); - - // createContentModeratedActions(parentMenuTitle, contentsModerated); - createTranslateAction(parentMenuTitle, TYPE_FOLDER, TYPE_WIKIPAGE); - createContentRenameAction(parentMenuTitle, i18n.t("Rename"), contents); - createRenameContentInCtxAction(parentMenuTitleCtx, i18n.t("Rename"), containersNoRoot); - createEditAction(parentMenuTitle, TYPE_WIKIPAGE); - - // final ActionToolbarMenuDescriptor<StateToken> setAsDefGroupCxt = - // createSetAsDefContent(parentMenuTitleCtx); - - createRefreshCntAction(parentMenuTitle, contents); - createRefreshCxtAction(parentMenuTitleCtx, containers); - - createSetAsDefContent(parentMenuTitle, contents); - // createSetGroupBackImageAction(parentMenuTitle, TYPE_UPLOADEDFILE); - - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", - i18n.t("Upload some files (images, PDFs, ...)"), null, containers); - - createDownloadActions(TYPE_UPLOADEDFILE); - - createGoAction(all); - - createGoHomeAction(containers); - - createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); - createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); - createShowDeletedItems(parentMenuTitleCtx, all); - } - - @Override - protected void createPostSessionInitActions() { - // super.createUploadMediaAction(); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -1,68 +0,0 @@ -/* - * - * 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 org.ourproject.kune.wiki.client; - -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.tool.OldFoldableAbstractClientTool; - -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.gspace.client.themes.GSpaceThemeManager; -import cc.kune.gspace.client.tool.selector.ToolSelector; - -public class WikiClientTool extends OldFoldableAbstractClientTool { - public static final String NAME = "wiki"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." - + OldFoldableAbstractClientTool.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; - - public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final GSpaceThemeManager wsThemePresenter, final WorkspaceSkeleton ws, - final ContentCapabilitiesRegistry cntCapabReg) { - super(NAME, i18n.t("wiki"), toolSelector, wsThemePresenter, ws, cntCapabReg); - - // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); - registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); - registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE); - registerDropableTypes(TYPE_ROOT, TYPE_FOLDER); - // registerPublishModerableTypes(); - registerRateableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); - registerRenamableTypes(TYPE_FOLDER, TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); - registerTageableTypes(TYPE_UPLOADEDFILE, TYPE_WIKIPAGE); - registerTranslatableTypes(TYPE_FOLDER, TYPE_WIKIPAGE); - - registerIcons(); - } - - @Override - public String getName() { - return NAME; - } - - private void registerIcons() { - registerContentTypeIcon(TYPE_FOLDER, "images/nav/folder.png"); - // registerContentTypeIcon(TYPE_FOLDER, "images/nav/wiki.png"); - registerContentTypeIcon(TYPE_WIKIPAGE, "images/nav/wikipage.png"); - registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiMessages.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -1,23 +0,0 @@ -/* - * - * 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 org.ourproject.kune.wiki.client; - -public interface WikiMessages { -} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/OldAbstractFoldableContentActions.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -33,8 +33,6 @@ import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; -import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.editor.ContentEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.upload.FileUploader; @@ -84,9 +82,9 @@ protected final ContentActionRegistry contentActionRegistry; protected final Provider<ContentServiceAsync> contentServiceProvider; - protected final ContextActionRegistry contextActionRegistry; + // protected final ContextActionRegistry contextActionRegistry; protected final ContextNavigator contextNavigator; - protected final Provider<ContextPropEditor> contextPropEditorProvider; + // protected final Provider<ContextPropEditor> contextPropEditorProvider; protected final SchedulerManager deferredCommandWrapper; protected final EntityHeader entityLogo; protected final ErrorHandler errorHandler; @@ -107,12 +105,13 @@ final SchedulerManager deferredCommandWrapper, final Provider<GroupServiceAsync> groupServiceProvider, final Provider<ContentServiceAsync> contentServiceProvider, - final Provider<FileUploader> fileUploaderProvider, final ContextNavigator contextNavigator, + final Provider<FileUploader> fileUploaderProvider, + final ContextNavigator contextNavigator, final ContentActionRegistry contentActionRegistry, - final ContextActionRegistry contextActionRegistry, + // final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final Provider<ContentEditor> textEditorProvider, - final Provider<ContextPropEditor> contextPropEditorProvider, + // final Provider<ContextPropEditor> contextPropEditorProvider, final FoldableContent foldableContent, final EntityHeader entityLogo, final GSpaceBackManager wsBackManager) { this.session = session; @@ -125,10 +124,10 @@ this.fileUploaderProvider = fileUploaderProvider; this.contextNavigator = contextNavigator; this.contentActionRegistry = contentActionRegistry; - this.contextActionRegistry = contextActionRegistry; + // this.contextActionRegistry = contextActionRegistry; this.fileDownloadProvider = fileDownloadProvider; this.textEditorProvider = textEditorProvider; - this.contextPropEditorProvider = contextPropEditorProvider; + // this.contextPropEditorProvider = contextPropEditorProvider; this.foldableContent = foldableContent; this.entityLogo = entityLogo; this.wsBackManager = wsBackManager; @@ -187,7 +186,7 @@ delContainer.setMustBeConfirmed(true); delContainer.setConfirmationTitle(i18n.t("Please confirm")); delContainer.setConfirmationText(i18n.t("You will delete it with all its contents. Are you sure?")); - contextActionRegistry.addAction(delContainer, registerInTypes); + // contextActionRegistry.addAction(delContainer, registerInTypes); } protected void createDelContentAction(final String parentMenuTitle, final String textDescription, @@ -243,7 +242,7 @@ downloadCtx.setIconUrl("images/nav/download.png"); // contentActionRegistry.addAction(download, typeUploadedfile); - contextActionRegistry.addAction(downloadCtx, typeUploadedfile); + // contextActionRegistry.addAction(downloadCtx, typeUploadedfile); } protected ActionToolbarButtonDescriptor<StateToken> createEditAction(final String fileMenuTitle, @@ -259,7 +258,7 @@ final ContentEditor editor = textEditorProvider.get(); foldableContent.detach(); contextNavigator.detach(); - contextPropEditorProvider.get().attach(); + // contextPropEditorProvider.get().attach(); editor.edit(session.getContentState().getContent(), new Listener<String>() { @Override public void onEvent(final String html) { @@ -294,7 +293,7 @@ @Override public void execute() { foldableContent.attach(); - contextPropEditorProvider.get().detach(); + // contextPropEditorProvider.get().detach(); contextNavigator.attach(); if (session.inSameToken(stateToken)) { contextNavigator.refreshState(); @@ -329,7 +328,7 @@ go.setMustBeAuthenticated(false); go.setTextDescription(i18n.t("Open")); go.setIconUrl("images/nav/go.png"); - contextActionRegistry.addAction(go, registerInTypes); + // contextActionRegistry.addAction(go, registerInTypes); return go; } @@ -351,7 +350,7 @@ } }); goGroupHome.setLeftSeparator(ActionToolbarButtonSeparator.fill); - contextActionRegistry.addAction(goGroupHome, registerInTypes); + // contextActionRegistry.addAction(goGroupHome, registerInTypes); return goGroupHome; } @@ -442,7 +441,7 @@ refreshCtx.setParentMenuTitle(parentMenuTitleCtx); refreshCtx.setTextDescription(i18n.t("Refresh")); refreshCtx.setIconUrl("images/nav/refresh.png"); - contextActionRegistry.addAction(refreshCtx, registerInTypes); + // contextActionRegistry.addAction(refreshCtx, registerInTypes); return refreshCtx; } @@ -457,7 +456,7 @@ }); renameCtx.setTextDescription(textDescription); renameCtx.setParentMenuTitle(parentMenuTitleCtx); - contextActionRegistry.addAction(renameCtx, registerInTypes); + // contextActionRegistry.addAction(renameCtx, registerInTypes); return renameCtx; } @@ -571,7 +570,7 @@ showDeletedItems.setParentMenuTitle(parentMenuTitle); showDeletedItems.setTextDescription("Show deleted items"); showDeletedItems.setMustBeAuthenticated(true); - contextActionRegistry.addAction(showDeletedItems, registerInTypes); + // contextActionRegistry.addAction(showDeletedItems, registerInTypes); } protected ActionToolbarMenuDescriptor<StateToken> createTranslateAction(final String fileMenuTitle, @@ -613,7 +612,7 @@ uploadFile.setTextDescription(textDescription); uploadFile.setIconUrl(iconUrl); uploadFile.setToolTip(toolTip); - contextActionRegistry.addAction(uploadFile, registerInTypes); + // contextActionRegistry.addAction(uploadFile, registerInTypes); return uploadFile; } @@ -622,7 +621,7 @@ final ActionToolbarButtonAndItemDescriptor<StateToken> uploadMedia = createUploadAction( i18n.t("Upload media"), "images/nav/upload.png", i18n.t("Upload some media (images, videos...)"), session.getGalleryPermittedExtensions()); - contextActionRegistry.addAction(uploadMedia, registerInTypes); + // contextActionRegistry.addAction(uploadMedia, registerInTypes); return uploadMedia; } @@ -655,7 +654,7 @@ private void register(final ActionToolbarMenuAndItemDescriptor<StateToken> action, final Position position, final String... registerInTypes) { if (position.equals(Position.ctx)) { - contextActionRegistry.addAction(action, registerInTypes); + // contextActionRegistry.addAction(action, registerInTypes); } else if (position.equals(Position.cnt)) { // contentActionRegistry.addAction(action, registerInTypes); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -28,8 +28,6 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cxt.ActionContextBottomToolbar; -import org.ourproject.kune.workspace.client.title.RenameAction; import org.ourproject.kune.workspace.client.upload.FileUploader; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -58,315 +56,320 @@ public class ContextNavigatorPresenter implements ContextNavigator { - private final ActionRegistry<StateToken> actionRegistry; - private final HashMap<StateToken, ActionItemCollection<StateToken>> actionsByItem; - private final ActionContextBottomToolbar bottomToolbar; - private final ContentCapabilitiesRegistry capabilitiesRegistry; - private final IconsRegistry contentIconsRegistry; - private final Provider<FileDownloadUtils> downloadUtilsProvider; - private boolean editOnNextStateChange; - private final I18nTranslationService i18n; - private final RenameAction renameAction; - private final Session session; - private final StateManager stateManager; - private final ActionToolbar<StateToken> topToolbar; - private final boolean useGenericImageIcon; - private ContextNavigatorView view; + private final ActionRegistry<StateToken> actionRegistry; + private final HashMap<StateToken, ActionItemCollection<StateToken>> actionsByItem; + // private final ActionContextBottomToolbar bottomToolbar; + private final ContentCapabilitiesRegistry capabilitiesRegistry; + private final IconsRegistry contentIconsRegistry; + private final Provider<FileDownloadUtils> downloadUtilsProvider; + private boolean editOnNextStateChange; + private final I18nTranslationService i18n; + // private final RenameAction renameAction; + private final Session session; + private final StateManager stateManager; + private final ActionToolbar<StateToken> topToolbar; + private final boolean useGenericImageIcon; + private ContextNavigatorView view; - public ContextNavigatorPresenter(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final IconsRegistry contentIconsRegistry, - final ContentCapabilitiesRegistry capabilitiesRegistry, final ActionToolbar<StateToken> toolbar, - final ActionContextBottomToolbar bottomToolbar, final ActionRegistry<StateToken> actionRegistry, - final Provider<FileDownloadUtils> downloadUtilsProvider, final boolean useGenericImageIcon, - final RenameAction renameAction) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.contentIconsRegistry = contentIconsRegistry; - this.capabilitiesRegistry = capabilitiesRegistry; - this.topToolbar = toolbar; - this.bottomToolbar = bottomToolbar; - this.actionRegistry = actionRegistry; - this.downloadUtilsProvider = downloadUtilsProvider; - this.useGenericImageIcon = useGenericImageIcon; - this.renameAction = renameAction; - actionsByItem = new HashMap<StateToken, ActionItemCollection<StateToken>>(); - editOnNextStateChange = false; - addRenameListener(); - } + public ContextNavigatorPresenter(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final IconsRegistry contentIconsRegistry, + final ContentCapabilitiesRegistry capabilitiesRegistry, final ActionToolbar<StateToken> toolbar, + final ActionRegistry<StateToken> actionRegistry, + final Provider<FileDownloadUtils> downloadUtilsProvider, final boolean useGenericImageIcon) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.contentIconsRegistry = contentIconsRegistry; + this.capabilitiesRegistry = capabilitiesRegistry; + this.topToolbar = toolbar; + // this.bottomToolbar = bottomToolbar; + this.actionRegistry = actionRegistry; + this.downloadUtilsProvider = downloadUtilsProvider; + this.useGenericImageIcon = useGenericImageIcon; + // this.renameAction = renameAction; + actionsByItem = new HashMap<StateToken, ActionItemCollection<StateToken>>(); + editOnNextStateChange = false; + addRenameListener(); + } - @Override - public void addFileUploaderListener(final FileUploader uploader) { - uploader.addOnUploadCompleteListener(new Listener<StateToken>() { - @Override - public void onEvent(final StateToken currentUploadStateToken) { - if (currentUploadStateToken.hasSameContainer(session.getCurrentStateToken())) { - stateManager.reload(); - } - } - }); - } + @Override + public void addFileUploaderListener(final FileUploader uploader) { + uploader.addOnUploadCompleteListener(new Listener<StateToken>() { + @Override + public void onEvent(final StateToken currentUploadStateToken) { + if (currentUploadStateToken.hasSameContainer(session.getCurrentStateToken())) { + stateManager.reload(); + } + } + }); + } - private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId, - final BasicMimeTypeDTO mimeType, final ContentStatus status, final StateToken stateToken, - final StateToken parentStateToken, final AccessRights rights, final boolean isNodeSelected) { - final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, - contentTypeId, session.isLogged(), rights, true); + private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId, + final BasicMimeTypeDTO mimeType, final ContentStatus status, final StateToken stateToken, + final StateToken parentStateToken, final AccessRights rights, final boolean isNodeSelected) { + final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, + contentTypeId, session.isLogged(), rights, true); - final String contentTypeIcon = getIcon(stateToken, contentTypeId, mimeType); - final String tooltip = getTooltip(stateToken, mimeType); - final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken), - contentTypeIcon, title, tooltip, status, stateToken, capabilitiesRegistry.isDragable(contentTypeId) - && rights.isAdministrable(), capabilitiesRegistry.isDropable(contentTypeId) - && rights.isAdministrable(), actionRegistry.getCurrentActions(stateToken, contentTypeId, - session.isLogged(), rights, false)); - if (status.equals(ContentStatus.inTheDustbin) && !session.getShowDeletedContent()) { - // Don't show - } else { - view.addItem(item); - } - return toolbarActions; + final String contentTypeIcon = getIcon(stateToken, contentTypeId, mimeType); + final String tooltip = getTooltip(stateToken, mimeType); + final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), + genId(parentStateToken), contentTypeIcon, title, tooltip, status, stateToken, + capabilitiesRegistry.isDragable(contentTypeId) && rights.isAdministrable(), + capabilitiesRegistry.isDropable(contentTypeId) && rights.isAdministrable(), + actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, false)); + if (status.equals(ContentStatus.inTheDustbin) && !session.getShowDeletedContent()) { + // Don't show + } else { + view.addItem(item); } + return toolbarActions; + } - private void addListeners() { - session.onUserSignIn(new Listener<UserInfoDTO>() { - @Override - public void onEvent(final UserInfoDTO parameter) { - clear(); - } - }); - session.onUserSignOut(new Listener0() { - @Override - public void onEvent() { - clear(); - } - }); - } + private void addListeners() { + session.onUserSignIn(new Listener<UserInfoDTO>() { + @Override + public void onEvent(final UserInfoDTO parameter) { + clear(); + } + }); + session.onUserSignOut(new Listener0() { + @Override + public void onEvent() { + clear(); + } + }); + } - private void addRenameListener() { - final Listener2<StateToken, String> onSuccess = new Listener2<StateToken, String>() { - @Override - public void onEvent(final StateToken token, final String newName) { - setItemText(token, newName); - } - }; - final Listener2<StateToken, String> onFail = new Listener2<StateToken, String>() { - @Override - public void onEvent(final StateToken token, final String oldName) { - setItemText(token, oldName); - } - }; - renameAction.onSuccess(onSuccess); - renameAction.onFail(onFail); - } + private void addRenameListener() { + final Listener2<StateToken, String> onSuccess = new Listener2<StateToken, String>() { + @Override + public void onEvent(final StateToken token, final String newName) { + setItemText(token, newName); + } + }; + final Listener2<StateToken, String> onFail = new Listener2<StateToken, String>() { + @Override + public void onEvent(final StateToken token, final String oldName) { + setItemText(token, oldName); + } + }; + // renameAction.onSuccess(onSuccess); + // renameAction.onFail(onFail); + } - @Override - public void attach() { - // FIXME At the moment detach (removeFromParent) destroy the gwt-ext - // TreePanel and the widget must be recreated (cannot be attached again - // like in gwt) - topToolbar.attach(); - bottomToolbar.attach(); - } + @Override + public void attach() { + // FIXME At the moment detach (removeFromParent) destroy the gwt-ext + // TreePanel and the widget must be recreated (cannot be attached again + // like in gwt) + topToolbar.attach(); + // bottomToolbar.attach(); + } - @Override - public void clear() { - topToolbar.clear(); - bottomToolbar.clear(); - view.clear(); - actionsByItem.clear(); - } + @Override + public void clear() { + topToolbar.clear(); + // bottomToolbar.clear(); + view.clear(); + actionsByItem.clear(); + } - private void createChildItems(final ContainerDTO container, final AccessRights containerRights) { - for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { - addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatus.publishedOnline, - siblingFolder.getStateToken(), - siblingFolder.getStateToken().copy().setFolder(siblingFolder.getParentFolderId()), containerRights, - false); - } - for (final ContentSimpleDTO content : container.getContents()) { - addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), - content.getStateToken(), content.getStateToken().copy().clearDocument(), content.getRights(), false); - } + private void createChildItems(final ContainerDTO container, final AccessRights containerRights) { + for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { + addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatus.publishedOnline, + siblingFolder.getStateToken(), + siblingFolder.getStateToken().copy().setFolder(siblingFolder.getParentFolderId()), + containerRights, false); } + for (final ContentSimpleDTO content : container.getContents()) { + addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), + content.getStateToken(), content.getStateToken().copy().clearDocument(), content.getRights(), + false); + } + } - private void createTreePath(final StateToken state, final ContainerSimpleDTO[] absolutePath, - final AccessRights rights) { - for (final ContainerSimpleDTO folder : absolutePath) { - final StateToken folderStateToken = folder.getStateToken(); - final StateToken parentStateToken = state.copy().clearDocument().setFolder(folder.getParentFolderId()); + private void createTreePath(final StateToken state, final ContainerSimpleDTO[] absolutePath, + final AccessRights rights) { + for (final ContainerSimpleDTO folder : absolutePath) { + final StateToken folderStateToken = folder.getStateToken(); + final StateToken parentStateToken = state.copy().clearDocument().setFolder( + folder.getParentFolderId()); - if (folder.getParentFolderId() != null) { - addItem(folder.getName(), folder.getTypeId(), null, ContentStatus.publishedOnline, folderStateToken, - parentStateToken, rights, false); - } else { - // Root must be already created - } - } + if (folder.getParentFolderId() != null) { + addItem(folder.getName(), folder.getTypeId(), null, ContentStatus.publishedOnline, + folderStateToken, parentStateToken, rights, false); + } else { + // Root must be already created + } } + } - @Override - public void detach() { - view.detach(); - topToolbar.detach(); - bottomToolbar.detach(); - } + @Override + public void detach() { + view.detach(); + topToolbar.detach(); + // bottomToolbar.detach(); + } - @Override - public void editItem(final StateToken stateToken) { - view.editItem(genId(stateToken)); - } + @Override + public void editItem(final StateToken stateToken) { + view.editItem(genId(stateToken)); + } - private String genId(final StateToken token) { - return "k-cnav-" + token.toString().replace(StateToken.SEPARATOR, "-"); - } + private String genId(final StateToken token) { + return "k-cnav-" + token.toString().replace(StateToken.SEPARATOR, "-"); + } - private String getIcon(final StateToken token, final String contentTypeId, final BasicMimeTypeDTO mimeType) { - if (contentTypeId.equals(TYPE_FOLDER)) { - return null; - } else if (!useGenericImageIcon && mimeType != null && mimeType.getType().equals("image")) { - return downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.ico); - } else { - return (String) contentIconsRegistry.getContentTypeIcon(contentTypeId, mimeType); - } + private String getIcon(final StateToken token, final String contentTypeId, + final BasicMimeTypeDTO mimeType) { + if (contentTypeId.equals(TYPE_FOLDER)) { + return null; + } else if (!useGenericImageIcon && mimeType != null && mimeType.getType().equals("image")) { + return downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.ico); + } else { + return (String) contentIconsRegistry.getContentTypeIcon(contentTypeId, mimeType); } + } - private String getTooltip(final StateToken token, final BasicMimeTypeDTO mimeType) { - if (mimeType != null && (mimeType.isImage() || mimeType.isPdf())) { - return KuneUiUtils.genQuickTipWithImage( - downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.thumb), session.getImgCropsize()); - } else { - return null; - } + private String getTooltip(final StateToken token, final BasicMimeTypeDTO mimeType) { + if (mimeType != null && (mimeType.isImage() || mimeType.isPdf())) { + return KuneUiUtils.genQuickTipWithImage( + downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.thumb), + session.getImgCropsize()); + } else { + return null; } + } - protected void gotoToken(final String token) { - stateManager.gotoHistoryToken(token); - } + protected void gotoToken(final String token) { + stateManager.gotoHistoryToken(token); + } - public void init(final ContextNavigatorView view) { - this.view = view; - addListeners(); - } + public void init(final ContextNavigatorView view) { + this.view = view; + addListeners(); + } - @Override - public boolean isSelected(final StateToken stateToken) { - return view.isSelected(genId(stateToken)); - } + @Override + public boolean isSelected(final StateToken stateToken) { + return view.isSelected(genId(stateToken)); + } - protected void onItemRename(final String token, final String newName, final String oldName) { - renameAction.rename(new StateToken(token), oldName, newName); - } + protected void onItemRename(final String token, final String newName, final String oldName) { + // renameAction.rename(new StateToken(token), oldName, newName); + } - @Override - public void refreshState() { - final StateAbstractDTO currentState = session.getCurrentState(); - if (currentState instanceof StateContainerDTO) { - setState((StateContainerDTO) currentState, true); - } + @Override + public void refreshState() { + final StateAbstractDTO currentState = session.getCurrentState(); + if (currentState instanceof StateContainerDTO) { + setState((StateContainerDTO) currentState, true); } + } - @Override - public void selectItem(final StateToken stateToken) { - view.selectItem(genId(stateToken)); - topToolbar.disableMenusAndClearButtons(); - bottomToolbar.disableMenusAndClearButtons(); - final ActionItemCollection<StateToken> itemCollection = actionsByItem.get(stateToken); - topToolbar.addActions(itemCollection, OldAbstractFoldableContentActions.CONTEXT_TOPBAR); - bottomToolbar.addActions(itemCollection, OldAbstractFoldableContentActions.CONTEXT_BOTTOMBAR); - } + @Override + public void selectItem(final StateToken stateToken) { + view.selectItem(genId(stateToken)); + topToolbar.disableMenusAndClearButtons(); + // bottomToolbar.disableMenusAndClearButtons(); + final ActionItemCollection<StateToken> itemCollection = actionsByItem.get(stateToken); + topToolbar.addActions(itemCollection, OldAbstractFoldableContentActions.CONTEXT_TOPBAR); + // bottomToolbar.addActions(itemCollection, + // OldAbstractFoldableContentActions.CONTEXT_BOTTOMBAR); + } - private void selectOrEditNode(final boolean select, final StateToken stateToken) { - // Finaly - if (editOnNextStateChange) { - // Code smell - selectItem(stateToken); - editItem(stateToken); - setEditOnNextStateChange(false); - } else { - if (select) { - selectItem(stateToken); - } - } + private void selectOrEditNode(final boolean select, final StateToken stateToken) { + // Finaly + if (editOnNextStateChange) { + // Code smell + selectItem(stateToken); + editItem(stateToken); + setEditOnNextStateChange(false); + } else { + if (select) { + selectItem(stateToken); + } } + } - @Override - public void setEditOnNextStateChange(final boolean edit) { - editOnNextStateChange = edit; - } + @Override + public void setEditOnNextStateChange(final boolean edit) { + editOnNextStateChange = edit; + } - @Override - public void setItemStatus(final StateToken stateToken, final ContentStatus status) { - clear(); - refreshState(); - } + @Override + public void setItemStatus(final StateToken stateToken, final ContentStatus status) { + clear(); + refreshState(); + } - private void setItemText(final StateToken stateToken, final String name) { - if (view.isAttached()) { - view.setItemText(genId(stateToken), name); - } + private void setItemText(final StateToken stateToken, final String name) { + if (view.isAttached()) { + view.setItemText(genId(stateToken), name); } + } - @Override - public void setState(final StateContainerDTO state, final boolean select) { - setStateContainer(state, select); - } + @Override + public void setState(final StateContainerDTO state, final boolean select) { + setStateContainer(state, select); + } - private void setStateContainer(final StateContainerDTO state, final boolean select) { - final StateToken stateToken = state.getStateToken(); - final boolean isContent = state instanceof StateContentDTO; - StateContentDTO stateContent = null; + private void setStateContainer(final StateContainerDTO state, final boolean select) { + final StateToken stateToken = state.getStateToken(); + final boolean isContent = state instanceof StateContentDTO; + StateContentDTO stateContent = null; - final ContainerDTO container = state.getContainer(); - final AccessRights containerRights = state.getContainerRights(); - AccessRights rights; + final ContainerDTO container = state.getContainer(); + final AccessRights containerRights = state.getContainerRights(); + AccessRights rights; - showRootFolder(state, containerRights); + showRootFolder(state, containerRights); - // Do the path to our current content - createTreePath(stateToken, container.getAbsolutePath(), containerRights); + // Do the path to our current content + createTreePath(stateToken, container.getAbsolutePath(), containerRights); - // Process our current content/container - final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); + // Process our current content/container + final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); - if (isContent) { - stateContent = (StateContentDTO) state; - rights = stateContent.getContentRights(); - final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), - stateContent.getMimeType(), stateContent.getStatus(), stateToken, container.getStateToken(), - rights, false); - final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions( - container.getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); - actionItems.addAll(containerActions); - actionItems.addAll(contentActions); - } else { - rights = containerRights; - final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), - container.getTypeId(), null, ContentStatus.publishedOnline, container.getStateToken(), - container.getStateToken().copy().setFolder(container.getParentFolderId()), containerRights, false); - actionItems.addAll(containerActions); - } - view.setEditable(rights.isEditable()); + if (isContent) { + stateContent = (StateContentDTO) state; + rights = stateContent.getContentRights(); + final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), + state.getTypeId(), stateContent.getMimeType(), stateContent.getStatus(), stateToken, + container.getStateToken(), rights, false); + final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions( + container.getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); + actionItems.addAll(containerActions); + actionItems.addAll(contentActions); + } else { + rights = containerRights; + final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), + container.getTypeId(), null, ContentStatus.publishedOnline, container.getStateToken(), + container.getStateToken().copy().setFolder(container.getParentFolderId()), containerRights, + false); + actionItems.addAll(containerActions); + } + view.setEditable(rights.isEditable()); - actionsByItem.put(stateToken, actionItems); + actionsByItem.put(stateToken, actionItems); - // Process container childs - createChildItems(container, containerRights); + // Process container childs + createChildItems(container, containerRights); - selectOrEditNode(select, stateToken); + selectOrEditNode(select, stateToken); - topToolbar.attach(); - bottomToolbar.attach(); - } + topToolbar.attach(); + // bottomToolbar.attach(); + } - private void showRootFolder(final StateContainerDTO state, final AccessRights containerRights) { - // If container is not a root folder process root (add - // childs to view) - final ContainerDTO root = state.getRootContainer(); - if (root != null) { - // container is not root - view.setRootItem(genId(root.getStateToken()), i18n.t(root.getName()), root.getStateToken()); - createChildItems(root, containerRights); - } + private void showRootFolder(final StateContainerDTO state, final AccessRights containerRights) { + // If container is not a root folder process root (add + // childs to view) + final ContainerDTO root = state.getRootContainer(); + if (root != null) { + // container is not root + view.setRootItem(genId(root.getStateToken()), i18n.t(root.getName()), root.getStateToken()); + createChildItems(root, containerRights); } + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -42,7 +42,6 @@ import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPresenter; import org.ourproject.kune.workspace.client.skel.Toolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.title.EntityTitle; import cc.kune.common.client.utils.SchedulerManager; import cc.kune.common.client.utils.TimerWrapper; @@ -63,111 +62,113 @@ public class ContentEditorPresenter extends RTESavingEditorPresenter implements ContentEditor { - public class RenameAction extends AbstractExtendedAction { - public RenameAction(final String text, final String tooltip, final ImageResource icon) { - super(text, tooltip, icon); - } + public class RenameAction extends AbstractExtendedAction { + public RenameAction(final String text, final String tooltip, final ImageResource icon) { + super(text, tooltip, icon); + } - @Override - public void actionPerformed(final ActionEvent actionEvent) { - entityTitle.edit(); - } + @Override + public void actionPerformed(final ActionEvent actionEvent) { + // entityTitle.edit(); } + } - private RTEditorPanel editorPanel; - private final EntityTitle entityTitle; - // private final SiteSignOutLink siteSignOutLink; - private final I18nTranslationService i18n; - private ComplexToolbar sndbar; - private ComplexToolbar topbar; - private VerticalPanel vpanel; - private final WorkspaceSkeleton wspace; + private RTEditorPanel editorPanel; + // private final EntityTitle entityTitle; + // private final SiteSignOutLink siteSignOutLink; + private final I18nTranslationService i18n; + private ComplexToolbar sndbar; + private ComplexToolbar topbar; + private VerticalPanel vpanel; + private final WorkspaceSkeleton wspace; - public ContentEditorPresenter(final I18nTranslationService i18n, final Session session, - final RTEImgResources imgResources, final Provider<InsertLinkDialog> insLinkDialog, - final Provider<ColorWebSafePalette> palette, final Provider<EditHtmlDialog> editHtmlDialog, - final Provider<InsertImageDialog> insertImageDialog, final Provider<InsertMediaDialog> insertMediaDialog, - final Provider<InsertTableDialog> insertTableDialog, final Provider<InsertSpecialCharDialog> insCharDialog, - final SchedulerManager deferred, final boolean autoSave, final StateManager stateManager, - final WorkspaceSkeleton wspace, final TimerWrapper timer, final EntityTitle entityTitle) { - super(i18n, session, imgResources, insLinkDialog, palette, editHtmlDialog, insertImageDialog, - insertMediaDialog, insertTableDialog, insCharDialog, deferred, autoSave, stateManager, timer); - super.setExtended(true); - this.i18n = i18n; + public ContentEditorPresenter(final I18nTranslationService i18n, final Session session, + final RTEImgResources imgResources, final Provider<InsertLinkDialog> insLinkDialog, + final Provider<ColorWebSafePalette> palette, final Provider<EditHtmlDialog> editHtmlDialog, + final Provider<InsertImageDialog> insertImageDialog, + final Provider<InsertMediaDialog> insertMediaDialog, + final Provider<InsertTableDialog> insertTableDialog, + final Provider<InsertSpecialCharDialog> insCharDialog, final SchedulerManager deferred, + final boolean autoSave, final StateManager stateManager, final WorkspaceSkeleton wspace, + final TimerWrapper timer) { + super(i18n, session, imgResources, insLinkDialog, palette, editHtmlDialog, insertImageDialog, + insertMediaDialog, insertTableDialog, insCharDialog, deferred, autoSave, stateManager, timer); + super.setExtended(true); + this.i18n = i18n; - this.entityTitle = entityTitle; - this.wspace = wspace; - Window.addWindowClosingHandler(new ClosingHandler() { - @Override - public void onWindowClosing(final ClosingEvent event) { - if (isSavePending()) { - event.setMessage(i18n.t("You have changes without save. Are you sure?")); - } - // onDoSaveAndClose(); - } - }); - wspace.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() { - @Override - public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, - final int rawWidth, final int rawHeight) { - adjHeight(adjHeight); - } - }); + // this.entityTitle = entityTitle; + this.wspace = wspace; + Window.addWindowClosingHandler(new ClosingHandler() { + @Override + public void onWindowClosing(final ClosingEvent event) { + if (isSavePending()) { + event.setMessage(i18n.t("You have changes without save. Are you sure?")); + } + // onDoSaveAndClose(); + } + }); + wspace.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() { + @Override + public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight, + final int rawWidth, final int rawHeight) { + adjHeight(adjHeight); + } + }); - } + } - private void addContentActions() { - final RenameAction renameAction = new RenameAction(i18n.t("Rename"), NO_TEXT, NO_ICON); - final OldMenuItemDescriptor renameItem = new OldMenuItemDescriptor(super.getFileMenu(), renameAction); - renameItem.setLocation(RTEditor.TOPBAR); - final KeyStroke key = KeyStroke.getKeyStroke(Keyboard.KEY_F2, 0); - renameAction.putValue(Action.ACCELERATOR_KEY, key); - super.setActionShortcut(key, renameAction); - addAction(renameItem); - } + private void addContentActions() { + final RenameAction renameAction = new RenameAction(i18n.t("Rename"), NO_TEXT, NO_ICON); + final OldMenuItemDescriptor renameItem = new OldMenuItemDescriptor(super.getFileMenu(), renameAction); + renameItem.setLocation(RTEditor.TOPBAR); + final KeyStroke key = KeyStroke.getKeyStroke(Keyboard.KEY_F2, 0); + renameAction.putValue(Action.ACCELERATOR_KEY, key); + super.setActionShortcut(key, renameAction); + addAction(renameItem); + } - private void adjHeight(final int height) { - final int barHeight = sndbar.getOffsetHeight(); - final int newHeight = height - 20 - barHeight; - // Log.debug("Sndbar height: " + barHeight + " new height: " + - // newHeight); - editorPanel.adjustSize(newHeight); - vpanel.setCellHeight(editorPanel, String.valueOf(newHeight)); - } + private void adjHeight(final int height) { + final int barHeight = sndbar.getOffsetHeight(); + final int newHeight = height - 20 - barHeight; + // Log.debug("Sndbar height: " + barHeight + " new height: " + + // newHeight); + editorPanel.adjustSize(newHeight); + vpanel.setCellHeight(editorPanel, String.valueOf(newHeight)); + } - @Override - public void edit(final String html, final Listener<String> onSave, final Listener0 onEditCancelled) { - super.edit(html, onSave, onEditCancelled); - final Toolbar contentTopBar = wspace.getEntityWorkspace().getContentTopBar(); - contentTopBar.removeAll(); - contentTopBar.add(topbar); - wspace.getEntityWorkspace().setContent(vpanel); - adjHeight(wspace.getEntityWorkspace().getContentHeight()); - // siteSignOutLink.addBeforeSignOut(getBeforeSavingListener()); - } + @Override + public void edit(final String html, final Listener<String> onSave, final Listener0 onEditCancelled) { + super.edit(html, onSave, onEditCancelled); + final Toolbar contentTopBar = wspace.getEntityWorkspace().getContentTopBar(); + contentTopBar.removeAll(); + contentTopBar.add(topbar); + wspace.getEntityWorkspace().setContent(vpanel); + adjHeight(wspace.getEntityWorkspace().getContentHeight()); + // siteSignOutLink.addBeforeSignOut(getBeforeSavingListener()); + } - public void init(final ContentEditorView view) { - super.init(view); - addContentActions(); - vpanel = new VerticalPanel(); - editorPanel = (RTEditorPanel) super.getEditorArea(); - topbar = ((ComplexToolbar) super.getTopBar()); - sndbar = ((ComplexToolbar) super.getSndBar()); - vpanel.add(sndbar); - vpanel.add(editorPanel); - vpanel.setWidth("100%"); - } + public void init(final ContentEditorView view) { + super.init(view); + addContentActions(); + vpanel = new VerticalPanel(); + editorPanel = (RTEditorPanel) super.getEditorArea(); + topbar = ((ComplexToolbar) super.getTopBar()); + sndbar = ((ComplexToolbar) super.getSndBar()); + vpanel.add(sndbar); + vpanel.add(editorPanel); + vpanel.setWidth("100%"); + } - @Override - protected void onCancelConfirmed() { - wspace.getEntityWorkspace().clearContent(); - super.onCancelConfirmed(); - // siteSignOutLink.addBeforeSignOut(getBeforeSavingListener()); - } + @Override + protected void onCancelConfirmed() { + wspace.getEntityWorkspace().clearContent(); + super.onCancelConfirmed(); + // siteSignOutLink.addBeforeSignOut(getBeforeSavingListener()); + } - @Override - public void setFileMenuTitle(final String fileMenuTitleNew) { - super.getFileMenu().setText(fileMenuTitleNew); - } + @Override + public void setFileMenuTitle(final String fileMenuTitleNew) { + super.getFileMenu().setText(fileMenuTitleNew); + } } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java 2011-06-26 22:30:12 UTC (rev 1424) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java 2011-06-27 01:10:49 UTC (rev 1425) @@ -1,86 +0,0 @@ -/* - * - * 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 org.ourproject.kune.workspace.client.site; - -import org.ourproject.kune.platf.client.ui.noti.ConfirmationAsk; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser; -import org.ourproject.kune.platf.client.ui.noti.OldNotifyUser.Level; -import org.ourproject.kune.workspace.client.site.msg.ToastMessage; -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; - -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.events.Listener2; -import com.calclab.suco.client.ioc.Provider; - -public class WorkspaceNotifyUser { - - public WorkspaceNotifyUser(final OldNotifyUser notifyUser, final I18nTranslationService i18n, - final Provider<ToastMessage> toaster, final Provider<WorkspaceSkeleton> ws) { - notifyUser.addProgressNotifier(new Listener<String>() { - @Override - public void onEvent(final String message) { - - } - }); - notifyUser.addHideProgressNotifier(new Listener0() { - @Override - public void onEvent() { - // siteProgress.hideProgress(); - } - }); - notifyUser.addNotifier(new Listener2<Level, String>() { - @Override - public void onEvent(final Level level, final String msg) { - String title = ""; - switch (level) { - case error: - title = i18n.t("Error"); - break; - case important: - title = i18n.t("Important"); - break; - case veryImportant: - title = i18n.t("Alert"); - break; - case info: - title = i18n.t("Info"); - break; - } - toaster.get().showMessage(title, msg, level); - } - }); - notifyUser.addAlerter(new Listener2<String, String>() { - @Override - public void onEvent(final String title, final String msg) { - ws.get().showAlertMessage(title, msg); - } - }); - notifyUser.addConfirmationAsker(new Listener<ConfirmationAsk>() { - @Override - public void onEvent(final ConfirmationAsk ask) { - ws.get().askConfirmation(ask.getTitle(), ask.getMessage(), ask.getOnConfirmed(), ask.getOnCancel()); - } - }); - } - -}

1 0

r1424 - in trunk: . src/main/java/cc/kune/core/client/services src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/manager/file src/main/java/cc/kune/wave src/main/java/cc/kune/wave/client src/main/webapp/others
by Vicente J. Ruiz Jurado 26 Jun '11

26 Jun '11

Author: vjrj_ Date: 2011-06-27 00:30:12 +0200 (Mon, 27 Jun 2011) New Revision: 1424 Added: trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java trunk/src/main/webapp/others/unknown.jpg Modified: trunk/pom.xml trunk/src/main/java/cc/kune/core/client/services/FileConstants.java trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java trunk/src/main/java/cc/kune/wave/client/WebClient.java Log: Wave client avatar workaround Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/pom.xml 2011-06-26 22:30:12 UTC (rev 1424) @@ -979,7 +979,7 @@ <module>${project.groupId}.Kune</module> </modules> <copyWebapp>true</copyWebapp> - <soyc>false</soyc> + <compileReport>false</compileReport> <extraJvmArgs>-Xmx1024m -Xss1024k</extraJvmArgs> </configuration> <executions> Modified: trunk/src/main/java/cc/kune/core/client/services/FileConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/FileConstants.java 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/core/client/services/FileConstants.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -21,19 +21,20 @@ public final class FileConstants { - public final static String HASH = "hash"; - public final static String TOKEN = "token"; - public final static String DOWNLOAD = "download"; - public final static String IMGSIZE = "imgsize"; - public final static String FILENAME = "filename"; - public final static String TYPE_ID = "typeid"; - public final static String USER_LOGO_FIELD = "k-ulogov-ff"; - public final static String GROUP_LOGO_FIELD = "k-glogov-ff"; - public final static int LOGO_DEF_HEIGHT = 60; - public final static int LOGO_DEF_WIDTH = 468; - public final static int LOGO_MIN_HEIGHT = 28; - public final static int LOGO_MIN_WIDTH = 468; + public final static String DOWNLOAD = "download"; + public final static String FILENAME = "filename"; + public final static String GROUP_LOGO_FIELD = "k-glogov-ff"; + public final static String HASH = "hash"; + public final static String IMGSIZE = "imgsize"; + public final static int LOGO_DEF_HEIGHT = 60; + public final static int LOGO_DEF_WIDTH = 468; + public final static int LOGO_MIN_HEIGHT = 28; + public final static int LOGO_MIN_WIDTH = 468; + public final static String TOKEN = "token"; + public final static String TYPE_ID = "typeid"; + public final static String USER_LOGO_FIELD = "k-ulogov-ff"; + public final static String USERNAME = "username"; - private FileConstants() { - } + private FileConstants() { + } } Modified: trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/core/client/services/FileDownloadUtils.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -33,6 +33,7 @@ public class FileDownloadUtils { + private static final String AVATARDOWNLOADSERVLET = "servlets/UserLogoDownloadManager"; private static final String BACKDOWNLOADSERVLET = "servlets/EntityBackgroundDownloadManager"; private static final String DOWNLOADSERVLET = "servlets/FileDownloadManager"; protected static final String GROUP_NO_AVATAR_IMAGE = "images/group-def-icon.png"; @@ -112,6 +113,11 @@ return calculateUrl(token, false, false); } + public String getUserAvatar(final String username) { + return new Url(GWT.getModuleBaseURL() + AVATARDOWNLOADSERVLET, new UrlParam(FileConstants.USERNAME, + username)).toString(); + } + public String getUserAvatar(final UserSimpleDTO user) { return user.hasLogo() ? getLogoImageUrl(user.getStateToken()) : PERSON_NO_AVATAR_IMAGE; } Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -40,6 +40,7 @@ import cc.kune.core.server.manager.file.FileDownloadManager; import cc.kune.core.server.manager.file.FileGwtUploadServlet; import cc.kune.core.server.manager.file.FileUploadManager; +import cc.kune.core.server.manager.file.UserLogoDownloadManager; import cc.kune.core.server.properties.PropertiesFileName; import cc.kune.core.server.rack.RackBuilder; import cc.kune.core.server.rack.RackModule; @@ -142,7 +143,8 @@ UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class); builder.installServlet("^/ws/servlets/", FileUploadManager.class, FileDownloadManager.class, EntityLogoUploadManager.class, EntityLogoDownloadManager.class, FileGwtUploadServlet.class, - EntityBackgroundDownloadManager.class, EntityBackgroundUploadManager.class); + EntityBackgroundDownloadManager.class, EntityBackgroundUploadManager.class, + UserLogoDownloadManager.class); builder.at("^/ws/(.*)$").install(new ForwardFilter("^/ws/(.*)$", "/ws/{0}")); } Added: trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -0,0 +1,86 @@ +/* + * + * 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.core.server.manager.file; + +import java.io.FileNotFoundException; +import java.io.IOException; + +import javax.persistence.NoResultException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import cc.kune.core.client.services.FileConstants; +import cc.kune.core.server.manager.GroupManager; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.domain.Group; + +import com.google.inject.Inject; + +/** + * The Class UserLogoDownloadManager the difference with + * {@link EntityLogoDownloadManager} it that this class download an avatar using + * the username and if the user doesn't exits then returns the default avatar. + * + * This works only for users (right now). + */ +public class UserLogoDownloadManager extends HttpServlet { + + private static final long serialVersionUID = -1958945058088446881L; + @Inject + GroupManager groupManager; + + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) + throws ServletException, IOException { + + final StateToken stateToken = new StateToken(req.getParameter(FileConstants.USERNAME)); + + Group group = Group.NO_GROUP; + try { + group = groupManager.findByShortName(stateToken.getGroup()); + if (group == Group.NO_GROUP) { + noResult(resp); + } else if (!group.hasLogo()) { + replyDefAvatar(resp); + } else { + // Has logo! + final byte[] logo = group.getLogo(); + resp.setContentLength(logo.length); + resp.setContentType(group.getLogoMime().toString()); + resp.setHeader("Content-Disposition", "attachment; filename=\"" + group.getShortName() + + "-logo\""); + resp.getOutputStream().write(logo); + } + } catch (final NoResultException e) { + noResult(resp); + return; + } + } + + private void noResult(final HttpServletResponse resp) throws IOException { + FileDownloadManagerUtils.returnNotFound(resp); + } + + private void replyDefAvatar(final HttpServletResponse resp) throws FileNotFoundException, IOException { + FileDownloadManagerUtils.returnFile("src/main/webapp/others/unknown.jpg", resp.getOutputStream()); + } +} Property changes on: trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/wave/KuneWave.gwt.xml 2011-06-26 22:30:12 UTC (rev 1424) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module> <inherits name='org.waveprotocol.box.webclient.WebClient' /> + <inherits name="cc.kune.core.KuneCore" />  <set-property name="compiler.emulatedStack" value="false" /> Added: trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java (rev 0) +++ trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -0,0 +1,48 @@ +package cc.kune.wave.client; + +import org.waveprotocol.box.webclient.client.Session; +import org.waveprotocol.wave.client.account.ProfileManager; +import org.waveprotocol.wave.client.account.impl.AbstractProfileManager; +import org.waveprotocol.wave.client.account.impl.ProfileImpl; +import org.waveprotocol.wave.model.wave.ParticipantId; + +import cc.kune.core.client.services.FileDownloadUtils; + +import com.google.inject.Inject; + +/** + * The Class KuneWaveProfileManager is a workaround to show avatars in kune + * while the Wave part is more mature + * + */ +public class KuneWaveProfileManager extends AbstractProfileManager<ProfileImpl> implements + ProfileManager { + + private final FileDownloadUtils downloadUtils; + + @Inject + public KuneWaveProfileManager(final FileDownloadUtils downloadUtils) { + this.downloadUtils = downloadUtils; + } + + private void checkAvatar(final ProfileImpl profile) { + final String address = profile.getAddress(); + if (address.contains(Session.get().getDomain())) { + profile.update(profile.getFirstName(), profile.getFullName(), + downloadUtils.getUserAvatar(address.split("@")[0])); + } + } + + @Override + public ProfileImpl getProfile(final ParticipantId participantId) { + ProfileImpl profile = profiles.get(participantId.getAddress()); + + if (profile == null) { + profile = new ProfileImpl(this, participantId); + checkAvatar(profile); + profiles.put(participantId.getAddress(), profile); + } + return profile; + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/wave/client/KuneWaveProfileManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/wave/client/WaveClientManager.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -41,7 +41,8 @@ @Inject public WaveClientManager(final Session session, final StateManager stateManager, - final EventBus eventBus, final UserServiceAsync userService, final GSpaceArmor wsArmor) { + final EventBus eventBus, final UserServiceAsync userService, final GSpaceArmor wsArmor, + final KuneWaveProfileManager profiles) { session.onUserSignIn(true, new UserSignInHandler() { @Override public void onUserSignIn(final UserSignInEvent event) { @@ -59,7 +60,7 @@ if (userSpace.getWidgetCount() > 0) { userSpace.remove(0); } - webClient = new WebClient(eventBus); + webClient = new WebClient(eventBus, profiles); userSpace.add(webClient); } else { webClient.login(); Modified: trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/wave/client/WaveGinModule.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -19,19 +19,19 @@ */ package cc.kune.wave.client; -import com.google.inject.Singleton; -import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; +import cc.kune.common.client.ExtendedGinModule; -public class WaveGinModule extends AbstractPresenterModule { - /* - * (non-Javadoc) - * - * @see com.google.gwt.inject.client.AbstractGinModule#configure() - */ - @Override - protected void configure() { - bind(WaveClientManager.class).in(Singleton.class); - bind(WaveStatusIndicator.class).in(Singleton.class); - bind(WaveParts.class).asEagerSingleton(); - } +public class WaveGinModule extends ExtendedGinModule { + /* + * (non-Javadoc) + * + * @see com.google.gwt.inject.client.AbstractGinModule#configure() + */ + @Override + protected void configure() { + s(WaveClientManager.class); + s(WaveStatusIndicator.class); + eagle(WaveParts.class); + s(KuneWaveProfileManager.class); + } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-06-26 10:50:56 UTC (rev 1423) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-06-26 22:30:12 UTC (rev 1424) @@ -198,7 +198,7 @@ // TODO (Yuri Z.) Change the implementation to RemoteProfileManagerImpl when // it will be ready. - private final ProfileManager profiles = new ProfileManagerImpl(); + private final ProfileManager profiles; @UiField SplitLayoutPanel splitPanel; @@ -216,7 +216,7 @@ private final Element loading = new LoadingIndicator().getElement(); @UiField(provided = true) - final SearchPanelWidget searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); + final SearchPanelWidget searchPanel; @UiField DebugMessagePanel logPanel; @@ -241,9 +241,11 @@ * This is the entry point method. */ @Inject - public WebClient(final EventBus eventBus) { + public WebClient(final EventBus eventBus, KuneWaveProfileManager profiles) { this.eventBus = eventBus; + this.profiles = profiles; + searchPanel = new SearchPanelWidget(new SearchPanelRenderer(profiles)); ErrorHandler.install(); ClientEvents.get().addWaveCreationEventHandler( Added: trunk/src/main/webapp/others/unknown.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/others/unknown.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r1423 - in donate: . war
by Esteban Carreras Genis 26 Jun '11

26 Jun '11

Author: ecarrerasg Date: 2011-06-26 12:50:56 +0200 (Sun, 26 Jun 2011) New Revision: 1423 Removed: donate/war/btn-orange.png donate/war/dot1.png donate/war/dot2.png donate/war/dot3.png donate/war/dot4.png Modified: donate/.classpath Log: UiBinder Changes Modified: donate/.classpath =================================================================== --- donate/.classpath 2011-06-26 10:50:12 UTC (rev 1422) +++ donate/.classpath 2011-06-26 10:50:56 UTC (rev 1423) @@ -2,6 +2,6 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (6)"/> + <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> <classpathentry kind="output" path="war/WEB-INF/classes"/> </classpath> Deleted: donate/war/btn-orange.png =================================================================== (Binary files differ) Deleted: donate/war/dot1.png =================================================================== (Binary files differ) Deleted: donate/war/dot2.png =================================================================== (Binary files differ) Deleted: donate/war/dot3.png =================================================================== (Binary files differ) Deleted: donate/war/dot4.png =================================================================== (Binary files differ)

1 0

r1422 - donate/war
by Esteban Carreras Genis 26 Jun '11

26 Jun '11

Author: ecarrerasg Date: 2011-06-26 12:50:12 +0200 (Sun, 26 Jun 2011) New Revision: 1422 Modified: donate/war/Donate.css Log: UiBinder Changes Modified: donate/war/Donate.css =================================================================== --- donate/war/Donate.css 2011-06-26 10:49:54 UTC (rev 1421) +++ donate/war/Donate.css 2011-06-26 10:50:12 UTC (rev 1422) @@ -11,423 +11,7 @@ body { background:#fff; - font:0.88em Arial,Helvetica,Geneva,sans-serif; + font:0.88em 'Ubuntu', Arial; line-height:1.5em; color:#444444; } - -a { - color: #FE7047; - font-weight: bold; - outline: medium none; - text-decoration: none; -} - -a:hover { - background: inherit; - color: #029A00; - outline: 0 none; - text-decoration: none; -} - -a:visited { - outline: 0 none; - text-decoration: none; -} - -.entries { - float: left; - line-height: 1.7em; - padding: 0 0 15px; - width: 590px; -} - -div#entries { - border-right: 0 solid #F2F2F2; - padding-right: 15px; -} - -.post { - margin-bottom: 2em; - text-align: justify; -} - -.title { - display: inline; - font-size: 2em; - line-height: 1em; - margin-bottom: 0.2em; - margin-top: 2.5em; - font-weight: bold; -} - -.intro { - padding-bottom: 5px; - padding-top: 5px; -} - -.titleRegular { - clear: both; - padding-top: 1em; - border-bottom: medium none; - letter-spacing: normal; - margin-bottom: -0.5em; - color: #555555; - font-size: 17px; - font-weight: bold; - text-transform: none -} - -.pnlOptions { - border-bottom: 1px solid #E7E7E7; - background-color: #FFFFFF; - clear: left; - float: left; - list-style: none outside none; - margin: 10px 10px; - margin-top: 15px; - padding: 5px; - display: inline; -} - -.option { - background: url("btn-blue.png") no-repeat scroll right top transparent; - float: left; - margin-right: 10px; -} - -.option a { - background: url("btn-blue.png") no-repeat scroll left top transparent; - color: #13335B; - cursor: pointer; - float: left; - font: 900 14px/22px "Arial",Helvetica,sans-serif; - text-decoration: none; - padding: 1px 8px 5px 18px; -} - -.option a:hover { - color: #951400; -} - -.option a:active { - color: #029A00; -} - -.optionOther { - float: left; -} - -.optionOther input { - margin: 5px 10px; -} - -.labelOther { - float: left; -} - -.gwt-TextBox { - float: left; -} - -.divTextDonate { - clear: both; - float: none; -} - -.textDonate { - float: left; - margin-top: 20px; -} - -.textDonateNewLine { - clear: both; - float: none; -} - -.divTextOtherBank { - clear: both; - float: none; - margin-top: 20px; -} - -.gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; -} - -.gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; -} - -.gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; -} - -.gwt-MenuItem { - font-size: 80%; - margin: 1px; - cursor: default; -} - -.gwt-MenuItem-selected { - background-color: #E8EEF7; -} - -.gwt-Tree { -} - -.gwt-Tree .gwt-TreeItem { - font-size: 80%; - cursor: default; -} - -.gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; -} - -.gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; -} - -.gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; -} - -.gwt-StackPanel .gwt-StackPanelItem-selected { -} - -.gwt-TabPanel { - -} - -.gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; -} - -.gwt-TabBar { - font-size: smaller; -} - -.gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; -} - -.gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; -} - -.gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; -} - -.gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; -} - -.gwt-PushButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-down { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-PushButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-up { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-up-hovering { - background-color: #C3D9FF; - padding: 2px; - border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-down { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-ToggleButton-down-hovering { - background-color: #C3D9FF; - padding: 2px; - background-color: #E8F1FF; - border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); - cursor: pointer; - cursor: hand; -} - -.gwt-RichTextArea { - border: 1px solid black; - background-color: white; -} - -.gwt-RichTextToolbar { - background-color: #C3D9FF; - padding: 2px; -} - -.gwt-RichTextToolbar .gwt-PushButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; -} - -.gwt-RichTextToolbar .gwt-PushButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); -} - -.gwt-RichTextToolbar .gwt-PushButton-down { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); -} - -.gwt-RichTextToolbar .gwt-PushButton-down-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up { - margin-right: 2px; - border: 1px solid #C3D9FF; -} - -.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { - margin-right: 2px; - border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); -} - -.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { - margin-right: 2px; - background-color: #E8F1FF; - border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); -} - -.gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; -} - -.gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; -} - -.gwt-HorizontalSplitPanel .left { - background-color: #E8EEF7; -} - -.gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; -} - -.gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; -} - -.gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; -} - -.gwt-SuggestBoxPopup .item { - padding: 2px; -} - -.gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; -} - -.gwt-DisclosurePanel { - border: 2px solid #C3D9FF; -} - -.gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; -} \ No newline at end of file

1 0

Jump to page: