Author: vjrj_ Date: 2011-05-07 20:46:51 +0200 (Sat, 07 May 2011) New Revision: 1358 Added: trunk/img/kune-intro-group.png trunk/img/kune-intro-user.png trunk/img/kune-intro-world.png trunk/src/main/java/cc/kune/core/public/images/kune-anim-g.gif trunk/src/main/java/cc/kune/core/public/images/kune-intro-group.png trunk/src/main/java/cc/kune/core/public/images/kune-intro-user.png trunk/src/main/java/cc/kune/core/public/images/kune-intro-world.png Removed: trunk/HOWTO_ADD_A_NEW_TOOL Modified: trunk/img/kune-intro.svg trunk/src/main/java/cc/kune/core/client/CoreParts.java trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java trunk/src/main/java/cc/kune/core/public/ws.html Log: kune intro Deleted: trunk/HOWTO_ADD_A_NEW_TOOL =================================================================== --- trunk/HOWTO_ADD_A_NEW_TOOL 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/HOWTO_ADD_A_NEW_TOOL 2011-05-07 18:46:51 UTC (rev 1358) @@ -1,32 +0,0 @@ -Here we try to describe a easy way to add a new Tool of type "Foldeable", that is, a tool with a folder/files structure. For other kind of tools (like, for instance a rich Web Calendar tool), better start from scratch creating the NewTool{ClientTool|ClientActions|ServerTool} classes and implementing the specific functionality. - -The steps (substitute 'wiki' and 'Wiki' for the new tool name): - -cd src/main/java/org/ourproject/kune/ -rsync -r -C docs/ wiki -cd wiki/ -find . -name '*.java' | xargs rename 's/Document/Wiki/g' -find . -name '*.java' | xargs rename 's/Docs/Wiki/g' -find . -name '*.java' | xargs rename 's/Doc/Wiki/g' -find . -name '*.xml' | xargs rename 's/Docs/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Documents/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Document/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Docs/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/Doc/Wiki/g' -find . -name *java | xargs perl -p -i -e 's/\.docs\./\.wiki\./g' -find . -name *java | xargs perl -p -i -e 's/documents/wiki/g' -find . -name *java | xargs perl -p -i -e 's/docs/wiki/g' - -Edit WikiClientTool and WikiServerTool and WikiClientActions with the specific actions and types the tool will have. - -Add - <inherits name='org.ourproject.kune.wiki.Kune-Wiki' /> -to Kune.gwt.xml - -Add - builder.use(new WikiServerModule()); -to KuneRackModule.java. - -Add the WikiClientModule to KuneEntryPoint. - - Added: trunk/img/kune-intro-group.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro-group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-intro-user.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro-user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-intro-world.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-intro-world.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/kune-intro.svg =================================================================== --- trunk/img/kune-intro.svg 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/img/kune-intro.svg 2011-05-07 18:46:51 UTC (rev 1358) @@ -22,10 +22,10 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="0.0" + inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="124.2033" + inkscape:cx="433.15576" inkscape:cy="320.54641" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -433,8 +433,8 @@ </g> <g id="g8699-2" - transform="matrix(0.69032837,0,0,0.69032837,66.145968,308.75342)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png" + transform="matrix(0.68695614,0,0,0.68695614,66.346124,311.85587)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-group.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path @@ -892,8 +892,8 @@ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Public</tspan></text> <g id="g8695-4" - transform="matrix(0.69032837,0,0,0.69032837,102.02122,263.35464)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png" + transform="matrix(0.68695614,0,0,0.68695614,102.04613,266.67887)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-user.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path @@ -924,9 +924,9 @@ transform="matrix(4.9493694,0,0,4.9493694,-42.107891,748.42974)" /> </g> <g - transform="matrix(0.69032837,0,0,0.69032837,30.270728,354.20632)" + transform="matrix(0.68695614,0,0,0.68695614,30.646132,357.08674)" id="g3297" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-world.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-05-07 18:46:51 UTC (rev 1358) @@ -14,20 +14,21 @@ public class CoreParts { - @Inject - public CoreParts(final Session session, final Provider<GroupSNPresenter> groupMembersPresenter, - final Provider<UserSNPresenter> buddiesAndParticipationPresenter, - final Provider<GroupSNConfActions> groupMembersConfActions, - final Provider<UserSNConfActions> userSNConfActions, final Provider<SiteUserOptionsPresenter> userOptions) { - session.onAppStart(true, new AppStartHandler() { - @Override - public void onAppStart(final AppStartEvent event) { - groupMembersConfActions.get(); - userSNConfActions.get(); - groupMembersPresenter.get(); - buddiesAndParticipationPresenter.get(); - userOptions.get(); - } - }); - } + @Inject + public CoreParts(final Session session, final Provider<GroupSNPresenter> groupMembersPresenter, + final Provider<UserSNPresenter> buddiesAndParticipationPresenter, + final Provider<GroupSNConfActions> groupMembersConfActions, + final Provider<UserSNConfActions> userSNConfActions, + final Provider<SiteUserOptionsPresenter> userOptions) { + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + groupMembersConfActions.get(); + userSNConfActions.get(); + groupMembersPresenter.get(); + buddiesAndParticipationPresenter.get(); + userOptions.get(); + } + }); + } } Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-05-07 18:46:51 UTC (rev 1358) @@ -35,68 +35,70 @@ import com.google.gwt.user.client.Window.ClosingEvent; import com.google.gwt.user.client.Window.ClosingHandler; import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.RootPanel; import com.google.inject.Inject; public class AppStarterDefault implements AppStarter { - private final EventBus eventBus; - private final PrefetchUtilities prefetchUtilities; - private final Session session; - private final SiteServiceAsync siteService; + private final EventBus eventBus; + private final PrefetchUtilities prefetchUtilities; + private final Session session; + private final SiteServiceAsync siteService; - @Inject - public AppStarterDefault(final Session session, final SiteServiceAsync siteService, final EventBus eventBus, - final PrefetchUtilities prefetchUtilities) { - this.session = session; - this.siteService = siteService; - this.eventBus = eventBus; - this.prefetchUtilities = prefetchUtilities; - Window.addWindowClosingHandler(new ClosingHandler() { - @Override - public void onWindowClosing(final ClosingEvent event) { - eventBus.fireEvent(new AppStopEvent()); - } - }); - } + @Inject + public AppStarterDefault(final Session session, final SiteServiceAsync siteService, + final EventBus eventBus, final PrefetchUtilities prefetchUtilities) { + this.session = session; + this.siteService = siteService; + this.eventBus = eventBus; + this.prefetchUtilities = prefetchUtilities; + Window.addWindowClosingHandler(new ClosingHandler() { + @Override + public void onWindowClosing(final ClosingEvent event) { + eventBus.fireEvent(new AppStopEvent()); + } + }); + } - private void getInitData() { - siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { - private void hideInitialPanels() { - } + private void getInitData() { + siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() { + private void hideInitialPanels() { + RootPanel.get("kuneloading").setVisible(false); + } - @Override - public void onFailure(final Throwable error) { - eventBus.fireEvent(new ProgressHideEvent()); - eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, - "Error fetching initial data from Kune server")); - Log.debug(error.getMessage()); - hideInitialPanels(); - } + @Override + public void onFailure(final Throwable error) { + eventBus.fireEvent(new ProgressHideEvent()); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, + "Error fetching initial data from Kune server")); + Log.debug(error.getMessage()); + hideInitialPanels(); + } - @Override - public void onSuccess(final InitDataDTO initData) { - session.setInitData(initData); - session.setCurrentUserInfo(initData.getUserInfo()); - eventBus.fireEvent(new AppStartEvent(initData)); - Scheduler.get().scheduleDeferred(new ScheduledCommand() { - @Override - public void execute() { - hideInitialPanels(); - } - }); - } + @Override + public void onSuccess(final InitDataDTO initData) { + session.setInitData(initData); + session.setCurrentUserInfo(initData.getUserInfo()); + eventBus.fireEvent(new AppStartEvent(initData)); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + hideInitialPanels(); + } }); - } + } + }); + } - @Override - public void start() { - prefetchUtilities.preFetchImpImages(); - getInitData(); - final Timer prefetchTimer = new Timer() { - @Override - public void run() { - prefetchUtilities.doTasksDeferred(); - } - }; - prefetchTimer.schedule(20000); - } + @Override + public void start() { + prefetchUtilities.preFetchImpImages(); + getInitData(); + final Timer prefetchTimer = new Timer() { + @Override + public void run() { + prefetchUtilities.doTasksDeferred(); + } + }; + prefetchTimer.schedule(20000); + } } Added: trunk/src/main/java/cc/kune/core/public/images/kune-anim-g.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-anim-g.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/kune-intro-group.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-intro-group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/kune-intro-user.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-intro-user.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/images/kune-intro-world.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-intro-world.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2011-05-07 15:55:38 UTC (rev 1357) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-05-07 18:46:51 UTC (rev 1358) @@ -54,56 +54,122 @@ <link type="text/css" rel="stylesheet" href="ws.css"> <style type="text/css"> body { - background-color: white; - color: black; - font-family: 'Ubuntu', Arial; - font-size: small; - overflow: hidden; - } + background-color: white; + color: black; + font-family: 'Ubuntu', Arial; + font-size: small; + overflow: hidden; +} + +#kuneloading { + position: absolute; + left: 2%; + top: 2%; + z-index: 20001; + height: auto; + border: solid 2px #ccc; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + background-color: white; +} + +#kuneloading a { + color: #225588; +} + +#kuneloading .kuneloading-indicator { + color: #444; + font: bold 13px tahoma, arial, helvetica; + padding: 3px 3px 8px; + margin: 0; + height: auto; +} + +#kuneloading-msg { + font: normal 10px arial, tahoma, sans-serif; +} + #k-home-prewrap { - margin-top: -22px; + margin-top: -22px; } #k-home-wrapper { - margin-left: auto; - margin-right: auto; - position: relative; - width: 665px; - min-width: 320px; + margin-left: auto; + margin-right: auto; + position: relative; + width: 665px; + min-width: 320px; } -#k-home-logo { -float: right; -margin-top: 50px; -} - #k-home-ini { -clear: both; -font-size: 28px; -color: #69312f; -text-align: justify; -padding: 50px 0; -line-height: 1.3em; + clear: both; + font-size: 28px; + color: #69312f; + text-align: justify; + padding: 27px 0; + line-height: 1.3em; } #k-home-ini a { -color: #803000; -font-weight: bold; + color: #803000; + font-weight: bold; } #k-home-ini strong { -font-weight: bold; + font-weight: bold; } - #k-home-stats { -font-size: 22px; -color: #c87137; -font-weight: bold; + font-size: 22px; + color: #c87137; + font-weight: bold; } +#k-home-table { + display: table; +} + +#k-home-header { + display: table-row; +} + +#k-home-logo { + display: table-cell; + margin: 50px 0 22px 0; + float: right; +} + +#k-home-summary { + display: table-cell; + font-size: 32px; + color: #dd8a3d; + font-weight: bold; + white-space: nowrap; + float: left; +} + +#k-home-summary li { + padding-left: 41px; + background-repeat: no-repeat; + background-position: 0 .2em; + line-height: 45px; +} + +#k-home-row { + display: table-row; +} + +#k-home-left { + display: table-cell; +} + +#k-home-right { + display: table-cell; +} + .banner { - margin: 30px; + margin: 30px; } </style> <!--[if IE 6]> @@ -111,43 +177,75 @@ <![endif]--> </head> <body> -<!-- Banner for wave errors --> -<div class="banner" id="banner"></div> -<!-- Autocomplete user/pass --> -<form method="post" action="javascript:void(0)" style="display: none"> -<input type="text" id="address" name="address" value="" /> <input - type="password" id="password" name="password" value="" /> <input - type="submit" value="Login" id="login" /> <input type="submit" - class="wiab le button" name="signIn" id="signIn" value="Sign in"> -</form> -<!-- RECOMMENDED if your web app will not function without JavaScript enabled --> -<noscript> -<div - style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> -Your web browser must have JavaScript enabled in order for this -application to display correctly.</div> -</noscript> -<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> -<iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> -<!--<div id="kuneinitialcurtain"></div>--> -<!--<div id="kuneloading">--> -<!--<div class="kuneloading-indicator"><img src="images/kune-anim.gif"--> -<!-- width="35" height="35" alt="kune-loading"--> -<!-- style="margin-right: 3px; float: left; vertical-align: top;" />kune <br />--> -<!--<span id="kuneloading-msg">Starting...</span></div>--> -<!--</div>--> -<div id="k-home-prewrap"> -<div id="k-home-wrapper"> -<div id="k-home-logo"><img src="logo-big-home.png" alt="" /></div> -<div id="k-home-ini">Welcome! This site is a Kune node. Kune, -which means "together" in esperanto, it's a network of interconnected -sites like this one, where you can <strong>communicate, share, collaborate with -others and create your web spaces easily</strong>. <a href="#signin">Join!</a> -</div> -<div id="k-home-stats" style="display: none;"> -Latests groups created -</div> -</div> -</div> + <!-- Banner for wave errors --> + <div class="banner" id="banner"></div> + <!-- Autocomplete user/pass --> + <form method="post" action="javascript:void(0)" style="display: none"> + <input type="text" id="address" name="address" value="" /> <input + type="password" id="password" name="password" value="" /> <input + type="submit" value="Login" id="login" /> <input type="submit" + class="wiab le button" name="signIn" id="signIn" value="Sign in"> + </form> + <!-- RECOMMENDED if your web app will not function without JavaScript enabled --> + <noscript> + <div + style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> + Your web browser must have JavaScript enabled in order for this + application to display correctly.</div> + </noscript> + <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> + <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> + <div id="kuneinitialcurtain"></div> + <div id="kuneloading"> + <div class="kuneloading-indicator"> + <img src="images/kune-anim-g.gif" width="35" height="35" + alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune <br /> + <span id="kuneloading-msg">Starting...</span> + </div> + </div> + <div id="k-home-prewrap"> + <div id="k-home-wrapper"> + <div id="k-home-table"> + <div id="k-home-header"> + <div id="k-home-logo"> + <img src="logo-big-home.png" alt="" /> + </div> + <div id="k-home-summary"> + <ul> + <li style="background-image: url(images/kune-intro-user.png);">Comunicate with others</li> + <li style="background-image: url(images/kune-intro-group.png);">Work in collaboration</li> + <li style="background-image: url(images/kune-intro-world.png);">And share with the world</li> + </ul> + </div> + <!-- k-home-summary --> + </div> + <!-- div home-header --> + <div id="k-home-row"> + <div id="k-home-left"> + <div id="k-home-ini"> + Welcome! This site is a Kune node. Kune, which means + "together" in esperanto, it's a network of interconnected + sites like this one, where you can <strong>communicate, + share, collaborate with others and create your web + spaces easily</strong>. <a href="#signin">Join!</a> + </div> + <!-- div home-ini --> + <div id="k-home-stats" style="display: none;">Latests + groups created</div> + </div> + <!-- div k-home-left --> + <div id="k-home-right"> + <!-- div home-stats --> + </div> + <!-- div k-home-right --> + </div> + <!-- div k-home-row --> + </div> + <!-- div home-table --> + </div> + <!-- home-wrapper --> + </div> + <!-- home-prewrap --> </body> </html>