Author: vjrj_ Date: 2010-12-07 23:38:26 +0100 (Tue, 07 Dec 2010) New Revision: 1158 Added: trunk/img/webtemplate/def-theme-doc-arrow-down.png trunk/img/webtemplate/def-theme-tools-arrow-left.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java Removed: trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar trunk/war/WEB-INF/lib/gwt-servlet-2.0.0-SNAPSHOT.jar trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar Modified: trunk/DEV-GUIDE trunk/INSTALL trunk/TODO trunk/TROUBLESHOOT trunk/img/webtemplate/web_template-2011.svg trunk/pom.xml trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java trunk/war/WEB-INF/ trunk/war/WEB-INF/web.xml Log: some cleanup Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/DEV-GUIDE 2010-12-07 22:38:26 UTC (rev 1158) @@ -164,6 +164,22 @@ ==Development Environment== +===Prerequisite: Install maven=== + +Install maven2. + +From: +http://google-web-toolkit.googlecode.com/svn/trunk/samples/expenses/README-M... + +Eclipse users will need to install the following plugin components: +- Google Plugin for Eclipse (instructions at http://code.google.com/eclipse/) +- m2eclipse Core +- Maven Integration for WTP (in m2eclipse extras) + Instructions for installing the maven plugins can be found here: + http://m2eclipse.sonatype.org/installing-m2eclipse.html + +Ensure Eclipse is configured to use Java 1.6. + ===Prerequisite: Install kune=== Install kune (see trunk/INSTALL file) and run kune for the first time. Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/INSTALL 2010-12-07 22:38:26 UTC (rev 1158) @@ -11,6 +11,11 @@ - Install java-jdk (>=5), maven2, mysql (> 5.0) and for example eclipse - Install gwt 1.5.3 and follow Appendix A for maven+gwt configuration +=== Wave in a Box === + +https://sites.google.com/a/waveprotocol.org/wave-protocol/code/installation +https://sites.google.com/a/waveprotocol.org/wave-protocol/federation/openfir... + ===MYSQL configuration=== ====Before db creation==== @@ -49,7 +54,7 @@ - Compile with maven: # (in the trunk directory) mvn compile -Dliquibase.should.run=false - mvn gwt-maven:compile + mvn gwt:compile - Copy the target to src directory (only for test): ./script/deploy_gwt.sh Modified: trunk/TODO =================================================================== --- trunk/TODO 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/TODO 2010-12-07 22:38:26 UTC (rev 1158) @@ -11,6 +11,22 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** new UI library (gwt-ext is dead) +- mosaic, +- gtx +- smartclient +- +** wave client integration +*** Documentation +**** Hosted Mode support for websocket +***** Test that websocket is supported in your GWT Hosted Mode browser: +http://www.websockets.org/ +http://jimbergman.net/websocket-web-browser-test/ +***** if not: +****** Install nighty firefox (for hosted-mode and websocket support) +add-apt-repository ppa:ubuntu-mozilla-daily/ppa +apt-get update + ** Compilation in target... resolve ** tag, resolve last implementation complexity. Summary: recover the: @@ -19,14 +35,11 @@ [Tag] <-1--m-> [TagUserContent (fecha)] <-m--1-> [Content] [User] <-1-------m--^ for user bookmarks/favorites/links -** Use hibernate cache - http://ehcache.sourceforge.net/documentation/openjpa_provider.html - http://ehcache.sourceforge.net/documentation/hibernate.html ** Do something with jetty/jruby alias issue http://jetty.mortbay.org/jetty5/faq/faq_s_400-Security_t_Aliases.html ** Use of webdriver instead of plain selenium http://code.google.com/p/webdriver/ -** New Action class +** New Action (Command) class *** Things to support - [X] menu and toolbars separators (space, bar, expand) - [X] index position insertion (for buttons added by other plugins) @@ -35,6 +48,28 @@ - [X] tongle/push buttons with isPressed (initially and later)... - [X] position id, that is, if we have some toolbars and a list of actions, how to select which action in which toolbar. - [X] radio menu (with group) and check menu item +- [ ] you can set a property in a action and change it in the gui without change the action +- [ ] actions/descriptors can be reused +- [ ] shortcuts +- [ ] Presenter/View separation +- [ ] Injection +- [ ] Many items of some action/description +- [ ] a better binding +https://code.google.com/p/gwt-beans-binding/ +https://code.google.com/p/gwt-beans-binding/wiki/MoreIntroduction +*** Descripción: +Tengo una acción que se asocia a una descripción de UI y que esta se puede traducir a un tipo de Wigdet + +acción <1---m>descrip<1---m>widgets + +avatar (des) ------------> Widget + lazy-menu (des) -------> Widget + lazy-submenu (des)---> Widget + lazy-item (des) ---> Widget + action (act) + +lista de (des) ---> lista de views + ** <s> Changes in UI - [ ] 2:21 (video) add member dialog with confirmation (other way to do confirmation) - [ ] Leave this group, with green icon @@ -45,14 +80,14 @@ - [ ] 2:35 "Start a chat with this member"-> chat! and other long items - [ ] 2.41 long submenus... - [ ] scroll of licenses -** maven-gwt problem (using another plugin from codehaus) +** maven-gwt problem (using another plugin from codehaus) :ARCHIVE: mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile and so on. More info: http://code.google.com/p/gwt-maven/wiki/M2FAQ ** vjrj use xwiki maven repo http://maven.xwiki.org/releases/com/xpn/xwiki/platform/xwiki-web-wysiwyg/1.8... -** vjrj <v> better RTE +** vjrj <v> better RTE :ARCHIVE: *** Pending **** Insert/Edit link ***** use cases @@ -72,7 +107,7 @@ http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/samples/int... http://www.mozilla.org/editor/midas-spec.html http://mozilla.org/editor/midasdemo/ -** vjrj <v> GWT 1.6 +** vjrj <v> GWT 1.6 :ARCHIVE: http://code.google.com/intl/es/webtoolkit/doc/1.6/ReleaseNotes_1_6.html#Upgr... http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/3e7e6... http://code.google.com/p/google-web-toolkit/wiki/WAR_Design_1_6 @@ -107,8 +142,7 @@ Properties Group - Properties - + Properties ** vjrj Styling braimstorming *** layouts - name :: greenforrest @@ -137,6 +171,9 @@ - name :: usercolor - status :: (setted|def) setted - value :: red +**** links +http://lesscss.org/ +http://xcss.antpaw.org/ https://code.google.com/p/xcssframework/ *** logos *** caching *** backgrounds @@ -172,6 +209,7 @@ http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory http://en.wikipedia.org/wiki/Fragment_identifier http://www.w3.org/DesignIssues/Fragment.html + Some related: https://code.google.com/p/restful-gwt/ ** vjrj <v> rails group-shortname.kune-site-domain/tool-name/folder-id/doc-id routing, maybe use: http://agilewebdevelopment.com/plugins/request_routing http://wiki.rubyonrails.org/rails/pages/Request+Routing @@ -184,6 +222,10 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** Use hibernate cache + http://ehcache.sourceforge.net/documentation/openjpa_provider.html + http://ehcache.sourceforge.net/documentation/hibernate.html + ** TODO <v> Images zoom-in/out with style="cursor: url(somezoomcursor.cur);" http://www.w3.org/TR/SVG/interact.html#Cursors http://www.w3.org/TR/CSS2/ui.html @@ -201,6 +243,8 @@ ** TODO <v> study opensocial, openstack and related http://developer.yahoo.net/blog/archives/2008/12/the_open_stack.html ** TODO <v> Use of command key ⌘ for Mac shortcuts +** TODO <s> Find the way to use: "NOYB: Privacy in online social networks" + http://www.citeulike.org/user/dartar/article/4252739 ** TODO <v,s> harden our privacy policy. Goals: - permit user/projects/contents how much private or public are - APIs public only to associated sites (in study) ( http://oauth.net ? ) Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/TROUBLESHOOT 2010-12-07 22:38:26 UTC (rev 1158) @@ -51,4 +51,14 @@ If running all the Kune test you get errors about "Too many files open" see: http://code.google.com/p/gwt-examples/wiki/gwtEclipseFaqs -about how to fix it in your system. \ No newline at end of file +about how to fix it in your system. + +=== Mysql: Caused by: java.sql.SQLException: Access denied for user 'kune'@'localhost' (using password: YES) === + +Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT senteces of the INSTALL. + +If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. + +=== Eclipse === + +If you have some tests with error like "can not be found in source packages. Check the inheritance chain from your module; it may not be inheriting a required module or a module may not be adding its source path entries properly" and you have installed GWTDesigner, uncheck "client classpath": http://code.google.com/webtoolkit/tools/gwtdesigner/preferences/gwt/preferen... Added: trunk/img/webtemplate/def-theme-doc-arrow-down.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/def-theme-doc-arrow-down.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/webtemplate/def-theme-tools-arrow-left.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/def-theme-tools-arrow-left.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/img/webtemplate/web_template-2011.svg 2010-12-07 22:38:26 UTC (rev 1158) @@ -49,18 +49,18 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="1" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="561.99451" - inkscape:cy="595.80311" - inkscape:current-layer="layer2" + inkscape:zoom="0.6953125" + inkscape:cx="512" + inkscape:cy="729.16854" + inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="false" inkscape:window-width="1280" - inkscape:window-height="973" + inkscape:window-height="749" inkscape:window-x="0" - inkscape:window-y="24" + inkscape:window-y="1024" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -101,7 +101,8 @@ <g inkscape:groupmode="layer" id="layer2" - inkscape:label="browser"> + inkscape:label="browser" + sodipodi:insensitive="true"> <rect style="color:#000000;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect5254" @@ -2194,7 +2195,7 @@ </g> <g id="layer1" - inkscape:label="Layer 1" + inkscape:label="normal" inkscape:groupmode="layer" style="display:inline"> <rect @@ -2208,7 +2209,7 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <g - style="display:inline;opacity:0.5" + style="opacity:0.5;display:inline" id="g5064" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -2221,7 +2222,7 @@ inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" id="path5050" d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" - style="font-size:58.13353347999999698px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" /> + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" /> <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -2233,31 +2234,31 @@ transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5054" d="m 60.321717,411.99998 377.014613,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247000000033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5056" d="m 252.61203,788.60332 0,-377.01178" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958000000355;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5058" d="m 252.86937,597.15755 377.0124,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721000000248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5060" d="m 437.45588,596.97447 0,-377.01491" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195000000463;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5062" d="m 372.87905,411.27704 64.93441,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947905999999364;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> </g> </g> <g @@ -2295,7 +2296,7 @@ id="g5365"> <path transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" - d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" + d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -2305,7 +2306,7 @@ sodipodi:type="arc" /> <path transform="matrix(0.05245387,0,0,0.05245387,400.1808,-0.554549)" - d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" + d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -2329,7 +2330,7 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <text - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu" id="text5373" font-size="11" x="1626.7657" @@ -2367,7 +2368,7 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <rect - style="opacity:1;color:#000000;fill:#f4e3d7;stroke:none;stroke-width:0.99999981999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#f4e3d7;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3017" width="810" height="130" @@ -2378,16 +2379,6 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - <rect - transform="matrix(0,1,1,0,0,0)" - ry="5" - rx="5.0000005" - y="93.094986" - x="-115.88918" - height="343" - width="63" - id="rect3248" - style="opacity:0.5;color:#000000;fill:#666666;stroke:#808080;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <text xml:space="preserve" style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" @@ -2440,7 +2431,7 @@ sodipodi:role="line">50x50</tspan></text> </g> <rect - style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999963999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999964;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3089" width="800" height="520" @@ -2453,7 +2444,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:56px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#550000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold;opacity:0.68400002" + style="font-size:56px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.68399999;fill:#550000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="91.84803" y="201.77293" id="text3096" @@ -2464,7 +2455,8 @@ sodipodi:role="line" id="tspan3098" x="91.84803" - y="201.77293">Name of Initiative</tspan></text> + y="201.77293" + style="-inkscape-font-specification:Ubuntu Bold;font-family:Ubuntu;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal">Name of the Initiative</tspan></text> <text sodipodi:linespacing="125%" id="text3073-8" @@ -2476,63 +2468,6 @@ x="-806.35638" sodipodi:role="line" id="tspan3125">centrado vertical/horizontal, tamaño y color letra, editor ??? mmm igual...</tspan></text> - <rect - style="color:#000000;fill:#4d4d4d;fill-opacity:0.98431373;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3460" - width="60.841721" - height="341.04489" - x="-114.73091" - y="94.094986" - rx="5" - ry="5" - transform="matrix(0,1,1,0,0,0)" /> - <image - y="-107.88917" - x="103.09499" - id="image3210" - xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABkAGQDASIA AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii gAooooAKY7rGpZ2Cj1JxWZqmqfZAYoQDLjknoo9ff6Vzsksksu+RmdiTgk5IH9KuMG9SHNJ2OxS7 t5DtSeJm9A4JqeuAkQFeeTn86bZ67d6VMAXMttnDRk5x9Cen8v5hunbYFPueg0VXtbmK8to7iFw0 bjKkVYrMsKKKKACiiigAooooASmSyLFE8jfdVST9AKkqjqr+Xpk59QB+ZA/rQtxM5WSVppXlc5Zi SeeB7e1M5ySSDx+VAIx1PToKDyTxj6iuowGuODxkkevSsm+HBHBPt2rWkPB4zwayb08Ec/lQxo3v A98xe50+RjgASxg9hnDfqR+tdrXmXhCUp4ngUDiRXQ8+ik/j0Fem1zzWprHYKKKKkoKKKKACiiig AqnqieZps6+ilvy5/pVymSIJI2RujAgj60LRiZw579h/OgnoScDHAFDApIyMCHUkN7GkJGB06+vT /GuowGSnCEDIH0rFvXySMkjPY9K0rqXg9ck81hXMm44BwPek2M2fBsYl8SRt/wA80duvTIx/WvSx XDeAbbMt5dEYAVY1Prnk/wAh+ddzWE3qax2CiiipKCiiigAooooAKKKKAOL8QQGx1IygHy58sMDo 3cf1/Gsh7sADnt0B6V3er2UF9p8sNwwRfvCQn7hHQ15XK7xyFCc4OMjoa3hLQyktSzc3OSew+tZ5 JcjHJz6fp70E5JyMn3NdH4MsbS81NpZ5EMkADRxHALH+97gfzIP1G7K4Ja2Ox8OaadL0aGCQYmb9 5J/vHt+AwPwrXNFJWD1NRaKKKACiiigAoo7VSvr9LKIMRuduFUd6EribLbMEUsxAA6knisu71y3g ysX71/Y4X8+/4ZrBub2e7YtMxIB4UHAH4f1qD19cdMVtGn3Ic+xLfXlxfZEj/KOQo+6P8awbu0yT gcVs4Bzkkk+9RtGrk9CMHv1rSySsiLtnLNAwONpwT370+CGVZQ6MyuDlShIII7gjp9a3mtFJJwMC nR2ip2ANKwGxpPiK4WNYr8GUY/1q8MPqOn+e9dJb3cF2m6CVXHcA4I+o6iuLVAFHtTGDKwdGZWBy GU4I+hFQ6aexam+p6BRXH6X4meKZbfUG3RkgLMeCp/2vUe/866+smmty077C0UUUhiZwMnpXHX10 by6eTtnCj2H8v/r10uqS+Tp0zDqV2/mcVyJOBwCTjsela0l1M5voB4AGMnPbvQAc4GRkY5/zxSYx xwCBSnggDk/yrYzADgdScdh0oPAPTpQc4POKOAcZJP8AKgAI5PA6dqTqAegzwAOv+NL256+nrRwA ACSfYUABxk8frTWAK46nH+fpTiMEdc5/KkY/KcZJx2PSgDKvkwDwM57d66zwhqZvNOa1kJMtsQuT 3U9PywR+ArlrwYUjjIHNS+ErkweJI4x92ZGRvbjI/UD86zmrouL1PSaKKKwNTK14/wCgKPWQA/ka 5odvpRRW9LYxnuIOh/GjFFFaEinv9f6U0nCgiiigBcdKF+YjNFFAAOWx7Udh9KKKAM27+4341U0p jHr9gV4JuIx+bYooqHsyo7nrFFFFc5sf/9k= " - height="44" - width="44" /> - <text - xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffe6d5;fill-opacity:1;stroke:none;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" - x="154.33131" - y="-98.012215" - id="text3213" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan3215" - x="154.33131" - y="-98.012215" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffe6d5;font-family:Verdana;-inkscape-font-specification:Verdana Bold">Some notice/info/alert title</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3217" - y="-80.012222" - x="154.33131" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana" - xml:space="preserve"><tspan - sodipodi:role="line" - id="tspan3221" - x="154.33131" - y="-80.012222">Lorem ipsum dolor sit amet, consectetuer</tspan><tspan - sodipodi:role="line" - x="154.33131" - y="-63.762222" - id="tspan3223">adipiscing elit.</tspan></text> - <text - xml:space="preserve" - style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:none;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" - x="433.41605" - y="-98.677803" - id="text3213-2" - sodipodi:linespacing="125%" - transform="scale(0.96997425,1.0309552)"><tspan - sodipodi:role="line" - id="tspan3215-7" - x="433.41605" - y="-98.677803" - style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff7f2a;font-family:Verdana;-inkscape-font-specification:Verdana Bold">x</tspan></text> <g id="g3877" style="fill:#a05a2c" @@ -2581,6 +2516,17 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <image + style="display:inline" + y="896.93811" + x="22.615988" + id="image15604-0" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAaCAIAAADuRDFPAAAAA3NCSVQICAjb4U/gAAAARklEQVQo kWPccewmA17A8unJRfwqGP///49fBRN+abqpYCHoUpZ///5RrOLv3790sGXouGPIuJSIFHT27FkC Kk7cLcSvAgArDTxriRhPvAAAAABJRU5ErkJggg== " + height="35.304516" + width="768.22107" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <g id="g3882" style="fill:#deaa87" @@ -2619,7 +2565,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="543.98315" y="692.14264" id="text3922" @@ -2695,7 +2641,7 @@ sodipodi:type="arc" /> <text xml:space="preserve" - style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#c8b7b7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#c8b7b7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="314.99805" y="213.47852" id="text5381" @@ -2714,7 +2660,7 @@ id="text14833" y="693.54028" x="377.75659" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -2845,7 +2791,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="22.983185" y="288.14264" id="text15331" @@ -2857,7 +2803,7 @@ sodipodi:role="line" x="22.983185" y="288.14264" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold">Editors:</tspan></text> + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold">Editors:</tspan></text> <image y="298.61829" x="280" @@ -2908,44 +2854,61 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - <g - id="g3772" - transform="matrix(1,0,0,1.0231188,0,-7.8217817)"> - <rect - y="338.32956" - x="821" - height="28.999994" - width="193" - id="rect3770" - style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" - transform="matrix(0.13329382,-0.09764957,0.03845747,0.33845395,702.43998,372.86271)" - inkscape:transform-center-y="-2.9508384" - inkscape:transform-center-x="0.48626974" - d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.3561945" - sodipodi:arg1="1.3089969" - sodipodi:r2="25.591238" - sodipodi:r1="47.539455" - sodipodi:cy="177" - sodipodi:cx="817" - sodipodi:sides="3" - id="path24758" - style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - </g> + <rect + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3770" + width="193" + height="29.670439" + x="821" + y="338.32956" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path24758" + sodipodi:sides="3" + sodipodi:cx="817" + sodipodi:cy="177" + sodipodi:r1="47.539455" + sodipodi:r2="25.591238" + sodipodi:arg1="1.3089969" + sodipodi:arg2="2.3561945" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" + inkscape:transform-center-x="0.48626974" + inkscape:transform-center-y="-2.9508384" + transform="matrix(0.13329382,-0.09990711,0.03845747,0.3462786,702.43998,373.66107)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/def-theme-tools-arrow-left.png" + transform="matrix(0.13329382,-0.09990711,0.03845747,0.3462786,-22.253699,-165.29606)" + inkscape:transform-center-y="-2.9508384" + inkscape:transform-center-x="0.48626974" + d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.3561945" + sodipodi:arg1="1.3089969" + sodipodi:r2="25.591238" + sodipodi:r1="47.539455" + sodipodi:cy="177" + sodipodi:cx="817" + sodipodi:sides="3" + id="path4530" + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> <text sodipodi:linespacing="125%" id="text3910" y="361.39798" x="832.44855" - style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -2967,7 +2930,7 @@ style="fill:#ffffff">gallery</tspan></text> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="830.96289" y="171.00255" id="text3886-8" @@ -3104,7 +3067,7 @@ id="text15696" y="199.23106" x="832.42969" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3128,17 +3091,17 @@ id="text15702" y="287.14264" x="495.33279" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" y="287.14264" x="495.33279" sodipodi:role="line" id="tspan15704">Just</tspan><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" y="307.14264" x="495.33279" sodipodi:role="line" @@ -3158,7 +3121,7 @@ id="text15823" y="687.00311" x="832.96289" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3229,7 +3192,7 @@ id="flowPara17974-3">Click here to reply</flowPara></flowRoot> </g> <text xml:space="preserve" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold;opacity:0.58959998" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.58959997;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="833" y="714.41913" id="text19962" @@ -3291,7 +3254,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="633.75659" y="726.54028" id="text22973" @@ -3358,7 +3321,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" x="399" y="129" id="text23159" @@ -3393,7 +3356,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="832.42969" y="269.2316" id="text24744" @@ -3405,26 +3368,6 @@ id="tspan24746" x="832.42969" y="269.2316">collabs (5)</tspan></text> - <g - id="g24752" - style="fill:#b3b3b3;stroke:#333333"> - <rect - ry="10" - rx="10" - y="-359.61053" - x="144.42018" - height="245.19261" - width="646.41687" - id="rect24748" - style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect24750" - width="646.41687" - height="203.1873" - x="144.42018" - y="-359.61053" /> - </g> <image y="117" x="12" @@ -3459,7 +3402,7 @@ y="157.5835" /> <text xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" x="795" y="163" id="text25501" @@ -3488,7 +3431,7 @@ id="text3670" y="726.54028" x="25.756592" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3546,7 +3489,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" x="175.75659" y="729.54028" id="text3814" @@ -3561,7 +3504,7 @@ sodipodi:role="line" x="175.75659" y="743.54028" - style="font-size:14px;font-style:italic;font-weight:normal;fill:#784421;-inkscape-font-specification:Arial Italic" + style="font-size:14px;font-style:italic;font-weight:normal;fill:#784421;-inkscape-font-specification:Ubuntu Italic" id="tspan3822">Average</tspan></text> <image width="16" @@ -3648,7 +3591,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="24.369394" y="245.97888" id="text3886" @@ -3665,7 +3608,7 @@ id="text3900" y="243.22296" x="802.5" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3938,7 +3881,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="29.756592" y="691.54028" id="text4986" @@ -3962,7 +3905,7 @@ id="text4994" y="692.39124" x="80.670654" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3971,13 +3914,13 @@ x="80.670654" sodipodi:role="line" id="tspan4996" /><tspan - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" y="708.39124" x="80.670654" sodipodi:role="line" id="tspan4998"><tspan id="tspan5000" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">resilence environmentalism</tspan></tspan></text> + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">resilence environmentalism</tspan></tspan></text> <rect style="color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect5031" @@ -4346,7 +4289,7 @@ style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path inkscape:connector-curvature="0" - d="m 20.573805,323.77693 c 0.152924,0.57507 0.190497,1.17498 0.15438,1.76718 -0.03038,0.26753 -0.121684,0.48473 -0.291308,0.69455 -0.05586,0.0691 -0.18559,0.1635 -0.253587,0.2239 -0.0064,0.004 -0.02135,0.0183 -0.01911,0.0113 0.01018,-0.032 0.05721,-0.11837 0.05401,-0.085 -0.01041,0.10883 -0.06511,0.26591 -0.09474,0.36487 -0.07868,0.16821 -0.112655,0.33065 -0.102349,0.51384 0.01597,0.11208 0.01426,0.22748 0.03304,0.33912 0.0024,0.0144 0.02196,0.0204 0.02816,0.0336 0.01305,0.0278 0.02409,0.0565 0.03613,0.0848 -6.23e-4,-0.013 -0.01432,-0.0425 -0.0019,-0.0389 0.04858,0.0143 0.265848,0.41908 0.284445,0.45886 0.0977,0.26582 0.07306,0.56157 0.168262,0.82748 0.01231,0.0377 0.02537,0.0751 0.03692,0.113 0.01406,0.0461 0.02814,0.0923 0.03991,0.13906 0.05093,0.20228 -0.08389,-0.15547 -0.119085,-0.15324 -0.386212,0.0245 -0.742151,0.2236 -1.121497,0.30012 -0.242456,-0.51088 -0.477321,-1.02482 -0.710692,-1.53981 -0.246429,-0.55372 -0.253659,-0.99784 0.285992,-1.38235 0.04475,-0.004 0.168369,-0.15396 0.123736,-0.12156 0.02449,-0.33118 0.112354,-0.6537 0.190996,-0.97535 0.04732,-0.34253 0.21472,-0.65415 0.279775,-0.99151 0.0025,-0.20834 0.06008,-0.40976 0.06091,-0.61779 -0.149925,-0.35672 -0.312136,-0.71027 -0.478623,-1.06091 -0.26978,-0.66785 -0.465661,-1.36167 -0.582712,-2.07194 -0.01121,-0.0611 -0.02262,-0.12221 -0.03363,-0.18336 -0.03341,-0.18548 -0.04585,-0.35767 -0.05157,-0.54551 -4.45e-4,-0.0146 -0.0036,0.029 -0.0053,0.0435 -0.100414,-0.34534 -0.114979,-0.70893 -0.120994,-1.06627 0.0084,-0.37328 0.137147,-0.72506 0.207447,-1.08726 0.02507,-0.12993 -0.02975,-0.25877 -0.02843,-0.3878 7.42e-4,-0.0725 0.01112,-0.14455 0.01668,-0.21683 0.147649,-0.67103 0.638135,-0.85851 1.293095,-0.70947 0.104303,0.0237 0.182638,0.11142 0.273957,0.16712 0.487193,0.51748 0.600238,1.22058 0.756263,1.88746 0.05177,0.30153 0.140306,0.59513 0.192741,0.89647 0.0039,0.0223 -0.01959,-0.0409 -0.02986,-0.0611 0.436253,0.65055 -0.209482,1.04999 -0.669286,1.3222 -0.109503,0.0513 -0.219006,0.10261 -0.32851,0.15391 -0.08291,0.0535 -0.838974,-1.11904 -0.756065,-1.17251 l 0,0 c 0.08843,-0.0284 0.176862,-0.0567 0.265293,-0.0851 0.0051,-0.002 0.369146,-0.15174 0.406751,-0.14902 0.02297,0.002 0.02195,0.0424 0.02228,0.0654 0.01563,1.11418 -0.09589,0.13072 0.05376,0.59606 0.0054,0.0169 -0.0252,-0.025 -0.03779,-0.0374 -0.267161,-0.37013 -0.391892,-0.81677 -0.49436,-1.25688 -0.07078,-0.29586 -0.115053,-0.59632 -0.187672,-0.89135 -0.01758,-0.0714 -0.04052,-0.14145 -0.06031,-0.2123 -0.0094,-0.0337 -0.03448,-0.067 -0.02729,-0.10127 0.0034,-0.0162 0.02912,0.0155 0.04367,0.0233 0.374498,0.21284 0.518061,-0.0415 0.548405,-0.30106 -0.01397,-0.0627 -0.0091,-0.0472 0.0025,0.0721 0.01751,0.17884 0.03861,0.35811 0.02396,0.53815 -0.02971,0.31474 -0.10458,0.62065 -0.148567,0.93308 0.0024,0.30786 -0.0031,0.61647 0.02662,0.92327 0.0042,0.0545 0.0085,0.10892 0.01275,0.16338 0.0012,0.0157 -0.006,-0.0316 -0.0038,-0.0472 6.59e-4,-0.005 0.0071,0.006 0.0091,0.0103 0.01354,0.0279 0.02543,0.0566 0.03723,0.0852 0.07737,0.18792 0.06451,0.16332 0.138576,0.38357 0.174323,0.61826 0.331487,1.24175 0.549165,1.84694 0.207571,0.52126 0.44834,1.05232 0.454103,1.62306 -0.02852,0.21541 -0.08288,0.42877 -0.06521,0.6472 -0.03177,0.40698 -0.155031,0.78942 -0.274426,1.1779 -0.0847,0.25327 -0.170497,0.50873 -0.205516,0.77312 -0.05828,0.41565 -0.217814,0.73129 -0.556481,0.99078 -0.02748,0.0128 -0.06958,0.0659 -0.08243,0.0385 -0.01879,-0.0401 0.03269,-0.0829 0.04126,-0.12639 0.01344,-0.0682 0.02374,-0.13754 0.02445,-0.20703 0.001,-0.10289 -0.07245,-0.1992 0.0431,-0.013 0.03885,0.0626 0.07699,0.12564 0.11548,0.18845 0.328368,0.59093 0.625581,1.2148 0.726699,1.88937 0.0072,0.60892 0.09871,0.549 -1.087597,0.70048 -0.131349,0.0168 -0.269771,-0.54218 -0.303566,-0.63599 -0.04574,-0.19534 -0.123348,-0.48077 -0.09005,-0.66554 -0.08903,-0.12454 -0.212933,-0.29025 -0.291171,-0.43514 -0.121319,-0.27311 -0.185132,-0.55276 -0.187106,-0.85263 -0.0065,-0.30977 0.02257,-0.61728 0.153239,-0.90283 0.136806,-0.26568 0.09794,-0.6052 0.378847,-0.81451 0.05239,-0.025 0.1641,-0.15532 0.16429,-0.1245 2.78e-4,0.045 -0.07276,0.1455 -0.02998,0.13159 0.009,-0.003 0.0017,-0.0188 0.0026,-0.0282 -0.06211,-0.54199 -0.132928,-1.08628 -0.121163,-1.63282 -0.01095,-0.0914 1.281744,-0.24622 1.292691,-0.15482 z" + d="m 20.573805,323.77693 c 0.152924,0.57507 0.190497,1.17498 0.15438,1.76718 -0.03038,0.26753 -0.121684,0.48473 -0.291308,0.69455 -0.05586,0.0691 -0.18559,0.1635 -0.253587,0.2239 -0.0064,0.004 -0.02135,0.0183 -0.01911,0.0113 0.01018,-0.032 0.05721,-0.11837 0.05401,-0.085 -0.01041,0.10883 -0.06511,0.26591 -0.09474,0.36487 -0.07868,0.16821 -0.112655,0.33065 -0.102349,0.51384 0.01597,0.11208 0.01426,0.22748 0.03304,0.33912 0.0024,0.0144 0.02196,0.0204 0.02816,0.0336 0.01305,0.0278 0.02409,0.0565 0.03613,0.0848 -6.23e-4,-0.013 -0.01432,-0.0425 -0.0019,-0.0389 0.04858,0.0143 0.265848,0.41908 0.284445,0.45886 0.0977,0.26582 0.07306,0.56157 0.168262,0.82748 0.01231,0.0377 0.02537,0.0751 0.03692,0.113 0.01406,0.0461 0.02814,0.0923 0.03991,0.13906 0.05093,0.20228 -0.08389,-0.15547 -0.119085,-0.15324 -0.386212,0.0245 -0.742151,0.2236 -1.121497,0.30012 -0.242456,-0.51088 -0.477321,-1.02482 -0.710692,-1.53981 -0.246429,-0.55372 -0.253659,-0.99784 0.285992,-1.38235 0.04475,-0.004 0.168369,-0.15396 0.123736,-0.12156 0.02449,-0.33118 0.112354,-0.6537 0.190996,-0.97535 0.04732,-0.34253 0.21472,-0.65415 0.279775,-0.99151 0.0025,-0.20834 0.06008,-0.40976 0.06091,-0.61779 -0.149925,-0.35672 -0.312136,-0.71027 -0.478623,-1.06091 -0.26978,-0.66785 -0.465661,-1.36167 -0.582712,-2.07194 -0.01121,-0.0611 -0.02262,-0.12221 -0.03363,-0.18336 -0.03341,-0.18548 -0.04585,-0.35767 -0.05157,-0.54551 -4.45e-4,-0.0146 -0.0036,0.029 -0.0053,0.0435 -0.100414,-0.34534 -0.114979,-0.70893 -0.120994,-1.06627 0.0084,-0.37328 0.137147,-0.72506 0.207447,-1.08726 0.02507,-0.12993 -0.02975,-0.25877 -0.02843,-0.3878 7.42e-4,-0.0725 0.01112,-0.14455 0.01668,-0.21683 0.147649,-0.67103 0.638135,-0.85851 1.293095,-0.70947 0.104303,0.0237 0.182638,0.11142 0.273957,0.16712 0.487193,0.51748 0.600238,1.22058 0.756263,1.88746 0.05177,0.30153 0.140306,0.59513 0.192741,0.89647 0.0039,0.0223 -0.01959,-0.0409 -0.02986,-0.0611 0.436253,0.65055 -0.209482,1.04999 -0.669286,1.3222 -0.109503,0.0513 -0.219006,0.10261 -0.32851,0.15391 -0.08291,0.0535 -0.838974,-1.11904 -0.756065,-1.17251 l 0,0 c 0.08843,-0.0284 0.176862,-0.0567 0.265293,-0.0851 0.0051,-0.002 0.369146,-0.15174 0.406751,-0.14902 0.02297,0.002 0.02195,0.0424 0.02228,0.0654 0.01563,1.11418 -0.09589,0.13072 0.05376,0.59606 0.0054,0.0169 -0.0252,-0.025 -0.03779,-0.0374 -0.267161,-0.37013 -0.391892,-0.81677 -0.49436,-1.25688 -0.07078,-0.29586 -0.115053,-0.59632 -0.187672,-0.89135 -0.01758,-0.0714 -0.04052,-0.14145 -0.06031,-0.2123 -0.0094,-0.0337 -0.03448,-0.067 -0.02729,-0.10127 0.0034,-0.0162 0.02912,0.0155 0.04367,0.0233 0.374498,0.21284 0.518061,-0.0415 0.548405,-0.30106 -0.01397,-0.0627 -0.0091,-0.0472 0.0025,0.0721 0.01751,0.17884 0.03861,0.35811 0.02396,0.53815 -0.02971,0.31474 -0.10458,0.62065 -0.148567,0.93308 0.0024,0.30786 -0.0031,0.61647 0.02662,0.92327 0.0042,0.0545 0.0085,0.10892 0.01275,0.16338 0.0012,0.0157 -0.006,-0.0316 -0.0038,-0.0472 6.59e-4,-0.005 0.0071,0.006 0.0091,0.0103 0.01354,0.0279 0.02543,0.0566 0.03723,0.0852 0.07737,0.18792 0.06451,0.16332 0.138576,0.38357 0.174323,0.61826 0.331487,1.24175 0.549165,1.84694 0.207571,0.52126 0.44834,1.05232 0.454103,1.62306 -0.02852,0.21541 -0.08288,0.42877 -0.06521,0.6472 -0.03177,0.40698 -0.155031,0.78942 -0.274426,1.1779 -0.0847,0.25327 -0.170497,0.50873 -0.205516,0.77312 -0.05828,0.41565 -0.217814,0.73129 -0.556481,0.99078 -0.02748,0.0128 -0.06958,0.0659 -0.08243,0.0385 -0.01879,-0.0401 0.03269,-0.0829 0.04126,-0.12639 0.01344,-0.0682 0.02374,-0.13754 0.02445,-0.20703 10e-4,-0.10289 -0.07245,-0.1992 0.0431,-0.013 0.03885,0.0626 0.07699,0.12564 0.11548,0.18845 0.328368,0.59093 0.625581,1.2148 0.726699,1.88937 0.0072,0.60892 0.09871,0.549 -1.087597,0.70048 -0.131349,0.0168 -0.269771,-0.54218 -0.303566,-0.63599 -0.04574,-0.19534 -0.123348,-0.48077 -0.09005,-0.66554 -0.08903,-0.12454 -0.212933,-0.29025 -0.291171,-0.43514 -0.121319,-0.27311 -0.185132,-0.55276 -0.187106,-0.85263 -0.0065,-0.30977 0.02257,-0.61728 0.153239,-0.90283 0.136806,-0.26568 0.09794,-0.6052 0.378847,-0.81451 0.05239,-0.025 0.1641,-0.15532 0.16429,-0.1245 2.78e-4,0.045 -0.07276,0.1455 -0.02998,0.13159 0.009,-0.003 0.0017,-0.0188 0.0026,-0.0282 -0.06211,-0.54199 -0.132928,-1.08628 -0.121163,-1.63282 -0.01095,-0.0914 1.281744,-0.24622 1.292691,-0.15482 z" id="path3728" style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path @@ -4466,5 +4409,259 @@ id="path24758-0" style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4528" + sodipodi:sides="3" + sodipodi:cx="817" + sodipodi:cy="177" + sodipodi:r1="47.539455" + sodipodi:r2="25.591238" + sodipodi:arg1="1.3089969" + sodipodi:arg2="2.3561945" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" + inkscape:transform-center-x="2.9508382" + inkscape:transform-center-y="0.4862702" + transform="matrix(-0.09990711,-0.13329382,0.3462786,-0.03845747,62.31919,-73.11654)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/def-theme-doc-arrow-down.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="overlay" + sodipodi:insensitive="true" + style="display:none"> + <rect + style="opacity:0.68399999;color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3865" + width="1017" + height="654" + x="5" + y="111" + ry="0" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="dialogs" + style="display:none"> + <rect + transform="matrix(0,1,1,0,0,0)" + ry="5" + rx="5.0000005" + y="138.96637" + x="375.22134" + height="343" + width="63" + id="rect3248" + style="opacity:0.5;color:#000000;fill:#666666;stroke:#808080;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3460" + width="60.841721" + height="341.04489" + x="376.37964" + y="139.96637" + rx="5" + ry="5" + transform="matrix(0,1,1,0,0,0)" /> + <image + style="display:inline" + y="383.22137" + x="148.96637" + id="image3210" + xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABkAGQDASIA AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii gAooooAKY7rGpZ2Cj1JxWZqmqfZAYoQDLjknoo9ff6Vzsksksu+RmdiTgk5IH9KuMG9SHNJ2OxS7 t5DtSeJm9A4JqeuAkQFeeTn86bZ67d6VMAXMttnDRk5x9Cen8v5hunbYFPueg0VXtbmK8to7iFw0 bjKkVYrMsKKKKACiiigAooooASmSyLFE8jfdVST9AKkqjqr+Xpk59QB+ZA/rQtxM5WSVppXlc5Zi SeeB7e1M5ySSDx+VAIx1PToKDyTxj6iuowGuODxkkevSsm+HBHBPt2rWkPB4zwayb08Ec/lQxo3v A98xe50+RjgASxg9hnDfqR+tdrXmXhCUp4ngUDiRXQ8+ik/j0Fem1zzWprHYKKKKkoKKKKACiiig AqnqieZps6+ilvy5/pVymSIJI2RujAgj60LRiZw579h/OgnoScDHAFDApIyMCHUkN7GkJGB06+vT /GuowGSnCEDIH0rFvXySMkjPY9K0rqXg9ck81hXMm44BwPek2M2fBsYl8SRt/wA80duvTIx/WvSx XDeAbbMt5dEYAVY1Prnk/wAh+ddzWE3qax2CiiipKCiiigAooooAKKKKAOL8QQGx1IygHy58sMDo 3cf1/Gsh7sADnt0B6V3er2UF9p8sNwwRfvCQn7hHQ15XK7xyFCc4OMjoa3hLQyktSzc3OSew+tZ5 JcjHJz6fp70E5JyMn3NdH4MsbS81NpZ5EMkADRxHALH+97gfzIP1G7K4Ja2Ox8OaadL0aGCQYmb9 5J/vHt+AwPwrXNFJWD1NRaKKKACiiigAoo7VSvr9LKIMRuduFUd6EribLbMEUsxAA6knisu71y3g ysX71/Y4X8+/4ZrBub2e7YtMxIB4UHAH4f1qD19cdMVtGn3Ic+xLfXlxfZEj/KOQo+6P8awbu0yT gcVs4Bzkkk+9RtGrk9CMHv1rSySsiLtnLNAwONpwT370+CGVZQ6MyuDlShIII7gjp9a3mtFJJwMC nR2ip2ANKwGxpPiK4WNYr8GUY/1q8MPqOn+e9dJb3cF2m6CVXHcA4I+o6iuLVAFHtTGDKwdGZWBy GU4I+hFQ6aexam+p6BRXH6X4meKZbfUG3RkgLMeCp/2vUe/866+smmty077C0UUUhiZwMnpXHX10 by6eTtnCj2H8v/r10uqS+Tp0zDqV2/mcVyJOBwCTjsela0l1M5voB4AGMnPbvQAc4GRkY5/zxSYx xwCBSnggDk/yrYzADgdScdh0oPAPTpQc4POKOAcZJP8AKgAI5PA6dqTqAegzwAOv+NL256+nrRwA ACSfYUABxk8frTWAK46nH+fpTiMEdc5/KkY/KcZJx2PSgDKvkwDwM57d66zwhqZvNOa1kJMtsQuT 3U9PywR+ArlrwYUjjIHNS+ErkweJI4x92ZGRvbjI/UD86zmrouL1PSaKKKwNTK14/wCgKPWQA/ka 5odvpRRW9LYxnuIOh/GjFFFaEinv9f6U0nCgiiigBcdKF+YjNFFAAOWx7Udh9KKKAM27+4341U0p jHr9gV4JuIx+bYooqHsyo7nrFFFFc5sf/9k= " + height="44" + width="44" /> + <text + xml:space="preserve" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffe6d5;fill-opacity:1;stroke:none;display:inline;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" + x="200.2027" + y="393.09833" + id="text3213" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3215" + x="200.2027" + y="393.09833" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffe6d5;font-family:Verdana;-inkscape-font-specification:Verdana Bold">Some notice/info/alert title</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3217" + y="411.09833" + x="200.2027" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Verdana;-inkscape-font-specification:Verdana" + xml:space="preserve"><tspan + sodipodi:role="line" + id="tspan3221" + x="200.2027" + y="411.09833">Lorem ipsum dolor sit amet, consectetuer</tspan><tspan + sodipodi:role="line" + x="200.2027" + y="427.34833" + id="tspan3223">adipiscing elit.</tspan></text> + <text + xml:space="preserve" + style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:none;display:inline;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" + x="480.7074" + y="377.68677" + id="text3213-2" + sodipodi:linespacing="125%" + transform="scale(0.96997425,1.0309552)"><tspan + sodipodi:role="line" + id="tspan3215-7" + x="480.7074" + y="377.68677" + style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff7f2a;font-family:Verdana;-inkscape-font-specification:Verdana Bold">x</tspan></text> + <rect + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect24748" + width="646.41687" + height="245.19261" + x="190.29156" + y="113.49999" + rx="10" + ry="10" /> + <rect + y="113.49999" + x="190.29156" + height="201.29102" + width="646.41687" + id="rect24750" + style="color:#000000;fill:#6c5353;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3894" + width="646.41687" + height="8.5292969" + x="190.29156" + y="111" /> + <rect + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3896" + width="320" + height="32" + x="221.5" + y="148.5" + rx="5" + ry="5" /> + <rect + ry="5" + rx="5" + y="204" + x="221.5" + height="32" + width="193" + id="rect3899" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3901" + width="193" + height="32" + x="221.5" + y="259.5" + rx="5" + ry="5" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="221.40039" + y="143.76562" + id="text3903" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3905" + x="221.40039" + y="143.76562">name</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3907" + y="199.76562" + x="271.49805" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="199.76562" + x="271.49805" + id="tspan3909" + sodipodi:role="line">email</tspan></text> + <rect + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3911" + width="103.29102" + height="26" + x="218.99998" + y="325" + rx="6.9999995" + ry="7" /> + <text + xml:space="preserve" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="232.03516" + y="343.10547" + id="text3903-1" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3905-6" + x="232.03516" + y="343.10547">Continuar</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="219.83398" + y="254.76562" + id="text3958" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3960" + x="219.83398" + y="254.76562">language</tspan></text> + <rect + ry="5" + rx="4.9999995" + y="259.5" + x="391.5" + height="32" + width="23" + id="rect3962" + style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3964" + y="328.44327" + x="339.50107" + style="font-size:21.83877945px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + transform="scale(1.1657305,0.8578312)"><tspan + y="328.44327" + x="339.50107" + id="tspan3966" + sodipodi:role="line">v</tspan></text> + <rect + ry="7" + rx="6.9999995" + y="325" + x="705" + height="26" + width="103.29102" + id="rect3968" + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3970" + y="343.10547" + x="722.03516" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="343.10547" + x="722.03516" + id="tspan3972" + sodipodi:role="line">Cancelar</tspan></text> + </g> </svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/pom.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -12,11 +12,11 @@ <name>kune</name> <url>http://kune.ourproject.org</url> <properties> - <!-- - Available versions: - http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ - --> - <gwt.version>2.0.0</gwt.version> + <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ --> + <gwtVersion>2.1.0</gwtVersion> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> <!-- guice --> @@ -30,30 +30,21 @@ <artifactId>guice-servlet</artifactId> <version>2.0.1</version> </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - <!-- GWT dependencies (from maven "central" repo) --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>compile</scope> + <version>${gwtVersion}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> + <version>${gwtVersion}</version> <scope>provided</scope> </dependency> - <!-- - <dependency> <groupId>com.extjs</groupId> - <artifactId>gxt</artifactId> <version>1.0-beta2</version> - </dependency> - --> + <!-- <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> + <version>1.0-beta2</version> </dependency> --> <dependency> <groupId>org.cobogw</groupId> <artifactId>gwt</artifactId> @@ -79,7 +70,6 @@ <artifactId>gwt-voices</artifactId> <version>1.6.0</version> </dependency> - <!-- utilities --> <dependency> <groupId>log4j</groupId> @@ -106,10 +96,9 @@ <artifactId>xwiki-web-gwt-dom</artifactId> <version>2.3-rc-1</version> <!-- <version>2.0-SNAPSHOT-g164</version> --> - <!-- <version>2.0-SNAPSHOT</version> --> + <!-- <version>2.0-SNAPSHOT</version> --> <!-- <version>2.0-SNAPSHOT-g20s</version> --> </dependency> - <!-- xmpp --> <dependency> <groupId>com.calclab.emite</groupId> @@ -131,15 +120,13 @@ <artifactId>smackx-debugger</artifactId> <version>3.0.4</version> </dependency> - - <!-- mysql --> + <!-- mysql --> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.0.5</version> </dependency> - - <!-- hibernate JPA --> + <!-- hibernate JPA --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> @@ -160,11 +147,8 @@ <artifactId>hibernate-commons-annotations</artifactId> <version>3.3.0.ga</version> </dependency> - <!-- - <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>3.3.1.GA</version> </dependency> - --> + <!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> + <version>3.3.1.GA</version> </dependency> --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-search</artifactId> @@ -200,7 +184,6 @@ <artifactId>slf4j-log4j12</artifactId> <version>1.5.2</version> </dependency> - <!-- REST: xml and json (stax) --> <dependency> <groupId>com.thoughtworks.xstream</groupId> @@ -228,7 +211,6 @@ <artifactId>commons-collections</artifactId> <version>3.2</version> </dependency> - <!-- File upload --> <dependency> <groupId>commons-beanutils</groupId> @@ -250,7 +232,6 @@ <artifactId>commons-fileupload</artifactId> <version>1.1.1</version> </dependency> - <!-- db upgrades --> <dependency> <groupId>org.liquibase</groupId> @@ -262,21 +243,20 @@ <artifactId>liquibase-plugin</artifactId> <version>1.7.0.0</version> </dependency> - - <!-- jetty dependencies --> + <!-- jetty dependencies --> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>6.1.11</version> - <!-- <version>7.0.0.pre5</version>--> + <!-- <version>6.1.11</version> --> + <version>7.0.0.pre5</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <!-- <artifactId>jetty-maven-plugin</artifactId>--> - <!-- <version>7.0.0.1beta0</version>--> - <version>6.1.11</version> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.2.1.v20101111</version> + <!-- <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.11</version> --> <scope>runtime</scope> </dependency> <dependency> @@ -285,7 +265,6 @@ <version>2.4</version> <scope>provided</scope> </dependency> - <!-- testing dependencies --> <dependency> <groupId>org.mockito</groupId> @@ -302,25 +281,21 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.4</version> - <!-- - <scope>test</scope> - --> + <version>4.7</version> + <!-- <scope>test</scope> --> </dependency> - <!-- <dependency>--> - <!-- <groupId>org.openqa.selenium.client-drivers</groupId>--> - <!-- <artifactId>selenium-java-client-driver</artifactId>--> - <!-- <version>1.0-beta-1</version>--> - <!-- <scope>test</scope>--> - <!-- </dependency>--> - + <!-- <dependency> --> + <!-- <groupId>org.openqa.selenium.client-drivers</groupId> --> + <!-- <artifactId>selenium-java-client-driver</artifactId> --> + <!-- <version>1.0-beta-1</version> --> + <!-- <scope>test</scope> --> + <!-- </dependency> --> <!-- public side --> <dependency> <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> - <version>0.9.4</version> + <version>1.0.3</version> </dependency> - <!-- wave --> <dependency> <groupId>org.waveprotocol</groupId> @@ -408,15 +383,10 @@ <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> </repository> </distributionManagement> - <!-- - http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/inde... - --> + <!-- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/inde... --> <pluginRepositories> - <!-- - <pluginRepository> <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> - --> + <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> + </pluginRepository> --> <pluginRepository> <id>Codehaus Snapshots</id> <url>http://snapshots.repository.codehaus.org/</url> @@ -427,6 +397,11 @@ <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below --> </releases> </pluginRepository> + <pluginRepository> + <id>gwt-plugin-repo</id> + <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url> + <name>Google Web Toolkit Plugin Repository</name> + </pluginRepository> </pluginRepositories> <repositories> <repository> @@ -469,6 +444,14 @@ <url>http://www.gwt-ext.com/maven2/</url> </repository> <repository> + <id>google-maven-snapshot-repository</id> + <name>Google Maven Snapshot Repository</name> + <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> <id>openqa.org</id> <name>Openqa Release Repository</name> <url>http://archiva.openqa.org/repository/releases</url> @@ -481,7 +464,7 @@ </releases> </repository> <repository> - <id>openqa.org</id> + <id>openqa.org snapshots</id> <name>Openqa Snapshot Repository</name> <url>http://archiva.openqa.org/repository/snapshots</url> <layout>default</layout> @@ -521,7 +504,7 @@ </repositories> <issueManagement> <system>kune issues list at ourproject.org</system> - <url>http://ourproject.org/tracker/?group_id=407</url> + <url>http://kune.ourproject.org/issues/</url> </issueManagement> <developers> <developer> @@ -557,31 +540,27 @@ <configuration> <source>1.6</source> <target>1.6</target> - <!-- - Uncomment and run mvn with -X -e if we have same compile - problems <compilerArgument>-verbose</compilerArgument> - <fork>true</fork> <verbose>true</verbose> - --> + <!-- Uncomment and run mvn with -X -e if we have same compile problems + <compilerArgument>-verbose</compilerArgument> <fork>true</fork> <verbose>true</verbose> --> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <!-- http://mojo.codehaus.org/gwt-maven-plugin/index.html --> - <version>1.2</version> + <!--<version>1.2</version> --> + <version>2.1.0</version> <executions> <execution> <configuration> <!-- <extraJvmArgs>-Xmx512M</extraJvmArgs> --> <soyc>false</soyc> <style>OBF</style> + <inline>true</inline> </configuration> <goals> <!-- gwt:* goals to be executed during build --> <goal>compile</goal> - <!-- - http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html - --> + <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html --> <goal>resources</goal> </goals> </execution> @@ -593,38 +572,50 @@ </plugin> <plugin> <artifactId>maven-eclipse-plugin</artifactId> - <version>2.3</version> + <version>2.7</version> <configuration> <downloadSources>true</downloadSources> - <downloadJavadocs>true</downloadJavadocs> - <wtpversion>1.5</wtpversion> + <downloadJavadocs>false</downloadJavadocs> + <wtpversion>2.0</wtpversion> </configuration> </plugin> +<!-- <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>exploded</goal> + </goals> + </execution> + </executions> + <configuration> + <webappDirectory>/war</webappDirectory> + </configuration> + </plugin> --> <plugin> <groupId>org.mortbay.jetty</groupId> - <!-- <artifactId>jetty-maven-plugin</artifactId>--> - <!-- <version>7.0.0.1beta0</version>--> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.11</version> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.2.1.v20101111</version> + <!--<artifactId>maven-jetty-plugin</artifactId> + <version>6.1.14</version> --> <configuration> - <contextPath>/</contextPath> + <!-- <contextPath>/</contextPath> --> + <!-- <webAppSourceDirectory>${basedir}/target/${project.artifactId}-${version}</webAppSourceDirectory> --> + <!-- <webAppSourceDirectory>war</webAppSourceDirectory> --> <webAppSourceDirectory>war</webAppSourceDirectory> <reload>manual</reload> <scanIntervalSeconds>0</scanIntervalSeconds> </configuration> </plugin> - <!-- - <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>deb-maven-plugin</artifactId> - <version>1.0-SNAPSHOT</version> <configuration> - <description>kune free/open/libre collaboration - platform</description> <maintainer>Kune Development Team - <[email protected]></maintainer> - <section>web</section> <priority>optional</priority> - <architecture>all</architecture> </configuration> <executions> - <execution> <goals> <goal>deb</goal> </goals> </execution> - </executions> </plugin> - --> + <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId> + <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre + collaboration platform</description> <maintainer>Kune Development Team <[email protected]></maintainer> + <section>web</section> <priority>optional</priority> <architecture>all</architecture> + </configuration> <executions> <execution> <goals> <goal>deb</goal> </goals> + </execution> </executions> </plugin> --> <plugin> <groupId>org.liquibase</groupId> <artifactId>liquibase-plugin</artifactId> @@ -641,11 +632,8 @@ <password>db4kune</password> <verbose>true</verbose> </configuration> - <!-- - <configuration> <verbose>true</verbose> <propertiesFile> - src/main/resources/db/liquibase.properties - </propertiesFile> </configuration> - --> + <!-- <configuration> <verbose>true</verbose> <propertiesFile> + src/main/resources/db/liquibase.properties </propertiesFile> </configuration> --> <goals> <goal>update</goal> </goals> @@ -684,13 +672,9 @@ <include>**/LabelWrapper*.**</include> <include>**/KuneUiUtils.**</include> <include>**/View.**</include> - <!-- - <include>**/platf/**</include> - <include>**/platf/client/extend/**</include> - <include>**/platf/client/*java</include> - <include>**/platf/client/app/**</include> - <include>**/platf/client/dispatch/**</include> - --> + <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include> + <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include> + <include>**/platf/client/dispatch/**</include> --> </includes> </configuration> </execution> @@ -709,33 +693,31 @@ </execution> </executions> </plugin> - <!-- <plugin>--> - <!-- <groupId>org.codehaus.mojo</groupId>--> - <!-- <artifactId>selenium-maven-plugin</artifactId>--> - <!-- <configuration>--> - <!-- <port>4441</port>--> - <!-- </configuration>--> - <!-- <executions>--> - <!-- <execution>--> - <!-- <phase>pre-integration-test</phase>--> - <!-- <goals>--> - <!-- <goal>start-server</goal>--> - <!-- </goals>--> - <!-- <configuration>--> - <!-- <background>true</background>--> - <!-- </configuration>--> - <!-- </execution>--> - <!-- </executions>--> - <!-- </plugin>--> + <!-- <plugin> --> + <!-- <groupId>org.codehaus.mojo</groupId> --> + <!-- <artifactId>selenium-maven-plugin</artifactId> --> + <!-- <configuration> --> + <!-- <port>4441</port> --> + <!-- </configuration> --> + <!-- <executions> --> + <!-- <execution> --> + <!-- <phase>pre-integration-test</phase> --> + <!-- <goals> --> + <!-- <goal>start-server</goal> --> + <!-- </goals> --> + <!-- <configuration> --> + <!-- <background>true</background> --> + <!-- </configuration> --> + <!-- </execution> --> + <!-- </executions> --> + <!-- </plugin> --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> - <!-- - Skip the normal tests, we'll run them in the - integration-test phase - --> + <!-- Skip the normal tests, we'll run them in the integration-test + phase --> <skip>true</skip> </configuration> <executions> @@ -750,15 +732,12 @@ </execution> </executions> </plugin> - <!-- - <plugin> <artifactId>maven-clean-plugin</artifactId> - <version>2.2</version> <configuration> <filesets> <fileset> - <directory>src/main/webapp/gwt/</directory> <includes> - <include>**/org.ourproject.kune.app.Kune*</include> - <followSymlinks>false</followSymlinks> </includes> </fileset> - </filesets> </configuration> </plugin> - --> + <!-- <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.2</version> + <configuration> <filesets> <fileset> <directory>src/main/webapp/gwt/</directory> + <includes> <include>**/org.ourproject.kune.app.Kune*</include> <followSymlinks>false</followSymlinks> + </includes> </fileset> </filesets> </configuration> </plugin> --> </plugins> + <!-- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> --> <outputDirectory>war/WEB-INF/classes</outputDirectory> <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> <resources> @@ -799,20 +778,6 @@ <artifactId>cobertura-maven-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name> net.sourceforge.cobertura.datafile </name> - <value> - ${project.reporting.directory}/cobertura/cobertura.ser </value> - </property> - </systemProperties> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jdepend-maven-plugin</artifactId> </plugin> @@ -822,4 +787,30 @@ </plugin> </plugins> </reporting> -</project> \ No newline at end of file + <profiles> + <profile> + <!-- Activate only when within eclipse --> + <id>m2eclipse</id> + <activation> + <property> + <name>!m2e.version</name> + </property> + </activation> + <!-- GWT SDK is provided by GWT SDK Classpath Container --> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwtVersion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwtVersion}</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> +</project> Modified: trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml =================================================================== --- trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" - "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <!-- --> <!-- Copyright 2009 Google Inc. --> <!-- Licensed under the Apache License, Version 2.0 (the "License"); you --> @@ -21,4 +19,5 @@ --> <script src="wave_embed.js"/> + <source path="client" /> </module> Modified: trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java =================================================================== --- trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,8 +1,8 @@ package com.google.gwt.wave.client; import com.google.gwt.core.client.GWT; -import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; +import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.user.client.Element; import com.google.gwt.wave.client.event.HasWaveLoadHandlers; import com.google.gwt.wave.client.event.WaveLoadEvent; @@ -44,7 +44,6 @@ }-*/; // Called from JSNI - @SuppressWarnings("unused") private static void fireWaveLoadEvent(final HasWaveLoadHandlers source, final String waveId) { final UncaughtExceptionHandler ueh = GWT.getUncaughtExceptionHandler(); final WaveLoadEvent event = new WaveLoadEvent(waveId); Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,66 +1,50 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module rename-to="ws"> - <inherits name="com.google.gwt.i18n.I18N" /> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.resources.Resources" /> - - <!-- for automated testing (see UIObject.ensureDebugId()) --> - <inherits name="com.google.gwt.user.Debug"/> - - <!-- http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/4d38c... --> - <set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" /> - - <inherits name="com.calclab.suco.Suco" /> - - <inherits name="org.ourproject.kune.platf.KunePlatform" /> - <inherits name="org.ourproject.kune.docs.KuneDocs" /> - <inherits name="org.ourproject.kune.blogs.KuneBlogs" /> - <inherits name="org.ourproject.kune.wiki.KuneWiki" /> - <inherits name="org.ourproject.kune.chat.KuneChat" /> - <inherits name="org.ourproject.kune.gallery.KuneGallery" /> - - - <inherits name="org.xwiki.gwt.dom.DOM" /> - <inherits name="org.cobogw.gwt.user.User" /> - - <!-- gwt-ext --> - <inherits name="com.gwtext.GwtExt" /> - <script src="js/ext/adapter/ext/ext-base.js" /> - <script src="js/ext/ext-all.js" /> - - <inherits name="com.gwtextux.GwtExtUx" /> - <inherits name="com.gwtextux.UploadDialog"/> - <inherits name="com.gwtextux.ToastWindow"/> - <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> - <stylesheet src="js/UploadDialog/css/Ext.ux.UploadDialog.css" /> - <script src="js/ext-ux-all-min.js" /> - - <!-- kune css --> - <stylesheet src="css/all.css" /> - - <inherits name="com.allen_sauer.gwt.log.gwt-log" /> - <extend-property name="log_level" values="DEBUG" /> - <set-property name="log_level" value="DEBUG" /> - <set-property name="log_DivLogger" value="DISABLED" /> - <set-property name="log_FirebugLogger" value="ENABLED" /> - <!-- - Inspired by Apache log4j PatternLayout: - http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.h... - --> - <set-configuration-property name="log_pattern" value="%d [%-5p] %m%n" /> - - <!-- - <extend-property name="locale" values="es" /> - <extend-property name="locale" values="ar" /> - --> - - <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> - - <!-- <set-property name="user.agent" value="gecko" /> --> - - <inherits name="com.google.gwt.wave.Wave" /> - - <!-- Specify the app entry point class. --> - <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" /> - -</module> + <inherits name="com.google.gwt.i18n.I18N" /> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.google.gwt.resources.Resources" /> + <!-- for automated testing (see UIObject.ensureDebugId()) --> + <inherits name="com.google.gwt.user.Debug" /> + <!-- http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/4d38c... --> + <set-property name="gwt.suppressNonStaticFinalFieldWarnings" + value="true" /> + <inherits name="com.calclab.suco.Suco" /> + <inherits name="org.ourproject.kune.platf.KunePlatform" /> + <inherits name="org.ourproject.kune.docs.KuneDocs" /> + <inherits name="org.ourproject.kune.blogs.KuneBlogs" /> + <inherits name="org.ourproject.kune.wiki.KuneWiki" /> + <inherits name="org.ourproject.kune.chat.KuneChat" /> + <inherits name="org.ourproject.kune.gallery.KuneGallery" /> + <inherits name="org.xwiki.gwt.dom.DOM" /> + <inherits name="org.cobogw.gwt.user.User" /> + <!-- gwt-ext --> + <inherits name="com.gwtext.GwtExt" /> + <script src="js/ext/adapter/ext/ext-base.js" /> + <script src="js/ext/ext-all.js" /> + <inherits name="com.gwtextux.GwtExtUx" /> + <inherits name="com.gwtextux.UploadDialog" /> + <inherits name="com.gwtextux.ToastWindow" /> + <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> + <stylesheet src="js/UploadDialog/css/Ext.ux.UploadDialog.css" /> + <script src="js/ext-ux-all-min.js" /> + <!-- kune css --> + <stylesheet src="css/all.css" /> + <inherits name="com.allen_sauer.gwt.log.gwt-log" /> + <extend-property name="log_level" values="DEBUG" /> + <set-property name="log_level" value="DEBUG" /> + <set-property name="log_DivLogger" value="DISABLED" /> + <set-property name="log_FirebugLogger" value="ENABLED" /> + <!-- Inspired by Apache log4j PatternLayout: http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.h... --> + <set-configuration-property name="log_pattern" + value="%d [%-5p] %m%n" /> + <!-- <extend-property name="locale" values="es" /> <extend-property name="locale" + values="ar" /> --> + <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> + <set-property name="user.agent" value="gecko1_8" /> + <inherits name="com.google.gwt.wave.Wave" /> + <!-- Specify the app entry point class. --> + <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" /> + <!-- excluding test sources for this module workaround for open issue 4454 + see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 --> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -52,10 +52,12 @@ // At the moment, in runtime: Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); - Loader.install(new RegistryModule(), new DocumentClientModule(), new BlogClientModule(), - new WikiClientModule(), new GalleryClientModule(), new EmiteUIModule(), new ChatClientModule(), - new WorkspaceModule(), new PlatformModule()); +// Loader.install(new RegistryModule(), new DocumentClientModule(), new BlogClientModule(), +// new WikiClientModule(), new GalleryClientModule(), new EmiteUIModule(), new ChatClientModule(), +// new WorkspaceModule(), new PlatformModule()); + Loader.install(new RegistryModule(), new PlatformModule()); + // We install our HelloWorldModule Loader.install(new HelloWorldModule()); } Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2010-12-07 22:38:26 UTC (rev 1158) @@ -33,7 +33,7 @@ -moz-opacity: 0.2; opacity: 0.2; } -*/.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.kune-Content-Main blockquote{border:1px dashed #DDD;padding:10px;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; +*/.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;cursor:hand;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.kune-Content-Main blockquote{border:1px dashed #DDD;padding:10px;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2; padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette-popup{z-index:9999!important;background-color:#FFF;border:1px solid gray;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:transparent none repeat scroll 0 50%;}.k-blank-toolbar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:1px;color:#B3B3B3;background:transparent;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:transparent;border-left-width:5px;border-bottom-color:transparent;border-bottom-width:5px;}.k-entitytextlogo-border{border:2px solid #F2F2F2;}.k-entitytextlogo-no-border{border:none;}.k-entitytextlogo{height:60px;margin:0 0 4px;overflow:hidden;width:468px;}.k-entitytextlogo table{vertical-align:middle;}.k-elogo-l-l{font-size:272%;}.k-elogo-l-m{font-size:167%;}.k-elogo-l-s{font-size:108%;}.k-entitytextlogo .gwt-Label{font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-elogo-plink{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-elogop-expand{background-color:transparent;}.k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split,.k-entity-green .x-layout-collapsed{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split,.k-entity-blue .x-layout-collapsed{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split,.k-entity-grey .x-layout-collapsed{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split,.k-entity-purple .x-layout-collapsed{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split,.k-entity-red .x-layout-collapsed{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split,.k-entityworkspace .x-layout-collapsed{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split,.k-entityworkspace-default .x-layout-collapsed{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split,.k-entityworkspace-green .x-layout-collapsed{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split,.k-entityworkspace-blue .x-layout-collapsed{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split,.k-entityworkspace-grey .x-layout-collapsed{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split,.k-entityworkspace-purple .x-layout-collapsed{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split,.k-entityworkspace-red .x-layout-collapsed{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:5px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-content{background:#FFF;}.k-entity-bottom div{/* line-height: 24px; */color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others *//* .x-tree-node a span, .x-dd-drag-ghost a span { Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -19,9 +19,6 @@ */ package org.ourproject.kune.app.server; -import org.ourproject.kune.app.server.wave.WaveContainerListener; -import org.ourproject.kune.app.server.wave.WaveInterceptorModule; -import org.ourproject.kune.app.server.wave.WavePropertiesParser; import org.ourproject.kune.blogs.server.BlogServerModule; import org.ourproject.kune.chat.server.ChatServerModule; import org.ourproject.kune.docs.server.DocumentServerModule; @@ -52,8 +49,6 @@ import org.ourproject.kune.rack.filters.RedirectFilter; import org.ourproject.kune.rack.filters.rest.RESTServicesModule; import org.ourproject.kune.wiki.server.WikiServerModule; -import org.waveprotocol.wave.examples.fedone.FlagSettings; -import org.waveprotocol.wave.examples.fedone.ServerModule; import com.google.inject.AbstractModule; import com.google.inject.Module; @@ -82,7 +77,7 @@ if (sessionScope != null) { bindScope(SessionScoped.class, sessionScope); } - bind(WavePropertiesParser.class).asEagerSingleton(); + // bind(WavePropertiesParser.class).asEagerSingleton(); } }; } @@ -92,7 +87,7 @@ installGuiceModules(builder); builder.add(KuneContainerListener.class); - builder.add(WaveContainerListener.class); + // builder.add(WaveContainerListener.class); builder.exclude("/http-bind.*"); builder.exclude("/public/.*"); @@ -129,9 +124,9 @@ builder.use(new GalleryServerModule()); builder.use(new RESTServicesModule()); builder.use(configModule); - builder.use(WavePropertiesParser.parseFlags(FlagSettings.class)); - builder.use(new WaveInterceptorModule()); - builder.use(new ServerModule()); + // builder.use(WavePropertiesParser.parseFlags(FlagSettings.class)); + // builder.use(new WaveInterceptorModule()); + // builder.use(new ServerModule()); } } Modified: trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,6 +1,7 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> + <source path="client" /> </module> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -67,10 +67,10 @@ private final WorkspaceSkeleton wskel; private ToolbarButton traybarButton; private final Provider<EmiteUIDialog> emiteUIProvider; - private final Provider<FileDownloadUtils> downloadUtils; private Collection<RosterItem> roster; private final Event0 onRosterChanged; private final KeyStroke shortcut; + private final Provider<FileDownloadUtils> downloadUtils; public ChatEngineDefault(final I18nTranslationService i18n, final WorkspaceSkeleton wskel, final Application application, final Session session, final Provider<EmiteUIDialog> emiteUIProvider, Modified: trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,37 +1,40 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> - <!-- Inherit the core Web Toolkit stuff. --> + <!-- Inherit the core Web Toolkit stuff. --> <inherits name='com.google.gwt.user.User' /> <inherits name='com.google.gwt.i18n.I18N' /> <inherits name="com.google.gwt.user.UserAgent" /> <inherits name="org.ourproject.kune.platf.RichText" /> + <inherits name="org.ourproject.kune.workspace.KuneWorkspace" /> <inherits name="com.google.gwt.resources.Resources" /> - <public path="public" /> <inherits name="com.google.gwt.user.UserAgent" /> <!-- RTE css inject --> <!-- See gwt-user: com/google/gwt/user/RichText.gwt.xml --> - <!-- IE-specific implementation --> <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplIE6"> <when-type-is class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <when-property-is name="user.agent" value="ie6" /> - <when-property-is name="user.agent" value="ie8" /> + <any> + <when-property-is name="user.agent" value="ie6" /> + <when-property-is name="user.agent" value="ie8" /> + </any> </replace-with> - <!-- Mozilla-specific implementation --> <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplMozilla"> <when-type-is class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <any> - <when-property-is name="user.agent" value="gecko1_8" /> - <when-property-is name="user.agent" value="gecko" /> - </any> + <when-property-is name="user.agent" value="gecko1_8" /> </replace-with> - + <!-- Old Mozilla-specific implementation --> + <replace-with + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplOldMozilla"> + <when-type-is + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> + <when-property-is name="user.agent" value="gecko" /> + </replace-with> <!-- Safari-specific implementation --> <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplSafari"> @@ -41,7 +44,6 @@ <when-property-is name="user.agent" value="safari" /> </any> </replace-with> - <!-- Opera-specific implementation --> <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplOpera"> @@ -51,4 +53,10 @@ <when-property-is name="user.agent" value="opera" /> </any> </replace-with> + <inherits name="com.calclab.suco.Suco" /> + <inherits name="com.gwtext.GwtExt" /> + <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> + <inherits name="org.xwiki.gwt.dom.DOM" /> + <inherits name="com.calclab.suco.Suco"/> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> </module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,4 +1,4 @@ -<!-- --> +<!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/src/gwt-module.dtd"> <!-- Copyright 2008 Google Inc. --> <!-- Licensed under the Apache License, Version 2.0 (the "License"); you --> <!-- may not use this file except in compliance with the License. You may --> Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -6,8 +6,6 @@ import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.resources.client.ImageResource; - public class BaseAction extends AbstractAction { public BaseAction(final String text, final String tooltip) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -65,7 +65,7 @@ return formatDateWithLocale(date, false); } - public String formatDateWithLocale(final Date date, boolean shortFormat) { + public String formatDateWithLocale(final Date date, final boolean shortFormat) { String dateFormat = shortFormat ? currentLang.getDateFormatShort() : currentLang.getDateFormat(); final DateTimeFormat fmt; @@ -75,13 +75,13 @@ if (shortFormat) { fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); } else { - String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date); - String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]"; + final String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date); + final String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]"; dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'"); fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); } } - String dateFormated = fmt.format(date); + final String dateFormated = fmt.format(date); return dateFormated; } @@ -100,7 +100,7 @@ final String locale = loc.getParameter("locale"); i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed"); + Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); } public void onSuccess(final I18nLanguageDTO result) { @@ -109,7 +109,7 @@ session.setCurrentLanguage(currentLang); i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed"); + Log.error("Workspace adaptation to your language failed:" + caught.getMessage()); } public void onSuccess(final HashMap<String, String> result) { @@ -198,33 +198,33 @@ */ private native void changeLocale(String newLocale) /*-{ - // Uncomment the "debugger;" line to see how to set debug statements in JSNI code - // When in web mode, if your browser has a JavaScript debugger attached, it will - // launch at this point in the code (when the user changes locale through the menu system). - // debugger; + // Uncomment the "debugger;" line to see how to set debug statements in JSNI code + // When in web mode, if your browser has a JavaScript debugger attached, it will + // launch at this point in the code (when the user changes locale through the menu system). + // debugger; - // Get the current location - var currLocation = $wnd.location.toString(); - // Get rid of any GWT History tokens that might be present - var noHistoryCurrLocArray = currLocation.split("#"); - var noHistoryCurrLoc = noHistoryCurrLocArray[0]; - var currHistory = noHistoryCurrLocArray[1]; - // Get rid of any locale string - var locArray = noHistoryCurrLoc.split("?"); - // Build the new href location and then send the browser there. - // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; - $wnd.location.href = locArray[0]+"?locale="+newLocale + // Get the current location + var currLocation = $wnd.location.toString(); + // Get rid of any GWT History tokens that might be present + var noHistoryCurrLocArray = currLocation.split("#"); + var noHistoryCurrLoc = noHistoryCurrLocArray[0]; + var currHistory = noHistoryCurrLocArray[1]; + // Get rid of any locale string + var locArray = noHistoryCurrLoc.split("?"); + // Build the new href location and then send the browser there. + // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; + $wnd.location.href = locArray[0]+"?locale="+newLocale - // extjs part: - // commented because the error: "Ext is not defined" - // we have to try other way - // var head = document.getElementsByTagName("head")[0]; - // var script = document.createElement('script'); - // script.id = 'localScript'; - // script.type = 'text/javascript'; - // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; - // head.appendChild(script); - }-*/; + // extjs part: + // commented because the error: "Ext is not defined" + // we have to try other way + // var head = document.getElementsByTagName("head")[0]; + // var script = document.createElement('script'); + // script.id = 'localScript'; + // script.type = 'text/javascript'; + // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; + // head.appendChild(script); + }-*/; private void fireI18nLanguageChange() { if (i18nChangeListeners != null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -110,7 +110,6 @@ import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.StyleInjector; public class PlatformModule extends AbstractExtendedModule { @@ -244,7 +243,7 @@ @Override public ImgResources create() { final ImgResources instance = GWT.create(ImgResources.class); - StyleInjector.injectStylesheet(instance.css().getText()); + instance.css().ensureInjected(); return instance; } }); @@ -253,7 +252,7 @@ @Override public RTEImgResources create() { final RTEImgResources instance = GWT.create(RTEImgResources.class); - StyleInjector.injectStylesheet(instance.css().getText()); + instance.css().ensureInjected(); return instance; } }); @@ -466,6 +465,12 @@ } }); + register(ApplicationComponentGroup.class, new Factory<GlobalShortcutRegister>(GlobalShortcutRegister.class) { + @Override + public GlobalShortcutRegister create() { + return new GlobalShortcutRegister(); + } + }); i(ApplicationComponentGroup.class).createAll(); i(ToolGroup.class).createAll(); i(Application.class).start(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -13,15 +13,15 @@ public class ShortcutRegister { - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private final HashMap<ShortcutDescriptor, ActionItem> shortcuts; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public ShortcutRegister() { shortcuts = new HashMap<ShortcutDescriptor, ActionItem>(); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes" }) public ActionItem get(final NativeEvent event) { final int modifiers = KeyStroke.getKeyboardModifiers(event); final boolean fnKey = (event.getKeyCode() >= Keyboard.KEY_F2 && event.getKeyCode() <= Keyboard.KEY_F12); @@ -32,7 +32,7 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public ActionItem get(final ShortcutDescriptor shortcut) { final ActionItem actionItem = shortcuts.get(shortcut); if (actionItem != null) { @@ -41,7 +41,7 @@ return actionItem; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public void put(final ShortcutDescriptor shortcut, final ActionItem actionItem) { if (shortcuts.get(shortcut) != null) { Log.warn("Shortcut" + shortcut + " already registered"); @@ -49,7 +49,7 @@ shortcuts.put(shortcut, actionItem); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes", "unchecked" }) public void put(final ShortcutDescriptor shortcut, final Listener0 listener) { final ActionDescriptor descriptor = new ActionDescriptor(AccessRolDTO.Viewer, new Listener0() { public void onEvent() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -17,10 +17,14 @@ import org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl; import org.xwiki.gwt.dom.client.Document; +import org.xwiki.gwt.dom.client.IFrameElement; +import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.IFrameElement; -import com.google.gwt.event.dom.client.HasAllMouseHandlers; +import com.google.gwt.event.logical.shared.HasInitializeHandlers; +import com.google.gwt.event.logical.shared.InitializeEvent; +import com.google.gwt.event.logical.shared.InitializeHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.HasHTML; @@ -35,20 +39,35 @@ * functionality will return <code>null</code> for the latter. * * <p> - * <img class='gallery' src='RichTextArea.png'/> + * <img class='gallery' src='doc-files/RichTextArea.png'/> * </p> * - * <h3>CSS Style Rules</h3> <ul class="css"> <li>.gwt-RichTextArea { }</li> - * </ul> + * <h3>CSS Style Rules</h3> + * <dl> + * <dt>.gwt-RichTextArea</dt> + * <dd>Applied to the rich text element.</dd> + * </dl> */ -public class RichTextArea extends FocusWidget implements HasHTML, HasAllMouseHandlers { +public class RichTextArea extends FocusWidget implements HasHTML, HasInitializeHandlers { /** + * <p> * This interface is used to access basic formatting options, when * available. If the implementation supports basic formatting, then * {@link RichTextArea#getBasicFormatter()} will return an instance of this * class. + * </p> + * <p> + * The formatter will format the user selected text in the + * {@link RichTextArea}. As a result, it will only work reliably if the + * {@link RichTextArea} is attached, visible to on the page, and has been + * focused at least once. If you just want to initialize the content of the + * {@link RichTextArea}, use {@link RichTextArea#setHTML(String)} instead. + * </p> + * + * @deprecated use {@link RichTextArea.Formatter} instead */ + @Deprecated public interface BasicFormatter { /** @@ -172,11 +191,23 @@ } /** + * <p> * This interface is used to access full formatting options, when available. * If the implementation supports full formatting, then * {@link RichTextArea#getExtendedFormatter()} will return an instance of * this class. + * </p> + * <p> + * The formatter will format the user selected text in the + * {@link RichTextArea}. As a result, it will only work reliably if the + * {@link RichTextArea} is attached, visible to on the page, and has been + * focused at least once. If you just want to initialize the content of the + * {@link RichTextArea}, use {@link RichTextArea#setHTML(String)} instead. + * </p> + * + * @deprecated use {@link RichTextArea.Formatter} instead */ + @Deprecated public interface ExtendedFormatter extends BasicFormatter { void copy(); @@ -202,11 +233,6 @@ void insertHorizontalRule(); /** - * Inserts html - */ - void insertHtml(String html); - - /** * Inserts an image element. * * @param url @@ -270,14 +296,14 @@ public static class FontSize { /** - * Represents an XX-Small font. + * Represents a Large font. */ - public static final FontSize XX_SMALL = new FontSize(1); + public static final FontSize LARGE = new FontSize(5); /** - * Represents an X-Small font. + * Represents a Medium font. */ - public static final FontSize X_SMALL = new FontSize(2); + public static final FontSize MEDIUM = new FontSize(4); /** * Represents a Small font. @@ -285,24 +311,24 @@ public static final FontSize SMALL = new FontSize(3); /** - * Represents a Medium font. + * Represents an X-Large font. */ - public static final FontSize MEDIUM = new FontSize(4); + public static final FontSize X_LARGE = new FontSize(6); /** - * Represents a Large font. + * Represents an X-Small font. */ - public static final FontSize LARGE = new FontSize(5); + public static final FontSize X_SMALL = new FontSize(2); /** - * Represents an X-Large font. + * Represents an XX-Large font. */ - public static final FontSize X_LARGE = new FontSize(6); + public static final FontSize XX_LARGE = new FontSize(7); /** - * Represents an XX-Large font. + * Represents an XX-Small font. */ - public static final FontSize XX_LARGE = new FontSize(7); + public static final FontSize XX_SMALL = new FontSize(1); private final int number; @@ -326,6 +352,223 @@ } /** + * <p> + * This interface is used to access full formatting options, when available. + * If the implementation supports full formatting, then + * {@link RichTextArea#getFormatter()} will return an instance of this + * class. + * </p> + * <p> + * The formatter will format the user selected text in the + * {@link RichTextArea}. As a result, it will only work reliably if the + * {@link RichTextArea} is attached, visible to on the page, and has been + * focused at least once. If you just want to initialize the content of the + * {@link RichTextArea}, use {@link RichTextArea#setHTML(String)} instead. + * </p> + */ + public interface Formatter extends ExtendedFormatter { + /** + * Creates a link to the supplied URL. + * + * @param url + * the URL to be linked to + */ + void createLink(String url); + + /** + * Gets the background color. + * + * @return the background color + */ + String getBackColor(); + + /** + * Gets the foreground color. + * + * @return the foreground color + */ + String getForeColor(); + + /** + * Inserts a horizontal rule. + */ + void insertHorizontalRule(); + + /** + * Inserts generic html. + * + * @param html + * the HTML to insert + */ + void insertHTML(String html); + + /** + * Inserts an image element. + * + * @param url + * the url of the image to be inserted + */ + void insertImage(String url); + + /** + * Starts an numbered list. Indentation will create nested items. + */ + void insertOrderedList(); + + /** + * Starts an bulleted list. Indentation will create nested items. + */ + void insertUnorderedList(); + + /** + * Is the current region bold? + * + * @return true if the current region is bold + */ + boolean isBold(); + + /** + * Is the current region italic? + * + * @return true if the current region is italic + */ + boolean isItalic(); + + /** + * Is the current region strikethrough? + * + * @return true if the current region is strikethrough + */ + boolean isStrikethrough(); + + /** + * Is the current region subscript? + * + * @return true if the current region is subscript + */ + boolean isSubscript(); + + /** + * Is the current region superscript? + * + * @return true if the current region is superscript + */ + boolean isSuperscript(); + + /** + * Is the current region underlined? + * + * @return true if the current region is underlined + */ + boolean isUnderlined(); + + /** + * Left indent. + */ + void leftIndent(); + + /** + * Redo an action that was just undone. + */ + void redo(); + + /** + * Removes all formatting on the selected text. + */ + void removeFormat(); + + /** + * Removes any link from the selected text. + */ + void removeLink(); + + /** + * Right indent. + */ + void rightIndent(); + + /** + * Selects all the text. + */ + void selectAll(); + + /** + * Sets the background color. + * + * @param color + * the new background color + */ + void setBackColor(String color); + + /** + * Sets the font name. + * + * @param name + * the new font name + */ + void setFontName(String name); + + /** + * Sets the font size. + * + * @param fontSize + * the new font size + */ + void setFontSize(FontSize fontSize); + + /** + * Sets the foreground color. + * + * @param color + * the new foreground color + */ + void setForeColor(String color); + + /** + * Sets the justification. + * + * @param justification + * the new justification + */ + void setJustification(Justification justification); + + /** + * Toggles bold. + */ + void toggleBold(); + + /** + * Toggles italic. + */ + void toggleItalic(); + + /** + * Toggles strikethrough. + */ + void toggleStrikethrough(); + + /** + * Toggles subscript. + */ + void toggleSubscript(); + + /** + * Toggles superscript. + */ + void toggleSuperscript(); + + /** + * Toggles underline. + */ + void toggleUnderline(); + + /** + * Undo the last action. + */ + void undo(); + } + + /** * Justification enumeration. The three values are <code>left</code>, * <code>right</code>, <code>center</code>. */ @@ -337,6 +580,11 @@ public static final Justification CENTER = new Justification("Center"); /** + * Full justification. + */ + public static final Justification FULL = new Justification("Full"); + + /** * Left justification. */ public static final Justification LEFT = new Justification("Left"); @@ -366,18 +614,24 @@ public RichTextArea() { setElement(impl.getElement()); setStyleName("gwt-RichTextArea"); + impl.setOwner(this); } + public HandlerRegistration addInitializeHandler(final InitializeHandler handler) { + return addHandler(handler, InitializeEvent.getType()); + } + /** - * Gets the basic rich text formatting interface. + * Gets the basic rich text formatting interface. Note that formatting can + * only be done when the {@link RichTextArea} is attached, visible on the + * page, and has been focused by the user. * * @return <code>null</code> if basic formatting is not supported + * @deprecated use {@link #getFormatter()} instead */ + @Deprecated public BasicFormatter getBasicFormatter() { - if ((impl instanceof BasicFormatter) && (impl.isBasicEditingSupported())) { - return (BasicFormatter) impl; - } - return null; + return getFormatter(); } /** @@ -403,13 +657,28 @@ } /** - * Gets the full rich text formatting interface. + * Gets the full rich text formatting interface. Note that formatting can + * only be done when the {@link RichTextArea} is attached, visible on the + * page, and has been focused by the user. * * @return <code>null</code> if full formatting is not supported + * @deprecated use {@link #getFormatter()} instead */ + @Deprecated public ExtendedFormatter getExtendedFormatter() { - if ((impl instanceof ExtendedFormatter) && (impl.isExtendedEditingSupported())) { - return (ExtendedFormatter) impl; + return getFormatter(); + } + + /** + * Gets the rich text formatting interface. Note that formatting can only be + * done when the {@link RichTextArea} is attached, visible on the page, and + * has been focused by the user. + * + * @return <code>null</code> if full formatting is not supported + */ + public Formatter getFormatter() { + if (impl instanceof Formatter) { + return (Formatter) impl; } return null; } @@ -423,9 +692,20 @@ } @Override + public boolean isEnabled() { + return impl.isEnabled(); + } + + @Override + public void setEnabled(final boolean enabled) { + impl.setEnabled(enabled); + } + + @Override public void setFocus(final boolean focused) { // There are different problems on each browser when you try to focus an // unattached rich text iframe, so just cut it off early. + Log.debug("Focus setted: " + focused); if (isAttached()) { impl.setFocus(focused); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -38,30 +38,30 @@ var _this = this; _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { - return; - } + setTimeout($entry(function() { + if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { + return; + } - // Attempt to set the iframe document's body to 'contentEditable' mode. - // There's no way to know when the body will actually be available, so - // keep trying every so often until it is. - // Note: The body seems to be missing only rarely, so please don't remove - // this retry loop just because it's hard to reproduce. - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - if (!doc.body) { - // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower - // would increase the probability of a user-visible delay. - setTimeout(arguments.callee, 50); - return; - } - var ct = "<html><head><style>@import url('" + $wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - doc.body.contentEditable = true; + // Attempt to set the iframe document's body to 'contentEditable' mode. + // There's no way to know when the body will actually be available, so + // keep trying every so often until it is. + // Note: The body seems to be missing only rarely, so please don't remove + // this retry loop just because it's hard to reproduce. + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + if (!doc.body) { + // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower + // would increase the probability of a user-visible delay. + setTimeout(arguments.callee, 50); + return; + } + var ct = "<html><head><style>@import url('" + $wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + doc.body.contentEditable = true; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1)); }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -32,6 +32,7 @@ * */ public class WrappedRichTextAreaImplMozilla extends RichTextAreaImplMozilla { + boolean isFirstFocus; @Override public native void initElement() /*-{ @@ -39,38 +40,47 @@ // fully loaded. var _this = this; var iframe = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplMozilla::isFirstFocus = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = $entry(function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // patch ccs inject: + // patch ccs inject: - var doc = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document; - head=doc.getElementsByTagName('head')[0]; - link=document.createElement('link'); - link.setAttribute('rel',"stylesheet"); - link.setAttribute('type',"text/css"); - link.setAttribute('href',$wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" ); - head.appendChild(link); + var doc = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document; + head=doc.getElementsByTagName('head')[0]; + link=document.createElement('link'); + link.setAttribute('rel',"stylesheet"); + link.setAttribute('type',"text/css"); + link.setAttribute('href',$wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" ); + head.appendChild(link); - // -- patch + // -- patch - // Send notification that the iframe has finished loading. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Don't set designMode until the RTA is targeted by an event. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for an event gets around this issue. + // + // Note: These events will not conflict with the + // addEventListener('oneventtype', ...) in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.onmouseover = null; + iframe.contentWindow.document.designMode = 'On'; + }; - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - }; - }; + // Issue 1441: we also need to catch the onmouseover event because focus + // occurs after mouse down, so the cursor will not appear until the user + // clicks twice, making the RichTextArea look uneditable. Catching the + // mouseover event allows us to set design mode earlier. The focus event + // is still needed to handle tab selection. + iframe.contentWindow.onmouseover = iframe.contentWindow.onfocus; + + // Send notification that the iframe has finished loading. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }); }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -22,27 +22,25 @@ import org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplOpera; public class WrappedRichTextAreaImplOpera extends RichTextAreaImplOpera { - - @Override public native void initElement() /*-{ // Most browsers don't like setting designMode until slightly _after_ // the iframe becomes attached to the DOM. Any non-zero timeout will do // just fine. var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // patch css inject: - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - var ct = "<html><head><style>@import url('" + $wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - // -- patch + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + setTimeout($entry(function() { + // Turn on design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // patch css inject: + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" +$wnd.location.protocol+ "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }), 1); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -29,21 +29,21 @@ // the iframe becomes attached to the DOM. Any non-zero timeout will do // just fine. var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + setTimeout($entry(function() { + // Turn on design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // patch css inject: - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - var ct = "<html><head><style>@import url('" +$wnd.location.protocol+ "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - // -- patch + // patch css inject: + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" +$wnd.location.protocol+ "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }), 1); }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -16,9 +16,8 @@ import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.RichTextArea; -import org.ourproject.kune.platf.client.ui.rte.RichTextArea.BasicFormatter; -import org.ourproject.kune.platf.client.ui.rte.RichTextArea.ExtendedFormatter; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Formatter; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Justification; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkExecutableUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; @@ -44,8 +43,7 @@ private static final Element NO_ELEMENT = null; private final I18nUITranslationService i18n; - private final BasicFormatter basic; - private final ExtendedFormatter extended; + private final Formatter extended; private final RTEditorPresenter presenter; private final GlobalShortcutRegister globalShortcutReg; private final RTELinkPopup linkCtxMenu; @@ -60,8 +58,7 @@ this.i18n = i18n; this.globalShortcutReg = globalShortcutReg; rta = new RichTextArea(); - basic = rta.getBasicFormatter(); - extended = rta.getExtendedFormatter(); + extended = rta.getFormatter(); topBar = new ComplexToolbar(bindings); sndBar = new ComplexToolbar(bindings); sndBar.setNormalStyle(); @@ -94,7 +91,7 @@ } public boolean canBeBasic() { - return basic != null; + return extended != null; } public boolean canBeExtended() { @@ -209,7 +206,7 @@ } public void insertHtml(final String html) { - extended.insertHtml(html); + extended.insertHTML(html); } public void insertImage(final String url) { @@ -229,7 +226,7 @@ } public boolean isBold() { - return basic.isBold(); + return extended.isBold(); } public boolean isCollapsed() { @@ -241,7 +238,7 @@ } public boolean isItalic() { - return basic.isItalic(); + return extended.isItalic(); } public boolean isLink() { @@ -257,27 +254,27 @@ } public boolean isSubscript() { - return basic.isSubscript(); + return extended.isSubscript(); } public boolean isSuperscript() { - return basic.isSuperscript(); + return extended.isSuperscript(); } public boolean isUnderlined() { - return basic.isUnderlined(); + return extended.isUnderlined(); } public void justifyCenter() { - basic.setJustification(Justification.CENTER); + extended.setJustification(Justification.CENTER); } public void justifyLeft() { - basic.setJustification(Justification.LEFT); + extended.setJustification(Justification.LEFT); } public void justifyRight() { - basic.setJustification(Justification.RIGHT); + extended.setJustification(Justification.RIGHT); } public void leftIndent() { @@ -344,7 +341,7 @@ } public void selectAll() { - basic.selectAll(); + extended.selectAll(); } public void selectLink() { @@ -352,7 +349,7 @@ } public void setBackColor(final String color) { - basic.setBackColor(color); + extended.setBackColor(color); } public void setFocus(final boolean focused) { @@ -360,15 +357,15 @@ } public void setFontName(final String name) { - basic.setFontName(name); + extended.setFontName(name); } public void setFontSize(final FontSize size) { - basic.setFontSize(size); + extended.setFontSize(size); } public void setForeColor(final String color) { - basic.setForeColor(color); + extended.setForeColor(color); } public void setHTML(final String html) { @@ -397,11 +394,11 @@ } public void toggleBold() { - basic.toggleBold(); + extended.toggleBold(); } public void toggleItalic() { - basic.toggleItalic(); + extended.toggleItalic(); } public void toggleStrikethrough() { @@ -409,15 +406,15 @@ } public void toggleSubscript() { - basic.toggleSubscript(); + extended.toggleSubscript(); } public void toggleSuperscript() { - basic.toggleSuperscript(); + extended.toggleSuperscript(); } public void toggleUnderline() { - basic.toggleUnderline(); + extended.toggleUnderline(); } public void undo() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -3,7 +3,6 @@ import com.google.gwt.resources.client.CssResource; public interface RTEImgCssResource extends CssResource { - @ClassName("k-icon-alignleft") String kIconAlignleft(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -3,7 +3,7 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -// @PMD:REVIEWED:TooManyMethods: by vjrj on 27/05/09 0:06 +// @PMD:REVIEWED:TooManyMethods: by vjrj on 27/05/09 0:06 public interface RTEImgResources extends ClientBundle { @Source("alignleft.png") Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,4 +1,4 @@ -@external k-icon-underline,k-icon-superscript,k-icon-subscript,k-icon-film,k-icon-strikeout,k-icon-removeFormat,k-icon-link,k-icon-linkbreak,k-icon-italic,k-icon-incrementindent,k-icon-images,k-icon-hfixedline,k-icon-fontheight,k-icon-fontcolor,k-icon-edithtml,k-icon-defaultnumbering,k-icon-defaultbullet,k-icon-decrementindent,k-icon-charfontname,k-icon-centerpara,k-icon-bold,k-icon-backcolor,k-icon-alignright,k-icon-alignleft,k-icon-specialchars,k-icon-copy,k-icon-cut,k-icon-insertspreadsheet,k-icon-insertsymbol,k-icon-inserttable,k-icon-paste,k-icon-redo,k-icon-save,k-icon-selectall,k-icon-undo; +@external .k-icon-underline,.k-icon-superscript,.k-icon-subscript,.k-icon-film,.k-icon-strikeout,.k-icon-removeFormat,.k-icon-link,.k-icon-linkbreak,.k-icon-italic,.k-icon-incrementindent,.k-icon-images,.k-icon-hfixedline,.k-icon-fontheight,.k-icon-fontcolor,.k-icon-edithtml,.k-icon-defaultnumbering,.k-icon-defaultbullet,.k-icon-decrementindent,.k-icon-charfontname,.k-icon-centerpara,.k-icon-bold,.k-icon-backcolor,.k-icon-alignright,.k-icon-alignleft,.k-icon-specialchars,.k-icon-copy,.k-icon-cut,.k-icon-insertspreadsheet,.k-icon-insertsymbol,.k-icon-inserttable,.k-icon-paste,.k-icon-redo,.k-icon-save,.k-icon-selectall,.k-icon-undo; @sprite div .k-icon-underline { gwt-image: "underline"; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -15,13 +15,17 @@ */ package org.ourproject.kune.platf.client.ui.rte.impl; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea; + +import com.google.gwt.event.logical.shared.HasInitializeHandlers; +import com.google.gwt.event.logical.shared.InitializeEvent; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; /** - * Base class for RichText platform implementations. The default version - * simply creates a text area with no rich text support. + * Base class for RichText platform implementations. The default version simply + * creates a text area with no rich text support. * * This is not currently used by any user-agent, but will provide a * <textarea> fallback in the event a future browser fails to implement @@ -30,9 +34,11 @@ public class RichTextAreaImpl { protected Element elem; + protected HasInitializeHandlers owner; public RichTextAreaImpl() { - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 14:39 + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 14:39 elem = createElement(); } @@ -52,30 +58,43 @@ onElementInitialized(); } - public boolean isBasicEditingSupported() { - return false; + public boolean isEnabled() { + return !elem.getPropertyBoolean("disabled"); } - public boolean isExtendedEditingSupported() { - return false; + public void setEnabled(final boolean enabled) { + elem.setPropertyBoolean("disabled", !enabled); } public native void setFocus(boolean focused) /*-{ - if (focused) { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.focus(); - } else { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.blur(); - } - }-*/; + if (focused) { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.focus(); + } else { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.blur(); + } + }-*/; - public void setHTML(String html) { + public void setHTML(final String html) { DOM.setElementProperty(elem, "value", html); } - public void setText(String text) { + public void setOwner(final HasInitializeHandlers owner) { + this.owner = owner; + } + + public void setText(final String text) { DOM.setElementProperty(elem, "value", text); } + /** + * @deprecated as of GWT 2.1, use {@link #setOwner(HasInitializeHandlers)} + * instead + */ + @Deprecated + public void setWidget(final RichTextArea richTextWidget) { + setOwner(richTextWidget); + } + public void uninitElement() { } @@ -84,11 +103,13 @@ } protected void hookEvents() { - DOM.sinkEvents(elem, Event.MOUSEEVENTS | Event.KEYEVENTS | Event.ONCHANGE - | Event.ONCLICK | Event.FOCUSEVENTS); + DOM.sinkEvents(elem, Event.MOUSEEVENTS | Event.KEYEVENTS | Event.ONCHANGE | Event.ONCLICK | Event.FOCUSEVENTS); } protected void onElementInitialized() { hookEvents(); + if (owner != null) { + InitializeEvent.fire(owner); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -25,106 +25,135 @@ @Override public Element createElement() { - Element elem = super.createElement(); + final Element elem = super.createElement(); DOM.setElementProperty(elem, "src", "javascript:''"); return elem; } @Override public native void initElement() /*-{ - var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; + var _this = this; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); - setTimeout(function() { - if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { - return; - } + setTimeout($entry(function() { + if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { + return; + } - // Attempt to set the iframe document's body to 'contentEditable' mode. - // There's no way to know when the body will actually be available, so - // keep trying every so often until it is. - // Note: The body seems to be missing only rarely, so please don't remove - // this retry loop just because it's hard to reproduce. - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - if (!doc.body) { - // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower - // would increase the probability of a user-visible delay. - setTimeout(arguments.callee, 50); - return; - } - doc.body.contentEditable = true; + // Attempt to set the iframe document's body to 'contentEditable' mode. + // There's no way to know when the body will actually be available, so + // keep trying every so often until it is. + // Note: The body seems to be missing only rarely, so please don't remove + // this retry loop just because it's hard to reproduce. + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + if (!doc.body) { + // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower + // would increase the probability of a user-visible delay. + setTimeout(arguments.callee, 50); + return; + } + doc.body.contentEditable = true; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1)); + }-*/; @Override + public native void insertHTML(String html) /*-{ + try { + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + doc.body.focus(); + var tr = doc.selection.createRange(); + if (tr == null) { + return; + } + if ([email protected]::isOrHasChild(Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/Element;)(doc.body, tr.parentElement())) { + return; + } + tr.pasteHTML(html); + } + catch (e) { + return; + } + }-*/; + + @Override protected native String getTextImpl() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - return elem.contentWindow.document.body.innerText; - }-*/; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + return elem.contentWindow.document.body.innerText; + }-*/; @Override protected native void hookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var body = elem.contentWindow.document.body; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var body = elem.contentWindow.document.body; - var handler = function() { - if (elem.__listener) { - // Weird: this code has the context of the script frame, but we need the - // event from the edit iframe's window. - var evt = elem.contentWindow.event; - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; + var handler = $entry(function() { + if (elem.__listener) { + if (@com.google.gwt.user.client.impl.DOMImpl::isMyListener(Ljava/lang/Object;)(elem.__listener)) { + // Weird: this code has the context of the script frame, but we need the + // event from the edit iframe's window. + var evt = elem.contentWindow.event; + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + } + }); - body.onkeydown = - body.onkeyup = - body.onkeypress = - body.onmousedown = - body.onmouseup = - body.onmousemove = - body.onmouseover = - body.onmouseout = - body.onclick = handler; + body.onkeydown = + body.onkeyup = + body.onkeypress = + body.onmousedown = + body.onmouseup = + body.onmousemove = + body.onmouseover = + body.onmouseout = + body.onclick = handler; - elem.contentWindow.onfocus = - elem.contentWindow.onblur = handler; - }-*/; + elem.contentWindow.onfocus = + elem.contentWindow.onblur = handler; + }-*/; @Override + protected native boolean isEnabledImpl() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + return elem.contentWindow.document.body.contentEditable.toLowerCase() == 'true'; + }-*/; + + @Override + protected native void setEnabledImpl(boolean enabled) /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + elem.contentWindow.document.body.contentEditable = enabled; + }-*/; + + @Override protected native void setTextImpl(String text) /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - elem.contentWindow.document.body.innerText = text; - }-*/; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + elem.contentWindow.document.body.innerText = text; + }-*/; @Override protected native void unhookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var body = elem.contentWindow.document.body; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var body = elem.contentWindow.document.body; - if (body) { - // The body can be undefined in the relatively obscure case that the RTA - // is attached and detached before it has a chance to finish initializing. - body.onkeydown = - body.onkeyup = - body.onkeypress = - body.onmousedown = - body.onmouseup = - body.onmousemove = - body.onmouseover = - body.onmouseout = - body.onclick = null; + if (body) { + // The body can be undefined in the relatively obscure case that the RTA + // is attached and detached before it has a chance to finish initializing. + body.onkeydown = + body.onkeyup = + body.onkeypress = + body.onmousedown = + body.onmouseup = + body.onmousemove = + body.onmouseover = + body.onmouseout = + body.onclick = null; - elem.contentWindow.onfocus = - elem.contentWindow.onblur = null; - } - }-*/; - - @Override - boolean isRichEditingActive(Element elem) { - return true; - } + elem.contentWindow.onfocus = + elem.contentWindow.onblur = null; + } + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -20,39 +20,93 @@ */ public class RichTextAreaImplMozilla extends RichTextAreaImplStandard { + /** + * Indicates that the RichTextArea has never received focus after + * initialization. + */ + boolean isFirstFocus; + @Override public native void initElement() /*-{ - // Mozilla doesn't allow designMode to be set reliably until the iframe is - // fully loaded. - var _this = this; - var iframe = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; + // Mozilla doesn't allow designMode to be set reliably until the iframe is + // fully loaded. + var _this = this; + var iframe = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplMozilla::isFirstFocus = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = $entry(function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // Send notification that the iframe has finished loading. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Don't set designMode until the RTA is targeted by an event. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for an event gets around this issue. + // + // Note: These events will not conflict with the + // addEventListener('oneventtype', ...) in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.onmouseover = null; + iframe.contentWindow.document.designMode = 'On'; + }; - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - }; - }; - }-*/; + // Issue 1441: we also need to catch the onmouseover event because focus + // occurs after mouse down, so the cursor will not appear until the user + // clicks twice, making the RichTextArea look uneditable. Catching the + // mouseover event allows us to set design mode earlier. The focus event + // is still needed to handle tab selection. + iframe.contentWindow.onmouseover = iframe.contentWindow.onfocus; + // Send notification that the iframe has finished loading. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }); + }-*/; + @Override - public void setBackColor(String color) { - // Gecko uses 'BackColor' for the *entire area's* background. 'HiliteColor' + public void setBackColor(final String color) { + // Gecko uses 'BackColor' for the *entire area's* background. + // 'HiliteColor' // does what we actually want. execCommand("HiliteColor", color); } + + /** + * Firefox will not display the caret the first time a RichTextArea is + * programmatically focused, so we need to focus, blur, and refocus the + * RichTextArea. This only needs to be done the first time after the + * RichTextArea is initialized. See issue 3503. + */ + protected native void setFirstFocusImpl() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; + + // Remove event listeners so we don't generate extra focus and blur events. + wnd.removeEventListener('focus', elem.__gwt_focusHandler, true); + wnd.removeEventListener('blur', elem.__gwt_blurHandler, true); + wnd.focus(); + wnd.blur(); + wnd.focus(); + + // Add the event listeners now that we have focus and a caret. + wnd.addEventListener('focus', elem.__gwt_focusHandler, true); + wnd.addEventListener('blur', elem.__gwt_blurHandler, true); + + // Fire a synthetic focus event. We can't move the last call to wnd.focus() + // here because firefox will not fire the focus event reliably. + var evt = document.createEvent('HTMLEvents'); + evt.initEvent('focus', false, false); + wnd.dispatchEvent(evt); + }-*/; + + @Override + protected void setFocusImpl(final boolean focused) { + if (isFirstFocus) { + isFirstFocus = false; + setFirstFocusImpl(); + } else { + super.setFocusImpl(focused); + } + } } Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -0,0 +1,50 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.ourproject.kune.platf.client.ui.rte.impl; + +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.DeferredCommand; + +/** + * Old Mozilla-specific implementation of rich-text editing. + */ +public class RichTextAreaImplOldMozilla extends RichTextAreaImplMozilla { + /** + * The content window cannot be focused immediately after the content window + * has been loaded, so we need to wait for an additional deferred command. + */ + @Override + protected void onElementInitialized() { + DeferredCommand.addCommand(new Command() { + public void execute() { + RichTextAreaImplOldMozilla.super.onElementInitialized(); + } + }); + } + + @Override + protected void setFirstFocusImpl() { + setFocusImpl(true); + } + + @Override + protected void setFocusImpl(boolean focused) { + // Old Mozilla does not support blur on the content window of an iframe. + if (focused) { + super.setFocusImpl(focused); + } + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -28,7 +28,7 @@ } @Override - public native void setFocus(boolean focused) /*-{ + protected native void setFocusImpl(boolean focused) /*-{ // Opera needs the *iframe* focused, not its window. if (focused) { this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.focus(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,12 +1,12 @@ /* * Copyright 2007 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -15,214 +15,86 @@ */ package org.ourproject.kune.platf.client.ui.rte.impl; -import com.google.gwt.user.client.Element; -import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; - /** * Safari rich text platform implementation. */ public class RichTextAreaImplSafari extends RichTextAreaImplStandard { - // @PMD:REVIEWED:VariableNamingConventions: by vjrj on 21/05/09 16:12 - private static final String[] sizeNumberCSSValues = new String[] { - "medium", "xx-small", "x-small", "small", "medium", "large", "x-large", - "xx-large"}; + @Override + public void setBackColor(String color) { + // Webkit uses 'BackColor' for the *entire area's* background. 'HiliteColor' + // does what we actually want. + execCommand("HiliteColor", color); + } - private static int webKitVersion = getWebKitVersion(); + @Override + protected native String getTextImpl() /*-{ + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText; + }-*/; - /** - * WebKit v420 began suppporting full rich text editing. - */ - private static boolean extendedEditingSupported = (webKitVersion >= 420); + @Override + protected native void hookEvents() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - /** - * WebKit v420 changed BackColor to HiliteColor. - */ - private static boolean useHiliteColor = (webKitVersion >= 420); - - /** - * WebKit version up to *and including* 420 require CSS font-size values - * (e.g. 'medium', 'x-large') rather than size numbers. All subsequent - * versions use size numbers like other browsers. - */ - private static boolean oldSchoolSizeValues = (webKitVersion <= 420); - - private static native int getWebKitVersion() /*-{ - var exp = / AppleWebKit\/([\d]+)/; - var result = exp.exec(navigator.userAgent); - if (result) { - var version = parseInt(result[1]); - if (version) { - return version; - } - } - - // Intentionally conservative fallback. - return 0; - }-*/;; - - @Override - public Element createElement() { - return super.createElement(); - } - - @Override - public native boolean isBold() /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.__gwt_isBold; - }-*/; - - @Override - public boolean isExtendedEditingSupported() { - return extendedEditingSupported; - } - - @Override - public native boolean isItalic() /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.__gwt_isItalic; - }-*/; - - @Override - public native boolean isUnderlined() /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.__gwt_isUnderlined; - }-*/; - - @Override - public void setBackColor(String color) { - if (useHiliteColor) { - execCommand("HiliteColor", color); - } else { - super.setBackColor(color); + elem.__gwt_handler = function(evt) { + if (elem.__listener) { + if (@com.google.gwt.user.client.impl.DOMImpl::isMyListener(Ljava/lang/Object;)(elem.__listener)) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); } - } + } + }; - @Override - public native void setFocus(boolean focused) /*-{ - // Safari needs the *iframe* focused, not its window. - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - if (focused) { - elem.focus(); - if (elem.__gwt_restoreSelection) { - elem.__gwt_restoreSelection(); - } - } else { - elem.blur(); - } - }-*/; + wnd.addEventListener('keydown', elem.__gwt_handler, true); + wnd.addEventListener('keyup', elem.__gwt_handler, true); + wnd.addEventListener('keypress', elem.__gwt_handler, true); + wnd.addEventListener('mousedown', elem.__gwt_handler, true); + wnd.addEventListener('mouseup', elem.__gwt_handler, true); + wnd.addEventListener('mousemove', elem.__gwt_handler, true); + wnd.addEventListener('mouseover', elem.__gwt_handler, true); + wnd.addEventListener('mouseout', elem.__gwt_handler, true); + wnd.addEventListener('click', elem.__gwt_handler, true); - @Override - public void setFontSize(FontSize fontSize) { - if (oldSchoolSizeValues) { - // Safari2 only accepts css-style 'small, medium, large, etc' values. - // Setting these doesn't seem to hurt Safari3. - int number = fontSize.getNumber(); - if ((number >= 0) && (number <= 7)) { - execCommand("FontSize", sizeNumberCSSValues[number]); - } - } else { - super.setFontSize(fontSize); - } - } + // Focus/blur event handlers. For some reason, [add|remove]eventListener() + // doesn't work on the iframe element (at least not for focus/blur). Don't + // dispatch through the normal handler method, as some of the querying we do + // there interferes with focus. + wnd.onfocus = function(evt) { + if (elem.__listener) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + }; - @Override - protected native String getTextImpl() /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText; - }-*/; + wnd.onblur = function(evt) { + if (elem.__listener) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + }; + }-*/; - @Override - protected native void hookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; - var doc = wnd.document; + @Override + protected native void setTextImpl(String text) /*-{ + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText = text; + }-*/; - // Create an expando on the element to hold the selection state. - elem.__gwt_selection = { baseOffset:0, extentOffset:0, baseNode:null, - extentNode:null }; + @Override + protected native void unhookEvents() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - // A function for restoring the selection state. - elem.__gwt_restoreSelection = function() { - var sel = elem.__gwt_selection; + wnd.removeEventListener('keydown', elem.__gwt_handler, true); + wnd.removeEventListener('keyup', elem.__gwt_handler, true); + wnd.removeEventListener('keypress', elem.__gwt_handler, true); + wnd.removeEventListener('mousedown', elem.__gwt_handler, true); + wnd.removeEventListener('mouseup', elem.__gwt_handler, true); + wnd.removeEventListener('mousemove', elem.__gwt_handler, true); + wnd.removeEventListener('mouseover', elem.__gwt_handler, true); + wnd.removeEventListener('mouseout', elem.__gwt_handler, true); + wnd.removeEventListener('click', elem.__gwt_handler, true); - // wnd.getSelection is not defined if the iframe isn't attached. - if (wnd.getSelection) { - wnd.getSelection().setBaseAndExtent(sel.baseNode, sel.baseOffset, - sel.extentNode, sel.extentOffset); - } - }; + elem.__gwt_handler = null; - // Generic event dispatcher. Also stores selection state. - elem.__gwt_handler = function(evt) { - // Store the editor's selection state. - var s = wnd.getSelection(); - elem.__gwt_selection = { - baseOffset:s.baseOffset, - extentOffset:s.extentOffset, - - baseNode:s.baseNode, - extentNode:s.extentNode - }; - - // Hang on to bold/italic/underlined states. - elem.__gwt_isBold = doc.queryCommandState('Bold'); - elem.__gwt_isItalic = doc.queryCommandState('Italic'); - elem.__gwt_isUnderlined = doc.queryCommandState('Underline'); - - // Dispatch the event. - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; - - wnd.addEventListener('keydown', elem.__gwt_handler, true); - wnd.addEventListener('keyup', elem.__gwt_handler, true); - wnd.addEventListener('keypress', elem.__gwt_handler, true); - wnd.addEventListener('mousedown', elem.__gwt_handler, true); - wnd.addEventListener('mouseup', elem.__gwt_handler, true); - wnd.addEventListener('mousemove', elem.__gwt_handler, true); - wnd.addEventListener('mouseover', elem.__gwt_handler, true); - wnd.addEventListener('mouseout', elem.__gwt_handler, true); - wnd.addEventListener('click', elem.__gwt_handler, true); - - // Focus/blur event handlers. For some reason, [add|remove]eventListener() - // doesn't work on the iframe element (at least not for focus/blur). Don't - // dispatch through the normal handler method, as some of the querying we do - // there interferes with focus. - elem.onfocus = function(evt) { - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; - - elem.onblur = function(evt) { - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; - }-*/; - - @Override - protected native void setTextImpl(String text) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText = text; - }-*/; - - @Override - protected native void unhookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; - - wnd.removeEventListener('keydown', elem.__gwt_handler, true); - wnd.removeEventListener('keyup', elem.__gwt_handler, true); - wnd.removeEventListener('keypress', elem.__gwt_handler, true); - wnd.removeEventListener('mousedown', elem.__gwt_handler, true); - wnd.removeEventListener('mouseup', elem.__gwt_handler, true); - wnd.removeEventListener('mousemove', elem.__gwt_handler, true); - wnd.removeEventListener('mouseover', elem.__gwt_handler, true); - wnd.removeEventListener('mouseout', elem.__gwt_handler, true); - wnd.removeEventListener('click', elem.__gwt_handler, true); - - elem.__gwt_restoreSelection = null; - elem.__gwt_handler = null; - - elem.onfocus = null; - elem.onblur = null; - }-*/; + elem.onfocus = null; + elem.onblur = null; + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -19,18 +19,27 @@ import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Justification; +import com.google.gwt.core.client.JavaScriptException; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; /** * Basic rich text platform implementation. */ +@SuppressWarnings("deprecation") public abstract class RichTextAreaImplStandard extends RichTextAreaImpl implements RichTextArea.BasicFormatter, - RichTextArea.ExtendedFormatter { + RichTextArea.ExtendedFormatter, RichTextArea.Formatter { + /** + * The message displayed when the formatter is used before the RichTextArea + * is initialized. + */ + private static final String INACTIVE_MESSAGE = "RichTextArea formatters " + + "cannot be used until the RichTextArea is attached and focused."; /** - * Holds a cached copy of any user setHTML/setText actions until the real - * text area is fully initialized. Becomes <code>null</code> after init. + * Holds a cached copy of any user setHTML/setText/setEnabled actions until + * the real text area is fully initialized. Becomes <code>null</code> after + * init. */ private Element beforeInitPlaceholder = DOM.createDiv(); @@ -42,16 +51,26 @@ */ protected boolean initializing; + /** + * Indicates that the text area should be focused as soon as it is loaded. + */ + private boolean isPendingFocus; + + /** + * True when the element has been attached. + */ + private boolean isReady; + public void copy() { execCommand("Copy", null); } @Override public native Element createElement() /*-{ - return $doc.createElement('iframe'); - }-*/; + return $doc.createElement('iframe'); + }-*/; - public void createLink(String url) { + public void createLink(final String url) { execCommand("CreateLink", url); } @@ -83,29 +102,29 @@ @Override public native void initElement() /*-{ - // Most browsers don't like setting designMode until slightly _after_ - // the iframe becomes attached to the DOM. Any non-zero timeout will do - // just fine. - var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; + // Most browsers don't like setting designMode until slightly _after_ + // the iframe becomes attached to the DOM. Any non-zero timeout will do + // just fine. + var _this = this; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + setTimeout($entry(function() { + // Turn on design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }), 1); + }-*/; public void insertHorizontalRule() { execCommand("InsertHorizontalRule", null); } - public void insertHtml(String html) { - execCommand("InsertHtml", html); + public void insertHTML(final String html) { + execCommand("InsertHTML", html); } - public void insertImage(String url) { + public void insertImage(final String url) { execCommand("InsertImage", url); } @@ -117,20 +136,14 @@ execCommand("InsertUnorderedList", null); } - @Override - // @PMD:REVIEWED:EmptyMethodInAbstractClassShouldBeAbstract: by vjrj on 21/05/09 13:58 - public boolean isBasicEditingSupported() { - return true; - } - public boolean isBold() { return queryCommandState("Bold"); } @Override - // @PMD:REVIEWED:EmptyMethodInAbstractClassShouldBeAbstract: by vjrj on 21/05/09 13:58 - public boolean isExtendedEditingSupported() { - return true; + public boolean isEnabled() { + return beforeInitPlaceholder == null ? isEnabledImpl() + : !beforeInitPlaceholder.getPropertyBoolean("disabled"); } public boolean isItalic() { @@ -162,7 +175,7 @@ } public void redo() { - execCommand("Redo", null); + execCommand("Redo", "false"); } public void removeFormat() { @@ -181,33 +194,45 @@ execCommand("SelectAll", null); } - public void setBackColor(String color) { + public void setBackColor(final String color) { execCommand("BackColor", color); } @Override - public native void setFocus(boolean focused) /*-{ - if (focused) { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.focus(); - } else { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.blur(); - } - }-*/; + public void setEnabled(final boolean enabled) { + if (beforeInitPlaceholder == null) { + setEnabledImpl(enabled); + } else { + beforeInitPlaceholder.setPropertyBoolean("disabled", !enabled); + } + } - public void setFontName(String name) { + @Override + public void setFocus(final boolean focused) { + if (initializing) { + // Issue 3503: if we focus before the iframe is in design mode, the + // text + // caret will not appear. + isPendingFocus = focused; + } else { + setFocusImpl(focused); + } + } + + public void setFontName(final String name) { execCommand("FontName", name); } - public void setFontSize(FontSize fontSize) { + public void setFontSize(final FontSize fontSize) { execCommand("FontSize", Integer.toString(fontSize.getNumber())); } - public void setForeColor(String color) { + public void setForeColor(final String color) { execCommand("ForeColor", color); } @Override - public final void setHTML(String html) { + public final void setHTML(final String html) { if (beforeInitPlaceholder == null) { setHTMLImpl(html); } else { @@ -215,9 +240,11 @@ } } - public void setJustification(Justification justification) { + public void setJustification(final Justification justification) { if (justification == Justification.CENTER) { execCommand("JustifyCenter", null); + } else if (justification == Justification.FULL) { + execCommand("JustifyFull", null); } else if (justification == Justification.LEFT) { execCommand("JustifyLeft", null); } else if (justification == Justification.RIGHT) { @@ -226,7 +253,7 @@ } @Override - public final void setText(String text) { + public final void setText(final String text) { if (beforeInitPlaceholder == null) { setTextImpl(text); } else { @@ -259,11 +286,13 @@ } public void undo() { - execCommand("Undo", null); + execCommand("Undo", "false"); } @Override public void uninitElement() { + isReady = false; + // Issue 1897: initElement uses a timeout, so its possible to call this // method after calling initElement, but before the event system is in // place. @@ -275,153 +304,206 @@ // Unhook all custom event handlers when the element is detached. unhookEvents(); - // Recreate the placeholder element and store the iframe's contents in it. - // This is necessary because some browsers will wipe the iframe's contents - // when it is removed from the DOM. - String html = getHTML(); + // Recreate the placeholder element and store the iframe's contents and + // the + // enabled status in it. This is necessary because some browsers will + // wipe + // the iframe's contents when it is removed from the DOM. + final String html = getHTML(); + final boolean enabled = isEnabled(); beforeInitPlaceholder = DOM.createDiv(); DOM.setInnerHTML(beforeInitPlaceholder, html); + setEnabled(enabled); } protected native String getHTMLImpl() /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML; - }-*/; + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML; + }-*/; protected native String getTextImpl() /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent; - }-*/; + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent; + }-*/; @Override protected native void hookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - elem.__gwt_handler = function(evt) { - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; + elem.__gwt_handler = $entry(function(evt) { + if (elem.__listener) { + if (@com.google.gwt.user.client.impl.DOMImpl::isMyListener(Ljava/lang/Object;)(elem.__listener)) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + } + }); - elem.__gwt_focusHandler = function(evt) { - if (elem.__gwt_isFocused) { - return; - } + elem.__gwt_focusHandler = function(evt) { + if (elem.__gwt_isFocused) { + return; + } - elem.__gwt_isFocused = true; - elem.__gwt_handler(evt); - }; + elem.__gwt_isFocused = true; + elem.__gwt_handler(evt); + }; - elem.__gwt_blurHandler = function(evt) { - if (!elem.__gwt_isFocused) { - return; - } + elem.__gwt_blurHandler = function(evt) { + if (!elem.__gwt_isFocused) { + return; + } - elem.__gwt_isFocused = false; - elem.__gwt_handler(evt); - }; + elem.__gwt_isFocused = false; + elem.__gwt_handler(evt); + }; - wnd.addEventListener('keydown', elem.__gwt_handler, true); - wnd.addEventListener('keyup', elem.__gwt_handler, true); - wnd.addEventListener('keypress', elem.__gwt_handler, true); - wnd.addEventListener('mousedown', elem.__gwt_handler, true); - wnd.addEventListener('mouseup', elem.__gwt_handler, true); - wnd.addEventListener('mousemove', elem.__gwt_handler, true); - wnd.addEventListener('mouseover', elem.__gwt_handler, true); - wnd.addEventListener('mouseout', elem.__gwt_handler, true); - wnd.addEventListener('click', elem.__gwt_handler, true); + wnd.addEventListener('keydown', elem.__gwt_handler, true); + wnd.addEventListener('keyup', elem.__gwt_handler, true); + wnd.addEventListener('keypress', elem.__gwt_handler, true); + wnd.addEventListener('mousedown', elem.__gwt_handler, true); + wnd.addEventListener('mouseup', elem.__gwt_handler, true); + wnd.addEventListener('mousemove', elem.__gwt_handler, true); + wnd.addEventListener('mouseover', elem.__gwt_handler, true); + wnd.addEventListener('mouseout', elem.__gwt_handler, true); + wnd.addEventListener('click', elem.__gwt_handler, true); - wnd.addEventListener('focus', elem.__gwt_focusHandler, true); - wnd.addEventListener('blur', elem.__gwt_blurHandler, true); - }-*/; + wnd.addEventListener('focus', elem.__gwt_focusHandler, true); + wnd.addEventListener('blur', elem.__gwt_blurHandler, true); + }-*/; + protected native boolean isEnabledImpl() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + return elem.contentWindow.document.designMode.toUpperCase() == 'ON'; + }-*/; + @Override protected void onElementInitialized() { - // Issue 1897: This method is called after a timeout, during which time the + // Issue 1897: This method is called after a timeout, during which time + // the // element might by detached. if (!initializing) { return; } initializing = false; + isReady = true; - super.onElementInitialized(); - // When the iframe is ready, ensure cached content is set. if (beforeInitPlaceholder != null) { setHTMLImpl(DOM.getInnerHTML(beforeInitPlaceholder)); + setEnabledImpl(isEnabled()); beforeInitPlaceholder = null; } + + super.onElementInitialized(); + + // Focus on the element now that it is initialized + if (isPendingFocus) { + isPendingFocus = false; + setFocus(true); + } } + protected void onElementInitializing() { + initializing = true; + isPendingFocus = false; + } + + protected native void setEnabledImpl(boolean enabled) /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + elem.contentWindow.document.designMode = enabled ? 'On' : 'Off'; + }-*/; + + protected native void setFocusImpl(boolean focused) /*-{ + if (focused) { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.focus(); + } else { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.blur(); + } + }-*/; + protected native void setHTMLImpl(String html) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML = html; - }-*/; + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML = html; + }-*/; protected native void setTextImpl(String text) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent = text; - }-*/; + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent = text; + }-*/; protected native void unhookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - wnd.removeEventListener('keydown', elem.__gwt_handler, true); - wnd.removeEventListener('keyup', elem.__gwt_handler, true); - wnd.removeEventListener('keypress', elem.__gwt_handler, true); - wnd.removeEventListener('mousedown', elem.__gwt_handler, true); - wnd.removeEventListener('mouseup', elem.__gwt_handler, true); - wnd.removeEventListener('mousemove', elem.__gwt_handler, true); - wnd.removeEventListener('mouseover', elem.__gwt_handler, true); - wnd.removeEventListener('mouseout', elem.__gwt_handler, true); - wnd.removeEventListener('click', elem.__gwt_handler, true); + wnd.removeEventListener('keydown', elem.__gwt_handler, true); + wnd.removeEventListener('keyup', elem.__gwt_handler, true); + wnd.removeEventListener('keypress', elem.__gwt_handler, true); + wnd.removeEventListener('mousedown', elem.__gwt_handler, true); + wnd.removeEventListener('mouseup', elem.__gwt_handler, true); + wnd.removeEventListener('mousemove', elem.__gwt_handler, true); + wnd.removeEventListener('mouseover', elem.__gwt_handler, true); + wnd.removeEventListener('mouseout', elem.__gwt_handler, true); + wnd.removeEventListener('click', elem.__gwt_handler, true); - wnd.removeEventListener('focus', elem.__gwt_focusHandler, true); - wnd.removeEventListener('blur', elem.__gwt_blurHandler, true); + wnd.removeEventListener('focus', elem.__gwt_focusHandler, true); + wnd.removeEventListener('blur', elem.__gwt_blurHandler, true); - elem.__gwt_handler = null; - elem.__gwt_focusHandler = null; - elem.__gwt_blurHandler = null; - }-*/; + elem.__gwt_handler = null; + elem.__gwt_focusHandler = null; + elem.__gwt_blurHandler = null; + }-*/; - void execCommand(String cmd, String param) { - if (isRichEditingActive(elem)) { - // When executing a command, focus the iframe first, since some commands + void execCommand(final String cmd, final String param) { + assert isReady : INACTIVE_MESSAGE; + if (isReady) { + // When executing a command, focus the iframe first, since some + // commands // don't take properly when it's not focused. setFocus(true); - execCommandAssumingFocus(cmd, param); + try { + execCommandAssumingFocus(cmd, param); + } catch (final JavaScriptException e) { + // In mozilla, editing throws a JS exception if the iframe is + // *hidden, but attached*. + } } } native void execCommandAssumingFocus(String cmd, String param) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.execCommand(cmd, false, param); - }-*/; + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.execCommand(cmd, false, param); + }-*/; - native boolean isRichEditingActive(Element e) /*-{ - return ((e.contentWindow.document.designMode).toUpperCase()) == 'ON'; - }-*/; - - boolean queryCommandState(String cmd) { - if (isRichEditingActive(elem)) { - // When executing a command, focus the iframe first, since some commands + boolean queryCommandState(final String cmd) { + if (isReady) { + // When executing a command, focus the iframe first, since some + // commands // don't take properly when it's not focused. setFocus(true); - return queryCommandStateAssumingFocus(cmd); - } else { - return false; + try { + return queryCommandStateAssumingFocus(cmd); + } catch (final JavaScriptException e) { + return false; + } } + return false; } native boolean queryCommandStateAssumingFocus(String cmd) /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandState(cmd); - }-*/; + return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandState(cmd); + }-*/; - String queryCommandValue(String cmd) { - // When executing a command, focus the iframe first, since some commands - // don't take properly when it's not focused. - setFocus(true); - return queryCommandValueAssumingFocus(cmd); + String queryCommandValue(final String cmd) { + if (isReady) { + // When executing a command, focus the iframe first, since some + // commands + // don't take properly when it's not focused. + setFocus(true); + try { + return queryCommandValueAssumingFocus(cmd); + } catch (final JavaScriptException e) { + return ""; + } + } + return ""; } native String queryCommandValueAssumingFocus(String cmd) /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandValue(cmd); - }-*/; + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandValue(cmd); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -23,20 +23,19 @@ import com.google.gwt.junit.client.GWTTestCase; /** - * Base class for all WYSIWYG client tests. It returns the name of the module in {@link #getModuleName()} so you don't - * have to do it in each test. + * Base class for all WYSIWYG client tests. It returns the name of the module in + * {@link #getModuleName()} so you don't have to do it in each test. * * @version $Id$ */ -public abstract class AbstractWysiwygClientTest extends GWTTestCase -{ +public abstract class AbstractWysiwygClientTest extends GWTTestCase { /** * {@inheritDoc} * * @see GWTTestCase#getModuleName() */ - public String getModuleName() - { + @Override + public String getModuleName() { return "com.xpn.xwiki.wysiwyg.Wysiwyg"; } @@ -45,11 +44,12 @@ * * @see GWTTestCase#gwtSetUp() */ - protected void gwtSetUp() throws Exception - { + @Override + protected void gwtSetUp() throws Exception { super.gwtSetUp(); - // We have to remove the default body border because it affects the range detection in IE. + // We have to remove the default body border because it affects the + // range detection in IE. Document.get().getBody().getStyle().setProperty("borderStyle", "none"); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -43,7 +43,7 @@ private final MethodInterceptor interceptor; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private final ThreadLocal count = new ThreadLocal() { @Override protected Integer initialValue() { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -28,44 +28,45 @@ private final TagUserContent finder; @Inject - public TagUserContentManagerDefault(Provider<EntityManager> provider, TagManager tagManager, TagUserContent finder) { + public TagUserContentManagerDefault(final Provider<EntityManager> provider, final TagManager tagManager, + final TagUserContent finder) { super(provider, TagUserContent.class); this.provider = provider; this.tagManager = tagManager; this.finder = finder; } - public List<Tag> find(User user, Content content) { + public List<Tag> find(final User user, final Content content) { return finder.findTags(user, content); } - public TagCloudResult getTagCloudResultByGroup(Group group) { + public TagCloudResult getTagCloudResultByGroup(final Group group) { return new TagCloudResult(getSummaryByGroup(group), getMaxCount(group), getMinCount(group)); } - public String getTagsAsString(User user, Content content) { + public String getTagsAsString(final User user, final Content content) { String tagConcatenated = ""; if (user.getId() != null) { // FIXME: User must be persisted (this fails on tests) - List<Tag> tags = find(user, content); - for (Tag tag : tags) { + final List<Tag> tags = find(user, content); + for (final Tag tag : tags) { tagConcatenated += " " + tag.getName(); } } return tagConcatenated.replaceFirst(" ", ""); } - public void remove(User user, Content content) { - for (TagUserContent item : finder.find(user, content)) { + public void remove(final User user, final Content content) { + for (final TagUserContent item : finder.find(user, content)) { provider.get().remove(item); } } - public void setTags(User user, Content content, String tags) { + public void setTags(final User user, final Content content, final String tags) { final ArrayList<String> tagsStripped = TextUtils.splitTags(tags); final ArrayList<Tag> tagList = new ArrayList<Tag>(); - for (String tagString : tagsStripped) { + for (final String tagString : tagsStripped) { Tag tag; try { tag = tagManager.findByTagName(tagString); @@ -78,33 +79,31 @@ } } remove(user, content); - for (Tag tag : tagList) { - TagUserContent tagUserContent = new TagUserContent(tag, user, content); + for (final Tag tag : tagList) { + final TagUserContent tagUserContent = new TagUserContent(tag, user, content); persist(tagUserContent); } } - @SuppressWarnings("unchecked") - private int getMaxCount(Group group) { - Query q = provider.get().createNamedQuery(TagUserContent.TAGSMAXGROUPED); + private int getMaxCount(final Group group) { + final Query q = provider.get().createNamedQuery(TagUserContent.TAGSMAXGROUPED); q.setParameter("group", group); - List resultList = q.getResultList(); + final List resultList = q.getResultList(); return (resultList.size() == 0 ? 0 : ((Long) resultList.get(0)).intValue()); } - @SuppressWarnings("unchecked") - private int getMinCount(Group group) { - Query q = provider.get().createNamedQuery(TagUserContent.TAGSMINGROUPED); + @SuppressWarnings("rawtypes") + private int getMinCount(final Group group) { + final Query q = provider.get().createNamedQuery(TagUserContent.TAGSMINGROUPED); q.setParameter("group", group); - List resultList = q.getResultList(); + final List resultList = q.getResultList(); return (resultList.size() == 0 ? 0 : ((Long) resultList.get(0)).intValue()); } - @SuppressWarnings("unchecked") private List<TagCount> getSummaryByGroup(final Group group) { - Query q = provider.get().createNamedQuery(TagUserContent.TAGSGROUPED); + final Query q = provider.get().createNamedQuery(TagUserContent.TAGSGROUPED); q.setParameter("group", group); - List<TagCount> results = q.getResultList(); + final List<TagCount> results = q.getResultList(); return results; } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -59,7 +59,7 @@ protected abstract void beforeRespond(final HttpServletResponse response, final Writer w) throws IOException; @Override - @SuppressWarnings( { "unchecked", "deprecation" }) + @SuppressWarnings({ "rawtypes", "deprecation" }) protected void doPost(final HttpServletRequest req, final HttpServletResponse response) throws ServletException, IOException { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -39,7 +39,7 @@ add(GroupListMode.NOBODY); } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Object convert(final Object destination, final Object source, final Class destinationClass, final Class sourceClass) { if (source == null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -105,7 +105,7 @@ String translation = null; try { translation = getTranslationWrapper(language, text); - } catch (SessionExpiredException e) { + } catch (final SessionExpiredException e) { } return translation; } Modified: trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,6 +1,17 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> +<!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/src/gwt-module.dtd"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name="com.google.gwt.core.Core" /> - -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name="org.ourproject.kune.chat.KuneChat" /> + <inherits name="com.google.gwt.core.Core" /> + <stylesheet src="js/ext/resources/css/ext-all.css" /> + <script src="js/ext/adapter/ext/ext-base.js" /> + <script src="js/ext/ext-all.js" /> + <inherits name="com.gwtext.GwtExt" /> + <inherits name="com.calclab.suco.Suco" /> + <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> + <inherits name="com.gwtextux.GwtExtUx" /> + <inherits name="com.gwtextux.UploadDialog" /> + <inherits name="com.gwtextux.ToastWindow" /> + <inherits name="com.google.gwt.wave.Wave" /> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -1081,13 +1081,6 @@ } }); - register(ApplicationComponentGroup.class, new Factory<GlobalShortcutRegister>(GlobalShortcutRegister.class) { - @Override - public GlobalShortcutRegister create() { - return new GlobalShortcutRegister(); - } - }); - register(InsertLinkGroup.class, new Factory<InsertLinkLocal>(InsertLinkLocal.class) { @Override public InsertLinkLocal create() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -44,9 +44,10 @@ mainFitPanel = new Panel(); mainFitPanel.setLayout(new FitLayout()); mainFitPanel.setBorder(false); - mainFitPanel.setWidth(150); + // 150 for small screens + mainFitPanel.setWidth(165); - Panel anchorLayoutPanel = new Panel(); + final Panel anchorLayoutPanel = new Panel(); anchorLayoutPanel.setLayout(new AnchorLayout()); anchorLayoutPanel.setBorder(false); @@ -104,8 +105,8 @@ private void openFirstIfActiveNotVisible() { if (accordionLayout.getActiveItem() != null && accordionLayout.getActiveItem().isHidden()) { - for (Component compo : entitySummary.getComponents()) { - Panel panel = (Panel) compo; + for (final Component compo : entitySummary.getComponents()) { + final Panel panel = (Panel) compo; if (panel.isVisible()) { // First visible if (panel.isCollapsed()) { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -20,7 +20,7 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getAttributeNames() { return null; } @@ -58,12 +58,12 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getHeaderNames() { return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getHeaders(final String arg0) { return null; } @@ -84,7 +84,7 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getLocales() { return null; } @@ -105,12 +105,12 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Map getParameterMap() { return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getParameterNames() { return null; } Property changes on: trunk/war/WEB-INF ___________________________________________________________________ Name: svn:ignore - classes test-classes + classes lib/* lib test-classes Name: svn:inore + lib lib/* Deleted: trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar =================================================================== (Binary files differ) Deleted: trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar =================================================================== (Binary files differ) Deleted: trunk/war/WEB-INF/lib/gwt-servlet-2.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar =================================================================== (Binary files differ) Modified: trunk/war/WEB-INF/web.xml =================================================================== --- trunk/war/WEB-INF/web.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/war/WEB-INF/web.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,16 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee +http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + <!-- TODO: Add <servlet> tags for each servlet here. --> + <!-- TODO: Add <servlet-mapping> tags for each <servlet> here. --> + <!-- TODO: Optionally add a <welcome-file-list> tag to display a welcome + file. --> <display-name>ws</display-name> <description>kune workspace</description> - <!-- Default page to serve --> <welcome-file-list> <welcome-file>ws.html</welcome-file> </welcome-file-list> - <context-param> <param-name>jruby.standalone</param-name> <param-value>true</param-value> @@ -29,57 +32,42 @@ <param-name>rails.env</param-name> <param-value>production</param-value> </context-param> - <context-param> <param-name>jruby.max.runtimes</param-name> <param-value>1</param-value> </context-param> - <context-param> <param-name>public.root</param-name> <param-value>/public/</param-value> </context-param> - - <filter> <filter-name>RackFilter</filter-name> - <filter-class>org.jruby.rack.RackFilter - </filter-class> + <filter-class>org.jruby.rack.RackFilter</filter-class> </filter> <filter-mapping> <filter-name>RackFilter</filter-name> <url-pattern>/public/*</url-pattern> </filter-mapping> - <listener> - <listener-class>org.jruby.rack.rails.RailsServletContextListener - </listener-class> + <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class> </listener> - - <filter> <filter-name>rack</filter-name> - <filter-class> - org.ourproject.kune.rack.RackServletFilter - </filter-class> + <filter-class>org.ourproject.kune.rack.RackServletFilter</filter-class> <init-param> - <param-name>org.ourproject.kune.rack.RackModule - </param-name> + <param-name>org.ourproject.kune.rack.RackModule</param-name> <param-value> org.ourproject.kune.app.server.KuneRackModule </param-value> </init-param> </filter> - <filter-mapping> <filter-name>rack</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <servlet> <servlet-name>Proxy</servlet-name> - <servlet-class>de.spieleck.servlets.ProxyServlet - </servlet-class> + <servlet-class>de.spieleck.servlets.ProxyServlet</servlet-class> <init-param> <param-name>remotePath</param-name> <param-value>/http-bind/</param-value> @@ -97,27 +85,83 @@ <servlet-name>Proxy</servlet-name> <url-pattern>/http-bind/</url-pattern> </servlet-mapping> - <servlet> - <servlet-name>remoteLoggerServiceImpl - </servlet-name> - <servlet-class> - com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>remoteLoggerServiceImpl - </servlet-name> - <url-pattern>/ws/gwt-log</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>jUnitHostImpl</servlet-name> - <servlet-class>com.google.gwt.junit.server.JUnitHostImpl - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>jUnitHostImpl</servlet-name> - <url-pattern>/ws/junithost</url-pattern> - </servlet-mapping> - -</web-app> + + <!-- with the new gwt-log remove this --> +<!-- <servlet>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <servlet-class>--> +<!-- com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl</servlet-class>--> +<!-- </servlet>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/ws/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>--> +<!-- </servlet>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/ws/junithost</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/ws/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.blogs.KuneBlogs/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.blogs.KuneBlogs/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.chat.KuneChat/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.chat.KuneChat/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.docs.KuneDocs/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.docs.KuneDocs/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.gallery.KuneGallery/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.gallery.KuneGallery/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.platf.KunePlatform/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.platf.KunePlatform/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.wiki.KuneWiki/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.wiki.KuneWiki/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>jUnitHostImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.workspace.KuneWorkspace/junithost/*</url-pattern>--> +<!-- </servlet-mapping>--> +<!-- <servlet-mapping>--> +<!-- <servlet-name>remoteLoggerServiceImpl</servlet-name>--> +<!-- <url-pattern>/org.ourproject.kune.workspace.KuneWorkspace/gwt-log</url-pattern>--> +<!-- </servlet-mapping>--> +</web-app> \ No newline at end of file