kune-commits
Threads by month
- ----- 2026 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
October 2011
- 1 participants
- 37 discussions
r1547 - in trunk/src: main/java/cc/kune/core/client/rpcservices main/java/cc/kune/core/server/manager main/java/cc/kune/core/server/manager/impl main/java/cc/kune/core/server/rpc test/java/cc/kune/core/server/integration/site
by Vicente J. Ruiz Jurado 08 Oct '11
by Vicente J. Ruiz Jurado 08 Oct '11
08 Oct '11
Author: vjrj_
Date: 2011-10-09 01:47:25 +0200 (Sun, 09 Oct 2011)
New Revision: 1547
Modified:
trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java
trunk/src/main/java/cc/kune/core/server/manager/UserManager.java
trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java
trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java
Log:
NEW - # 138: Add change password functionality to the User Interface
http://kune.ourproject.org/issues/ticket/138
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2011-10-06 13:32:53 UTC (rev 1546)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2011-10-08 23:47:25 UTC (rev 1547)
@@ -34,6 +34,8 @@
@RemoteServiceRelativePath("UserService")
public interface UserService extends RemoteService {
+ void changePasswd(String userHash, String oldPassword, String newPassword);
+
void createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException;
String getUserAvatarBaser64(String userHash, StateToken userToken) throws DefaultException;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2011-10-06 13:32:53 UTC (rev 1546)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2011-10-08 23:47:25 UTC (rev 1547)
@@ -31,6 +31,8 @@
public interface UserServiceAsync {
+ void changePasswd(String userHash, String oldPassword, String newPassword, AsyncCallback<Void> callback);
+
void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<Void> asyncCallback);
void getUserAvatarBaser64(String userHash, StateToken userToken, AsyncCallback<String> asyncCallback);
Modified: trunk/src/main/java/cc/kune/core/server/manager/UserManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/UserManager.java 2011-10-06 13:32:53 UTC (rev 1546)
+++ trunk/src/main/java/cc/kune/core/server/manager/UserManager.java 2011-10-08 23:47:25 UTC (rev 1547)
@@ -30,6 +30,8 @@
import cc.kune.domain.utils.UserBuddiesData;
public interface UserManager {
+ User changePasswd(Long userId, String oldPassword, String newPassword);
+
/**
* CreateUser new method with language country and timezone params
*
Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-10-06 13:32:53 UTC (rev 1546)
+++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-10-08 23:47:25 UTC (rev 1547)
@@ -35,10 +35,17 @@
import org.apache.lucene.search.Query;
import org.jivesoftware.smack.RosterEntry;
import org.jivesoftware.smack.packet.RosterPacket.ItemType;
+import org.waveprotocol.box.server.account.AccountData;
import org.waveprotocol.box.server.authentication.PasswordDigest;
import org.waveprotocol.box.server.persistence.AccountStore;
+import org.waveprotocol.box.server.persistence.PersistenceException;
+import org.waveprotocol.box.server.robots.agent.RobotAgentUtil;
+import org.waveprotocol.wave.model.wave.ParticipantId;
import org.waveprotocol.wave.model.waveref.WaveRef;
+import cc.kune.common.client.utils.TextUtils;
+import cc.kune.core.client.errors.AccessViolationException;
+import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.client.errors.EmailAddressInUseException;
import cc.kune.core.client.errors.GroupLongNameInUseException;
import cc.kune.core.client.errors.GroupShortNameInUseException;
@@ -114,6 +121,32 @@
this.mailService = mailService;
}
+ @Override
+ public User changePasswd(final Long userId, final String oldPassword, final String newPassword) {
+ final User user = find(userId);
+ final ParticipantId participantId = participantUtils.of(user.getShortName());
+ // Check oldPasswd
+ try {
+ final AccountData account = waveAccountStore.getAccount(participantId);
+ if (TextUtils.notEmpty(oldPassword) && account != null
+ && !account.asHuman().getPasswordDigest().verify(oldPassword.toCharArray())) {
+ throw new AccessViolationException("You cannot change passwd");
+ }
+ // Wave change passwd
+ RobotAgentUtil.changeUserPassword(newPassword, participantId, waveAccountStore);
+ } catch (final IllegalArgumentException e) {
+ throw new DefaultException("Error changing user passwd", e);
+ } catch (final PersistenceException e) {
+ throw new DefaultException("Error changing user passwd", e);
+ }
+ // Kune db change passwd
+ final PasswordDigest newPasswordDigest = new PasswordDigest(newPassword.toCharArray());
+ user.setPassword(newPassword);
+ user.setSalt(newPasswordDigest.getSalt());
+ user.setDiggest(newPasswordDigest.getDigest());
+ return persist(user);
+ }
+
private void checkIfEmailAreInUse(final String email) {
if (userFinder.countByEmail(email) != 0) {
throw new EmailAddressInUseException();
@@ -355,7 +388,6 @@
user.setEmail(email);
}
user.setLanguage(findLanguage(lang.getCode()));
- // user.setLanguage(findLanguage(userDTO.getLanguage().getCode()));
persist(user);
groupManager.persist(userGroup);
return user;
Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-10-06 13:32:53 UTC (rev 1546)
+++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-10-08 23:47:25 UTC (rev 1547)
@@ -88,6 +88,14 @@
}
@Override
+ @Authenticated
+ @Transactional
+ public void changePasswd(final String userHash, final String oldPassword, final String newPassword) {
+ final Long userId = userSessionManager.getUser().getId();
+ userManager.changePasswd(userId, oldPassword, newPassword);
+ }
+
+ @Override
@Transactional(rollbackOn = DefaultException.class)
public void createUser(final UserDTO userDTO, final boolean wantPersonalHomepage)
throws DefaultException {
@@ -137,7 +145,7 @@
// sessionService.getNewSession();
final User user = userManager.login(nickOrEmail, passwd);
return loginUser(user, waveToken);
- }
+ };
private UserInfoDTO loginUser(final User user, final String waveToken) throws DefaultException {
if (user != null) {
@@ -146,7 +154,7 @@
} else {
throw new UserAuthException();
}
- };
+ }
@Override
@Authenticated
Modified: trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java
===================================================================
--- trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-10-06 13:32:53 UTC (rev 1546)
+++ trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-10-08 23:47:25 UTC (rev 1547)
@@ -172,7 +172,27 @@
}
}
+ @Test(expected = AccessViolationException.class)
+ public void testSiteChangeIncorrectPasswdMustFail() throws Exception {
+ assertNull(session.getUser().getId());
+ doLogin(properties.getAdminShortName(), properties.getAdminPassword());
+ assertNotNull(session.getUser().getId());
+ userService.changePasswd(session.getHash(), "otherpasswd", "kkkkkk");
+ }
+
@Test
+ public void testSiteChangePasswd() throws Exception {
+ assertNull(session.getUser().getId());
+ doLogin(properties.getAdminShortName(), properties.getAdminPassword());
+ assertNotNull(session.getUser().getId());
+ userService.changePasswd(session.getHash(), properties.getAdminPassword(), "kkkkkk");
+ doLogout();
+ doLogin(properties.getAdminShortName(), "kkkkkk");
+ userService.changePasswd(session.getHash(), "kkkkkk", properties.getAdminPassword());
+ doLogout();
+ }
+
+ @Test
public void testSiteEmailLogin() throws Exception {
assertNull(session.getUser().getId());
userService.login(properties.getAdminEmail(), properties.getAdminPassword(), token);
@@ -235,8 +255,8 @@
timezone, null, true, SubscriptionMode.manual, "blue");
userService.createUser(user, false);
doLogin("test", "123456");
- final UserDTO userChanged = new UserDTO(shortName, longName, "123456", email, lang, country,
- timezone, null, true, SubscriptionMode.manual, "blue");
+ final UserDTO userChanged = new UserDTO("test", longName, "123456", email, lang, country, timezone,
+ null, true, SubscriptionMode.manual, "blue");
userChanged.setId(session.getUser().getId());
userService.updateUser(getHash(), userChanged, simpleLang);
}
1
0
r1546 - in trunk: img/webtemplate src/main/java/cc/kune/common/client/ui src/main/java/cc/kune/hspace/client
by Vicente J. Ruiz Jurado 06 Oct '11
by Vicente J. Ruiz Jurado 06 Oct '11
06 Oct '11
Author: vjrj_
Date: 2011-10-06 15:32:53 +0200 (Thu, 06 Oct 2011)
New Revision: 1546
Modified:
trunk/img/webtemplate/web_home_template-2011.svg
trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
Log:
NEW - # 132: Global public stats
http://kune.ourproject.org/issues/ticket/132
Modified: trunk/img/webtemplate/web_home_template-2011.svg
===================================================================
--- trunk/img/webtemplate/web_home_template-2011.svg 2011-10-05 12:53:57 UTC (rev 1545)
+++ trunk/img/webtemplate/web_home_template-2011.svg 2011-10-06 13:32:53 UTC (rev 1546)
@@ -1219,7 +1219,7 @@
height="15"
width="15"
id="rect15395"
- style="color:#000000;fill:#ffb380;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ style="color:#000000;fill:#ffccaa;fill-opacity:1;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
style="color:#000000;fill:#ffb380;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect15397"
Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-10-05 12:53:57 UTC (rev 1545)
+++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-10-06 13:32:53 UTC (rev 1546)
@@ -102,6 +102,12 @@
flow.clear();
}
+ private void commonStyle(final Image icon, final String imgCss) {
+ icon.setUrl(GWT.getModuleBaseURL() + "images/clear.gif");
+ icon.setStyleName(imgCss);
+ icon.addStyleName("oc-ico-pad");
+ }
+
public HasClickHandlers getFocus() {
return self;
}
@@ -135,10 +141,8 @@
}
public void setLeftIcon(final String imgCss) {
- iconLeft.setUrl(GWT.getModuleBaseURL() + "images/clear.gif");
- iconLeft.setStyleName(imgCss);
+ commonStyle(iconLeft, imgCss);
iconLeft.addStyleName("k-iconlabel-left");
- iconLeft.addStyleName("oc-ico-pad");
iconLeft.setVisible(true);
}
@@ -164,9 +168,7 @@
}
public void setRightIcon(final String imgCss) {
- iconRight.setUrl("images/clear.gif");
- iconRight.setStyleName(imgCss);
- iconRight.addStyleName("oc-ico-pad");
+ commonStyle(iconRight, imgCss);
iconRight.addStyleName("k-iconlabel-right");
iconRight.setVisible(true);
}
Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-05 12:53:57 UTC (rev 1545)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-06 13:32:53 UTC (rev 1546)
@@ -89,6 +89,8 @@
tabPanel.addTab(lastPublishedPanel);
globalStats.removeFromParent();
// groupStats.removeFromParent();
+
+ // FIXME: Make this optional (aitor's comment)
globalStatsParent = RootPanel.get("k-home-global-stats");
globalStatsParent.add(globalStats);
groupStatsParent = RootPanel.get("k-home-group-stats");
1
0
Author: vjrj_
Date: 2011-10-05 14:53:57 +0200 (Wed, 05 Oct 2011)
New Revision: 1545
Added:
trunk/src/main/java/cc/kune/common/client/resources/clear.png
trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java
trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml
trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java
trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml
trunk/src/main/webapp/others/defgroup.gif
trunk/src/main/webapp/others/defgroup.png
Modified:
trunk/img/icons/from-private-to-public.svg
trunk/img/webtemplate/web_home_template-2011.svg
trunk/script/css-update.sh
trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java
trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java
trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java
trunk/src/main/java/cc/kune/core/public/ws.css
trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java
trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml
trunk/src/main/webapp/ws.html
Log:
NEW - # 132: Global public stats
http://kune.ourproject.org/issues/ticket/132
Modified: trunk/img/icons/from-private-to-public.svg
===================================================================
--- trunk/img/icons/from-private-to-public.svg 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/img/icons/from-private-to-public.svg 2011-10-05 12:53:57 UTC (rev 1545)
@@ -27,15 +27,15 @@
inkscape:pageshadow="2"
inkscape:zoom="1.2968783"
inkscape:cx="372.04724"
- inkscape:cy="526.18109"
+ inkscape:cy="865.45734"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="1080"
- inkscape:window-height="1824"
+ inkscape:window-width="1078"
+ inkscape:window-height="897"
inkscape:window-x="0"
- inkscape:window-y="21"
- inkscape:window-maximized="1"
+ inkscape:window-y="947"
+ inkscape:window-maximized="0"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
@@ -57,7 +57,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -721,5 +721,117 @@
id="tspan8835"
x="24.299999"
y="56.452183">1234</tspan></text>
+ <g
+ id="g3063"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/webapp/others/defgroup.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <g
+ id="g3047"
+ transform="matrix(0.9,0,0,0.9,246.64216,77.109544)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/grop-def-new.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <path
+ inkscape:transform-center-x="2.1800737"
+ transform="matrix(4.71003,1.6779794,-1.6779794,4.71003,-33.10757,48.018455)"
+ inkscape:transform-center-y="-0.21689042"
+ d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="true"
+ sodipodi:arg2="2.1991149"
+ sodipodi:arg1="1.5707963"
+ sodipodi:r2="4.045085"
+ sodipodi:r1="5"
+ sodipodi:cy="12.362183"
+ sodipodi:cx="35"
+ sodipodi:sides="5"
+ id="path3049"
+ style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="star"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3051"
+ sodipodi:cx="90"
+ sodipodi:cy="32.362183"
+ sodipodi:rx="20"
+ sodipodi:ry="10"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ transform="matrix(2.375,0,0,4.7499998,-102.75,10.817397)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3053"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,45.524372,-53.39817)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,18.680548,-64.20388)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path3055"
+ style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3057"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,43.935022,-24.026857)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,16.336633,-16.494463)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path3059"
+ style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3061"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(11.211448,3.9941526,-3.9941526,11.211448,-16.590722,-79.68006)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+ </g>
</g>
</svg>
Modified: trunk/img/webtemplate/web_home_template-2011.svg
===================================================================
--- trunk/img/webtemplate/web_home_template-2011.svg 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/img/webtemplate/web_home_template-2011.svg 2011-10-05 12:53:57 UTC (rev 1545)
@@ -29,9 +29,9 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="546.88652"
- inkscape:cy="140.60185"
+ inkscape:zoom="0.91276042"
+ inkscape:cx="512"
+ inkscape:cy="252.53067"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
@@ -440,7 +440,7 @@
id="flowSpan5635">communicate, share, collaborate with others and </flowSpan></flowSpan>create your web spaces easily. <flowSpan
style="font-size:18px;fill:#803300"
id="flowSpan5641">Join!</flowSpan></flowPara></flowRoot> <g
- transform="translate(544.82096,-695.09755)"
+ transform="translate(554.68116,-707.1489)"
id="g2737"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/logo-big-home.png"
inkscape:export-xdpi="90"
@@ -499,7 +499,7 @@
x="1473"
y="534" />
<flowRoot
- transform="translate(-102,209)"
+ transform="translate(-102.00001,229.81598)"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot4636"
xml:space="preserve"><flowRegion
@@ -512,20 +512,20 @@
id="rect4640" /></flowRegion><flowPara
style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
id="flowPara4642">Latests groups created</flowPara></flowRoot> <flowRoot
- transform="translate(290,408)"
- style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(-68,405.18005)"
+ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot4644"
xml:space="preserve"><flowRegion
id="flowRegion4646"><rect
- style="text-align:justify;text-anchor:start;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ style="font-size:14px;text-align:end;text-anchor:end;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
y="329.61539"
x="286.03818"
height="187.65573"
width="666.18433"
id="rect4648" /></flowRegion><flowPara
- style="font-size:20px;font-weight:bold;text-align:justify;text-anchor:start;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;-inkscape-font-specification:Ubuntu Bold"
+ style="font-size:14px;font-weight:bold;text-align:end;text-anchor:end;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;-inkscape-font-specification:Ubuntu Bold"
id="flowPara4650">(©) cc-by-sa kune.beta.ieapala.es </flowPara></flowRoot> <flowRoot
- transform="translate(-102.234,241)"
+ transform="translate(-102.23401,261.81598)"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot4654"
xml:space="preserve"><flowRegion
@@ -1080,7 +1080,7 @@
xml:space="preserve"
id="flowRoot14561"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- transform="translate(-102,294)"><flowRegion
+ transform="translate(-98.713267,335.12435)"><flowRegion
id="flowRegion14563"><rect
id="rect14565"
width="331.18436"
@@ -1093,7 +1093,7 @@
xml:space="preserve"
id="flowRoot14569"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- transform="translate(-101.478,321)"><flowRegion
+ transform="translate(-98.191267,362.12435)"><flowRegion
id="flowRegion14571"><rect
id="rect14573"
width="666.18433"
@@ -1103,7 +1103,7 @@
style="font-size:18px;text-align:justify;text-anchor:start;fill:#8a5050;fill-opacity:1" /></flowRegion><flowPara
id="flowPara14575">group1 / Some project about bla bla bla</flowPara><flowPara
id="flowPara14577">group2 / Other project</flowPara></flowRoot> <flowRoot
- transform="translate(-102,379)"
+ transform="translate(-98.713267,420.12435)"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot14579"
xml:space="preserve"><flowRegion
@@ -1116,7 +1116,7 @@
id="rect14583" /></flowRegion><flowPara
style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
id="flowPara14585">Latests activity in your groups</flowPara></flowRoot> <flowRoot
- transform="translate(-101.478,406)"
+ transform="translate(-98.191267,447.12435)"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot14587"
xml:space="preserve"><flowRegion
@@ -1193,6 +1193,42 @@
y="247.90636"
rx="3.7326424"
ry="2.6603734" />
+ <rect
+ ry="1.4876868"
+ rx="3.7326424"
+ y="167.90636"
+ x="158"
+ height="81.306496"
+ width="725"
+ id="rect14623"
+ style="color:#000000;fill:none;stroke:#e6e6e6;stroke-width:0.88812524;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect14625"
+ width="15"
+ height="15"
+ x="185.15265"
+ y="528.40656"
+ rx="4.6459203"
+ ry="1.5668095" />
+ <rect
+ ry="1.5668095"
+ rx="4.6459203"
+ y="528.40656"
+ x="205.15265"
+ height="15"
+ width="15"
+ id="rect15395"
+ style="color:#000000;fill:#ffb380;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#ffb380;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect15397"
+ width="15"
+ height="15"
+ x="225.15265"
+ y="528.40656"
+ rx="4.6459203"
+ ry="1.5668095" />
</g>
<g
inkscape:groupmode="layer"
Modified: trunk/script/css-update.sh
===================================================================
--- trunk/script/css-update.sh 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/script/css-update.sh 2011-10-05 12:53:57 UTC (rev 1545)
@@ -16,7 +16,7 @@
cp src/main/java/cc/kune/msgs/public/kune-message.css target/kune-$VERSION/ws/
cp src/main/java/cc/kune/common/public/kune-common.css target/kune-$VERSION/ws/
cp src/main/java/cc/kune/core/public/ws.css target/kune-$VERSION/ws/
-cp src/main/java/cc/kune/core/public/ws.html target/kune-$VERSION/ws/
+#cp src/main/java/cc/kune/core/public/ws.html target/kune-$VERSION/
#cp src/main/webapp/templates/basic/basic.css target/kune-$VERSION/templates/basic/basic.css
#cp src/main/webapp/templates/basic/docs.liquid.html target/kune-$VERSION/templates/basic/
cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-$VERSION/ws/gxt-custom/css/gxt-op-common.css
Modified: trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -30,6 +30,9 @@
@Source("checked.png")
ImageResource checked();
+ @Source("clear.png")
+ ImageResource clear();
+
@Source("kune-close.png")
ImageResource kuneClose();
Added: trunk/src/main/java/cc/kune/common/client/resources/clear.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/cc/kune/common/client/resources/clear.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -0,0 +1,19 @@
+package cc.kune.common.client.ui;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+
+public class DottedTab extends Composite {
+
+ interface DottedTabUiBinder extends UiBinder<Widget, DottedTab> {
+ }
+
+ private static DottedTabUiBinder uiBinder = GWT.create(DottedTabUiBinder.class);
+
+ public DottedTab() {
+ initWidget(uiBinder.createAndBindUi(this));
+ }
+
+}
Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml 2011-10-05 12:53:57 UTC (rev 1545)
@@ -0,0 +1,11 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:with field='res'
+ type='cc.kune.common.client.resources.CommonIconResources'/>
+ <ui:style>
+
+ </ui:style>
+ <g:Image ui:field="image" stylePrimaryName="k-dottedtab"
+ width="15px" height="15px" resource='{res.clear}'/>
+ </ui:UiBinder>
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -0,0 +1,29 @@
+package cc.kune.common.client.ui;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.TabLayoutPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public class DottedTabPanel extends Composite {
+
+ interface DottedTabPanelUiBinder extends UiBinder<Widget, DottedTabPanel> {
+ }
+
+ private static DottedTabPanelUiBinder uiBinder = GWT.create(DottedTabPanelUiBinder.class);
+
+ @UiField
+ TabLayoutPanel tabPanel;
+
+ public DottedTabPanel(final String width, final String height) {
+ initWidget(uiBinder.createAndBindUi(this));
+ tabPanel.setSize(width, height);
+ }
+
+ public void addTab(final IsWidget view) {
+ tabPanel.add(view, new DottedTab());
+ }
+}
Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml 2011-10-05 12:53:57 UTC (rev 1545)
@@ -0,0 +1,8 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:style>
+ </ui:style>
+ <g:TabLayoutPanel stylePrimaryName="k-dotted-tabpanel"
+ ui:field="tabPanel" barUnit="PX" barHeight="17"/>
+</ui:UiBinder>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -135,7 +135,7 @@
}
public void setLeftIcon(final String imgCss) {
- iconLeft.setUrl("images/clear.gif");
+ iconLeft.setUrl(GWT.getModuleBaseURL() + "images/clear.gif");
iconLeft.setStyleName(imgCss);
iconLeft.addStyleName("k-iconlabel-left");
iconLeft.addStyleName("oc-ico-pad");
Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -222,7 +222,7 @@
return kuneConstants.getString(I18nUtils.convertMethodName(text + " " + noteForTranslators));
} catch (final MissingResourceException e) {
if (lexicon == null) {
- Log.warn("i18n not initialized");
+ Log.warn("i18n not initialized: " + text);
return text;
}
String translation = lexicon.get(encodeText);
Modified: trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -19,6 +19,8 @@
*/
package cc.kune.core.client.init;
+import cc.kune.core.shared.FileConstants;
+
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.RepeatingCommand;
import com.google.gwt.user.client.ui.Image;
@@ -45,13 +47,13 @@
while (i < lic.length) {
final String licImg = lic[i];
- Image.prefetch("images/lic/" + licImg);
+ Image.prefetch(FileConstants.ASITE_PREFIX + "images/lic/" + licImg);
i++;
}
while (j < ext.length) {
final String extImg = ext[j];
- Image.prefetch("gxt/images/" + extImg);
+ Image.prefetch(FileConstants.ASITE_PREFIX + "gxt/images/" + extImg);
j++;
}
@@ -72,7 +74,7 @@
final String[] imgs = { "images/corner.png", "images/hborder.png" };
for (final String img : imgs) {
- Image.prefetch(img);
+ Image.prefetch(FileConstants.ASITE_PREFIX + img);
}
}
}
Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -20,6 +20,7 @@
package cc.kune.core.client.ws.entheader;
import cc.kune.core.client.avatar.MediumAvatarDecorator;
+import cc.kune.core.shared.FileConstants;
import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -97,7 +98,7 @@
}
public void setLogoImage(final String url) {
- logoImage.setUrl("images/clear.gif");
+ logoImage.setUrl(FileConstants.ASITE_PREFIX + "images/clear.gif");
Image.prefetch(url);
logoImage.setUrl(url);
}
Modified: trunk/src/main/java/cc/kune/core/public/ws.css
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.css 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-10-05 12:53:57 UTC (rev 1545)
@@ -1,4 +1,4 @@
-GCHARSET "UTF-8 "; body {
+GCHARSET "UTF-8 "; body {
background-color: transparent;
color: black;
font-family: 'Ubuntu', Arial;
@@ -944,7 +944,7 @@
border-color: #CCCCCC !important;
background: inherits !important;
kfilter: alpha(opacity =
- 60) !important;
+ 60) !important;
-moz-opacity: 0.60 !important;
-khtml-opacity: 0.60 !important;
opacity: 0.60 !important;
@@ -1230,7 +1230,7 @@
-moz-border-radius-bottomleft: 5px;
border-bottom-left-radius: 5px;
kfilter: alpha(opacity =
- 90);
+ 90);
-moz-opacity: 0.90;
-khtml-opacity: 0.90;
opacity: 0.90;
@@ -1531,4 +1531,18 @@
div.jGrowl div.jGrowl-notification div.header {
background-color: #000000 !important;
padding: 0 !important;
+}
+
+/* Dotted tab panel */
+.k-dotted-tabpanel .gwt-TabLayoutPanelTab {
+ background-color: #ffccaa;
+ -webkit-border-radius: 0px !important;
+ -moz-border-radius: 0px !important;
+ border-radius: 0px !important;
+ margin: 0 2px;
+ cursor: pointer;
+}
+
+.k-dotted-tabpanel .gwt-TabLayoutPanelTab-selected {
+ background-color: #dd8a3d;
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -27,7 +27,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import cc.kune.core.server.manager.GroupManager;
import cc.kune.core.shared.FileConstants;
import cc.kune.core.shared.domain.utils.StateToken;
@@ -37,37 +36,40 @@
public class EntityLogoDownloadManager extends HttpServlet {
- private static final long serialVersionUID = -1958945058088446881L;
- @Inject
- GroupManager groupManager;
+ private static final long serialVersionUID = -1958945058088446881L;
+ @Inject
+ GroupManager groupManager;
- @Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException,
- IOException {
+ @Override
+ protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)
+ throws ServletException, IOException {
- // final String userHash = req.getParameter(FileParams.HASH);
- final StateToken stateToken = new StateToken(req.getParameter(FileConstants.TOKEN));
+ // final String userHash = req.getParameter(FileParams.HASH);
+ final StateToken stateToken = new StateToken(req.getParameter(FileConstants.TOKEN));
- Group group = Group.NO_GROUP;
- try {
- group = groupManager.findByShortName(stateToken.getGroup());
- if (group == Group.NO_GROUP) {
- throw new NoResultException("Group not found trying to get the logo");
- }
+ Group group = Group.NO_GROUP;
+ try {
+ group = groupManager.findByShortName(stateToken.getGroup());
+ if (group == Group.NO_GROUP) {
+ throw new NoResultException("Group not found trying to get the logo");
+ }
- if (!group.hasLogo()) {
- throw new NoResultException("This Group has no logo");
- }
- } catch (NoResultException e) {
- FileDownloadManagerUtils.returnNotFound(resp);
- return;
- }
+ if (!group.hasLogo()) {
+ FileDownloadManagerUtils.returnFile("src/main/webapp/others/defgroup.gif",
+ resp.getOutputStream());
+ } else {
+ // Has logo
+ final byte[] logo = group.getLogo();
- byte[] logo = group.getLogo();
-
resp.setContentLength(logo.length);
resp.setContentType(group.getLogoMime().toString());
- resp.setHeader("Content-Disposition", "attachment; filename=\"" + group.getShortName() + "-logo\"");
+ resp.setHeader("Content-Disposition", "attachment; filename=\"" + group.getShortName()
+ + "-logo\"");
resp.getOutputStream().write(logo);
+ }
+ } catch (final NoResultException e) {
+ FileDownloadManagerUtils.returnNotFound(resp);
+ return;
}
+ }
}
Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -11,7 +11,7 @@
public class StatsServiceDefault implements StatsService {
- private static final int LIMIT = 20;
+ private static final int LIMIT = 6;
private final ContentFinder contentFinder;
private final GroupFinder groupFinder;
private final UserFinder userFinder;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -28,6 +28,7 @@
AdmissionType admissionType;
private String backgroundImage;
+ private Long createdOn;
private ContentSimpleDTO defaultContent;
private LicenseDTO defaultLicense;
private GroupType groupType;
@@ -78,6 +79,10 @@
return backgroundImage;
}
+ public Long getCreatedOn() {
+ return createdOn;
+ }
+
public ContentSimpleDTO getDefaultContent() {
return defaultContent;
}
@@ -145,6 +150,10 @@
this.backgroundImage = backgroundImage;
}
+ public void setCreatedOn(final Long createdOn) {
+ this.createdOn = createdOn;
+ }
+
public void setDefaultContent(final ContentSimpleDTO defaultContent) {
this.defaultContent = defaultContent;
}
Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-05 12:53:57 UTC (rev 1545)
@@ -2,6 +2,9 @@
import java.util.List;
+import org.waveprotocol.wave.client.common.util.DateUtils;
+
+import cc.kune.common.client.ui.DottedTabPanel;
import cc.kune.core.client.services.FileDownloadUtils;
import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContentSimpleDTO;
@@ -44,21 +47,25 @@
public InlineLabel globalStatsTotalUsersCount;
@UiField
public InlineLabel globalStatsTotalUsersTitle;
- @UiField
- FlowPanel groupStats;
private final RootPanel groupStatsParent;
@UiField
public FlowPanel lastActivityInYourGroup;
@UiField
public Label lastActivityInYourGroupTitle;
@UiField
+ FlowPanel lastActivityPanel;
+ @UiField
public FlowPanel lastGroups;
@UiField
+ FlowPanel lastGroupsPanel;
+ @UiField
public Label lastGroupsTitle;
@UiField
public FlowPanel lastPublishedContents;
@UiField
public Label lastPublishedContentsTitle;
+ @UiField
+ FlowPanel lastPublishedPanel;
private final Provider<GroupContentHomeLink> linkProv;
@@ -73,15 +80,19 @@
globalStatsTitle.setText(i18n.t("Stats"));
globalStatsTotalGroupsTitle.setText(i18n.t("Hosted groups:"));
globalStatsTotalUsersTitle.setText(i18n.t("Registered users:"));
- lastActivityInYourGroupTitle.setText(i18n.t("Latest created groups"));
- lastGroupsTitle.setText(i18n.t("Latest publications"));
- lastPublishedContentsTitle.setText(i18n.t("Latest activity in your groups"));
+ lastGroupsTitle.setText(i18n.t("Latest created groups"));
+ lastPublishedContentsTitle.setText(i18n.t("Latest publications"));
+ lastActivityInYourGroupTitle.setText(i18n.t("Latest activity in your groups"));
+ final DottedTabPanel tabPanel = new DottedTabPanel("465px", "200px");
+ tabPanel.addTab(lastGroupsPanel);
+ // tabPanel.addTab(lastActivityPanel);
+ tabPanel.addTab(lastPublishedPanel);
globalStats.removeFromParent();
- groupStats.removeFromParent();
+ // groupStats.removeFromParent();
globalStatsParent = RootPanel.get("k-home-global-stats");
globalStatsParent.add(globalStats);
groupStatsParent = RootPanel.get("k-home-group-stats");
- groupStatsParent.add(groupStats);
+ groupStatsParent.add(tabPanel);
armor.getHomeSpace().add(RootPanel.get("k-home-wrapper"));
}
@@ -90,6 +101,11 @@
return widget;
}
+ private String format(final Long modifiedOn, final String name) {
+ final String modOn = DateUtils.getInstance().formatPastDate(modifiedOn);
+ return modOn + " ~ " + name;
+ }
+
@Override
public HasText getGlobalStatsTotalGroupsCount() {
return globalStatsTotalGroupsCount;
@@ -107,7 +123,7 @@
final GroupContentHomeLink link = linkProv.get();
final StateToken token = content.getStateToken();
link.setValues(downUtils.getLogoImageUrl(token.copy().clearDocument().clearFolder()),
- content.getName(), token.toString());
+ format(content.getModifiedOn(), content.getName()), token.toString());
lastActivityInYourGroup.add(link);
}
}
@@ -117,8 +133,8 @@
lastGroups.clear();
for (final GroupDTO group : lastGroupsList) {
final GroupContentHomeLink link = linkProv.get();
- link.setValues(downUtils.getLogoImageUrl(group.getStateToken()), group.getLongName(),
- group.getShortName());
+ link.setValues(downUtils.getLogoImageUrl(group.getStateToken()),
+ format(group.getCreatedOn(), group.getLongName()), group.getShortName());
lastGroups.add(link);
}
}
@@ -130,7 +146,7 @@
final GroupContentHomeLink link = linkProv.get();
final StateToken token = content.getStateToken();
link.setValues(downUtils.getLogoImageUrl(token.copy().clearDocument().clearFolder()),
- content.getName(), token.toString());
+ format(content.getModifiedOn(), content.getName()), token.toString());
lastPublishedContents.add(link);
}
}
@@ -143,7 +159,9 @@
@Override
public void setUserGroupsActivityVisible(final boolean logged) {
- lastActivityInYourGroup.setVisible(logged);
+ if (logged) {
+ lastActivityInYourGroup.setVisible(logged);
+ }
lastActivityInYourGroupTitle.setVisible(logged);
}
Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-05 12:53:57 UTC (rev 1545)
@@ -2,7 +2,9 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:style>
-.padl { padding-left: 5px; }
+ .padl {
+ padding-left: 5px;
+ }
</ui:style>
<g:FlowPanel>
<g:FlowPanel ui:field="globalStats">
@@ -20,14 +22,20 @@
addStyleNames="{style.padl} k-home-em-text"/>
</g:FlowPanel>
</g:FlowPanel>
- <g:FlowPanel ui:field="groupStats">
+ <g:FlowPanel ui:field="lastGroupsPanel">
<g:Label ui:field="lastGroupsTitle" styleName="k-home-title"/>
<g:FlowPanel ui:field="lastGroups" styleName="k-home-normal-text"/>
+ </g:FlowPanel>
+ <g:FlowPanel ui:field="lastPublishedPanel">
<g:Label ui:field="lastPublishedContentsTitle" styleName="k-home-title"/>
- <g:FlowPanel ui:field="lastPublishedContents" styleName="k-home-normal-text"/>
+ <g:FlowPanel ui:field="lastPublishedContents"
+ styleName="k-home-normal-text"/>
+ </g:FlowPanel>
+ <g:FlowPanel ui:field="lastActivityPanel">
<g:Label ui:field="lastActivityInYourGroupTitle"
styleName="k-home-title"/>
- <g:FlowPanel ui:field="lastActivityInYourGroup" styleName="k-home-normal-text"/>
+ <g:FlowPanel ui:field="lastActivityInYourGroup"
+ styleName="k-home-normal-text"/>
</g:FlowPanel>
</g:FlowPanel>
</ui:UiBinder>
\ No newline at end of file
Added: trunk/src/main/webapp/others/defgroup.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/webapp/others/defgroup.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/webapp/others/defgroup.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/webapp/others/defgroup.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2011-10-05 01:42:19 UTC (rev 1544)
+++ trunk/src/main/webapp/ws.html 2011-10-05 12:53:57 UTC (rev 1545)
@@ -116,13 +116,12 @@
min-width: 320px;
}
-#k-home-ini {
- clear: both;
+#k-home-ini { /* clear: both; */
font-size: 20px;
color: #69312f;
text-align: justify;
- padding: 27px 0;
- line-height: 1.3em;
+ /* padding: 27px 0; */
+ /* line-height: 1.3em; */
}
#k-home-ini a {
@@ -135,13 +134,18 @@
}
#k-home-table {
- display: table;
+ display: block;
}
-.k-home-header {
+#k-home-header {
display: table-row;
+ float: right;
}
+#k-home-intro {
+ display: table-row;
+}
+
#k-home-footer {
display: table-row;
font-size: 14px;
@@ -150,18 +154,14 @@
}
#k-home-logo {
- display: table-cell;
margin: 50px 0 22px 0;
- float: right;
}
#k-home-summary {
- display: table-cell;
font-size: 28px;
color: #dd8a3d;
font-weight: bold;
white-space: nowrap;
- float: left;
}
#k-home-summary li {
@@ -171,19 +171,35 @@
line-height: 45px;
}
-#k-home-row { /* display: table-row;*/
+#k-home-body { /* display: table-row;*/
+ clear: both;
+ display: block;
+}
+#k-home-left,#k-home-summary-left {
+ display: table-cell;
}
#k-home-left {
+ float: left;
+}
+
+#k-home-right,#k-home-summary-right {
display: table-cell;
+ text-align: right;
+ padding-left: 20px;
}
+#k-home-summary-right {
+ padding-top: 42px;
+ vertical-align: bottom;
+}
+
#k-home-right {
- display: table-cell;
- text-align: right;
white-space: nowrap;
- padding-left: 30px;
+ vertical-align: top;
+ padding-top: 20px;
+ float: right;
}
#k-home-group-stats {
@@ -196,15 +212,15 @@
.k-home-title {
color: #c87137;
- font-size: 19px;
+ font-size: 18px;
font-weight: bold;
padding-top: 10px;
- clear: both;
+ /* clear: both; */
}
.k-home-normal-text {
color: #8a5050;
- font-size: 18px;
+ font-size: 16px;
}
.k-home-em-text {
@@ -228,7 +244,7 @@
.k-home-group-stats-item {
clear: both;
- line-height: 1.2em;
+ /* line-height: 1.2em; */
}
.banner {
@@ -269,32 +285,32 @@
</div>
<div id="k-home-prewrap">
<div id="k-home-wrapper">
+ <!-- This id is required for kune (you can create a different .html but preserve this id) -->
<div id="k-home-table">
- <div class="k-home-header">
- <div id="k-home-logo">
- <img src="ws/logo-big-home.png" alt="" />
- </div>
- </div>
+ <div id="k-home-header"></div>
<!-- div home-header -->
- <div class="k-home-header">
- <div id="k-home-summary">
- <ul>
- <li
- style="background-image: url(ws/images/kune-intro-user.png);">Comunicate
- with others</li>
- <li
- style="background-image: url(ws/images/kune-intro-group.png);">Work
- in collaboration</li>
- <li
- style="background-image: url(ws/images/kune-intro-world.png);">And
- share with the world</li>
- </ul>
+ <div id="k-home-intro">
+ <div id="k-home-summary-left">
+ <div id="k-home-logo">
+ <img src="ws/logo-big-home.png" alt="" />
+ </div>
+ <div id="k-home-summary">
+ <ul>
+ <li
+ style="background-image: url(ws/images/kune-intro-user.png);">Comunicate
+ with others</li>
+ <li
+ style="background-image: url(ws/images/kune-intro-group.png);">Work
+ in collaboration</li>
+ <li
+ style="background-image: url(ws/images/kune-intro-world.png);">And
+ share with the world</li>
+ </ul>
+ </div>
+ <!-- k-home-summary -->
</div>
- <!-- k-home-summary -->
- </div>
- <!-- div home-header -->
- <div id="k-home-row">
- <div id="k-home-left">
+ <!-- k-home-summary-left -->
+ <div id="k-home-summary-right">
<div id="k-home-ini">
Welcome! This site is a Kune node. Kune, which means
"together" in esperanto, it's a network of interconnected
@@ -303,18 +319,28 @@
spaces easily</strong>. <a href="#signin">Join!</a>
</div>
<!-- div home-ini -->
- <div id="k-home-group-stats" style="display: none;"></div>
- <!-- div home-stats -->
+ <!-- k-home-summary-right -->
</div>
+ <!-- div home-header -->
+ </div>
+ <div id="k-home-body">
+ <div id="k-home-left">
+ <div id="k-home-group-stats" style="display: none;">
+ <!-- This id is required for kune (you can create a different .html but preserve this id) -->
+ </div>
+ <!-- div home-group-stats -->
+ </div>
<!-- div k-home-left -->
<div id="k-home-right">
<div id="k-home-global-stats" style="display: none;">
+ <!-- This id is required for kune (you can create a different .html but preserve this id) -->
</div>
</div>
<!-- div k-home-right -->
</div>
- <!-- div k-home-row -->
- <div id="k-home-footer" style="display: none;"></div>
+ <!-- div k-home-body -->
+ <!-- <div id="k-home-footer" style="display: none;"> -->
+ <!-- </div> -->
<!-- div k-home-footer -->
</div>
<!-- div home-table -->
1
0
r1544 - in trunk: img/webtemplate src/main/java/cc/kune/chat/client src/main/java/cc/kune/gspace/client src/main/java/cc/kune/hspace/client src/main/resources src/main/webapp
by Vicente J. Ruiz Jurado 05 Oct '11
by Vicente J. Ruiz Jurado 05 Oct '11
05 Oct '11
Author: vjrj_
Date: 2011-10-05 03:42:19 +0200 (Wed, 05 Oct 2011)
New Revision: 1544
Added:
trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java
trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml
Modified:
trunk/img/webtemplate/web_home_template-2011.svg
trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java
trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml
trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java
trunk/src/main/resources/kune.properties
trunk/src/main/webapp/ws.html
Log:
NEW - # 132: Global public stats
http://kune.ourproject.org/issues/ticket/132
Modified: trunk/img/webtemplate/web_home_template-2011.svg
===================================================================
--- trunk/img/webtemplate/web_home_template-2011.svg 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/img/webtemplate/web_home_template-2011.svg 2011-10-05 01:42:19 UTC (rev 1544)
@@ -14,7 +14,7 @@
height="768"
id="svg3182"
version="1.1"
- inkscape:version="0.48.0 r9654"
+ inkscape:version="0.48.1 r9760"
sodipodi:docname="web_home_template-2011.svg"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png"
inkscape:export-xdpi="90"
@@ -31,15 +31,15 @@
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="546.88652"
- inkscape:cy="736.55101"
+ inkscape:cy="140.60185"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
- inkscape:window-width="1280"
- inkscape:window-height="974"
+ inkscape:window-width="1078"
+ inkscape:window-height="897"
inkscape:window-x="0"
- inkscape:window-y="21"
- inkscape:window-maximized="1"
+ inkscape:window-y="947"
+ inkscape:window-maximized="0"
inkscape:snap-bbox="false"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
@@ -74,7 +74,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -96,12 +96,6 @@
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
- </g>
- <g
- id="layer1"
- inkscape:label="normal"
- inkscape:groupmode="layer"
- style="display:inline">
<rect
style="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"
id="rect5037"
@@ -112,6 +106,16 @@
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer7"
+ inkscape:label="chat" />
+ <g
+ id="layer1"
+ inkscape:label="normal"
+ inkscape:groupmode="layer"
+ style="display:inline">
<rect
style="color:#000000;fill:#ff9999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect4635"
@@ -209,7 +213,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"
@@ -219,7 +223,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"
@@ -354,7 +358,7 @@
transform="translate(-751,-12)">
<path
transform="translate(0,-3)"
- d="m 333,232 c 0,6.07513 -4.92487,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.07513,0 11,4.92487 11,11 z"
+ d="m 333,232 a 11,11 0 1 1 -22,0 11,11 0 1 1 22,0 z"
sodipodi:ry="11"
sodipodi:rx="11"
sodipodi:cy="232"
@@ -388,13 +392,6 @@
id="rect5041"
style="color:#000000;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<image
- width="16"
- height="16"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAdpJREFU OI2lkk1I03EYxz97aYyx9J9lCWlYNjZaIE16uYTUZVDdgsJjt6B7lBEMIlAvmRV5VAovXTuFCRUD KRy71ETLpcPR2EsrRi/7b/9vh3+0lkqFz+nh+3s+Dw/f39chic2Uc1M04Aa4ccRx2OMzxr9VypF/ gbx+I1H9Ur54/aVeIYmhfmMuPjmiulmVUtNSblHKvpYWnkkLz+0+tyilplU3q4pPjmio35iTBJKI 9WHDdVOKhaXSinTntJR6Ks3P2H1pxX6rm6qbVcX6kKSGB073FsgkoSMEvjYoLEHoJARPQCFtax0h yCTt2XVNLKRhWxeUlsHobOjGbltr2wP5pSakeUF7DxTfw4698DHT0MursL0bisv2zJ+/AGDVTJyd vZB/B59zsCsIb56A0wU7A1ApQP4tdPVi1czmC7x+IzE7NYplWTBwF2TB2WHwbgWPz+6tOpwfw7LE 7NQoXr+RAHBI+pUDyYqcGRznYHSASvEDM/eukXw8gSxrwxw4fo/yw0vRB4HjpwJHwz1OJi4EcXtu 8zV7kzF9Xy9QTR48OudwZfOt0WOVFzDfnUbeAwxnVjcC1ywof2q52u6pte4PH7rF5fiVv4FrFhgu M7Kvhfv/A8NPEzdTPwCqtvHRDwWVwwAAAABJRU5ErkJggg== "
- id="image5043"
- x="972.55145"
- y="-76.540894" />
- <image
y="112.88816"
x="7.4508514"
id="image4632"
@@ -423,80 +420,27 @@
height="3.7137473"
x="2.0788269"
y="111.25339" />
- <g
- transform="translate(804.21116,-270.59772)"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/kune-logo.png"
- id="g8266"
- style="opacity:0.5;display:inline">
- <path
- 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"
- 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"
- id="path8268"
- inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- inkscape:connector-curvature="0" />
- <g
- id="g8270"
- transform="matrix(0.1111494,0,0,0.111008,121.5678,22.515968)"
- inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- 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"
- d="m 60.321717,411.99998 377.014613,0"
- id="path8272"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- inkscape:connector-curvature="0" />
- <path
- 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"
- d="m 252.61203,788.60332 0,-377.01178"
- id="path8274"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- inkscape:connector-curvature="0" />
- <path
- 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"
- d="m 252.86937,597.15755 377.0124,0"
- id="path8276"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- inkscape:connector-curvature="0" />
- <path
- 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"
- d="m 437.45588,596.97447 0,-377.01491"
- id="path8278"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- inkscape:connector-curvature="0" />
- <path
- 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"
- d="m 372.87905,411.27704 64.93441,0"
- id="path8280"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- inkscape:connector-curvature="0" />
- </g>
- </g>
<flowRoot
xml:space="preserve"
id="flowRoot3835"
- style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#2b1100;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- transform="translate(-103,-19)"><flowRegion
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#2b1100;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(-102,74)"><flowRegion
id="flowRegion3837"><rect
id="rect3839"
- width="666.18433"
- height="187.65573"
+ width="426.18436"
+ height="295.65573"
x="286.03818"
y="329.61539"
- style="text-align:justify;text-anchor:start" /></flowRegion><flowPara
- style="font-size:28px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Ubuntu Bold"
+ style="font-size:18px;text-align:justify;text-anchor:start" /></flowRegion><flowPara
+ style="font-size:18px;font-weight:bold;text-align:justify;text-anchor:start;-inkscape-font-specification:Ubuntu Bold"
id="flowPara5637"><flowSpan
id="flowSpan5644"
- style="font-size:28px;font-weight:normal;text-align:justify;text-anchor:start;-inkscape-font-specification:Ubuntu">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 <flowSpan
- style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold"
+ style="font-size:18px;font-weight:normal;text-align:justify;text-anchor:start;-inkscape-font-specification:Ubuntu">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 <flowSpan
+ style="font-size:18px;font-weight:bold;-inkscape-font-specification:Ubuntu Bold"
id="flowSpan5635">communicate, share, collaborate with others and </flowSpan></flowSpan>create your web spaces easily. <flowSpan
- style="fill:#803300"
+ style="font-size:18px;fill:#803300"
id="flowSpan5641">Join!</flowSpan></flowPara></flowRoot> <g
- transform="translate(527.82096,-660.09755)"
+ transform="translate(544.82096,-695.09755)"
id="g2737"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/logo-big-home.png"
inkscape:export-xdpi="90"
@@ -555,20 +499,20 @@
x="1473"
y="534" />
<flowRoot
- transform="translate(-101,201)"
- style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(-102,209)"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot4636"
xml:space="preserve"><flowRegion
id="flowRegion4638"><rect
- style="font-size:22px;text-align:justify;text-anchor:start;fill:#c87137;fill-opacity:1"
+ style="font-size:18px;text-align:justify;text-anchor:start;fill:#c87137;fill-opacity:1"
y="329.61539"
x="286.03818"
height="62.655731"
width="331.18436"
id="rect4640" /></flowRegion><flowPara
- style="font-size:22px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
+ style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
id="flowPara4642">Latests groups created</flowPara></flowRoot> <flowRoot
- transform="translate(-100,388)"
+ transform="translate(290,408)"
style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot4644"
xml:space="preserve"><flowRegion
@@ -581,7 +525,7 @@
id="rect4648" /></flowRegion><flowPara
style="font-size:20px;font-weight:bold;text-align:justify;text-anchor:start;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;-inkscape-font-specification:Ubuntu Bold"
id="flowPara4650">(©) cc-by-sa kune.beta.ieapala.es </flowPara></flowRoot> <flowRoot
- transform="translate(-103,238)"
+ transform="translate(-102.234,241)"
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
id="flowRoot4654"
xml:space="preserve"><flowRegion
@@ -592,80 +536,666 @@
height="187.65573"
width="666.18433"
id="rect4658" /></flowRegion><flowPara
- id="flowPara4662">11/Feb/2011 - Some project</flowPara><flowPara
+ id="flowPara4662">11/Feb/2011 - Some project about bla bla bla</flowPara><flowPara
id="flowPara4664">11/Feb/2011 - Other project</flowPara></flowRoot> <flowRoot
xml:space="preserve"
id="flowRoot5602"
- style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- transform="translate(-98,306)"><flowRegion
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(254,69)"><flowRegion
id="flowRegion5604"><rect
id="rect5606"
width="331.18436"
height="62.655731"
x="286.03818"
y="329.61539"
- style="font-size:22px;text-align:justify;text-anchor:start;fill:#c87137;fill-opacity:1" /></flowRegion><flowPara
+ style="font-size:18px;text-align:end;text-anchor:end;fill:#c87137;fill-opacity:1" /></flowRegion><flowPara
id="flowPara5608"
- style="font-size:22px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Other stats</flowPara></flowRoot> <g
- style="display:inline"
- transform="translate(354.82096,-1105.0975)"
- id="g2737-4"
- inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/logo-big-home.png"
+ style="font-size:18px;font-weight:bold;text-align:end;text-anchor:end;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Stats</flowPara></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot6630"
+ style="font-size:18px;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:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Trebuchet MS;-inkscape-font-specification:Trebuchet MS Bold"><flowRegion
+ id="flowRegion6632"><rect
+ id="rect6634"
+ width="395"
+ height="203"
+ x="107"
+ y="502" /></flowRegion><flowPara
+ id="flowPara6636"></flowPara></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot6638"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(-78.792,76)"><flowRegion
+ id="flowRegion6640"><rect
+ id="rect6642"
+ width="666.18433"
+ height="187.65573"
+ x="286.03818"
+ y="329.61539"
+ style="font-size:18px;text-align:end;text-anchor:end;fill:#8a5050;fill-opacity:1" /></flowRegion><flowPara
+ id="flowPara6644" /><flowPara
+ id="flowPara6646">Hosted groups:<flowSpan
+ style="font-size:18px;font-weight:bold;text-align:end;text-anchor:end;-inkscape-font-specification:Ubuntu Bold"
+ id="flowSpan14396"> 999</flowSpan></flowPara><flowPara
+ id="flowPara14394">Registered users: <flowSpan
+ style="font-size:18px;font-weight:bold;text-align:end;text-anchor:end;-inkscape-font-specification:Ubuntu Bold"
+ id="flowSpan14398">999</flowSpan></flowPara><flowPara
+ id="flowPara14557">Users online: <flowSpan
+ style="font-weight:bold;text-align:end;text-anchor:end"
+ id="flowSpan14559">999</flowSpan></flowPara></flowRoot> <text
+ inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- inkscape:connector-curvature="0"
- inkscape:export-ydpi="399.59854"
- inkscape:export-xdpi="399.59854"
- inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png"
- id="path2689-7"
- d="m 298.07933,890.09763 c -0.74303,0 -1.45723,0.003 -2.17391,0.0494 -0.0669,0.0136 -0.13033,0.0368 -0.19763,0.0494 -0.66715,0.12461 -1.32536,0.23087 -2.02569,0.24704 -0.097,0.0136 -0.19995,-0.0145 -0.29644,0 -5.71605,0.86055 -10.54554,3.34248 -14.42688,7.46047 -4.53271,4.78706 -6.81817,10.52182 -6.81818,17.19368 0,6.74672 2.28548,12.52044 6.81818,17.29249 4.90667,5.14604 11.2818,7.70749 19.12055,7.70751 4.15869,-2e-5 8.15681,-1.03328 11.95652,-3.11265 3.79965,-2.01951 7.10345,-4.87783 9.93083,-8.49802 l -8.54743,-4.74308 c -3.68005,4.90668 -8.20158,7.36166 -13.58695,7.36166 -3.73988,0 -7.0931,-1.21319 -9.98024,-3.60672 -2.93207,-2.39351 -4.39727,-5.30891 -4.39723,-8.79447 l 39.08102,0 0,-1.97629 c -4e-5,-8.45204 -2.86291,-15.22007 -8.54743,-20.30632 -4.78705,-4.23347 -10.0899,-6.32405 -15.90909,-6.32411 z m -181.71937,0.34585 0,18.92292 -6.62055,0 0,9.6838 6.62055,0 0,19.76285 10.07905,0 0,-19.76285 6.07708,0 12.40119,19.76285 11.95652,0 -16.6502,-25.09882 15.90909,-22.33202 -12.20356,0 -12.30237,17.98419 -5.18775,0 0,-18.92292 -10.07905,0 z m 123.66601,0 c -1.73503,0.30966 -3.35171,0.81366 -4.8419,1.58103 -2.5132,1.34638 -4.49729,3.12201 -5.97826,5.33597 l 0,-5.97827 -10.12846,0 0,47.43084 10.12846,0 0,-26.58103 c -1e-5,-3.79965 1.07224,-6.71507 3.21147,-8.79447 2.15413,-2.07932 4.88507,-3.11262 8.25098,-3.11265 3.56032,3e-5 6.34065,0.95537 8.3004,2.91502 1.95964,1.95972 2.91496,5.03102 2.91502,9.18973 l 0,26.3834 10.12846,0 0,-28.60672 c -5e-5,-5.8192 -1.77567,-10.62715 -5.33597,-14.42688 -2.67029,-2.84973 -5.76,-4.62351 -9.28854,-5.33597 l -7.36166,0 z m -76.77865,0.93873 0,27.47036 c -2e-5,6.43257 2.16853,11.63344 6.52173,15.61265 4.03904,3.73986 9.04189,5.63239 14.92095,5.63241 5.93886,-2e-5 10.91633,-1.89255 14.97036,-5.63241 4.35315,-3.97921 6.52169,-9.18008 6.52174,-15.61265 l 0,-27.47036 -10.12846,0 0,26.58103 c -5e-5,3.50052 -1.0723,6.34841 -3.21146,8.54743 -2.21404,2.27385 -4.906,3.40909 -8.15218,3.40909 -3.12654,2e-5 -5.83938,-1.15019 -8.05336,-3.40909 -2.19905,-2.27381 -3.2609,-5.10673 -3.26087,-8.54743 l 0,-26.58103 -10.12845,0 z m 133.54743,7.80633 c 3.306,5e-5 6.19285,0.92683 8.64624,2.7668 2.37851,1.88491 4.13014,4.63084 5.23716,8.25099 l -27.22332,0 c 0.79283,-3.48552 2.43792,-6.19246 4.8913,-8.15218 2.37853,-1.89981 5.18745,-2.86556 8.44862,-2.86561 z"
- 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" />
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png"
+ xml:space="preserve"
+ style="font-size:32px;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:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="408.875"
+ y="-262.90875"
+ id="text14416"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan14418"
+ x="408.875"
+ y="-262.90875"
+ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Comunicate with others</tspan></text>
+ <g
+ id="g14538"
+ transform="translate(167,-571)">
<g
- inkscape:export-ydpi="399.59854"
- inkscape:export-xdpi="399.59854"
- inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png"
- transform="matrix(0.347343,0,0,0.346901,34.203754,588.03773)"
- id="g2691-6">
+ id="g14400"
+ transform="matrix(0.68695614,0,0,0.68695614,580.20577,-228.76982)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-group-t.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
<path
- inkscape:connector-curvature="0"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- id="path2693-7"
- d="m 60.321717,411.99998 377.014613,0"
- style="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" />
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ sodipodi:type="star"
+ style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path14402"
+ sodipodi:sides="5"
+ sodipodi:cx="35"
+ sodipodi:cy="12.362183"
+ sodipodi:r1="5"
+ sodipodi:r2="4.045085"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.1991149"
+ inkscape:flatsided="true"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z"
+ inkscape:transform-center-y="-0.10735044"
+ transform="matrix(2.331168,0.83049401,-0.83049401,2.331168,12.776852,771.74251)"
+ inkscape:transform-center-x="1.078998" />
<path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png"
+ transform="matrix(1.1754752,0,0,2.3509505,-21.691738,753.33034)"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ sodipodi:ry="10"
+ sodipodi:rx="20"
+ sodipodi:cy="32.362183"
+ sodipodi:cx="90"
+ id="path14404"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,51.694712,721.54769)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path14406"
+ style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path14408"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,38.408722,716.19953)" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,50.908082,736.08463)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path14410"
+ style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path14412"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,37.248612,739.8127)" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ transform="matrix(5.5489598,1.9768537,-1.9768537,5.5489598,20.951652,708.53981)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path14414"
+ style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ </g>
+ <g
+ id="g14420"
+ transform="matrix(0.68695614,0,0,0.68695614,615.90577,-271.26982)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-user-t.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/src/main/java/cc/kune/wspace/client/resources/userSpaceEnabled.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path14422"
+ sodipodi:cx="90"
+ sodipodi:cy="32.362183"
+ sodipodi:rx="20"
+ sodipodi:ry="10"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ transform="matrix(1.1754752,0,0,2.3509505,-73.660121,753.33034)" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/userSpaceEnabled.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#d45500;fill-opacity:1;stroke:#d45500;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path14424"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(4.9493694,0,0,4.9493694,-42.107891,748.42974)" />
+ </g>
+ <g
+ transform="matrix(0.68695614,0,0,0.68695614,544.50578,-185.26982)"
+ id="g14426"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-world-t.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <path
+ transform="matrix(1.1754752,0,0,2.3509505,30.276632,753.33034)"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ sodipodi:ry="10"
+ sodipodi:rx="20"
+ sodipodi:cy="32.362183"
+ sodipodi:cx="90"
+ id="path14428"
+ style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- id="path2695-8"
- d="m 252.61203,788.60332 0,-377.01178"
- style="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" />
+ id="path14430"
+ d="m 130.79962,807.50532 c -2.85339,0.78923 -5.20625,2.69048 -7.74114,4.12698 -1.45578,1.08139 -3.17371,4.03552 -1.21347,5.32414 1.55176,0.2611 2.79811,-1.05921 4.32566,-1.15498 1.78407,-0.4112 3.60556,-0.7363 5.29696,-1.46265 2.88934,-0.9105 2.88934,-0.9105 3.18467,-1.97638 0.14032,-1.60483 -1.00047,-3.09256 -2.07745,-4.18939 -0.49137,-0.40285 -1.11497,-0.78049 -1.77523,-0.66772 z"
+ style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
<path
+ sodipodi:nodetypes="cacccccccccc"
inkscape:connector-curvature="0"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- id="path2697-9"
- d="m 252.86937,597.15755 377.0124,0"
- style="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" />
+ id="path14432"
+ d="m 153.3922,823.22551 c -4.04703,2.06374 -8.81245,4.142 -10.56886,8.25203 -0.54013,1.26397 0.22272,2.75445 0.4124,4.10295 0.7708,1.43658 -1.11269,2.70312 -0.55672,4.14497 0.66534,1.49717 2.56652,1.27157 3.82727,0.79099 1.28493,-0.44158 -0.53582,-1.70575 0,0 0.58286,1.36335 5.36635,1.77935 6.80857,1.16016 1.38701,-0.50855 2.33091,-0.74837 2.99303,-1.90611 2.17102,-4.41676 3.23712,-9.41812 2.89588,-14.33661 -0.10641,-1.32539 -0.51397,-2.60792 -0.99259,-3.83098 -0.49507,-1.61389 -2.16711,0.0173 -2.82476,0.68071 -0.60256,0.42631 -1.2709,0.77633 -1.99422,0.94189 z"
+ style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
<path
+ sodipodi:nodetypes="cccccacccc"
+ style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 121.52672,824.27304 c -2.3826,0.90534 -4.95654,1.52602 -7.13172,2.85353 -1.8032,1.51882 -1.57875,4.29287 -0.64391,6.22636 1.14716,2.47466 2.05723,5.06419 3.4281,7.43042 1.32587,1.74784 -0.0893,0.98747 1.52127,2.46832 0.45524,0.54208 3.2913,3.28282 4.94937,2.47469 0.82652,-0.40286 0.61983,-1.62095 0.54826,-2.70337 0.52083,-2.24499 -0.82476,-4.39163 -0.7175,-6.65278 -0.0579,-2.83898 0.49943,-5.64398 0.8377,-8.45265 0.19302,-1.55725 -0.68561,-4.455 -2.79157,-3.64452 z"
+ id="path14434"
inkscape:connector-curvature="0"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- id="path2699-7"
- d="m 437.45588,596.97447 0,-377.01491"
- style="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" />
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
<path
- inkscape:connector-curvature="0"
- transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)"
- id="path2701-4"
- d="m 372.87905,411.27704 64.93441,0"
- style="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" />
+ sodipodi:type="arc"
+ style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path14436"
+ sodipodi:cx="90"
+ sodipodi:cy="32.362183"
+ sodipodi:rx="20"
+ sodipodi:ry="10"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ transform="matrix(1.1754752,0,0,2.3509505,30.276632,753.33034)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceEnabled.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
</g>
</g>
+ <text
+ sodipodi:linespacing="125%"
+ id="text14438"
+ y="-220.23883"
+ x="443.5025"
+ style="font-size:32px;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:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;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/kune-intro-min.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
+ y="-220.23883"
+ x="443.5025"
+ id="tspan14440"
+ sodipodi:role="line">Work in collaboration</tspan></text>
+ <text
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png"
+ xml:space="preserve"
+ style="font-size:32px;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:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="390.12"
+ y="-174.88892"
+ id="text14442"
+ sodipodi:linespacing="125%"><tspan
+ id="tspan14444"
+ sodipodi:role="line"
+ x="390.12"
+ y="-174.88892"
+ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">And share with the world</tspan></text>
+ <g
+ style="display:inline"
+ id="g8699-2"
+ transform="matrix(0.68695614,0,0,0.68695614,140.20577,-250.76982)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-group-t.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/icons/from-private-to-public.png"
+ sodipodi:type="star"
+ style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4963-9"
+ sodipodi:sides="5"
+ sodipodi:cx="35"
+ sodipodi:cy="12.362183"
+ sodipodi:r1="5"
+ sodipodi:r2="4.045085"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.1991149"
+ inkscape:flatsided="true"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z"
+ inkscape:transform-center-y="-0.10735044"
+ transform="matrix(2.331168,0.83049401,-0.83049401,2.331168,12.776852,771.74251)"
+ inkscape:transform-center-x="1.078998" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png"
+ transform="matrix(1.1754752,0,0,2.3509505,-21.691738,753.33034)"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ sodipodi:ry="10"
+ sodipodi:rx="20"
+ sodipodi:cy="32.362183"
+ sodipodi:cx="90"
+ id="path4965-9"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,51.694712,721.54769)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path4973-0"
+ style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4975-8"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,38.408722,716.19953)" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,50.908082,736.08463)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path4977-1"
+ style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4979-3"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(4.6623359,1.6609881,-1.6609881,4.6623359,37.248612,739.8127)" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ transform="matrix(5.5489598,1.9768537,-1.9768537,5.5489598,20.951652,708.53981)"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="16.362183"
+ sodipodi:cx="15"
+ id="path4981-1"
+ style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ </g>
+ <text
+ sodipodi:linespacing="125%"
+ id="text2991-8"
+ y="286.09125"
+ x="231.875"
+ style="font-size:32px;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:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;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/kune-intro-min.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
+ y="286.09125"
+ x="231.875"
+ id="tspan2993-4"
+ sodipodi:role="line">Comunicate with others</tspan></text>
+ <g
+ style="display:inline"
+ id="g8695-4"
+ transform="matrix(0.68695614,0,0,0.68695614,175.90577,-293.26982)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-user-t.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/src/main/java/cc/kune/wspace/client/resources/userSpaceEnabled.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4961-0"
+ sodipodi:cx="90"
+ sodipodi:cy="32.362183"
+ sodipodi:rx="20"
+ sodipodi:ry="10"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ transform="matrix(1.1754752,0,0,2.3509505,-73.660121,753.33034)" />
+ <path
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/userSpaceEnabled.png"
+ sodipodi:type="arc"
+ style="color:#000000;fill:#d45500;fill-opacity:1;stroke:#d45500;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path4971-6"
+ sodipodi:cx="15"
+ sodipodi:cy="16.362183"
+ sodipodi:rx="1"
+ sodipodi:ry="1"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ transform="matrix(4.9493694,0,0,4.9493694,-42.107891,748.42974)" />
+ </g>
+ <g
+ style="display:inline"
+ transform="matrix(0.68695614,0,0,0.68695614,104.50578,-207.26982)"
+ id="g3297"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-world-t.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <path
+ transform="matrix(1.1754752,0,0,2.3509505,30.276632,753.33034)"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ sodipodi:ry="10"
+ sodipodi:rx="20"
+ sodipodi:cy="32.362183"
+ sodipodi:cx="90"
+ id="path3299"
+ style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ id="path3301"
+ d="m 130.79962,807.50532 c -2.85339,0.78923 -5.20625,2.69048 -7.74114,4.12698 -1.45578,1.08139 -3.17371,4.03552 -1.21347,5.32414 1.55176,0.2611 2.79811,-1.05921 4.32566,-1.15498 1.78407,-0.4112 3.60556,-0.7363 5.29696,-1.46265 2.88934,-0.9105 2.88934,-0.9105 3.18467,-1.97638 0.14032,-1.60483 -1.00047,-3.09256 -2.07745,-4.18939 -0.49137,-0.40285 -1.11497,-0.78049 -1.77523,-0.66772 z"
+ style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:nodetypes="cacccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3303"
+ d="m 153.3922,823.22551 c -4.04703,2.06374 -8.81245,4.142 -10.56886,8.25203 -0.54013,1.26397 0.22272,2.75445 0.4124,4.10295 0.7708,1.43658 -1.11269,2.70312 -0.55672,4.14497 0.66534,1.49717 2.56652,1.27157 3.82727,0.79099 1.28493,-0.44158 -0.53582,-1.70575 0,0 0.58286,1.36335 5.36635,1.77935 6.80857,1.16016 1.38701,-0.50855 2.33091,-0.74837 2.99303,-1.90611 2.17102,-4.41676 3.23712,-9.41812 2.89588,-14.33661 -0.10641,-1.32539 -0.51397,-2.60792 -0.99259,-3.83098 -0.49507,-1.61389 -2.16711,0.0173 -2.82476,0.68071 -0.60256,0.42631 -1.2709,0.77633 -1.99422,0.94189 z"
+ style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:nodetypes="cccccacccc"
+ style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:2.47468472;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 121.52672,824.27304 c -2.3826,0.90534 -4.95654,1.52602 -7.13172,2.85353 -1.8032,1.51882 -1.57875,4.29287 -0.64391,6.22636 1.14716,2.47466 2.05723,5.06419 3.4281,7.43042 1.32587,1.74784 -0.0893,0.98747 1.52127,2.46832 0.45524,0.54208 3.2913,3.28282 4.94937,2.47469 0.82652,-0.40286 0.61983,-1.62095 0.54826,-2.70337 0.52083,-2.24499 -0.82476,-4.39163 -0.7175,-6.65278 -0.0579,-2.83898 0.49943,-5.64398 0.8377,-8.45265 0.19302,-1.55725 -0.68561,-4.455 -2.79157,-3.64452 z"
+ id="path3305"
+ inkscape:connector-curvature="0"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3307"
+ sodipodi:cx="90"
+ sodipodi:cy="32.362183"
+ sodipodi:rx="20"
+ sodipodi:ry="10"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ transform="matrix(1.1754752,0,0,2.3509505,30.276632,753.33034)"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceEnabled.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+ <text
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-intro-min.png"
+ xml:space="preserve"
+ style="font-size:32px;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:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="232.83501"
+ y="328.76117"
+ id="text3250"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3252"
+ x="232.83501"
+ y="328.76117"
+ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Work in collaboration</tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text3254"
+ y="374.11108"
+ x="233.155"
+ style="font-size:32px;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:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;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/kune-intro-min.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ style="font-size:32px;font-weight:bold;fill:#dd8a3d;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
+ y="374.11108"
+ x="233.155"
+ sodipodi:role="line"
+ id="tspan14386">And share with the world</tspan></text>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot14561"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(-102,294)"><flowRegion
+ id="flowRegion14563"><rect
+ id="rect14565"
+ width="331.18436"
+ height="62.655731"
+ x="286.03818"
+ y="329.61539"
+ style="font-size:18px;text-align:justify;text-anchor:start;fill:#c87137;fill-opacity:1" /></flowRegion><flowPara
+ id="flowPara14567"
+ style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold">Latests publications</flowPara></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot14569"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ transform="translate(-101.478,321)"><flowRegion
+ id="flowRegion14571"><rect
+ id="rect14573"
+ width="666.18433"
+ height="187.65573"
+ x="286.03818"
+ y="329.61539"
+ style="font-size:18px;text-align:justify;text-anchor:start;fill:#8a5050;fill-opacity:1" /></flowRegion><flowPara
+ id="flowPara14575">group1 / Some project about bla bla bla</flowPara><flowPara
+ id="flowPara14577">group2 / Other project</flowPara></flowRoot> <flowRoot
+ transform="translate(-102,379)"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ id="flowRoot14579"
+ xml:space="preserve"><flowRegion
+ id="flowRegion14581"><rect
+ style="font-size:18px;text-align:justify;text-anchor:start;fill:#c87137;fill-opacity:1"
+ y="329.61539"
+ x="286.03818"
+ height="62.655731"
+ width="331.18436"
+ id="rect14583" /></flowRegion><flowPara
+ style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold"
+ id="flowPara14585">Latests activity in your groups</flowPara></flowRoot> <flowRoot
+ transform="translate(-101.478,406)"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;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;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ id="flowRoot14587"
+ xml:space="preserve"><flowRegion
+ id="flowRegion14589"><rect
+ style="font-size:18px;text-align:justify;text-anchor:start;fill:#8a5050;fill-opacity:1"
+ y="329.61539"
+ x="286.03818"
+ height="187.65573"
+ width="666.18433"
+ id="rect14591" /></flowRegion><flowPara
+ id="flowPara14593">group1 / Some project about bla bla bla</flowPara><flowPara
+ id="flowPara14595">group2 / Other project</flowPara></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot14597"
+ style="-inkscape-font-specification:Ubuntu Bold;font-family:Trebuchet MS;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;font-size:18px;text-anchor:start;text-align:start;writing-mode:lr-tb;line-height:125%;text-indent:0;text-decoration:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;opacity:1;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke:none;stroke-opacity:1;stroke-width:1.40678155000000005;stroke-miterlimit:4;stroke-dasharray:none;fill:#181870;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0;baseline-shift:baseline"><flowRegion
+ id="flowRegion14599"><rect
+ id="rect14601"
+ width="472"
+ height="97"
+ x="94"
+ y="619" /></flowRegion><flowPara
+ id="flowPara14603"></flowPara></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot14605"
+ style="-inkscape-font-specification:Ubuntu Bold;font-family:Trebuchet MS;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;font-size:18px;text-anchor:start;text-align:start;writing-mode:lr-tb;line-height:125%;text-indent:0;text-decoration:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;opacity:1;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke:none;stroke-opacity:1;stroke-width:1.40678155000000005;stroke-miterlimit:4;stroke-dasharray:none;fill:#181870;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0;baseline-shift:baseline"><flowRegion
+ id="flowRegion14607"><rect
+ id="rect14609"
+ width="435"
+ height="104"
+ x="114"
+ y="601" /></flowRegion><flowPara
+ id="flowPara14611"></flowPara></flowRoot> <rect
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#e6e6e6;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect14613"
+ width="725"
+ height="204"
+ x="158"
+ y="524"
+ rx="3.7326424"
+ ry="3.7326424" />
+ <rect
+ ry="2.3739674"
+ rx="1.3012474"
+ y="393.62781"
+ x="630.62781"
+ height="129.74437"
+ width="252.74437"
+ id="rect14615"
+ style="color:#000000;fill:none;stroke:#e6e6e6;stroke-width:0.66241109;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:none;stroke:#e6e6e6;stroke-width:0.90581501;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect14617"
+ width="473.50098"
+ height="129.50096"
+ x="157.74951"
+ y="393.74951"
+ rx="2.4378066"
+ ry="2.3695138" />
+ <rect
+ ry="0.79297251"
+ rx="3.7326424"
+ y="726.92798"
+ x="158"
+ height="43.338306"
+ width="725"
+ id="rect14619"
+ style="color:#000000;fill:none;stroke:#e6e6e6;stroke-width:0.6484068;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:none;stroke:#e6e6e6;stroke-width:1.18765354;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect14621"
+ width="725"
+ height="145.39731"
+ x="158"
+ y="247.90636"
+ rx="3.7326424"
+ ry="2.6603734" />
</g>
<g
inkscape:groupmode="layer"
- id="layer7"
- inkscape:label="chat" />
- <g
- inkscape:groupmode="layer"
id="layer3"
inkscape:label="overlay"
style="display:none">
Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-10-05 01:42:19 UTC (rev 1544)
@@ -93,7 +93,6 @@
public ChatClientAction(final ChatResources res) {
super();
this.res = res;
- putValue(Action.SMALL_ICON, res.chat());
kuneEventBus.addHandler(NewUserRegisteredEvent.getType(),
new NewUserRegisteredEvent.NewUserRegisteredHandler() {
@Override
@@ -167,9 +166,6 @@
this.avatarManager = chatInstances.avatarManager;
this.subscriptionManager = chatInstances.subscriptionManager;
- // Not necessary, in ChatInstance
- // Suco.get(SessionReconnect.class);
-
session.onAppStart(true, new AppStartEvent.AppStartHandler() {
@Override
public void onAppStart(final AppStartEvent event) {
@@ -254,6 +250,7 @@
chatIcon.setId(CHAT_CLIENT_ICON_ID);
chatIcon.setStyles("k-no-backimage, k-btn-sitebar, k-chat-icon");
chatIcon.putValue(Action.NAME, i18n.t(CHAT_TITLE));
+ chatIcon.putValue(Action.SMALL_ICON, chatResources.chat());
chatIcon.putValue(Action.TOOLTIP, i18n.t("Show/hide the chat window"));
final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C'));
shorcutRegister.put(shortcut, action);
Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-10-05 01:42:19 UTC (rev 1544)
@@ -53,6 +53,8 @@
IsActionExtensible getHeaderToolbar();
+ SimplePanel getHomeSpace();
+
IsWidget getMainpanel();
SimplePanel getPublicSpace();
Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-10-05 01:42:19 UTC (rev 1544)
@@ -36,7 +36,6 @@
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget;
import com.google.gwt.user.client.ui.IsWidget;
-import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.SplitLayoutPanel;
@@ -104,7 +103,6 @@
public GSpaceArmorImpl(final Provider<ActionFlowPanel> toolbarProv) {
initWidget(uiBinder.createAndBindUi(this));
groupSpace.setWidgetMinSize(splitEast, 150);
- homeSpace.add(RootPanel.get("k-home-wrapper"));
DOM.setStyleAttribute((Element) groupSpace.getWidgetContainerElement(splitEast), "overflow",
"visible");
DOM.setStyleAttribute((Element) splitEast.getWidgetContainerElement(entityToolsContainer),
@@ -199,6 +197,11 @@
}
@Override
+ public SimplePanel getHomeSpace() {
+ return homeSpace;
+ }
+
+ @Override
public IsWidget getMainpanel() {
return mainpanel;
}
Added: trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java 2011-10-05 01:42:19 UTC (rev 1544)
@@ -0,0 +1,34 @@
+package cc.kune.hspace.client;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.Widget;
+
+public class GroupContentHomeLink extends Composite {
+
+ interface GroupContentHomeLinkUiBinder extends UiBinder<Widget, GroupContentHomeLink> {
+ }
+
+ private static GroupContentHomeLinkUiBinder uiBinder = GWT.create(GroupContentHomeLinkUiBinder.class);
+
+ @UiField
+ Image icon;
+
+ @UiField
+ Hyperlink link;
+
+ public GroupContentHomeLink() {
+ initWidget(uiBinder.createAndBindUi(this));
+ }
+
+ public void setValues(final String logoImageUrl, final String text, final String historyToken) {
+ icon.setUrl(logoImageUrl);
+ link.setText(text);
+ link.setTargetHistoryToken(historyToken);
+ }
+
+}
Added: trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml 2011-10-05 01:42:19 UTC (rev 1544)
@@ -0,0 +1,11 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:style>
+ </ui:style>
+ <g:FlowPanel styleName="k-home-group-stats-item">
+ <g:Image ui:field="icon" width="22px" height="22px" styleName="k-home-group-cnt-icon"
+ url="images/clear.png" />
+ <g:Hyperlink ui:field="link" styleName="k-home-group-cnt-link" />
+ </g:FlowPanel>
+</ui:UiBinder>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-05 01:42:19 UTC (rev 1544)
@@ -1,10 +1,26 @@
package cc.kune.hspace.client;
+import java.util.List;
+
+import cc.kune.core.client.services.FileDownloadUtils;
+import cc.kune.core.shared.domain.utils.StateToken;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.gspace.client.GSpaceArmor;
import cc.kune.hspace.client.HSpacePresenter.HSpaceView;
import com.google.gwt.core.client.GWT;
import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HasText;
+import com.google.gwt.user.client.ui.InlineLabel;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.gwtplatform.mvp.client.ViewImpl;
public class HSpacePanel extends ViewImpl implements HSpaceView {
@@ -14,10 +30,59 @@
private static HSpacePanelUiBinder uiBinder = GWT.create(HSpacePanelUiBinder.class);
+ private final FileDownloadUtils downUtils;
+ @UiField
+ FlowPanel globalStats;
+ private final RootPanel globalStatsParent;
+ @UiField
+ public Label globalStatsTitle;
+ @UiField
+ public InlineLabel globalStatsTotalGroupsCount;
+ @UiField
+ public InlineLabel globalStatsTotalGroupsTitle;
+ @UiField
+ public InlineLabel globalStatsTotalUsersCount;
+ @UiField
+ public InlineLabel globalStatsTotalUsersTitle;
+ @UiField
+ FlowPanel groupStats;
+ private final RootPanel groupStatsParent;
+ @UiField
+ public FlowPanel lastActivityInYourGroup;
+ @UiField
+ public Label lastActivityInYourGroupTitle;
+ @UiField
+ public FlowPanel lastGroups;
+ @UiField
+ public Label lastGroupsTitle;
+ @UiField
+ public FlowPanel lastPublishedContents;
+ @UiField
+ public Label lastPublishedContentsTitle;
+
+ private final Provider<GroupContentHomeLink> linkProv;
+
private final Widget widget;
- public HSpacePanel() {
+ @Inject
+ public HSpacePanel(final I18nTranslationService i18n, final GSpaceArmor armor,
+ final Provider<GroupContentHomeLink> linkProv, final FileDownloadUtils downUtils) {
+ this.linkProv = linkProv;
+ this.downUtils = downUtils;
widget = uiBinder.createAndBindUi(this);
+ globalStatsTitle.setText(i18n.t("Stats"));
+ globalStatsTotalGroupsTitle.setText(i18n.t("Hosted groups:"));
+ globalStatsTotalUsersTitle.setText(i18n.t("Registered users:"));
+ lastActivityInYourGroupTitle.setText(i18n.t("Latest created groups"));
+ lastGroupsTitle.setText(i18n.t("Latest publications"));
+ lastPublishedContentsTitle.setText(i18n.t("Latest activity in your groups"));
+ globalStats.removeFromParent();
+ groupStats.removeFromParent();
+ globalStatsParent = RootPanel.get("k-home-global-stats");
+ globalStatsParent.add(globalStats);
+ groupStatsParent = RootPanel.get("k-home-group-stats");
+ groupStatsParent.add(groupStats);
+ armor.getHomeSpace().add(RootPanel.get("k-home-wrapper"));
}
@Override
@@ -25,4 +90,61 @@
return widget;
}
+ @Override
+ public HasText getGlobalStatsTotalGroupsCount() {
+ return globalStatsTotalGroupsCount;
+ }
+
+ @Override
+ public HasText getGlobalStatsTotalUsersCount() {
+ return globalStatsTotalUsersCount;
+ }
+
+ @Override
+ public void setLastContentsOfMyGroup(final List<ContentSimpleDTO> lastContentsOfMyGroupsList) {
+ lastActivityInYourGroup.clear();
+ for (final ContentSimpleDTO content : lastContentsOfMyGroupsList) {
+ final GroupContentHomeLink link = linkProv.get();
+ final StateToken token = content.getStateToken();
+ link.setValues(downUtils.getLogoImageUrl(token.copy().clearDocument().clearFolder()),
+ content.getName(), token.toString());
+ lastActivityInYourGroup.add(link);
+ }
+ }
+
+ @Override
+ public void setLastGroups(final List<GroupDTO> lastGroupsList) {
+ lastGroups.clear();
+ for (final GroupDTO group : lastGroupsList) {
+ final GroupContentHomeLink link = linkProv.get();
+ link.setValues(downUtils.getLogoImageUrl(group.getStateToken()), group.getLongName(),
+ group.getShortName());
+ lastGroups.add(link);
+ }
+ }
+
+ @Override
+ public void setLastPublishedContents(final List<ContentSimpleDTO> lastPublishedContentsList) {
+ lastPublishedContents.clear();
+ for (final ContentSimpleDTO content : lastPublishedContentsList) {
+ final GroupContentHomeLink link = linkProv.get();
+ final StateToken token = content.getStateToken();
+ link.setValues(downUtils.getLogoImageUrl(token.copy().clearDocument().clearFolder()),
+ content.getName(), token.toString());
+ lastPublishedContents.add(link);
+ }
+ }
+
+ @Override
+ public void setStatsVisible(final boolean visible) {
+ globalStatsParent.setVisible(visible);
+ groupStatsParent.setVisible(visible);
+ }
+
+ @Override
+ public void setUserGroupsActivityVisible(final boolean logged) {
+ lastActivityInYourGroup.setVisible(logged);
+ lastActivityInYourGroupTitle.setVisible(logged);
+ }
+
}
Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-05 01:42:19 UTC (rev 1544)
@@ -2,12 +2,32 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:style>
- .important {
- font-weight: bold;
- }
+.padl { padding-left: 5px; }
</ui:style>
- <g:HTMLPanel>
- Hello,
- <g:Button styleName="{style.important}" ui:field="button"/>
- </g:HTMLPanel>
-</ui:UiBinder>
\ No newline at end of file
+ <g:FlowPanel>
+ <g:FlowPanel ui:field="globalStats">
+ <g:Label ui:field="globalStatsTitle" styleName="k-home-title"/>
+ <g:FlowPanel>
+ <g:InlineLabel ui:field="globalStatsTotalGroupsTitle"
+ styleName="k-home-normal-text"/>
+ <g:InlineLabel ui:field="globalStatsTotalGroupsCount"
+ addStyleNames="{style.padl} k-home-em-text"/>
+ </g:FlowPanel>
+ <g:FlowPanel>
+ <g:InlineLabel ui:field="globalStatsTotalUsersTitle"
+ styleName="k-home-normal-text"/>
+ <g:InlineLabel ui:field="globalStatsTotalUsersCount"
+ addStyleNames="{style.padl} k-home-em-text"/>
+ </g:FlowPanel>
+ </g:FlowPanel>
+ <g:FlowPanel ui:field="groupStats">
+ <g:Label ui:field="lastGroupsTitle" styleName="k-home-title"/>
+ <g:FlowPanel ui:field="lastGroups" styleName="k-home-normal-text"/>
+ <g:Label ui:field="lastPublishedContentsTitle" styleName="k-home-title"/>
+ <g:FlowPanel ui:field="lastPublishedContents" styleName="k-home-normal-text"/>
+ <g:Label ui:field="lastActivityInYourGroupTitle"
+ styleName="k-home-title"/>
+ <g:FlowPanel ui:field="lastActivityInYourGroup" styleName="k-home-normal-text"/>
+ </g:FlowPanel>
+ </g:FlowPanel>
+</ui:UiBinder>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java 2011-10-05 01:42:19 UTC (rev 1544)
@@ -19,13 +19,18 @@
*/
package cc.kune.hspace.client;
-import cc.kune.common.client.notify.NotifyUser;
+import java.util.List;
+
import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.UserSignInOrSignOutEvent;
+import cc.kune.core.client.state.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler;
+import cc.kune.core.shared.dto.ContentSimpleDTO;
+import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.HomeStatsDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.HasText;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.gwtplatform.mvp.client.Presenter;
@@ -40,28 +45,54 @@
public interface HSpaceProxy extends Proxy<HSpacePresenter> {
}
public interface HSpaceView extends View {
+
+ HasText getGlobalStatsTotalGroupsCount();
+
+ HasText getGlobalStatsTotalUsersCount();
+
+ void setLastContentsOfMyGroup(List<ContentSimpleDTO> lastContentsOfMyGroupsList);
+
+ void setLastGroups(List<GroupDTO> lastGroups);
+
+ void setLastPublishedContents(List<ContentSimpleDTO> lastPublishedContentsList);
+
+ void setStatsVisible(boolean visible);
+
+ void setUserGroupsActivityVisible(boolean logged);
}
- private final I18nTranslationService i18n;
-
@Inject
public HSpacePresenter(final Session session, final EventBus eventBus, final HSpaceView view,
- final HSpaceProxy proxy, final I18nTranslationService i18n,
- final Provider<ClientStatsServiceAsync> statsService) {
+ final HSpaceProxy proxy, final Provider<ClientStatsServiceAsync> statsService) {
super(eventBus, view, proxy);
- this.i18n = i18n;
final AsyncCallbackSimple<HomeStatsDTO> callback = new AsyncCallbackSimple<HomeStatsDTO>() {
@Override
public void onSuccess(final HomeStatsDTO result) {
- NotifyUser.info(
- "Total groups: " + result.getTotalGroups() + " total users: " + result.getTotalUsers(), true);
+ getView().getGlobalStatsTotalGroupsCount().setText(result.getTotalGroups().toString());
+ getView().getGlobalStatsTotalUsersCount().setText(result.getTotalUsers().toString());
+ getView().setLastGroups(result.getLastGroups());
+ final List<ContentSimpleDTO> lastContentsOfMyGroups = result.getLastContentsOfMyGroups();
+ final boolean myGroupsHasActivity = lastContentsOfMyGroups != null
+ && lastContentsOfMyGroups.size() > 0;
+ if (myGroupsHasActivity) {
+ getView().setLastContentsOfMyGroup(lastContentsOfMyGroups);
+ }
+ getView().setUserGroupsActivityVisible(myGroupsHasActivity);
+ getView().setLastPublishedContents(result.getLastPublishedContents());
+ getView().setStatsVisible(true);
}
};
- if (session.isLogged()) {
- statsService.get().getHomeStats(session.getUserHash(), callback);
- } else {
- statsService.get().getHomeStats(callback);
- }
+ session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() {
+ @Override
+ public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) {
+ final boolean logged = event.isLogged();
+ if (logged) {
+ statsService.get().getHomeStats(session.getUserHash(), callback);
+ } else {
+ statsService.get().getHomeStats(callback);
+ }
+ }
+ });
}
@Override
Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/resources/kune.properties 2011-10-05 01:42:19 UTC (rev 1544)
@@ -73,36 +73,38 @@
### Workspace enabled themes
# This names are also the name of the items in the theme menu and there are translated
-kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent
+kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent,eurosur
kune.wsthemes.default = default
+kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e3dbdb, #FFF, #000
+kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #000, #FFF
+kune.wsthemes.blue.backgrounds = #8cbaff, #87aade, #5280c5, #528ce2, #c5dcff, #528ce2, #FFF, #c9d8f0
+kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa
+kune.wsthemes.camp.backgrounds = #e7cc5f, #a49e87, #3c3c3c, #dcbc3a, #f6f1de, #4f472b, #FFF, #fff8dc
+kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515
kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7
kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c
+kune.wsthemes.eurosur.backgrounds = #b8d0e1, #dfe9f1, #181870, #e0eaf2, #dfe9f1,#b8d0e1, #FFF, #dfe9f1
+kune.wsthemes.eurosur.colors = #181870,#181870,#FFF,#181870,#181870,#181870,#181870,#181870
kune.wsthemes.green.backgrounds = #abde88, #bfe7a6, #5a8141, #749b5a, #d5efc3, #749b5a, #FFF, #eaf7e1
kune.wsthemes.green.colors = #225500, #225500, #FFF, #FFF, #17280b, #FFF, #225500, #225500
+kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7
+kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d
+kune.wsthemes.highcontrast.backgrounds = #0c1f3d, #162d50, #000000, #0c2855, #162d50, #000000, #FFF, #162d50
+kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF
+kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #e777a4, #ffddf8, #d25b8b, #FFF, #f6dee8
+kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066
kune.wsthemes.purple.backgrounds = #ddaee9, #f4c6ff, #9753aa, #db79f4, #f4e4f8, #b852d2, #FFF, #f9e3ff
kune.wsthemes.purple.colors = #FFF, #FFF, #FFF, #FFF, #6d0c87, #FFF, #6d0c87, #6d0c87
-kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7
-kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d
kune.wsthemes.red.backgrounds = #ec3a3a, #d35f5f, #9f0000, #c52b2b, #ffe0e0, #ec3a3a, #FFF, #f7e1e1
kune.wsthemes.red.colors = #FFF, #FFF, #FFF, #FFF, #a02c2c, #FFF, #a02c2c, #a02c2c
+kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1
+kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000
kune.wsthemes.sahara.backgrounds = #e8bc9e, #eac9b3, #d59367, #eac9b3, #f7ece4, #e0ae8d, #FFF, #f7ece4
kune.wsthemes.sahara.colors = #502d16, #502d16, #552200, #502d16, #502d16, #784421, #d45500, #d45500
-kune.wsthemes.blue.backgrounds = #8cbaff, #87aade, #5280c5, #528ce2, #c5dcff, #528ce2, #FFF, #c9d8f0
-kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa
-kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1
-kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000
-kune.wsthemes.camp.backgrounds = #e7cc5f, #a49e87, #3c3c3c, #dcbc3a, #f6f1de, #4f472b, #FFF, #fff8dc
-kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515
-kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #e777a4, #ffddf8, #d25b8b, #FFF, #f6dee8
-kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066
-kune.wsthemes.highcontrast.backgrounds = #0c1f3d, #162d50, #000000, #0c2855, #162d50, #000000, #FFF, #162d50
-kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF
+kune.wsthemes.transparent.backgrounds = transparent, transparent, #e3dbdb, transparent, transparent, #e3dbdb, transparent, transparent
+kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000
kune.wsthemes.whiteblack.backgrounds = #FFF, #FFF, #e3dbdb, #FFF, #FFF, #e3dbdb, #FFF, #FFF
kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000
-kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e3dbdb, #FFF, #000
-kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #000, #FFF
-kune.wsthemes.transparent.backgrounds = transparent, transparent, #e3dbdb, transparent, transparent, #e3dbdb, transparent, transparent
-kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000
### Uploads
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2011-10-04 00:46:24 UTC (rev 1543)
+++ trunk/src/main/webapp/ws.html 2011-10-05 01:42:19 UTC (rev 1544)
@@ -51,18 +51,22 @@
<link type="text/css" rel="stylesheet"
href="ws/fontface/ubuntufontface.css">
<link type="text/css" rel="stylesheet" href="ws/kune-message.css">
-<link type="text/css" rel="stylesheet" href="others/splash/style/permalink.css">
-<link type="text/css" rel="stylesheet" href="others/splash/style/stuff.css">
-<link type="text/css" rel="stylesheet" href="others/splash/style/main.css">
+<link type="text/css" rel="stylesheet"
+ href="others/splash/style/permalink.css">
+<link type="text/css" rel="stylesheet"
+ href="others/splash/style/stuff.css">
+<link type="text/css" rel="stylesheet"
+ href="others/splash/style/main.css">
<link type="text/css" rel="stylesheet" href="ws/ws.css">
<script type="text/javascript" src="others/splash/js/gadget.js"></script>
<script type="text/javascript" src="others/splash/js/rpc.js"></script>
<script type="text/javascript" src="others/splash/js/common_client.js"></script>
-<script type="text/javascript" src="others/splash/js/permalink_client.js"></script>
-<script type="text/javascript" src="http://wave.google.com/gadgets/js/core:rpc.js?c=1"></script>
+<script type="text/javascript"
+ src="others/splash/js/permalink_client.js"></script>
+<script type="text/javascript"
+ src="http://wave.google.com/gadgets/js/core:rpc.js?c=1"></script>
<style type="text/css">
-
body {
background-color: white;
color: black;
@@ -114,7 +118,7 @@
#k-home-ini {
clear: both;
- font-size: 28px;
+ font-size: 20px;
color: #69312f;
text-align: justify;
padding: 27px 0;
@@ -130,20 +134,21 @@
font-weight: bold;
}
-#k-home-stats {
- font-size: 22px;
- color: #c87137;
- font-weight: bold;
-}
-
#k-home-table {
display: table;
}
-#k-home-header {
+.k-home-header {
display: table-row;
}
+#k-home-footer {
+ display: table-row;
+ font-size: 14px;
+ text-align: right;
+ color: #8a5050;
+}
+
#k-home-logo {
display: table-cell;
margin: 50px 0 22px 0;
@@ -152,7 +157,7 @@
#k-home-summary {
display: table-cell;
- font-size: 32px;
+ font-size: 28px;
color: #dd8a3d;
font-weight: bold;
white-space: nowrap;
@@ -166,8 +171,8 @@
line-height: 45px;
}
-#k-home-row {
- display: table-row;
+#k-home-row { /* display: table-row;*/
+
}
#k-home-left {
@@ -176,8 +181,56 @@
#k-home-right {
display: table-cell;
+ text-align: right;
+ white-space: nowrap;
+ padding-left: 30px;
}
+#k-home-group-stats {
+ color: #c87137;
+}
+
+#k-home-global-stats {
+
+}
+
+.k-home-title {
+ color: #c87137;
+ font-size: 19px;
+ font-weight: bold;
+ padding-top: 10px;
+ clear: both;
+}
+
+.k-home-normal-text {
+ color: #8a5050;
+ font-size: 18px;
+}
+
+.k-home-em-text {
+ color: #8a5050;
+ font-size: 18px;
+ font-weight: bold;
+}
+
+.k-home-group-cnt-icon {
+ float: left;
+}
+
+.k-home-group-cnt-link {
+ float: left;
+}
+
+.k-home-group-cnt-link a {
+ color: #8a5050;
+ padding-left: 10px;
+}
+
+.k-home-group-stats-item {
+ clear: both;
+ line-height: 1.2em;
+}
+
.banner {
margin: 30px;
}
@@ -217,15 +270,24 @@
<div id="k-home-prewrap">
<div id="k-home-wrapper">
<div id="k-home-table">
- <div id="k-home-header">
+ <div class="k-home-header">
<div id="k-home-logo">
<img src="ws/logo-big-home.png" alt="" />
</div>
+ </div>
+ <!-- div home-header -->
+ <div class="k-home-header">
<div id="k-home-summary">
<ul>
- <li style="background-image: url(ws/images/kune-intro-user.png);">Comunicate with others</li>
- <li style="background-image: url(ws/images/kune-intro-group.png);">Work in collaboration</li>
- <li style="background-image: url(ws/images/kune-intro-world.png);">And share with the world</li>
+ <li
+ style="background-image: url(ws/images/kune-intro-user.png);">Comunicate
+ with others</li>
+ <li
+ style="background-image: url(ws/images/kune-intro-group.png);">Work
+ in collaboration</li>
+ <li
+ style="background-image: url(ws/images/kune-intro-world.png);">And
+ share with the world</li>
</ul>
</div>
<!-- k-home-summary -->
@@ -241,16 +303,19 @@
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 id="k-home-group-stats" style="display: none;"></div>
+ <!-- div home-stats -->
</div>
<!-- div k-home-left -->
<div id="k-home-right">
- <!-- div home-stats -->
+ <div id="k-home-global-stats" style="display: none;">
+ </div>
</div>
<!-- div k-home-right -->
</div>
<!-- div k-home-row -->
+ <div id="k-home-footer" style="display: none;"></div>
+ <!-- div k-home-footer -->
</div>
<!-- div home-table -->
</div>
1
0
Author: vjrj_
Date: 2011-10-04 02:46:24 +0200 (Tue, 04 Oct 2011)
New Revision: 1543
Added:
trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java
Removed:
trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java
Modified:
trunk/pom.xml
trunk/src/main/java/cc/kune/chat/client/ChatClient.java
trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
trunk/src/main/java/cc/kune/chat/client/ChatParts.java
trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java
trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java
trunk/src/main/java/cc/kune/client/KuneEntryPoint.java
trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java
trunk/src/main/java/cc/kune/core/client/CoreParts.java
trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java
trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java
trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties
trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java
trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java
trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java
trunk/src/main/java/cc/kune/core/client/state/Session.java
trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java
trunk/src/main/java/cc/kune/core/server/InitData.java
trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java
trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java
trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java
trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java
trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java
trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java
trunk/src/main/resources/db/liquibase_changelog.xml
trunk/src/main/resources/kune.properties
Log:
CLOSED - # 79: I18n refactorization
http://kune.ourproject.org/issues/ticket/79
CLOSED - # 133: Messages not clear: "this site"?
http://kune.ourproject.org/issues/ticket/133
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/pom.xml 2011-10-04 00:46:24 UTC (rev 1543)
@@ -1109,7 +1109,7 @@
<plugin>
<groupId>org.dstovall</groupId>
<artifactId>onejar-maven-plugin</artifactId>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.4</version>
<executions>
<execution>
<configuration>
Modified: trunk/src/main/java/cc/kune/chat/client/ChatClient.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -25,7 +25,7 @@
public interface ChatClient {
public static final String CHAT_CLIENT_ICON_ID = "k-chat-icon-id";
- void addNewBuddie(String shortName);
+ void addNewBuddy(String shortName);
void chat(String shortName);
@@ -33,9 +33,9 @@
void doLogin();
- boolean isBuddie(String shortName);
+ boolean isBuddy(String shortName);
- boolean isBuddie(XmppURI jid);
+ boolean isBuddy(XmppURI jid);
boolean isLoggedIn();
Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -223,7 +223,7 @@
}
@Override
- public void addNewBuddie(final String shortName) {
+ public void addNewBuddy(final String shortName) {
roster.requestAddItem(uriFrom(shortName), shortName);
}
@@ -341,7 +341,7 @@
public void onSubscriptionRequestReceived(final SubscriptionRequestReceivedEvent event) {
final XmppURI uri = event.getFrom();
final String nick = event.getNick();
- NotifyUser.askConfirmation(res.question32(), i18n.t("Confirm new buddie"), i18n.t(
+ NotifyUser.askConfirmation(res.question32(), i18n.t("Confirm new buddy"), i18n.t(
"[%s] had added you as a buddy. Do you want to add him/her also?", uri.getJID().toString()),
new SimpleResponseCallback() {
@Override
@@ -359,12 +359,12 @@
}
@Override
- public boolean isBuddie(final String shortName) {
- return isBuddie(uriFrom(shortName));
+ public boolean isBuddy(final String shortName) {
+ return isBuddy(uriFrom(shortName));
}
@Override
- public boolean isBuddie(final XmppURI jid) {
+ public boolean isBuddy(final XmppURI jid) {
if (roster.isRosterReady()) {
if (roster.getItemByJID(jid) != null) {
return true;
Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -19,7 +19,7 @@
*/
package cc.kune.chat.client;
-import cc.kune.chat.client.actions.AddAsBuddieAction;
+import cc.kune.chat.client.actions.AddAsBuddyAction;
import cc.kune.chat.client.actions.AddAsBuddieHeaderButton;
import cc.kune.chat.client.actions.ChatClientActions;
import cc.kune.chat.client.actions.ChatSitebarActions;
@@ -72,7 +72,7 @@
final IsCurrentStateEditableCondition isEditableCondition,
final IsBuddieCondition isBuddieCondition, final IsNotBuddieCondition isNotBuddieCondition,
final IsCurrentStateAGroupCondition isGroupCondition, final IsPersonCondition isPersonCondition,
- final Provider<AddAsBuddieAction> addAsBuddie,
+ final Provider<AddAsBuddyAction> addAsBuddie,
final Provider<StartChatWithMemberAction> startChatWithMemberAction,
final IsLoggedCondition isLogged,
final Provider<StartChatWithThisPersonAction> startChatWithPersonAction,
@@ -112,7 +112,7 @@
final Provider<MenuItemDescriptor> addAsBuddieItem = new Provider<MenuItemDescriptor>() {
@Override
public MenuItemDescriptor get() {
- final AddAsBuddieAction action = addAsBuddie.get();
+ final AddAsBuddyAction action = addAsBuddie.get();
final MenuItemDescriptor item = new MenuItemDescriptor(action);
item.add(isNotMe);
item.add(isNotBuddieCondition);
Deleted: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -1,62 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.chat.client.actions;
-
-import cc.kune.chat.client.ChatClient;
-import cc.kune.chat.client.ChatInstances;
-import cc.kune.common.client.actions.AbstractExtendedAction;
-import cc.kune.common.client.actions.Action;
-import cc.kune.common.client.actions.ActionEvent;
-import cc.kune.core.client.resources.CoreMessages;
-import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.UserSimpleDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
-
-import com.google.inject.Inject;
-
-public class AddAsBuddieAction extends AbstractExtendedAction {
- private final ChatClient chatEngine;
-
- @Inject
- public AddAsBuddieAction(final ChatClient chatEngine, final ChatInstances chatInstances,
- final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img) {
- super();
- this.chatEngine = chatEngine;
- putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDIE));
- putValue(Action.SMALL_ICON, img.addGreen());
- }
-
- @Override
- public void actionPerformed(final ActionEvent event) {
- String username = null;
- if (event.getTarget() instanceof GroupDTO) {
- username = ((GroupDTO) event.getTarget()).getShortName();
- } else if (event.getTarget() instanceof UserSimpleDTO) {
- username = ((UserSimpleDTO) event.getTarget()).getShortName();
- }
- if (username != null) {
- chatEngine.addNewBuddie(username);
- // NotifyUser.info("Added as buddie. Waiting buddie response");
- setEnabled(false);
- }
- }
-}
Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -75,14 +75,14 @@
setState();
}
});
- putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDIE));
+ putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDY));
putValue(Action.SMALL_ICON, img.addGreen());
}
@Override
public void actionPerformed(final ActionEvent event) {
- chatEngine.addNewBuddie(session.getCurrentState().getGroup().getShortName());
- // NotifyUser.info("Added as buddie. Waiting buddie response");
+ chatEngine.addNewBuddy(session.getCurrentState().getGroup().getShortName());
+ // NotifyUser.info("Added as buddy. Waiting buddy response");
setEnabled(false);
}
@@ -104,7 +104,7 @@
private void setState(final StateAbstractDTO state) {
final String groupName = state.getGroup().getShortName();
final boolean imLogged = session.isLogged();
- final boolean isNotBuddie = !chatEngine.isBuddie(groupName);
+ final boolean isNotBuddie = !chatEngine.isBuddy(groupName);
if (imLogged && currentGroupsIsAsPerson(state) && isNotBuddie && isNotMe(groupName)) {
setEnabled(true);
} else {
Copied: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java (from rev 1538, trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieAction.java)
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java (rev 0)
+++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.chat.client.actions;
+
+import cc.kune.chat.client.ChatClient;
+import cc.kune.chat.client.ChatInstances;
+import cc.kune.common.client.actions.AbstractExtendedAction;
+import cc.kune.common.client.actions.Action;
+import cc.kune.common.client.actions.ActionEvent;
+import cc.kune.core.client.resources.CoreMessages;
+import cc.kune.core.client.resources.CoreResources;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.UserSimpleDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.google.inject.Inject;
+
+public class AddAsBuddyAction extends AbstractExtendedAction {
+ private final ChatClient chatEngine;
+
+ @Inject
+ public AddAsBuddyAction(final ChatClient chatEngine, final ChatInstances chatInstances,
+ final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img) {
+ super();
+ this.chatEngine = chatEngine;
+ putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDY));
+ putValue(Action.SMALL_ICON, img.addGreen());
+ }
+
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ String username = null;
+ if (event.getTarget() instanceof GroupDTO) {
+ username = ((GroupDTO) event.getTarget()).getShortName();
+ } else if (event.getTarget() instanceof UserSimpleDTO) {
+ username = ((UserSimpleDTO) event.getTarget()).getShortName();
+ }
+ if (username != null) {
+ chatEngine.addNewBuddy(username);
+ // NotifyUser.info("Added as buddy. Waiting buddy response");
+ setEnabled(false);
+ }
+ }
+}
Modified: trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/chat/client/actions/conditions/IsBuddieCondition.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -43,7 +43,7 @@
}
private boolean isBuddie(final String targetName) {
- return chatClient.isBuddie(targetName);
+ return chatClient.isBuddy(targetName);
}
private boolean isThisGroupInRoster(final GuiActionDescrip descr) {
Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -88,7 +88,6 @@
ginjector.getWikiParts();
ginjector.getSiteLogoPresenter();
- ginjector.getSpacesTabPresenter();
ginjector.getChatClient();
ginjector.getCoreParts();
ginjector.getGSpaceParts();
Modified: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -157,7 +157,6 @@
* Try to use {@link SimpleHtmlSanitizer} better
*
*/
- @Deprecated
public static String escapeHtmlLight(final String source) {
String result = source;
if (source != null) {
Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -23,6 +23,7 @@
import cc.kune.core.client.init.AppStartEvent;
import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
import cc.kune.core.client.sitebar.SiteUserOptionsPresenter;
+import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter;
import cc.kune.core.client.sn.GroupSNPresenter;
import cc.kune.core.client.sn.UserSNPresenter;
import cc.kune.core.client.sn.actions.registry.GroupSNConfActions;
@@ -39,7 +40,8 @@
final Provider<UserSNPresenter> buddiesAndParticipationPresenter,
final Provider<GroupSNConfActions> groupMembersConfActions,
final Provider<UserSNConfActions> userSNConfActions, final Provider<AnonUsersManager> anonUsers,
- final Provider<SiteUserOptionsPresenter> userOptions) {
+ final Provider<SiteUserOptionsPresenter> userOptions,
+ final Provider<SpaceSelectorPresenter> spaceSelector) {
session.onAppStart(true, new AppStartHandler() {
@Override
public void onAppStart(final AppStartEvent event) {
@@ -49,6 +51,7 @@
buddiesAndParticipationPresenter.get();
userOptions.get();
anonUsers.get();
+ spaceSelector.get();
}
});
}
Modified: trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/auth/AnonUsersManager.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -3,13 +3,13 @@
import cc.kune.common.client.notify.NotifyUser;
import cc.kune.common.client.utils.TextUtils;
import cc.kune.core.client.cookies.CookiesManager;
+import cc.kune.core.client.i18n.I18nUITranslationService;
import cc.kune.core.client.init.AppStartEvent;
import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.SiteTokens;
import cc.kune.core.client.state.UserSignInEvent;
import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
-import cc.kune.core.shared.i18n.I18nTranslationService;
import com.google.inject.Inject;
@@ -19,7 +19,7 @@
@Inject
public AnonUsersManager(final Session session, final CookiesManager cookiesManager,
- final I18nTranslationService i18n) {
+ final I18nUITranslationService i18n) {
session.onAppStart(true, new AppStartHandler() {
@Override
public void onAppStart(final AppStartEvent event) {
@@ -32,13 +32,14 @@
i18n.tWithNT("register", "register, in lowercase"), false);
final String signin = TextUtils.generateHtmlLink("#" + SiteTokens.SIGNIN,
i18n.tWithNT("sign in", "register, in lowercase"), false);
+ final String siteCommonName = i18n.getSiteCommonName();
NotifyUser.info(
"",
i18n.tWithNT(
- "You did not sign-in, so you can just see some public contents in this website, "
- + "but not edit or collaborate with others. Please [%s] or [%s] in order to get full access to this site tools and contents",
- "This will be something like 'Please register or sign in', but instead of %s some links",
- register, signin), ANON_MESSAGE_CLOSE_ICON, true);
+ "You did not sign-in, so you can just see some public contents in [%s], "
+ + "but not edit or collaborate with others. Please [%s] or [%s] in order to get full access to [%s] tools and contents",
+ "This will be something like 'Please register or sign in in other to get full access to this site tools', but instead of %s some links",
+ siteCommonName, register, signin, siteCommonName), ANON_MESSAGE_CLOSE_ICON, true);
} else {
if (Boolean.valueOf(anonCookie)) {
// Registered already: we set the cookie for some big period again
Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -175,6 +175,8 @@
true, SubscriptionMode.manual, "blue");
super.saveAutocompleteLoginData(getView().getShortName(), getView().getRegisterPassword());
final AsyncCallback<Void> callback = new AsyncCallback<Void>() {
+ final String siteCommonName = i18n.getSiteCommonName();
+
@Override
public void onFailure(final Throwable caught) {
onRegistrationFailure(caught);
@@ -214,20 +216,22 @@
private void showWelcolmeDialog() {
NotifyUser.info(
i18n.t("Welcome"),
- i18n.t("Thanks for joining this site. "
- + "Now you can actively participate in this site. "
- + "You can also use your personal space to publish contents. "
- + "Note: your email is not verified, please follow the instructions you will receive by email."),
- Register.WELCOME_ID, true);
+ i18n.t(
+ "Thanks for joining [%s]. "
+ + "Now you can actively participate in [%s]. "
+ + "You can also use your personal space to publish contents. "
+ + "Note: your email is not verified, please follow the instructions you will receive by email.",
+ siteCommonName, siteCommonName), Register.WELCOME_ID, true);
}
private void showWelcolmeDialogNoHomepage() {
NotifyUser.info(
i18n.t("Welcome"),
- i18n.t("Thanks for joining this site"
- + "Now you can actively participate in this site. "
- + "Note: your email is not verified, please follow the instructions you will receive by email."),
- Register.WELCOME_ID, true);
+ i18n.t(
+ "Thanks for joining [%s]. "
+ + "Now you can actively participate in [%s]. "
+ + "Note: your email is not verified, please follow the instructions you will receive by email.",
+ siteCommonName, siteCommonName), Register.WELCOME_ID, true);
}
};
userServiceProvider.get().createUser(user, wantHomepage, callback);
Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -45,6 +45,7 @@
private final KuneConstants kuneConstants;
private HashMap<String, String> lexicon;
private final Session session;
+ private String siteCommonName;
@Inject
public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService,
@@ -167,10 +168,30 @@
return lexicon;
}
+ public String getSiteCommonName() {
+ if (siteCommonName == null) {
+ siteCommonName = t(session.getSiteCommonName());
+ }
+ return siteCommonName;
+ }
+
public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) {
}
+ private void save(final String text, final String noteForTranslators) {
+ i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, noteForTranslators,
+ new AsyncCallback<String>() {
+ @Override
+ public void onFailure(final Throwable caught) {
+ }
+
+ @Override
+ public void onSuccess(final String result) {
+ }
+ });
+ }
+
public void setCurrentLanguage(final String newLanguage) {
this.currentLanguageCode = newLanguage;
}
@@ -213,16 +234,7 @@
} else {
// Not translated and not in db, make a petition for translation
if (session.isLogged()) {
- i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text,
- noteForTranslators, new AsyncCallback<String>() {
- @Override
- public void onFailure(final Throwable caught) {
- }
-
- @Override
- public void onSuccess(final String result) {
- }
- });
+ save(text, noteForTranslators);
Log.debug("Registering in db '" + text + "' as pending translation");
lexicon.put(encodeText, UNTRANSLATED_VALUE);
}
Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -6,511 +6,4 @@
import com.google.gwt.i18n.client.ConstantsWithLookup;
public interface KuneConstants extends ConstantsWithLookup {
- String aboutKune();
-
- String aboutKuneTitleOfDialog();
-
- String acceptThisMember();
-
- String actions();
-
- String addANewBuddy();
-
- String addAsABuddie();
-
- String admins();
-
- String allowAnyUsesOfYourWorkIncludingCommercial();
-
- String allowModificationsOfYourWork();
-
- String alsoYouCanUploadABackground();
-
- String anOrganizationWorksAsAProjectButOrganizationsMustBeALegalEntity();
-
- String anyone();
-
- String apacheWavePowered();
-
- String aProjectIsAKindOfGroupInWhichNewMembersJoiningIsModeratedByTheProjectAdministratorsAnAdministratorIs();
-
- String areYouSure();
-
- String autoAcceptRequestToJoin();
-
- String available();
-
- String availableForChat();
-
- String away();
-
- String backusedInButton();
-
- String blackwhiteAThemeName();
-
- String blueAThemeName();
-
- String buddies();
-
- String busy();
-
- String calendar();
-
- String campAThemeName();
-
- String cancel();
-
- String change();
-
- String changeThisWorkspaceTheme();
-
- String changeToAdmin();
-
- String changeToCollaborator();
-
- String chat();
-
- String chatAbout();
-
- String chatAndCommentThis();
-
- String chatWithThisMember();
-
- String chatWithThisPerson();
-
- String chatWithYourBuddie();
-
- String choose();
-
- String clear();
-
- String clickToRename();
-
- String clickToSelectAndConfigureThisTheme();
-
- String close();
-
- String closed();
-
- String closedForNewMembers();
-
- String closedGroupsAreSocialGroupsOfPersonsLikeFamilyFriendsBuddiesEtcWhichAreModeratedToNewMembersAndWithP();
-
- String collaborators();
-
- String commonLicensesForCulturalWorks();
-
- String communitiesAreSocialGroupsOfPersonsWithSharedInterestsWhichAreOpenToNewMembersForInstanceTheEnvironm();
-
- String community();
-
- String connecting();
-
- String copyleft();
-
- String copyTheTextToTranslate();
-
- String create();
-
- String createANewBlog();
-
- String createANewBlogPost();
-
- String createANewChatRoom();
-
- String createANewDocumentHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt();
-
- String createANewDocumentThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt();
-
- String createANewFolder();
-
- String createANewFolderHereAFolderWillBeASectionInThePublicWeb();
-
- String createANewList();
-
- String createANewMeetingHere();
-
- String createANewPost();
-
- String createANewTask();
-
- String createANewWikipageHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt();
-
- String createNewGroup();
-
- String currentBackgroundImage();
-
- String defaultAThemeName();
-
- String delete();
-
- String doNotParticipateAnymoreInThisGroup();
-
- String doubleClickToOpen();
-
- String edit();
-
- String enterLanguage();
-
- String enterToThisGroupPublicChatRoom();
-
- String enterToThisGroupPublicChatRoomAndInviteMembers();
-
- String enterToThisRoom();
-
- String errorsInfo();
-
- String finishusedInButton();
-
- String general();
-
- String goUpOpenTheContainerFolder();
-
- String greenAThemeName();
-
- String greyAThemeName();
-
- String groupAndPersonalSpaceWhereYouCanCreateAndPublishContentsForYourPersonalOrGroupWebSpaces();
-
- String groupMembers();
-
- String groupOptions();
-
- String groupsInWhichThisUserParticipates();
-
- String groupSPublicRoom();
-
- String groupTags();
-
- String groupType();
-
- String helpToTranslateKune();
-
- String helpWithTheTranslation();
-
- String hereYouCanChangeThisValues();
-
- String hereYouCanSelectTheToolsUsed();
-
- String hereYouWillSeeTheArchiveOfOldConversationsInDevelopment();
-
- String highcontrastAThemeName();
-
- String hisHerNetwork();
-
- String keywordsOrTermsAssociatedWithThisGroup();
-
- String kuneDevelopmentSite();
-
- String leaveThisGroup();
-
- String license();
-
- String licenseWizard();
-
- String loading();
-
- String longName();
-
- String makeThisListNotPublic();
-
- String media();
-
- String moderateRequestToJoin();
-
- String name();
-
- String nConversationsUnread();
-
- String newBlog();
-
- String newDocument();
-
- String newFolder();
-
- String newGadget();
-
- String newList();
-
- String newMeeting();
-
- String newMembersPolicy();
-
- String newPoll();
-
- String newPost();
-
- String newRoom();
-
- String newTask();
-
- String newTaskFolder();
-
- String newWikipage();
-
- String nextusedInButton();
-
- String no();
-
- String notes();
-
- String notPublicable();
-
- String nSubscribedNPosts();
-
- String offline();
-
- String ok();
-
- String onlyAdmins();
-
- String onlyMembers();
-
- String onlyYou();
-
- String onlyYourBuddies();
-
- String oopsSomethingHasGoneWrongWithOurServersRetryLaterPlease();
-
- String open();
-
- String openArchive();
-
- String openTheConversationsArchiveOfThisRoom();
-
- String options();
-
- String organization();
-
- String otherKindOfLicenses();
-
- String otherPeopleThatCollaborateWithThisGroup();
-
- String others();
-
- String paramCreatednewContentCreatedForInstance();
-
- String paramUnderLicenseParam();
-
- String participate();
-
- String participatesIn();
-
- String pending();
-
- String peopleAndGroupsCollaboratingInThisGroup();
-
- String peoplePendingToBeAcceptedInThisGroupByTheAdmins();
-
- String peopleThatCanAdminThisGroup();
-
- String pinkAThemeName();
-
- String pleaseConfirm();
-
- String post();
-
- String preview();
-
- String project();
-
- String publicDescription();
-
- String publicSpaceInThisSpaceYouCanSeeAPreviewOfHowThePersonalOrGroupSpaceLooksLikeOnTheWebOutsideThisSite();
-
- String pulseAltpageupOrAltpagedownToMoveUpDownInTheListWhileTranslatingAndAltVToCopyTheOriginalTextTheTrans();
-
- String purpleAThemeName();
-
- String reasonsNotToUseANonCommercialLicense();
-
- String recommendations();
-
- String redAThemeName();
-
- String redblackAThemeName();
-
- String register();
-
- String registerANewGroup();
-
- String rejectAsMember();
-
- String reloadCurrentPage();
-
- String reloadThis();
-
- String removeCurrentBackgroundImage();
-
- String removeThisMember();
-
- String reportKuneIssuesProblems();
-
- String requestToParticipateInThisGroup();
-
- String saharaAThemeName();
-
- String saving();
-
- String search();
-
- String searching();
-
- String select();
-
- String selectACreativeCommonsLicenseRecommendedForCulturalWorks();
-
- String selectALicenseToShareYourGroupContentsWithOtherPeople();
-
- String selectAndConfigureThePublicSpaceThemeOfThisGroup();
-
- String selectAnImageInYourComputerAsTheLogoForThisGroupForBestResultsUseANxnPixelImageWeWillAutomaticallyRe();
-
- String selectAnImageInYourComputerAsYourAvatarForBestResultsUseANxnPixelImageWeWillAutomaticallyResizeBigge();
-
- String selectAsTheHomepage();
-
- String selectLicense();
-
- String selectOtherKindOfLicenses();
-
- String selectTheLicenseType();
-
- String setYourChatStatus();
-
- String setYourGroupPreferencesHere();
-
- String shortName();
-
- String showHideTheChatWindow();
-
- String signInToCollaborate();
-
- String signOut();
-
- String signOutOfChat();
-
- String startAPublicAssemblyWithMembers();
-
- String style();
-
- String subscribe();
-
- String subscribeToThisList();
-
- String tags();
-
- String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformOnlyUnalteredCopiesOfTheWorkNotDerivativeWo();
-
- String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkAsWellAsMakeDerivativeWorksBasedOnIt();
-
- String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkForNonCommercialPurposesOnly();
-
- String theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkIncludingForCommercialPurposes();
-
- String theLicensorPermitsOthersToDistributeDerivativeWorksOnlyUnderTheSameLicenseOrOneCompatibleWithTheOneT();
-
- String theMembersOfThisGroupAreNotPublic();
-
- String theNameMustBeBetween3And15LowercaseCharactersItCanOnlyContainWesternCharactersAndNumbers();
-
- String theNameMustContainOnlyCharactersNumbersAndDashes();
-
- String thisFolderIsEmpty();
-
- String thisIsACopyleftLicense();
-
- String thisIsAnOrphanedProjectIfYouAreInterestedPleaseRequestToJoinToWorkOnIt();
-
- String thisIsAppropriateForFreeCulturalWorks();
-
- String thisIsNotACopyleftLicense();
-
- String thisIsNotAppropriateForFreeCulturalWorks();
-
- String thisIsOnlyAPreviewOfHowThisPageLooksLikeToTheGeneralPublicOnTheWebOutsideThisSite();
-
- String thisIsTheDefaultLicenseForAllTheContentsOfThisGroupYouCanAlsoSelectAnotherDifferentLicensePerContent();
-
- String thisPageIsNotPublicable();
-
- String thisUserBuddies();
-
- String thisUserBuddiesAndGroupsWhereParticipes();
-
- String thisUserDoesNotHaveAHomepage();
-
- String thoseWhoCanViewThisMemberList();
-
- String thoseWhoCanViewYourNetwork();
-
- String tip();
-
- String to();
-
- String tools();
-
- String toParamForExampleToSpanish();
-
- String translated();
-
- String translateThis();
-
- String transparentAThemeName();
-
- String typeSomeKeywordThatDefineYourGroup();
-
- String typeSomethingToSearchUsersAndGroupsInThisSite();
-
- String untranslated();
-
- String useACopyleftLicenseRecommended();
-
- String useAnotherKindOfLicenseAdvanced();
-
- String userOptions();
-
- String userSpaceItShowsAListOfAllYourDocumentsAndContentsInWhichYouParticipate();
-
- String useTheGnuLicensesRecommendedForFreeSoftwareWorksAndOtherKindOfLicenses();
-
- String visitHisHerHomepage();
-
- String visitThisGroupHomepage();
-
- String visitThisMemberHomepage();
-
- String visitYourHomepage();
-
- String voting();
-
- String welcomeToTheParamPublicChatRoom();
-
- String weRecommendParamLicensesSpeciallyForPracticalWorks();
-
- String whiteblackAThemeName();
-
- String whyDoWeNeedALicense();
-
- String withACreativeCommonsLicenseYouKeepYourCopyrightButAllowPeopleToCopyAndDistributeYourWorkProvidedThey();
-
- String yes();
-
- String yesAsLongAsOtherShareAlike();
-
- String youCanChangeThisLicenseLater();
-
- String youCannotDisableThisToolBecauseItSWhereTheCurrentGroupHomePageIsLocatedToDoThatYouHaveToSelectOtherC();
-
- String yourGroups();
-
- String yourHomepage();
-
- String yourHomePageInThisSite();
-
- String yourLanguage();
-
- String yourPreferences();
-
- String youWillDeleteItWithAllItsContentsAreYouSure();
}
Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties 2011-10-04 00:46:24 UTC (rev 1543)
@@ -1,256 +0,0 @@
-chatWithYourBuddie = Chat with your buddie
-chatWithThisMember = Chat with this member
-addAsABuddie = Add as a buddie
-chat = Chat ;)
-thisIsOnlyAPreviewOfHowThisPageLooksLikeToTheGeneralPublicOnTheWebOutsideThisSite = This is only a preview of how this page looks like to the general public on the web, outside this site.
-preview = Preview
-paramUnderLicenseParam = © [%s], under license: [%s]
-clickToRename = Click to rename
-createANewDocumentThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt = Create a New Document. This document will be a new 'Page' in the public web if you publish it
-reloadCurrentPage = Reload current page
-newDocument = New document
-goUpOpenTheContainerFolder = Go up: Open the container folder
-edit = Edit
-chatAndCommentThis = Chat and comment this
-chatAbout = Chat about
-available = Available
-nConversationsUnread = [%d] conversations unread
-offline = Offline
-connecting = Connecting
-newGadget = New Gadget
-voting = Voting
-calendar = Calendar
-media = Media
-others = Others
-loading = Loading
-participate = Participate
-options = Options
-doNotParticipateAnymoreInThisGroup = Do not participate anymore in this group
-requestToParticipateInThisGroup = Request to participate in this group
-leaveThisGroup = Leave this group
-thoseWhoCanViewThisMemberList = Those who can view this member list
-newMembersPolicy = New members policy
-anyone = anyone
-onlyMembers = only members
-onlyAdmins = only admins
-moderateRequestToJoin = moderate request to join
-autoAcceptRequestToJoin = auto accept request to join
-closedForNewMembers = closed for new members
-addANewBuddy = Add a new buddy
-thoseWhoCanViewYourNetwork = Those who can view your network
-onlyYourBuddies = only your buddies
-onlyYou = only you
-groupMembers = Group members
-peopleAndGroupsCollaboratingInThisGroup = People and groups collaborating in this group
-admins = Admins
-peopleThatCanAdminThisGroup = People that can admin this group
-collaborators = Collaborators
-otherPeopleThatCollaborateWithThisGroup = Other people that collaborate with this group
-pending = Pending
-peoplePendingToBeAcceptedInThisGroupByTheAdmins = People pending to be accepted in this group by the admins
-thisIsAnOrphanedProjectIfYouAreInterestedPleaseRequestToJoinToWorkOnIt = This is an orphaned project, if you are interested please request to join to work on it
-theMembersOfThisGroupAreNotPublic = The members of this group are not public
-changeToCollaborator = Change to collaborator
-changeToAdmin = Change to admin
-removeThisMember = Remove this member
-acceptThisMember = Accept this member
-rejectAsMember = Reject as member
-visitThisGroupHomepage = Visit this group homepage
-visitThisMemberHomepage = Visit this member homepage
-visitYourHomepage = Visit your homepage
-visitHisHerHomepage = Visit his/her homepage
-hisHerNetwork = His/her network:
-thisUserBuddiesAndGroupsWhereParticipes = This user buddies and groups where participes
-buddies = Buddies
-thisUserBuddies = This user buddies
-participatesIn = Participates in
-groupsInWhichThisUserParticipates = Groups in which this user participates
-yourGroups = Your groups
-yourHomepage = Your homepage
-yourHomePageInThisSite = Your home page in this site
-userSpaceItShowsAListOfAllYourDocumentsAndContentsInWhichYouParticipate = User space: it shows a list of all your documents and contents in which you participate
-groupAndPersonalSpaceWhereYouCanCreateAndPublishContentsForYourPersonalOrGroupWebSpaces = Group and personal space: Where you can create and publish contents for your personal or group web spaces
-publicSpaceInThisSpaceYouCanSeeAPreviewOfHowThePersonalOrGroupSpaceLooksLikeOnTheWebOutsideThisSite = Public space: In this space you can see a preview of how the Personal or Group Space looks like on the web, outside this site
-tags = Tags
-keywordsOrTermsAssociatedWithThisGroup = Keywords or terms associated with this group
-typeSomethingToSearchUsersAndGroupsInThisSite = Type something to search users and groups in this site
-search = Search
-close = Close
-groupOptions = Group options
-setYourGroupPreferencesHere = Set your group preferences here
-userOptions = User options
-yourPreferences = Your preferences
-helpWithTheTranslation = Help with the translation
-showHideTheChatWindow = Show/hide the chat window
-setYourChatStatus = Set your chat status
-availableForChat = Available for chat
-away = Away
-busy = Busy
-signOutOfChat = Sign out of chat
-groupSPublicRoom = Group's public room
-enterToThisGroupPublicChatRoom = Enter to this group public chat room
-startAPublicAssemblyWithMembers = Start a public assembly with members
-enterToThisGroupPublicChatRoomAndInviteMembers = Enter to this group public chat room and invite members
-reportKuneIssuesProblems = Report Kune issues/problems
-apacheWavePowered = Apache Wave powered
-aboutKune = About kune
-errorsInfo = Errors info
-signInToCollaborate = Sign in to collaborate
-signOut = Sign out
-createNewGroup = Create New Group
-kuneDevelopmentSite = kune development site
-enterLanguage = Enter language
-searching = Searching...
-copyTheTextToTranslate = Copy the text to translate
-translateThis = translate this:
-notes = Notes:
-tip = Tip:
-pulseAltpageupOrAltpagedownToMoveUpDownInTheListWhileTranslatingAndAltVToCopyTheOriginalTextTheTrans = Pulse Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved
-untranslated = Untranslated
-translated = Translated
-recommendations = Recommendations
-helpToTranslateKune = Help to translate kune
-to = to
-general = General
-name = Name
-hereYouCanChangeThisValues = Here you can change this values:
-tools = Tools
-hereYouCanSelectTheToolsUsed = Here you can select the tools used:
-choose = Choose
-selectAnImageInYourComputerAsYourAvatarForBestResultsUseANxnPixelImageWeWillAutomaticallyResizeBigge = Select an image in your computer as your avatar. For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.
-style = Style
-changeThisWorkspaceTheme = Change this workspace theme:
-currentBackgroundImage = Current background image:
-alsoYouCanUploadABackground = Also you can upload a background:
-change = Change
-clear = Clear
-thisUserDoesNotHaveAHomepage = This user does not have a homepage
-removeCurrentBackgroundImage = Remove current background image
-selectAndConfigureThePublicSpaceThemeOfThisGroup = Select and configure the public space theme of this group:
-clickToSelectAndConfigureThisTheme = Click to select and configure this theme
-license = License
-thisIsTheDefaultLicenseForAllTheContentsOfThisGroupYouCanAlsoSelectAnotherDifferentLicensePerContent = This is the default license for all the contents of this group (you can also select another different license per content):
-notPublicable = Not Publicable
-thisPageIsNotPublicable = This page is not publicable
-chatWithThisPerson = Chat with this person
-toParamForExampleToSpanish = to [%s]:
-saving = Saving
-ok = Ok
-registerANewGroup = Register a new group
-register = Register
-cancel = Cancel
-shortName = Short name
-theNameMustBeBetween3And15LowercaseCharactersItCanOnlyContainWesternCharactersAndNumbers = The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers
-longName = Long name
-publicDescription = Public description
-groupTags = Group tags
-typeSomeKeywordThatDefineYourGroup = type some keyword that define your group
-groupType = Group type
-project = Project
-aProjectIsAKindOfGroupInWhichNewMembersJoiningIsModeratedByTheProjectAdministratorsAnAdministratorIs = A project is a kind of group in which new members joining is moderated by the project administrators. An administrator is the person who creates the project and other people she/he chooses to be administrator as well.
-organization = Organization
-anOrganizationWorksAsAProjectButOrganizationsMustBeALegalEntity = An organization works as a project, but organizations must be a legal entity.
-closed = Closed
-closedGroupsAreSocialGroupsOfPersonsLikeFamilyFriendsBuddiesEtcWhichAreModeratedToNewMembersAndWithP = Closed groups are social groups of persons like family, friends, buddies, etc, which are moderated to new members and with private contents (by default)
-community = Community
-communitiesAreSocialGroupsOfPersonsWithSharedInterestsWhichAreOpenToNewMembersForInstanceTheEnvironm = Communities are social groups of persons with shared interests, which are open to new members (for instance the environmental community or the LGBT community). They rarely are a legal entity.
-createANewDocumentHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt = Create a New Document here. This document will be a new 'Page' in the public web if you publish it
-newFolder = New folder
-createANewFolderHereAFolderWillBeASectionInThePublicWeb = Create a new folder here. A folder will be a 'section' in the public web
-doubleClickToOpen = Double click to open
-delete = Delete
-open = Open
-selectAsTheHomepage = Select as the homepage
-actions = Actions
-newBlog = New blog
-createANewBlog = Create a new blog
-reloadThis = Reload this
-newList = New list
-createANewList = Create a new list
-newPost = New post
-createANewBlogPost = Create a new blog post
-makeThisListNotPublic = Make this list not public
-createANewPost = Create a new post
-subscribe = Subscribe
-subscribeToThisList = Subscribe to this list
-nSubscribedNPosts = [%d] subscribed, [%d] posts
-newMeeting = New meeting
-createANewMeetingHere = Create a New Meeting here
-createANewTask = Create a new task
-newTask = New task
-newTaskFolder = New task folder
-createANewFolder = Create a new folder
-newWikipage = New wikipage
-createANewWikipageHereThisDocumentWillBeANewPageInThePublicWebIfYouPublishIt = Create a New Wikipage here. This document will be a new 'Page' in the public web if you publish it
-youCannotDisableThisToolBecauseItSWhereTheCurrentGroupHomePageIsLocatedToDoThatYouHaveToSelectOtherC = You cannot disable this tool because it's where the current group home page is located. To do that you have to select other content as the default group home page but in another tool.
-selectAnImageInYourComputerAsTheLogoForThisGroupForBestResultsUseANxnPixelImageWeWillAutomaticallyRe = Select an image in your computer as the logo for this group. For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.
-licenseWizard = License wizard
-backusedInButton = « Back
-nextusedInButton = Next »
-finishusedInButton = Finish
-select = Select
-selectALicenseToShareYourGroupContentsWithOtherPeople = Select a license to share your group contents with other people:
-useACopyleftLicenseRecommended = Use a copyleft license (recommended)
-useAnotherKindOfLicenseAdvanced = Use another kind of license (advanced)
-copyleft = copyleft
-weRecommendParamLicensesSpeciallyForPracticalWorks = We recommend [%s] licenses, specially for practical works
-whyDoWeNeedALicense = Why do we need a license?
-youCanChangeThisLicenseLater = You can change this license later
-selectTheLicenseType = Select the license type:
-commonLicensesForCulturalWorks = Common licenses for cultural works
-selectACreativeCommonsLicenseRecommendedForCulturalWorks = Select a Creative Commons license (recommended for cultural works)
-otherKindOfLicenses = Other kind of licenses
-useTheGnuLicensesRecommendedForFreeSoftwareWorksAndOtherKindOfLicenses = Use the GNU licenses (recommended for free software works) and other kind of licenses
-withACreativeCommonsLicenseYouKeepYourCopyrightButAllowPeopleToCopyAndDistributeYourWorkProvidedThey = With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?
-allowAnyUsesOfYourWorkIncludingCommercial = Allow any uses of your work, including commercial?
-allowModificationsOfYourWork = Allow modifications of your work?
-yes = Yes
-theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkIncludingForCommercialPurposes = The licensor permits others to copy, distribute, display, and perform the work, including for commercial purposes
-no = No
-theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkForNonCommercialPurposesOnly = The licensor permits others to copy, distribute, display, and perform the work for non-commercial purposes only
-theLicensorPermitsOthersToCopyDistributeDisplayAndPerformTheWorkAsWellAsMakeDerivativeWorksBasedOnIt = The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it
-yesAsLongAsOtherShareAlike = Yes, as long as other share alike
-theLicensorPermitsOthersToDistributeDerivativeWorksOnlyUnderTheSameLicenseOrOneCompatibleWithTheOneT = The licensor permits others to distribute derivative works only under the same license or one compatible with the one that governs the licensor's work
-theLicensorPermitsOthersToCopyDistributeDisplayAndPerformOnlyUnalteredCopiesOfTheWorkNotDerivativeWo = The licensor permits others to copy, distribute, display and perform only unaltered copies of the work — not derivative works based on it
-thisIsACopyleftLicense = This is a copyleft license.
-thisIsNotACopyleftLicense = This is not a copyleft license.
-thisIsAppropriateForFreeCulturalWorks = This is appropriate for free cultural works.
-thisIsNotAppropriateForFreeCulturalWorks = This is not appropriate for free cultural works.
-reasonsNotToUseANonCommercialLicense = Reasons not to use a non commercial license.
-selectOtherKindOfLicenses = Select other kind of licenses:
-selectLicense = Select license
-areYouSure = Are you sure?
-paramCreatednewContentCreatedForInstance = [%s] created
-pleaseConfirm = Please confirm
-thisFolderIsEmpty = This folder is empty
-youWillDeleteItWithAllItsContentsAreYouSure = You will delete it with all its contents. Are you sure?
-welcomeToTheParamPublicChatRoom = Welcome to the [%s] public chat room
-createANewChatRoom = Create a new chat room
-newRoom = New room
-enterToThisRoom = Enter to this room
-openArchive = Open archive
-openTheConversationsArchiveOfThisRoom = Open the conversations archive of this room
-hereYouWillSeeTheArchiveOfOldConversationsInDevelopment = Here you will see the archive of old conversations (in development)
-create = Create
-theNameMustContainOnlyCharactersNumbersAndDashes = The name must contain only characters, numbers and dashes
-post = Post
-newPoll = New poll
-thisUserDoesNotHaveAHomepage = This user does not have a homepage
-oopsSomethingHasGoneWrongWithOurServersRetryLaterPlease = Oops! Something has gone wrong with our servers. Retry later, please.
-yourLanguage = Your language
-redblackAThemeName = redblack
-purpleAThemeName = purple
-greenAThemeName = green
-highcontrastAThemeName = highcontrast
-blackwhiteAThemeName = blackwhite
-campAThemeName = camp
-defaultAThemeName = default
-redAThemeName = red
-blueAThemeName = blue
-greyAThemeName = grey
-saharaAThemeName = sahara
-pinkAThemeName = pink
-whiteblackAThemeName = whiteblack
-transparentAThemeName = transparent
-aboutKuneTitleOfDialog = About Kune
-
Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -20,7 +20,7 @@
package cc.kune.core.client.resources;
public final class CoreMessages {
- public final static String ADD_AS_A_BUDDIE = "Add as a buddie";
+ public final static String ADD_AS_A_BUDDY = "Add as a buddy";
public final static String BUDDIES_NOT_PUBLIC = "The social network of this user is not public";
public final static String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one";
public final static String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo";
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -42,12 +42,14 @@
private final StateManager stateManager;
@Inject
- public SitebarSignInAction(final StateManager stateManager, final I18nTranslationService i18n) {
+ public SitebarSignInAction(final StateManager stateManager, final I18nTranslationService i18n,
+ final Session session) {
super();
+ final String siteCommonName = i18n.t(session.getSiteCommonName());
this.stateManager = stateManager;
putValue(Action.NAME, i18n.t("Sign in to collaborate"));
- putValue(Action.TOOLTIP,
- i18n.t("Please sign in or register to get full access to this site tools and contents"));
+ putValue(Action.TOOLTIP, i18n.t(
+ "Please sign in or register to get full access to [%s] tools and contents", siteCommonName));
}
@Override
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -21,11 +21,12 @@
import cc.kune.common.client.notify.NotifyUser;
import cc.kune.common.client.tooltip.Tooltip;
+import cc.kune.core.client.i18n.I18nUITranslationService;
import cc.kune.core.client.resources.CoreResources;
import cc.kune.core.client.sitebar.search.SitebarSearchPresenter.SitebarSearchView;
+import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
import cc.kune.core.shared.SearcherConstants;
-import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.gspace.client.GSpaceArmor;
import com.google.gwt.event.dom.client.HasAllFocusHandlers;
@@ -55,8 +56,8 @@
private final SuggestBox suggestBox;
@Inject
- public SitebarSearchPanel(final GSpaceArmor gs, final CoreResources img,
- final StateManager stateManager, final I18nTranslationService i18n) {
+ public SitebarSearchPanel(final GSpaceArmor gs, final CoreResources img, final Session session,
+ final StateManager stateManager, final I18nUITranslationService i18n) {
searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush()));
searchButton.ensureDebugId(SITE_SEARCH_BUTTON);
final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox(
@@ -84,8 +85,10 @@
}
};
};
+ final String siteCommonName = i18n.getSiteCommonName();
suggestBox = multivalueSBox.getSuggestBox();
- Tooltip.to(suggestBox, i18n.t("Type something to search for users and groups in this site"));
+ Tooltip.to(suggestBox,
+ i18n.t("Type something to search for users and groups in [%s]", siteCommonName));
searchTextBox = suggestBox.getTextBox();
searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX);
searchTextBox.addStyleName("k-fr");
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -20,8 +20,9 @@
package cc.kune.core.client.sitebar.spaces;
import cc.kune.common.client.tooltip.Tooltip;
+import cc.kune.core.client.i18n.I18nUITranslationService;
import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView;
-import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.core.client.state.Session;
import cc.kune.gspace.client.GSpaceArmor;
import cc.kune.gspace.client.resources.GSpaceArmorResources;
@@ -55,11 +56,12 @@
private final Tooltip userSpaceTooltip;
@Inject
- public SpaceSelectorPanel(final GSpaceArmor armor, final I18nTranslationService i18n,
- final GSpaceArmorResources res) {
+ public SpaceSelectorPanel(final GSpaceArmor armor, final I18nUITranslationService i18n,
+ final GSpaceArmorResources res, final Session session) {
armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0);
// homeButton.setVisible(false);
- homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in this site"));
+ final String siteCommonName = i18n.getSiteCommonName();
+ homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in [%s]", siteCommonName));
userSpaceTooltip = Tooltip.to(
userButton,
i18n.t("User space: it shows a list of all documents and contents " + "in which you participate"));
@@ -67,7 +69,7 @@
+ "and publish contents for your personal or group web spaces"));
publicSpaceTooltip = Tooltip.to(publicButton,
i18n.t("Public space: Where you can see a preview of how your Personal or "
- + "Group Space looks like on the web, outside this site"));
+ + "Group Space looks like on the web"));
// homeSpaceTooltip.setWidth(0);
userSpaceTooltip.setWidth(190);
groupSpaceTooltip.setWidth(170);
Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -1,302 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.sitebar.spaces;
-
-import cc.kune.common.client.notify.NotifyLevel;
-import cc.kune.common.client.ui.MaskWidgetView;
-import cc.kune.core.client.auth.SignIn;
-import cc.kune.core.client.events.WindowFocusEvent;
-import cc.kune.core.client.init.AppStartEvent;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.client.state.SiteTokens;
-import cc.kune.core.client.state.StateManager;
-import cc.kune.core.client.state.TokenUtils;
-import cc.kune.core.client.state.UserSignOutEvent;
-import cc.kune.core.shared.i18n.I18nTranslationService;
-import cc.kune.gspace.client.GSpaceArmor;
-import cc.kune.gspace.client.style.GSpaceBackManager;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.HasClickHandlers;
-import com.google.gwt.event.shared.EventBus;
-import com.google.gwt.user.client.Timer;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.gwtplatform.mvp.client.Presenter;
-import com.gwtplatform.mvp.client.View;
-import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
-import com.gwtplatform.mvp.client.annotations.ProxyEvent;
-import com.gwtplatform.mvp.client.proxy.Proxy;
-import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent;
-
-public class SpaceSelectorPresenter extends
- Presenter<SpaceSelectorPresenter.SpaceSelectorView, SpaceSelectorPresenter.SpaceSelectorProxy> {
-
- @ProxyCodeSplit
- public interface SpaceSelectorProxy extends Proxy<SpaceSelectorPresenter> {
- }
-
- public interface SpaceSelectorView extends View {
-
- public static String GROUP_SPACE_ID = "k-space-group-id";
- public static String HOME_SPACE_ID = "k-space-home-id";
- public static String PUBLIC_SPACE_ID = "k-space-public-id";
- public static String USER_SPACE_ID = "k-space-user-id";
-
- HasClickHandlers getGroupBtn();
-
- HasClickHandlers getHomeBtn();
-
- HasClickHandlers getPublicBtn();
-
- HasClickHandlers getUserBtn();
-
- void setGroupBtnDown(boolean down);
-
- void setHomeBtnDown(boolean down);
-
- void setPublicBtnDown(boolean down);
-
- void setUserBtnDown(boolean down);
-
- void showGroupSpaceTooltip();
-
- void showHomeSpaceTooltip();
-
- void showPublicSpaceTooltip();
-
- void showUserSpaceTooltip();
- }
-
- private final GSpaceArmor armor;
- private final GSpaceBackManager backManager;
- private Space currentSpace;
- private String groupToken;
- private String homeToken;
- private final I18nTranslationService i18n;
- private String publicToken;
- private final Session session;
- private final Provider<SignIn> signIn;
- private final StateManager stateManager;
- private String userToken;
-
- @Inject
- public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager,
- final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor,
- final Session session, final Provider<SignIn> signIn, final GSpaceBackManager backManager,
- final I18nTranslationService i18n, final MaskWidgetView mask) {
- super(eventBus, view, proxy);
- this.stateManager = stateManager;
- this.armor = armor;
- this.session = session;
- this.signIn = signIn;
- this.backManager = backManager;
- this.i18n = i18n;
- currentSpace = null;
- homeToken = SiteTokens.HOME;
- userToken = SiteTokens.WAVEINBOX;
- groupToken = SiteTokens.GROUP_HOME;
- publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME);
- view.getHomeBtn().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(final ClickEvent event) {
- restoreToken(homeToken);
- setDown(Space.homeSpace);
- }
- });
- view.getUserBtn().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(final ClickEvent event) {
- restoreToken(userToken);
- setDown(Space.userSpace);
- }
- });
- view.getGroupBtn().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(final ClickEvent event) {
- restoreToken(groupToken);
- setDown(Space.groupSpace);
- }
- });
- view.getPublicBtn().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(final ClickEvent event) {
- restoreToken(publicToken);
- setDown(Space.publicSpace);
- }
-
- });
- eventBus.addHandler(WindowFocusEvent.getType(), new WindowFocusEvent.WindowFocusHandler() {
- @Override
- public void onWindowFocus(final WindowFocusEvent event) {
- if (event.isHasFocus() && !mask.isShowing()) {
- // showTooltipWithDelay();
- }
- }
- });
- }
-
- @ProxyEvent
- public void onAppStart(final AppStartEvent event) {
- // showTooltipWithDelay();
- }
-
- private void onGroupSpaceSelect(final boolean shouldRestoreToken) {
- restoreToken(shouldRestoreToken, groupToken);
- armor.selectGroupSpace();
- backManager.restoreBackImage();
- setDown(Space.groupSpace);
- currentSpace = Space.groupSpace;
- }
-
- private void onHomeSpaceSelect(final boolean shouldRestoreToken) {
- restoreToken(shouldRestoreToken, homeToken);
- armor.selectHomeSpace();
- backManager.clearBackImage();
- setDown(Space.homeSpace);
- currentSpace = Space.homeSpace;
- }
-
- private void onPublicSpaceSelect(final boolean shouldRestoreToken) {
- restoreToken(shouldRestoreToken, userToken);
- armor.selectPublicSpace();
- backManager.restoreBackImage();
- setDown(Space.publicSpace);
- currentSpace = Space.publicSpace;
- }
-
- @ProxyEvent
- public void onSpaceConf(final SpaceConfEvent event) {
- final Space space = event.getSpace();
- final String token = event.getToken();
- switch (space) {
- case homeSpace:
- homeToken = token;
- break;
- case userSpace:
- userToken = token;
- break;
- case groupSpace:
- groupToken = token;
- break;
- case publicSpace:
- publicToken = token;
- break;
- }
- }
-
- @ProxyEvent
- public void onSpaceSelect(final SpaceSelectEvent event) {
- final Space space = event.getSpace();
- if (space != currentSpace) {
- final boolean restoreToken = event.shouldRestoreToken();
- switch (space) {
- case homeSpace:
- onHomeSpaceSelect(restoreToken);
- break;
- case userSpace:
- onUserSpaceSelect(restoreToken);
- break;
- case groupSpace:
- onGroupSpaceSelect(restoreToken);
- break;
- case publicSpace:
- onPublicSpaceSelect(restoreToken);
- break;
- default:
- break;
- }
- }
- }
-
- @ProxyEvent
- public void onUserSignOut(final UserSignOutEvent event) {
- if (currentSpace == Space.userSpace) {
- restoreToken(homeToken);
- }
- userToken = SiteTokens.WAVEINBOX;
- }
-
- private void onUserSpaceSelect(final boolean shouldRestoreToken) {
- if (session.isLogged()) {
- restoreToken(shouldRestoreToken, userToken);
- armor.selectUserSpace();
- backManager.clearBackImage();
- setDown(Space.userSpace);
- currentSpace = Space.userSpace;
- } else {
- signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"),
- NotifyLevel.info);
- stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken));
- getView().setUserBtnDown(false);
- }
- }
-
- private void restoreToken(final boolean shouldRestoreToken, final String token) {
- if (shouldRestoreToken) {
- restoreToken(token);
- }
- }
-
- private void restoreToken(final String token) {
- stateManager.gotoHistoryToken(token);
- }
-
- @Override
- protected void revealInParent() {
- RevealRootContentEvent.fire(this, this);
- }
-
- private void setDown(final Space space) {
- getView().setHomeBtnDown(space.equals(Space.homeSpace));
- getView().setUserBtnDown(space.equals(Space.userSpace));
- getView().setGroupBtnDown(space.equals(Space.groupSpace));
- getView().setPublicBtnDown(space.equals(Space.publicSpace));
- }
-
- private void showTooltipNow() {
- if (currentSpace != null) {
- switch (currentSpace) {
- case homeSpace:
- getView().showHomeSpaceTooltip();
- break;
- case userSpace:
- getView().showUserSpaceTooltip();
- break;
- case groupSpace:
- getView().showGroupSpaceTooltip();
- break;
- case publicSpace:
- getView().showPublicSpaceTooltip();
- break;
- }
- }
- }
-
- protected void showTooltipWithDelay() {
- new Timer() {
- @Override
- public void run() {
- showTooltipNow();
- }
- }.schedule(200);
- }
-}
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -0,0 +1,302 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.client.sitebar.spaces;
+
+import cc.kune.common.client.notify.NotifyLevel;
+import cc.kune.common.client.ui.MaskWidgetView;
+import cc.kune.core.client.auth.SignIn;
+import cc.kune.core.client.events.WindowFocusEvent;
+import cc.kune.core.client.init.AppStartEvent;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.SiteTokens;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.client.state.TokenUtils;
+import cc.kune.core.client.state.UserSignOutEvent;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.gspace.client.GSpaceArmor;
+import cc.kune.gspace.client.style.GSpaceBackManager;
+
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.HasClickHandlers;
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.Timer;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.gwtplatform.mvp.client.Presenter;
+import com.gwtplatform.mvp.client.View;
+import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
+import com.gwtplatform.mvp.client.annotations.ProxyEvent;
+import com.gwtplatform.mvp.client.proxy.Proxy;
+import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent;
+
+public class SpaceSelectorPresenter extends
+ Presenter<SpaceSelectorPresenter.SpaceSelectorView, SpaceSelectorPresenter.SpaceSelectorProxy> {
+
+ @ProxyCodeSplit
+ public interface SpaceSelectorProxy extends Proxy<SpaceSelectorPresenter> {
+ }
+
+ public interface SpaceSelectorView extends View {
+
+ public static String GROUP_SPACE_ID = "k-space-group-id";
+ public static String HOME_SPACE_ID = "k-space-home-id";
+ public static String PUBLIC_SPACE_ID = "k-space-public-id";
+ public static String USER_SPACE_ID = "k-space-user-id";
+
+ HasClickHandlers getGroupBtn();
+
+ HasClickHandlers getHomeBtn();
+
+ HasClickHandlers getPublicBtn();
+
+ HasClickHandlers getUserBtn();
+
+ void setGroupBtnDown(boolean down);
+
+ void setHomeBtnDown(boolean down);
+
+ void setPublicBtnDown(boolean down);
+
+ void setUserBtnDown(boolean down);
+
+ void showGroupSpaceTooltip();
+
+ void showHomeSpaceTooltip();
+
+ void showPublicSpaceTooltip();
+
+ void showUserSpaceTooltip();
+ }
+
+ private final GSpaceArmor armor;
+ private final GSpaceBackManager backManager;
+ private Space currentSpace;
+ private String groupToken;
+ private String homeToken;
+ private final I18nTranslationService i18n;
+ private String publicToken;
+ private final Session session;
+ private final Provider<SignIn> signIn;
+ private final StateManager stateManager;
+ private String userToken;
+
+ @Inject
+ public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager,
+ final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor,
+ final Session session, final Provider<SignIn> signIn, final GSpaceBackManager backManager,
+ final I18nTranslationService i18n, final MaskWidgetView mask) {
+ super(eventBus, view, proxy);
+ this.stateManager = stateManager;
+ this.armor = armor;
+ this.session = session;
+ this.signIn = signIn;
+ this.backManager = backManager;
+ this.i18n = i18n;
+ currentSpace = null;
+ homeToken = SiteTokens.HOME;
+ userToken = SiteTokens.WAVEINBOX;
+ groupToken = SiteTokens.GROUP_HOME;
+ publicToken = TokenUtils.preview(SiteTokens.GROUP_HOME);
+ view.getHomeBtn().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ restoreToken(homeToken);
+ setDown(Space.homeSpace);
+ }
+ });
+ view.getUserBtn().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ restoreToken(userToken);
+ setDown(Space.userSpace);
+ }
+ });
+ view.getGroupBtn().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ restoreToken(groupToken);
+ setDown(Space.groupSpace);
+ }
+ });
+ view.getPublicBtn().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ restoreToken(publicToken);
+ setDown(Space.publicSpace);
+ }
+
+ });
+ eventBus.addHandler(WindowFocusEvent.getType(), new WindowFocusEvent.WindowFocusHandler() {
+ @Override
+ public void onWindowFocus(final WindowFocusEvent event) {
+ if (event.isHasFocus() && !mask.isShowing()) {
+ // showTooltipWithDelay();
+ }
+ }
+ });
+ }
+
+ @ProxyEvent
+ public void onAppStart(final AppStartEvent event) {
+ // showTooltipWithDelay();
+ }
+
+ private void onGroupSpaceSelect(final boolean shouldRestoreToken) {
+ restoreToken(shouldRestoreToken, groupToken);
+ armor.selectGroupSpace();
+ backManager.restoreBackImage();
+ setDown(Space.groupSpace);
+ currentSpace = Space.groupSpace;
+ }
+
+ private void onHomeSpaceSelect(final boolean shouldRestoreToken) {
+ restoreToken(shouldRestoreToken, homeToken);
+ armor.selectHomeSpace();
+ backManager.clearBackImage();
+ setDown(Space.homeSpace);
+ currentSpace = Space.homeSpace;
+ }
+
+ private void onPublicSpaceSelect(final boolean shouldRestoreToken) {
+ restoreToken(shouldRestoreToken, userToken);
+ armor.selectPublicSpace();
+ backManager.restoreBackImage();
+ setDown(Space.publicSpace);
+ currentSpace = Space.publicSpace;
+ }
+
+ @ProxyEvent
+ public void onSpaceConf(final SpaceConfEvent event) {
+ final Space space = event.getSpace();
+ final String token = event.getToken();
+ switch (space) {
+ case homeSpace:
+ homeToken = token;
+ break;
+ case userSpace:
+ userToken = token;
+ break;
+ case groupSpace:
+ groupToken = token;
+ break;
+ case publicSpace:
+ publicToken = token;
+ break;
+ }
+ }
+
+ @ProxyEvent
+ public void onSpaceSelect(final SpaceSelectEvent event) {
+ final Space space = event.getSpace();
+ if (space != currentSpace) {
+ final boolean restoreToken = event.shouldRestoreToken();
+ switch (space) {
+ case homeSpace:
+ onHomeSpaceSelect(restoreToken);
+ break;
+ case userSpace:
+ onUserSpaceSelect(restoreToken);
+ break;
+ case groupSpace:
+ onGroupSpaceSelect(restoreToken);
+ break;
+ case publicSpace:
+ onPublicSpaceSelect(restoreToken);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ @ProxyEvent
+ public void onUserSignOut(final UserSignOutEvent event) {
+ if (currentSpace == Space.userSpace) {
+ restoreToken(homeToken);
+ }
+ userToken = SiteTokens.WAVEINBOX;
+ }
+
+ private void onUserSpaceSelect(final boolean shouldRestoreToken) {
+ if (session.isLogged()) {
+ restoreToken(shouldRestoreToken, userToken);
+ armor.selectUserSpace();
+ backManager.clearBackImage();
+ setDown(Space.userSpace);
+ currentSpace = Space.userSpace;
+ } else {
+ signIn.get().setErrorMessage(i18n.t("Sign in or create an account to access to your inbox"),
+ NotifyLevel.info);
+ stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken));
+ getView().setUserBtnDown(false);
+ }
+ }
+
+ private void restoreToken(final boolean shouldRestoreToken, final String token) {
+ if (shouldRestoreToken) {
+ restoreToken(token);
+ }
+ }
+
+ private void restoreToken(final String token) {
+ stateManager.gotoHistoryToken(token);
+ }
+
+ @Override
+ protected void revealInParent() {
+ RevealRootContentEvent.fire(this, this);
+ }
+
+ private void setDown(final Space space) {
+ getView().setHomeBtnDown(space.equals(Space.homeSpace));
+ getView().setUserBtnDown(space.equals(Space.userSpace));
+ getView().setGroupBtnDown(space.equals(Space.groupSpace));
+ getView().setPublicBtnDown(space.equals(Space.publicSpace));
+ }
+
+ private void showTooltipNow() {
+ if (currentSpace != null) {
+ switch (currentSpace) {
+ case homeSpace:
+ getView().showHomeSpaceTooltip();
+ break;
+ case userSpace:
+ getView().showUserSpaceTooltip();
+ break;
+ case groupSpace:
+ getView().showGroupSpaceTooltip();
+ break;
+ case publicSpace:
+ getView().showPublicSpaceTooltip();
+ break;
+ }
+ }
+ }
+
+ protected void showTooltipWithDelay() {
+ new Timer() {
+ @Override
+ public void run() {
+ showTooltipNow();
+ }
+ }.schedule(200);
+ }
+}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -47,8 +47,8 @@
@Override
public void actionPerformed(final ActionEvent event) {
- NotifyUser.info(i18n.t("Search the user you want to add and in his/her homepage press '"
- + CoreMessages.ADD_AS_A_BUDDIE + "'"));
+ NotifyUser.info(i18n.t("Search the user you want to add and in his/her homepage click '"
+ + CoreMessages.ADD_AS_A_BUDDY + "'"));
searcher.get().focus();
}
Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -1,73 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.client.sn.actions;
-
-import cc.kune.chat.client.ChatClient;
-import cc.kune.common.client.actions.AbstractAction;
-import cc.kune.common.client.actions.PropertyChangeEvent;
-import cc.kune.common.client.actions.PropertyChangeListener;
-import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.client.state.StateChangedEvent;
-import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler;
-import cc.kune.core.client.state.StateManager;
-import cc.kune.core.client.ws.entheader.EntityHeader;
-import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.StateAbstractDTO;
-
-import com.google.inject.Inject;
-
-public class WriteToBuddieHeaderButton {
-
- @Inject
- public WriteToBuddieHeaderButton(final WriteToAction writeToAction, final EntityHeader entityHeader,
- final StateManager stateManager, final Session session, final ChatClient chatEngine) {
- final ButtonDescriptor button = new ButtonDescriptor(writeToAction);
- // button.setVisible(false);
- button.withText("Write to your buddie");
- // button.setStyles("k-chat-add-as-buddie");
- writeToAction.addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(final PropertyChangeEvent event) {
- if (event.getPropertyName().equals(AbstractAction.ENABLED)) {
- button.setVisible((Boolean) event.getNewValue());
- }
- }
- });
- entityHeader.addAction(button);
- stateManager.onStateChanged(true, new StateChangedHandler() {
- @Override
- public void onStateChanged(final StateChangedEvent event) {
- final StateAbstractDTO state = event.getState();
- final GroupDTO group = state.getGroup();
- final String groupName = group.getShortName();
- final boolean imLogged = session.isLogged();
- final boolean isBuddie = chatEngine.isBuddie(groupName);
- if (imLogged && group.isPersonal() && isBuddie
- && !session.getCurrentUser().getShortName().equals(groupName)) {
- button.setTarget(group);
- writeToAction.setEnabled(true);
- } else {
- writeToAction.setEnabled(false);
- }
- }
- });
- }
-}
\ No newline at end of file
Copied: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java (from rev 1538, trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddieHeaderButton.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToBuddyHeaderButton.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -0,0 +1,73 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.client.sn.actions;
+
+import cc.kune.chat.client.ChatClient;
+import cc.kune.common.client.actions.AbstractAction;
+import cc.kune.common.client.actions.PropertyChangeEvent;
+import cc.kune.common.client.actions.PropertyChangeListener;
+import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateChangedEvent;
+import cc.kune.core.client.state.StateChangedEvent.StateChangedHandler;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.client.ws.entheader.EntityHeader;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+
+import com.google.inject.Inject;
+
+public class WriteToBuddyHeaderButton {
+
+ @Inject
+ public WriteToBuddyHeaderButton(final WriteToAction writeToAction, final EntityHeader entityHeader,
+ final StateManager stateManager, final Session session, final ChatClient chatEngine) {
+ final ButtonDescriptor button = new ButtonDescriptor(writeToAction);
+ // button.setVisible(false);
+ button.withText("Write to your buddy");
+ // button.setStyles("k-chat-add-as-buddie");
+ writeToAction.addPropertyChangeListener(new PropertyChangeListener() {
+ @Override
+ public void propertyChange(final PropertyChangeEvent event) {
+ if (event.getPropertyName().equals(AbstractAction.ENABLED)) {
+ button.setVisible((Boolean) event.getNewValue());
+ }
+ }
+ });
+ entityHeader.addAction(button);
+ stateManager.onStateChanged(true, new StateChangedHandler() {
+ @Override
+ public void onStateChanged(final StateChangedEvent event) {
+ final StateAbstractDTO state = event.getState();
+ final GroupDTO group = state.getGroup();
+ final String groupName = group.getShortName();
+ final boolean imLogged = session.isLogged();
+ final boolean isBuddie = chatEngine.isBuddy(groupName);
+ if (imLogged && group.isPersonal() && isBuddie
+ && !session.getCurrentUser().getShortName().equals(groupName)) {
+ button.setTarget(group);
+ writeToAction.setEnabled(true);
+ } else {
+ writeToAction.setEnabled(false);
+ }
+ }
+ });
+ }
+}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNAdminsMenuItemsRegistry.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -46,8 +46,7 @@
@Inject
public GroupSNAdminsMenuItemsRegistry(final Session session, final I18nTranslationService i18n,
- final IsLoggedCondition isLogged,
- final IsCurrentStateAdministrableCondition isAdministrable,
+ final IsLoggedCondition isLogged, final IsCurrentStateAdministrableCondition isAdministrable,
final IsPersonCondition isPerson, final IsGroupCondition isGroup,
final IsBuddieCondition isBuddie, final IsMeCondition isMe, final IsNotMeCondition isNotMe,
final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction,
@@ -78,7 +77,7 @@
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(writeToAction);
item.add(isPerson);
- item.withText(i18n.t("Write to your buddie"));
+ item.withText(i18n.t("Write to your buddy"));
item.add(isNotMe);
item.add(isBuddie);
item.add(isLogged);
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNCollabsMenuItemsRegistry.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -76,7 +76,7 @@
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(writeToAction);
item.add(isPersonCondition);
- item.withText(i18n.t("Write to your buddie"));
+ item.withText(i18n.t("Write to your buddy"));
item.add(isNotMe);
item.add(isBuddie);
item.add(isLogged);
Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -117,6 +117,8 @@
boolean getShowDeletedContent();
+ String getSiteCommonName();
+
String getSiteUrl();
Object[][] getTimezones();
Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -215,6 +215,10 @@
return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent();
}
+ public String getSiteCommonName() {
+ return getInitData().getSiteCommonName();
+ }
+
@Override
public String getSiteUrl() {
final String baseURL = GWT.getModuleBaseURL();
Modified: trunk/src/main/java/cc/kune/core/server/InitData.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/InitData.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/server/InitData.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -57,6 +57,7 @@
private String mp3EmbedObject;
private String oggEmbedObject;
private ReservedWordsRegistryDTO reservedWords;
+ private String siteCommonName;
private String siteDomain;
private String siteLogoUrl;
private String siteShortName;
@@ -157,6 +158,10 @@
return this.reservedWords;
}
+ public String getSiteCommonName() {
+ return siteCommonName;
+ }
+
@Deprecated
public String getSiteDomain() {
return siteDomain;
@@ -286,6 +291,10 @@
this.reservedWords = reservedWords;
}
+ public void setSiteCommonName(final String siteCommonName) {
+ this.siteCommonName = siteCommonName;
+ }
+
@Deprecated
public void setSiteDomain(final String siteDomain) {
this.siteDomain = siteDomain;
Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -243,9 +243,9 @@
roster = xmppManager.getRoster(connection);
xmppManager.disconnect(connection);
} catch (final ChatException e) {
- // Seems that it not possible to get the buddy list, then we follow
+ // Seems that it not possible to get the buddies list, then we follow
// with a empty buddy list
- log.error("Cannot retrieve the buddie list", e);
+ log.error("Cannot retrieve the buddies list", e);
roster = new HashSet<RosterEntry>();
}
for (final RosterEntry entry : roster) {
@@ -291,10 +291,11 @@
public void run() {
xmppManager.sendMessage(
userName,
- i18n.t("This is the chat window. "
- + ""
- + "Here you can communicate with other users of this site but also with other users with compatible accounts (like gmail accounts). "
- + "" + "Just add some buddie and start to chat."));
+ i18n.t(
+ "This is the chat window. "
+ + "Here you can communicate with other users of [%s] but also with other users with compatible accounts (like gmail accounts). "
+ + "Just add some buddy and start to chat.",
+ i18n.t(properties.getSiteCommonName())));
}
}, 5000);
}
Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/server/properties/KuneBasicProperties.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -62,6 +62,10 @@
return properties.get(KuneProperties.SITE_SHORTNAME);
}
+ public String getSiteCommonName() {
+ return properties.get(KuneProperties.SITE_COMMON_NAME);
+ }
+
public String getWelcomewave() {
return properties.get(KuneProperties.WELCOME_WAVE);
}
Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -42,6 +42,7 @@
String SITE_ADMIN_NAME = "kune.admin.name";
String SITE_ADMIN_PASSWD = "kune.admin.password";
String SITE_ADMIN_SHORTNAME = "kune.admin.shortName";
+ String SITE_COMMON_NAME = "kune.default.site.commonname";
String SITE_DEF_LICENSE = "kune.default.license";
String SITE_DOMAIN = "kune.site.domain";
String SITE_GROUP_AVAILABLE_TOOLS = "kune.tools.groupSiteAvailableTools";
Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -148,6 +148,7 @@
data.setExtMediaDescrips(extMediaDescManager.getAll());
data.setFeedbackEnabled(kuneProperties.getBoolean(KuneProperties.FEEDBACK_ENABLED));
data.setSiteShortName(kuneProperties.get(KuneProperties.SITE_SHORTNAME));
+ data.setSiteCommonName(kuneProperties.get(KuneProperties.SITE_COMMON_NAME));
return data;
}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -50,6 +50,7 @@
private String mp3EmbedObject;
private String oggEmbedObject;
private ReservedWordsRegistryDTO reservedWords;
+ private String siteCommonName;
private String siteDomain;
private String siteLogoUrl;
private String siteShortName;
@@ -153,6 +154,10 @@
return this.reservedWords;
}
+ public String getSiteCommonName() {
+ return siteCommonName;
+ }
+
@Deprecated
public String getSiteDomain() {
return siteDomain;
@@ -286,6 +291,10 @@
this.reservedWords = reservedWords;
}
+ public void setSiteCommonName(final String siteCommonName) {
+ this.siteCommonName = siteCommonName;
+ }
+
@Deprecated
public void setSiteDomain(final String siteDomain) {
this.siteDomain = siteDomain;
Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -22,7 +22,7 @@
import cc.kune.common.client.ExtendedGinModule;
import cc.kune.core.client.sitebar.search.SitebarSearchPanel;
import cc.kune.core.client.sitebar.search.SitebarSearchPresenter;
-import cc.kune.core.client.sn.actions.WriteToBuddieHeaderButton;
+import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton;
import cc.kune.gspace.client.actions.ContentViewerOptionsMenu;
import cc.kune.gspace.client.actions.GiveUsFeedbackBtn;
import cc.kune.gspace.client.actions.RenameAction;
@@ -187,7 +187,7 @@
s(ContentViewerOptionsMenu.class);
s(RenameAction.class);
s(GiveUsFeedbackBtn.class);
- s(WriteToBuddieHeaderButton.class);
+ s(WriteToBuddyHeaderButton.class);
// LicenseWizard
bindPresenter(LicenseWizardPresenter.class, LicenseWizardView.class, LicenseWizardPanel.class,
Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceParts.java 2011-10-04 00:46:24 UTC (rev 1543)
@@ -22,7 +22,7 @@
import cc.kune.core.client.init.AppStartEvent;
import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
import cc.kune.core.client.sitebar.search.SitebarSearchPresenter;
-import cc.kune.core.client.sn.actions.WriteToBuddieHeaderButton;
+import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton;
import cc.kune.core.client.state.Session;
import cc.kune.gspace.client.actions.GiveUsFeedbackBtn;
import cc.kune.gspace.client.i18n.I18nToTranslateGridPanel;
@@ -72,7 +72,7 @@
final Provider<GiveUsFeedbackBtn> giveUsFeedback,
final Provider<I18nToTranslateGridPanel> toTrans,
final Provider<I18nTranslatorTabsCollection> gtranslator,
- final Provider<WriteToBuddieHeaderButton> writeToBuddie) {
+ final Provider<WriteToBuddyHeaderButton> writeToBuddie) {
session.onAppStart(true, new AppStartHandler() {
@Override
Modified: trunk/src/main/resources/db/liquibase_changelog.xml
===================================================================
--- trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-04 00:46:24 UTC (rev 1543)
@@ -151,7 +151,7 @@
</changeSet>
<changeSet id="23" author="vjrj">
<comment>I18n translations cleanup 3</comment>
- <sqlFile path="src/main/resources/db/update-0017-i18nclean3.sql"
+ <sqlFile path="src/main/resources/db/update-0018-i18nclean3.sql"
encoding="utf8" stripComments="1" />
<rollback>SELECT * FROM globalize_countries;</rollback>
</changeSet>
Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties 2011-10-03 23:19:58 UTC (rev 1542)
+++ trunk/src/main/resources/kune.properties 2011-10-04 00:46:24 UTC (rev 1543)
@@ -12,6 +12,11 @@
kune.default.site.shortName = site
kune.site.domain = localhost
+# In the client UI we will use this string for mention this site in messages
+# like: "Thanks for joining this site"
+# Your can use another string and the message will looks like "Thanks for joining example.org"
+kune.default.site.commonname = this site
+
# Email
kune.site.smtp.host = localhost
kune.site.smtp.defaultfrom = noreply@localhost
1
0
Author: vjrj_
Date: 2011-10-04 01:19:58 +0200 (Tue, 04 Oct 2011)
New Revision: 1542
Added:
trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java
trunk/src/main/resources/db/update-0018-i18nclean3.sql
Removed:
trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java
Modified:
trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java
trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java
trunk/src/main/java/cc/kune/chat/client/ChatParts.java
trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java
trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java
trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java
trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java
trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java
trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java
trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java
trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java
trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java
trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java
trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java
trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java
trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java
trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java
trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java
trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java
trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java
trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java
trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java
trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java
trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java
trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java
trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java
trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java
trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java
trunk/src/main/resources/db/liquibase_changelog.xml
Log:
CLOSED - # 122: To revise our UI English
http://kune.ourproject.org/issues/ticket/122
Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -31,7 +31,7 @@
@Inject
public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action,
final NavResources res) {
- super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder here"),
+ super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder"),
i18n.t("New folder"), BartersConstants.TYPE_FOLDER);
}
Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -53,7 +53,7 @@
private void registerIcons() {
registerContentTypeIcon(TYPE_ROOM, res.groupChat());
registerEmptyMessages(TYPE_ROOM,
- i18n.t("Here you will see the archive of old conversations" + TextUtils.IN_DEVELOPMENT_P));
+ i18n.t("See the archive of old conversations" + TextUtils.IN_DEVELOPMENT_P));
}
}
Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -26,7 +26,7 @@
import cc.kune.chat.client.actions.OpenGroupPublicChatRoomAction;
import cc.kune.chat.client.actions.StartAssemblyWithMembers;
import cc.kune.chat.client.actions.StartChatWithMemberAction;
-import cc.kune.chat.client.actions.StartChatWithThisBuddieAction;
+import cc.kune.chat.client.actions.StartChatWithThisBuddyAction;
import cc.kune.chat.client.actions.StartChatWithThisPersonAction;
import cc.kune.chat.client.actions.conditions.IsBuddieCondition;
import cc.kune.chat.client.actions.conditions.IsNotBuddieCondition;
@@ -76,7 +76,7 @@
final Provider<StartChatWithMemberAction> startChatWithMemberAction,
final IsLoggedCondition isLogged,
final Provider<StartChatWithThisPersonAction> startChatWithPersonAction,
- final Provider<StartChatWithThisBuddieAction> startChatWithBuddieAction,
+ final Provider<StartChatWithThisBuddyAction> startChatWithBuddieAction,
final ChatClientActions chatActions, final Provider<StartAssemblyWithMembers> startAssembly,
final Provider<OpenGroupPublicChatRoomAction> openGroupRoomAction,
// final Provider<OpenGroupPublicChatRoomButton> openGroupRoom,
Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -80,7 +80,7 @@
public ChatAboutContentBtn(final ChatAboutContentAction action, final CoreResources res,
final I18nTranslationService i18n) {
super(action);
- this.withIcon(res.emiteRoom()).withToolTip(i18n.t("Chat and comment this")).withText(
+ this.withIcon(res.emiteRoom()).withToolTip(i18n.t("Chat and comment on this")).withText(
i18n.t("Chat about")).withStyles("k-def-docbtn, k-fl").withId(ID);
}
}
Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -70,7 +70,7 @@
// setState(session.getCurrentState());
}
});
- putValue(Action.NAME, i18n.t("Group's public room"));
+ putValue(Action.NAME, i18n.t("Group's public chat room"));
putValue(Action.TOOLTIP, i18n.t("Enter to this group public chat room"));
putValue(Action.SMALL_ICON, res.groupChat());
setInviteMembersImpl(false);
Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -41,7 +41,7 @@
final Provider<ChatClient> chatClient) {
this.i18n = i18n;
this.chatClient = chatClient;
- putValue(NAME, i18n.t("Chat with this member"));
+ putValue(NAME, i18n.t("Chat with this group member"));
putValue(Action.SMALL_ICON, res.newChat());
}
Deleted: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -1,36 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.chat.client.actions;
-
-import cc.kune.chat.client.ChatClient;
-import cc.kune.core.client.resources.CoreResources;
-import cc.kune.core.shared.i18n.I18nTranslationService;
-
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-
-public class StartChatWithThisBuddieAction extends StartChatWithMemberAction {
- @Inject
- public StartChatWithThisBuddieAction(final I18nTranslationService i18n, final CoreResources res,
- final Provider<ChatClient> chatClient) {
- super(i18n, res, chatClient);
- putValue(NAME, i18n.t("Chat with your buddie"));
- }
-}
Copied: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java (from rev 1538, trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java)
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java (rev 0)
+++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.chat.client.actions;
+
+import cc.kune.chat.client.ChatClient;
+import cc.kune.core.client.resources.CoreResources;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class StartChatWithThisBuddyAction extends StartChatWithMemberAction {
+ @Inject
+ public StartChatWithThisBuddyAction(final I18nTranslationService i18n, final CoreResources res,
+ final Provider<ChatClient> chatClient) {
+ super(i18n, res, chatClient);
+ putValue(NAME, i18n.t("Chat with your buddy"));
+ }
+}
Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -164,30 +164,34 @@
form.add(groupTypeFieldSet);
- projectRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Project"), TYPEOFGROUP_FIELD,
- i18n.t("A project is a kind of group in which new members joining "
- + "is moderated by the project administrators. "
- + "An administrator is the person who creates the project "
- + "and other people she/he chooses to be administrator as well."), PROJ_GROUP_TYPE_ID);
+ projectRadio = DefaultFormUtils.createRadio(
+ groupTypeFieldSet,
+ i18n.t("Project"),
+ TYPEOFGROUP_FIELD,
+ i18n.t("A project is a kind of group in which the joining of new members is moderated by the project administrators."),
+ PROJ_GROUP_TYPE_ID);
projectRadio.setTabIndex(6);
projectRadio.setValue(true);
orgRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Organization"),
- TYPEOFGROUP_FIELD, i18n.t("An organization works as a project, "
- + "but organizations must be a legal entity."), ORG_GROUP_TYPE_ID);
+ TYPEOFGROUP_FIELD, i18n.t("An organization works the same way as a project, "
+ + "except that it must be a legal entity."), ORG_GROUP_TYPE_ID);
orgRadio.setTabIndex(7);
- closedRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Closed"), TYPEOFGROUP_FIELD,
- i18n.t("Closed groups are social groups of persons "
- + "like family, friends, buddies, etc, which are moderated to new members "
- + "and with private contents (by default)"), CLOSED_GROUP_TYPE_ID);
+ closedRadio = DefaultFormUtils.createRadio(
+ groupTypeFieldSet,
+ i18n.t("Closed"),
+ TYPEOFGROUP_FIELD,
+ i18n.t("A Closed group is a private project, which contents are only accessible to its members (by default)."),
+ CLOSED_GROUP_TYPE_ID);
closedRadio.setTabIndex(8);
- communityRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Community"),
- TYPEOFGROUP_FIELD, i18n.t("Communities are social groups of persons "
- + "with shared interests, which are open to new members "
- + "(for instance the environmental community or the LGBT community). "
- + "They rarely are a legal entity."), COMM_GROUP_TYPE_ID);
+ communityRadio = DefaultFormUtils.createRadio(
+ groupTypeFieldSet,
+ i18n.t("Community"),
+ TYPEOFGROUP_FIELD,
+ i18n.t("A community is a group of users with shared interests (for instance the environmental community or the LGBT community). It is open to any new member to join freely without the moderation of the administrators."),
+ COMM_GROUP_TYPE_ID);
communityRadio.setTabIndex(9);
return form;
Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -25,7 +25,7 @@
public final static String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one";
public final static String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo";
public final static String ENT_LOGO_SELECTOR_PERSON_TITLE = "Avatar";
- public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers";
+ public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase Western characters and/or numbers";
public final static String FIELD_MUST_BE_BETWEEN_3_AND_15_NO_CHARS = "The name must be between 3 and 15 lowercase characters.";
public final static String GROUP_OPTIONS_DIALOG_TITLE = "Group options";
public final static String GROUPNAME_RESTRICTED = "This group name can not be used. Please try with a different name";
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -65,7 +65,6 @@
@Override
public void onExactMatch(final String match) {
NotifyUser.info(match);
- NotifyUser.info("kk");
}
}) {
@@ -86,7 +85,7 @@
};
};
suggestBox = multivalueSBox.getSuggestBox();
- Tooltip.to(suggestBox, i18n.t("Type something to search users and groups in this site"));
+ Tooltip.to(suggestBox, i18n.t("Type something to search for users and groups in this site"));
searchTextBox = suggestBox.getTextBox();
searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX);
searchTextBox.addStyleName("k-fr");
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -60,14 +60,14 @@
armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0);
// homeButton.setVisible(false);
homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in this site"));
- userSpaceTooltip = Tooltip.to(userButton,
- i18n.t("User space: it shows a list of all your documents and contents "
- + "in which you participate"));
+ userSpaceTooltip = Tooltip.to(
+ userButton,
+ i18n.t("User space: it shows a list of all documents and contents " + "in which you participate"));
groupSpaceTooltip = Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create "
+ "and publish contents for your personal or group web spaces"));
publicSpaceTooltip = Tooltip.to(publicButton,
- i18n.t("Public space: In this space you can see a preview of how the Personal o"
- + "r Group Space looks like on the web, outside this site"));
+ i18n.t("Public space: Where you can see a preview of how your Personal or "
+ + "Group Space looks like on the web, outside this site"));
// homeSpaceTooltip.setWidth(0);
userSpaceTooltip.setWidth(190);
groupSpaceTooltip.setWidth(170);
Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -45,14 +45,15 @@
super(i18n, guiProvider, armor, avatarDecorator, dragController, notDrop);
setVisibleImpl(false);
mainTitle.setText(i18n.t("Group members"));
- Tooltip.to(mainTitle, i18n.t("People and groups collaborating in this group"));
- firstCategoryLabel.setText(i18n.t("Admins"));
- setTooltip(firstCategoryLabel, i18n.t("People that can admin this group"));
+ Tooltip.to(mainTitle, i18n.t("Users and groups collaborating in this group"));
+ firstCategoryLabel.setText(i18n.t("Administrators"));
+ setTooltip(firstCategoryLabel, i18n.t("Users who can administrate this group"));
sndCategoryLabel.setText(i18n.t("Collaborators"));
- setTooltip(sndCategoryLabel, i18n.t("Other people that collaborate with this group"));
+ setTooltip(sndCategoryLabel, i18n.t("Others who collaborate with this group"));
trdCategoryLabel.setText(i18n.t("Pending"));
- setTooltip(trdCategoryLabel, i18n.t("People pending to be accepted in this group by the admins"));
- sndDeckLabel.setText(i18n.t("This is an orphaned project, if you are interested please request to join to work on it"));
+ setTooltip(trdCategoryLabel,
+ i18n.t("Users pending to be accepted in this group by the administrators"));
+ sndDeckLabel.setText(i18n.t("This is an orphaned project, if you are interested in contributing please request to join"));
firstDeckLabel.setText(i18n.t("The members of this group are not public"));
bottomActionsToolbar = new ActionFlowPanel(guiProvider);
bottomPanel.add(bottomActionsToolbar);
Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -51,11 +51,11 @@
setVisibleImpl(false);
mainTitle.setText(i18n.t("His/her network:"));
- mainTitle.setTitle(i18n.t("This user buddies and groups where participes"));
+ mainTitle.setTitle(i18n.t("This user's groups and buddies"));
firstCategoryLabel.setText(i18n.t("Buddies"));
- setTooltip(firstCategoryLabel, i18n.t("This user buddies"));
- sndCategoryLabel.setText(i18n.t("Participates in"));
- setTooltip(sndCategoryLabel, i18n.t("Groups in which this user participates"));
+ setTooltip(firstCategoryLabel, i18n.t("This user's buddies"));
+ sndCategoryLabel.setText(i18n.t("Joins in"));
+ setTooltip(sndCategoryLabel, i18n.t("Groups which this user Joined"));
trdCategoryLabel.setText("NOT USED");
setTooltip(trdCategoryLabel, "NOT USED");
super.setTrdCategoryVisible(false);
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -36,35 +36,36 @@
import com.google.inject.Provider;
public class ChangeToAdminAction extends AbstractExtendedAction {
- private final I18nTranslationService i18n;
- private final Session session;
- private final Provider<SocialNetworkServiceAsync> snServiceProvider;
- private final StateManager stateManager;
+ private final I18nTranslationService i18n;
+ private final Session session;
+ private final Provider<SocialNetworkServiceAsync> snServiceProvider;
+ private final StateManager stateManager;
- @Inject
- public ChangeToAdminAction(final StateManager stateManager, final Session session,
- final I18nTranslationService i18n, final CoreResources res,
- final Provider<SocialNetworkServiceAsync> snServiceProvider) {
- this.stateManager = stateManager;
- this.session = session;
- this.i18n = i18n;
- this.snServiceProvider = snServiceProvider;
- putValue(NAME, i18n.t("Change to admin"));
- putValue(Action.SMALL_ICON, res.arrowUpGreen());
- }
+ @Inject
+ public ChangeToAdminAction(final StateManager stateManager, final Session session,
+ final I18nTranslationService i18n, final CoreResources res,
+ final Provider<SocialNetworkServiceAsync> snServiceProvider) {
+ this.stateManager = stateManager;
+ this.session = session;
+ this.i18n = i18n;
+ this.snServiceProvider = snServiceProvider;
+ putValue(NAME, i18n.t("Change to administrator"));
+ putValue(Action.SMALL_ICON, res.arrowUpGreen());
+ }
- @Override
- public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
- snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), session.getCurrentState().getStateToken(),
- ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() {
- @Override
- public void onSuccess(final SocialNetworkDataDTO result) {
- NotifyUser.hideProgress();
- NotifyUser.info(i18n.t("Member type changed"));
- stateManager.setSocialNetwork(result);
- }
- });
- }
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgressProcessing();
+ snServiceProvider.get().setCollabAsAdmin(session.getUserHash(),
+ session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(),
+ new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
+ public void onSuccess(final SocialNetworkDataDTO result) {
+ NotifyUser.hideProgress();
+ NotifyUser.info(i18n.t("Member type changed"));
+ stateManager.setSocialNetwork(result);
+ }
+ });
+ }
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -36,7 +36,7 @@
public GotoGroupAction(final StateManager stateManager, final I18nTranslationService i18n,
final CoreResources res) {
this.stateManager = stateManager;
- putValue(NAME, i18n.t("Visit this group homepage"));
+ putValue(NAME, i18n.t("Visit this group's homepage"));
putValue(Action.SMALL_ICON, res.groupHome());
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -27,10 +27,11 @@
public class GotoMemberAction extends GotoGroupAction {
- @Inject
- public GotoMemberAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) {
- super(stateManager, i18n, res);
- putValue(NAME, i18n.t("Visit this member homepage"));
- }
+ @Inject
+ public GotoMemberAction(final StateManager stateManager, final I18nTranslationService i18n,
+ final CoreResources res) {
+ super(stateManager, i18n, res);
+ putValue(NAME, i18n.t("Visit this member's homepage"));
+ }
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -52,8 +52,8 @@
super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Viewer,
false, true, false);
this.signIn = signIn;
- putValue(NAME, i18n.t("Participate"));
- putValue(TOOLTIP, i18n.t("Request to participate in this group"));
+ putValue(NAME, i18n.t("Join"));
+ putValue(TOOLTIP, i18n.t("Request to Join in this group"));
putValue(Action.SMALL_ICON, res.addGreen());
putValue(Action.STYLES, "k-sn-join");
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -45,7 +45,7 @@
super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Editor,
true, false, true);
putValue(NAME, i18n.t("Leave this group"));
- putValue(TOOLTIP, i18n.t("Do not participate anymore in this group"));
+ // putValue(TOOLTIP, i18n.t("I want to leave this group"));
putValue(Action.SMALL_ICON, res.del());
putValue(Action.STYLES, "k-sn-join");
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -55,7 +55,7 @@
this.i18n = i18n;
this.snServiceProvider = snServiceProvider;
putValue(NAME, i18n.t("Leave this group"));
- putValue(TOOLTIP, i18n.t("Do not participate anymore in this group"));
+ // putValue(TOOLTIP, i18n.t("I want to leave this group"));
putValue(Action.SMALL_ICON, res.del());
putValue(Action.STYLES, "k-sn-join");
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -49,7 +49,7 @@
NotifyUser.askConfirmation(
i18n.t("Confirm, please:"),
isPerson ? i18n.t("Do you want to write a message to your buddy?")
- : onlyToAdmins ? i18n.t("Do you want to write a message to the admins of this group?")
+ : onlyToAdmins ? i18n.t("Do you want to write a message to the administrators of this group?")
: i18n.t("Do you want to write a message to the members of this group?"),
new SimpleResponseCallback() {
@Override
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -31,7 +31,7 @@
public WriteToAdmins(final WriteToAction action, final I18nTranslationService i18n) {
super(action);
action.setOnlyToAdmin(true);
- withText(i18n.t("Write to the admins of this group"));
+ withText(i18n.t("Write to the administrators of this group"));
setParent(GroupSNConfActions.OPTIONS_MENU);
setPosition(0);
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -87,11 +87,11 @@
addImpl(OPTIONS_MENU);
new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU);
- VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent(OPTIONS_MENU);
+ VISIBILITY_SUBMENU.withText(i18n.t("Users who can view this member list")).withParent(OPTIONS_MENU);
MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU);
anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"));
onlyMembersItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only members"));
- onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only admins"));
+ onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only administrators"));
moderatedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("moderate request to join"));
openItem.withParent(MODERATION_SUBMENU).withText(i18n.t("auto accept request to join"));
closedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("closed for new members"));
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -69,7 +69,7 @@
assert anyoneItem.getAction() != onlyYourBuddiesItem.getAction();
assert anyoneItem.getAction() != onlyYou.getAction();
addImpl(OPTIONS_MENU);
- VISIBILITY_SUBMENU.withText(i18n.t("Those who can view your network")).withParent(OPTIONS_MENU);
+ VISIBILITY_SUBMENU.withText(i18n.t("Users who can view your network")).withParent(OPTIONS_MENU);
anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone"));
onlyYourBuddiesItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only your buddies"));
onlyYou.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only you"));
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -81,7 +81,7 @@
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(writeToAction);
item.add(isPerson);
- item.withText(i18n.t("Write to your buddie"));
+ item.withText(i18n.t("Write to your buddy"));
item.add(isBuddie);
item.add(isNotMe);
item.add(isLogged);
@@ -112,7 +112,7 @@
public MenuItemDescriptor get() {
writeToActionOnlyAdmins.setOnlyToAdmin(true);
final MenuItemDescriptor item = new MenuItemDescriptor(writeToActionOnlyAdmins);
- item.withText(i18n.t("Write to the admins of this group"));
+ item.withText(i18n.t("Write to the administrators of this group"));
item.add(isLogged);
item.add(isGroup);
item.add(imPartOfGroup);
Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -34,7 +34,7 @@
public NewDocIconBtn(final I18nTranslationService i18n, final NewContentAction action,
final NavResources res, final GlobalShortcutRegister shorcutReg) {
super(i18n, action, res.pageAdd(), shorcutReg, "", i18n.t("Create a New Document. "
- + "This document will be a new 'Page' in the public web if you publish it"),
+ + "If you choose to publish it, this document will appear as a new 'Page' in the public web"),
i18n.t("New document"), DocsConstants.TYPE_DOCUMENT);
withStyles("k-btn-min, k-fl");
}
Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -34,9 +34,14 @@
public NewDocMenuItem(final I18nTranslationService i18n, final NewContentAction action,
final NavResources res, final GlobalShortcutRegister shorcutReg,
final DocsFolderNewMenu docsFolderNewMenu) {
- super(i18n, action, res.pageAdd(), shorcutReg, i18n.t("New document"),
+ super(
+ i18n,
+ action,
+ res.pageAdd(),
+ shorcutReg,
+ i18n.t("New document"),
i18n.t("Create a New Document here. "
- + "This document will be a new 'Page' in the public web if you publish it"),
+ + "If you choose to publish it, this document will appear as a new 'Page' in the public web"),
i18n.t("New document"), DocsConstants.TYPE_DOCUMENT, docsFolderNewMenu.get());
}
Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -32,7 +32,7 @@
public NewFolderMenuItem(final I18nTranslationService i18n, final NewContainerAction action,
final NavResources res, final DocsFolderNewMenu docsFolderNewMenu) {
super(i18n, action, res.folderAdd(), i18n.t("New folder"),
- i18n.t("Create a new folder here. A folder will be a 'section' in the public web"),
+ i18n.t("Create a new folder. A folder will be a 'section' in the public web"),
i18n.t("New folder"), DocsConstants.TYPE_FOLDER, docsFolderNewMenu.get());
}
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -67,8 +67,8 @@
public void actionPerformed(final ActionEvent event) {
final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken();
ConfirmAskEvent.fire(eventBus, i18n.t("Please confirm"),
- i18n.t("You will delete it with all its contents. Are you sure?"), i18n.t("Yes"),
- i18n.t("No"), null, null, new OnAcceptCallback() {
+ i18n.t("Are you sure you want this? It will be deleted with all its contents."),
+ i18n.t("Yes"), i18n.t("No"), null, null, new OnAcceptCallback() {
@Override
public void onSuccess() {
NotifyUser.showProgress();
Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -16,7 +16,7 @@
@Inject
public I18nToTranslateGridPanel(final I18nTranslationService i18n, final I18nCellList list) {
this.list = list;
- tabTitle = new Label(i18n.t("Untranslated"));
+ tabTitle = new Label(i18n.t("Not translated"));
initWidget(list);
}
Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -130,7 +130,7 @@
toTranslateTitle.setText(i18n.t("translate this:"));
noteForTranslatorsTittle.setText(i18n.t("Notes:"));
keyboardRecomendationTitle.setText(i18n.t("Tip:"));
- keyboardRecomendation.setText(i18n.t("Pulse Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved"));
+ keyboardRecomendation.setText(i18n.t("Click Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved"));
}
private void saveIfNeeded() {
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -54,7 +54,7 @@
// super.setHeight(LicenseWizardView.HEIGHT);
final Label intro = new Label();
- intro.setText(i18n.t("Select a license to share your group contents with other people:"));
+ intro.setText(i18n.t("Select the license you prefer using for sharing your group contents with other people:"));
intro.addStyleName("kune-Margin-10-b");
final FieldSet fieldSet = new FieldSet();
// fieldSet.setTitle(i18n.t("license recommended"));
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -138,7 +138,7 @@
modificationsGroup,
i18n.t("Yes"),
RADIO_MODIF_FIELD_NAME,
- i18n.t("The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it"),
+ i18n.t("The licensor permits others to copy, distribute, display and perform the work, as well as to make derivative works based on it"),
RADIO_PERMIT_MOD_ID);
permitModSaRadio = createRadio(
modificationsGroup,
Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -49,7 +49,7 @@
super.getFormPanel().setLabelWidth(100);
super.addStyleName("k-overflow-y-auto");
final Label label = new Label();
- label.setText(i18n.t("Here you can change this values:"));
+ label.setText(i18n.t("Change this values:"));
label.addStyleName("kune-Margin-10-tb");
super.add(label);
}
Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -46,7 +46,7 @@
final FlowPanel flow = new FlowPanel();
final Label intro = new Label();
intro.setWordWrap(true);
- intro.setText(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):"));
+ intro.setText(i18n.t("This is the default license for all the contents of this group (although you can choose a different license for specific contents):"));
intro.addStyleName("kune-Margin-20-tb");
flow.add(intro);
licenseImage = new Image();
Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -97,16 +97,16 @@
@Override
public void setNormalGroupsLabels() {
- uploader.setLabelText(i18n.t("Select an image in your computer as the logo for this group. "
- + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.",
+ uploader.setLabelText(i18n.t("Select an image from your computer as the logo for this group. "
+ + "For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized.",
FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT));
tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE);
}
@Override
public void setPersonalGroupsLabels() {
- uploader.setLabelText(i18n.t("Select an image in your computer as your avatar. "
- + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.",
+ uploader.setLabelText(i18n.t("Select an image from your computer as your avatar. "
+ + "For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized.",
FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT));
tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE);
}
Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -75,7 +75,7 @@
flow.add(wsThemeInfo);
flow.add(styleSelector);
hasBackLabel = i18n.t("Current background image: ");
- noHasBacklabel = i18n.t("Also you can upload a background:");
+ noHasBacklabel = i18n.t("You can also upload a background:");
backgroundLabel = new Label(hasBackLabel);
backgroundLabel.addStyleName("k-clear");
chooseImage = i18n.t("Choose");
Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -36,8 +36,7 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
-public class GroupOptToolsPresenter extends EntityOptToolsPresenter implements
- GroupOptTools {
+public class GroupOptToolsPresenter extends EntityOptToolsPresenter implements GroupOptTools {
@Inject
public GroupOptToolsPresenter(final StateManager stateManager, final Session session,
@@ -72,7 +71,7 @@
@Override
protected String getDefContentTooltip() {
// FIXME
- return i18n.t("You cannot disable this tool because it's where the current group home page is located. To do that you have to select other content as the default group home page but in another tool.");
+ return i18n.t("This tool cannot be disabled as long as it’s where the group’s home page is located. Change the default home page to another tool then try again.");
}
@Override
Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -96,19 +96,19 @@
private void setContentNotPublic() {
getView().getTitle().setText(i18n.t("Not Published yet") + TextUtils.IN_DEVELOPMENT_P);
getView().getDescription().setText(
- i18n.t("This is only a preview of how this page will looks like to the general public if you want to publish it"));
+ i18n.t("This is only a preview of how this webpage would look like to the general public on the internet."));
}
private void setContentNotPublicable() {
- getView().getTitle().setText(i18n.t("Not Publicable") + TextUtils.IN_DEVELOPMENT_P);
- getView().getDescription().setText(i18n.t("This page is not publicable"));
+ getView().getTitle().setText(i18n.t("Not Publisable") + TextUtils.IN_DEVELOPMENT_P);
+ getView().getDescription().setText(i18n.t("This page is not publisable"));
getView().setContentGotoPublicUrl("about:blank");
}
private void setContentPublic() {
getView().getTitle().setText(i18n.t("Preview") + TextUtils.IN_DEVELOPMENT_P);
getView().getDescription().setText(
- i18n.t("This is only a preview of how this page looks like to the general public on the web, outside this site."));
+ i18n.t("This is only a preview of how this page would look like to the general public on the internet."));
}
public void setState(final StateAbstractDTO state) {
Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -32,7 +32,7 @@
public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action,
final NavResources res, final WikiFolderNewMenu wikiFolderNewMenu) {
super(i18n, action, res.wikiAdd(), i18n.t("New folder"),
- i18n.t("Create a new folder here. A folder will be a 'section' in the public web"),
+ i18n.t("Create a new folder. A folder will be a 'section' in the public web"),
i18n.t("New folder"), WikiConstants.TYPE_FOLDER, wikiFolderNewMenu.get());
}
Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -34,7 +34,7 @@
public NewWikiIconBtn(final I18nTranslationService i18n, final NewContentAction action,
final NavResources res, final GlobalShortcutRegister shorcutReg) {
super(i18n, action, res.wikipageAdd(), shorcutReg, "", i18n.t("Create a New Wikipage here. "
- + "This document will be a new 'Page' in the public web if you publish it"),
+ + "If you choose to publish it, this document will appear as a new 'Page' in the public web"),
i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE);
withStyles("k-btn-min, k-fl");
}
Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java
===================================================================
--- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542)
@@ -34,9 +34,14 @@
public NewWikiMenuItem(final I18nTranslationService i18n, final NewContentAction action,
final NavResources res, final GlobalShortcutRegister shorcutReg,
final WikiFolderNewMenu wikiFolderNewMenu) {
- super(i18n, action, res.wikipageAdd(), shorcutReg, i18n.t("New wikipage"),
+ super(
+ i18n,
+ action,
+ res.wikipageAdd(),
+ shorcutReg,
+ i18n.t("New wikipage"),
i18n.t("Create a New Wikipage here. "
- + "This document will be a new 'Page' in the public web if you publish it"),
+ + "If you choose to publish it, this document will appear as a new 'Page' in the public web"),
i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE, wikiFolderNewMenu.get());
}
Modified: trunk/src/main/resources/db/liquibase_changelog.xml
===================================================================
--- trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-03 12:31:04 UTC (rev 1541)
+++ trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-03 23:19:58 UTC (rev 1542)
@@ -149,4 +149,10 @@
encoding="utf8" stripComments="1" />
<rollback>SELECT * FROM globalize_countries;</rollback>
</changeSet>
+ <changeSet id="23" author="vjrj">
+ <comment>I18n translations cleanup 3</comment>
+ <sqlFile path="src/main/resources/db/update-0017-i18nclean3.sql"
+ encoding="utf8" stripComments="1" />
+ <rollback>SELECT * FROM globalize_countries;</rollback>
+ </changeSet>
</databaseChangeLog>
Added: trunk/src/main/resources/db/update-0018-i18nclean3.sql
===================================================================
--- trunk/src/main/resources/db/update-0018-i18nclean3.sql (rev 0)
+++ trunk/src/main/resources/db/update-0018-i18nclean3.sql 2011-10-03 23:19:58 UTC (rev 1542)
@@ -0,0 +1,3 @@
+BEGIN WORK;
+TRUNCATE TABLE globalize_translations;
+COMMIT;
\ No newline at end of file
1
0
Author: vjrj_
Date: 2011-10-03 14:31:04 +0200 (Mon, 03 Oct 2011)
New Revision: 1541
Added:
trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java
trunk/src/main/java/cc/kune/core/server/stats/
trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java
trunk/src/main/java/cc/kune/core/server/stats/StatsService.java
trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java
trunk/src/main/java/cc/kune/hspace/
trunk/src/main/java/cc/kune/hspace/HSpace.gwt.xml
trunk/src/main/java/cc/kune/hspace/client/
trunk/src/main/java/cc/kune/hspace/client/ClientStatsService.java
trunk/src/main/java/cc/kune/hspace/client/ClientStatsServiceAsync.java
trunk/src/main/java/cc/kune/hspace/client/HSpaceGinModule.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml
trunk/src/main/java/cc/kune/hspace/client/HSpaceParts.java
trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java
trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java
Modified:
trunk/img/icons-base.svg
trunk/img/webtemplate/theme-palettes.svg
trunk/img/webtemplate/web_template-2011.svg
trunk/src/main/java/cc/kune/Kune.gwt.xml
trunk/src/main/java/cc/kune/client/KuneEntryPoint.java
trunk/src/main/java/cc/kune/client/KuneGinjector.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java
trunk/src/main/java/cc/kune/core/server/KuneRackModule.java
trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java
trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java
trunk/src/main/java/cc/kune/domain/finders/ContentFinder.java
trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java
trunk/src/main/java/cc/kune/domain/finders/UserFinder.java
trunk/src/main/resources/dozerBeanMapping.xml
Log:
NEW - # 132: Global public stats functions
http://kune.ourproject.org/issues/ticket/132
Modified: trunk/img/icons-base.svg
===================================================================
--- trunk/img/icons-base.svg 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/img/icons-base.svg 2011-10-03 12:31:04 UTC (rev 1541)
@@ -28,16 +28,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="5.4453125"
+ inkscape:zoom="1"
inkscape:cx="303.02471"
- inkscape:cy="213.02648"
+ inkscape:cy="775.23021"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1078"
inkscape:window-height="897"
inkscape:window-x="0"
inkscape:window-y="947"
- showgrid="true"
+ showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:grid-points="true"
@@ -1914,7 +1914,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -4695,11 +4695,11 @@
<image
sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png"
xlink:href="icons/lock_break.png"
- y="450.82797"
- x="330.84604"
- id="image2972"
+ width="16"
height="16"
- width="16" />
+ id="image2972"
+ x="330.84604"
+ y="450.82797" />
<use
x="0"
y="0"
@@ -4790,12 +4790,12 @@
<image
sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png"
xlink:href="icons/lock_break.png"
- y="432.36218"
- x="-371"
- id="image3958"
- height="16"
+ transform="scale(-1,1)"
width="16"
- transform="scale(-1,1)" />
+ height="16"
+ id="image3958"
+ x="-371"
+ y="432.36218" />
<g
id="g3962"
transform="translate(-43.509019,-21.462476)">
@@ -5541,62 +5541,28 @@
y="761.23108"
x="235.11862"
id="image3658"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXpJREFU
-OI2Nk7GOGjEQhn9veAbSXMRV0FEQcdfQ8BQ810lQ8EQooqOkIykQ27CIBS/rmflTsOuw5CAZaSR7
-rP/7x2PZkYRz7gXAVwBf8DxSAD9JWqyQBIDvRVFkIQQVEX6WRVFwOp1+AHgFkJC8aivAWwhB8zzn
-6XSKeTgcuN/vudvtKCLcbreczWYNCAA4AG8iQu89L5cLvff03vN4PDLLMqZpShHh+Xxmnuecz+cf
-AF5JwlWAoYj8UFUsFguUZYmyLBFCiDmZTBrDaLVa7wCWrdtikiQYjUZxNqoKVYWIIMsymBlEBO12
-+w/oFuCcw3K5RAgBIoKyLCEiEWRmGI/HzU7u32k4HDb2dSdmBlWth/4YsFqtICIN51poZvGKDwH9
-fv++FMX1+ilgvV7HwZlZbB0AzAyDweA5oNvtNpzuHe/jL8Bms4nOdd5Cer3eQwABuE6n89SxCqu6
-Y8Ir3lTV1wf/EqvqGYACgKu+8zdcv3PyP/aVOCX56zfInVxa8Hj31gAAAABJRU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXpJREFU OI2Nk7GOGjEQhn9veAbSXMRV0FEQcdfQ8BQ810lQ8EQooqOkIykQ27CIBS/rmflTsOuw5CAZaSR7 rP/7x2PZkYRz7gXAVwBf8DxSAD9JWqyQBIDvRVFkIQQVEX6WRVFwOp1+AHgFkJC8aivAWwhB8zzn 6XSKeTgcuN/vudvtKCLcbreczWYNCAA4AG8iQu89L5cLvff03vN4PDLLMqZpShHh+Xxmnuecz+cf AF5JwlWAoYj8UFUsFguUZYmyLBFCiDmZTBrDaLVa7wCWrdtikiQYjUZxNqoKVYWIIMsymBlEBO12 +w/oFuCcw3K5RAgBIoKyLCEiEWRmGI/HzU7u32k4HDb2dSdmBlWth/4YsFqtICIN51poZvGKDwH9 fv++FMX1+ilgvV7HwZlZbB0AzAyDweA5oNvtNpzuHe/jL8Bms4nOdd5Cer3eQwABuE6n89SxCqu6 Y8Ir3lTV1wf/EqvqGYACgKu+8zdcv3PyP/aVOCX56zfInVxa8Hj31gAAAABJRU5ErkJggg== "
height="16"
width="16" />
<image
y="747.60388"
x="265.6059"
id="image3628"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAhVJREFU
-OI3Fk7tuE1EQhr85e7xeO15fSBxDHCfCSBEtz8ADUPMEtLwAPTUtHRIF6ZBAiqAIEikAQZ8iSAk2
-MVlfkniztvd6KGzCpU3BSKOZKebX/DP/iDGGq5i6UjegHz39uOsU3TsDP166mCUqM5BhSDNDZgyp
-MWTZvF64QdI4npwPOvsHB7peq7Qe3Nsqh7ERJ2/9hS7/5jKP0zCxpmG6dv9xOFPeOGlHSSbPd3t0
-BhFBaDgaZnRGGd2zjN55hucbBoEhTqE7jHjyqsdpECq33rqlgjCVfE7RvFHmzRePs4uYRlnIWWBb
-gq0FW0O1IAzHEdt7J1SvlVmu5gFETWYJAO3rJdYbZXY+e5z6MSslha3BtqDiCCM/YnvPY2W5TLtZ
-QhbHU8EsnW/TgvZaiXqtyIt3HUZ+RMURXEcY+hHP3naoVIq010oU9B9nDKbzCUQgiRMcnbHRrPL6
-k0d3MKM7mPHyg0erWcW1U5RJsPXvzepJmGKAKEo4Gfm0Gi62naM3cni/P0YBW60ajeUCwSyiN/BZ
-qbkYAxhBT8LEpJkRb+jTqrsUnBwYuLlaZGO1iACy0IYu2uhVl+P+mGm1ACYzOhh9PwyjZPP2ekFK
-BSWiUtSCkohcauCXDkCzWXOzwx9+NO53j3V00T+6+3CnlneXlnTeEq0tlCVYCpQSlF4AyCVtkyZR
-ND0/Hfa/dr7Jf3+mKwP8BP1J+XtVAGrrAAAAAElFTkSuQmCC
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAhVJREFU OI3Fk7tuE1EQhr85e7xeO15fSBxDHCfCSBEtz8ADUPMEtLwAPTUtHRIF6ZBAiqAIEikAQZ8iSAk2 MVlfkniztvd6KGzCpU3BSKOZKebX/DP/iDGGq5i6UjegHz39uOsU3TsDP166mCUqM5BhSDNDZgyp MWTZvF64QdI4npwPOvsHB7peq7Qe3Nsqh7ERJ2/9hS7/5jKP0zCxpmG6dv9xOFPeOGlHSSbPd3t0 BhFBaDgaZnRGGd2zjN55hucbBoEhTqE7jHjyqsdpECq33rqlgjCVfE7RvFHmzRePs4uYRlnIWWBb gq0FW0O1IAzHEdt7J1SvlVmu5gFETWYJAO3rJdYbZXY+e5z6MSslha3BtqDiCCM/YnvPY2W5TLtZ QhbHU8EsnW/TgvZaiXqtyIt3HUZ+RMURXEcY+hHP3naoVIq010oU9B9nDKbzCUQgiRMcnbHRrPL6 k0d3MKM7mPHyg0erWcW1U5RJsPXvzepJmGKAKEo4Gfm0Gi62naM3cni/P0YBW60ajeUCwSyiN/BZ qbkYAxhBT8LEpJkRb+jTqrsUnBwYuLlaZGO1iACy0IYu2uhVl+P+mGm1ACYzOhh9PwyjZPP2ekFK BSWiUtSCkohcauCXDkCzWXOzwx9+NO53j3V00T+6+3CnlneXlnTeEq0tlCVYCpQSlF4AyCVtkyZR ND0/Hfa/dr7Jf3+mKwP8BP1J+XtVAGrrAAAAAElFTkSuQmCC "
height="16"
width="16" />
<image
y="749.65729"
x="265.74442"
id="image3725"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVRJREFU
-OI2Vk7FqAkEQhr+5XbQULLQLSZvGKuZ9xOIqXyWIFlelVPIcgpAyT2CSRmIhCAHN7ZhJEU9Os8Zk
-YdiF2f3/b2Z3BbgAmoDwcyyAVzP7jOT24ybP8w9VtSJCCLZer20wGPSBK8CZGbEQoK2qjyEEZrMZ
-8/mcEAK1Wo0QAqPR6CHLsjHwdIqmraq22WxsMplYnuf2HxpfqCRJsp9jNK1Wq5emaTPLsrGIHNC0
-C6fpdGq/0RS54XDYBy6BxJdrEZEojaqiqoQQqNfrdDqdnveeNE3vkti1iAjOuYO1c25vUKlU6Ha7
-PaARFSjTOOdIkgTnHNVqldVqxXK53O87KMHMztKICKoaFyhcT4kU+fI+Dyy897d8P+VrVb2P0RTu
-ZSEAb2bPIvLC0V+I0ZT7clCCfduZiLydozkWPm7in2m22+07sJVY53eHLoFGNLnTABZfqoEJ24bE
-i/YAAAAASUVORK5CYII=
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVRJREFU OI2Vk7FqAkEQhr+5XbQULLQLSZvGKuZ9xOIqXyWIFlelVPIcgpAyT2CSRmIhCAHN7ZhJEU9Os8Zk YdiF2f3/b2Z3BbgAmoDwcyyAVzP7jOT24ybP8w9VtSJCCLZer20wGPSBK8CZGbEQoK2qjyEEZrMZ 8/mcEAK1Wo0QAqPR6CHLsjHwdIqmraq22WxsMplYnuf2HxpfqCRJsp9jNK1Wq5emaTPLsrGIHNC0 C6fpdGq/0RS54XDYBy6BxJdrEZEojaqiqoQQqNfrdDqdnveeNE3vkti1iAjOuYO1c25vUKlU6Ha7 PaARFSjTOOdIkgTnHNVqldVqxXK53O87KMHMztKICKoaFyhcT4kU+fI+Dyy897d8P+VrVb2P0RTu ZSEAb2bPIvLC0V+I0ZT7clCCfduZiLydozkWPm7in2m22+07sJVY53eHLoFGNLnTABZfqoEJ24bE i/YAAAAASUVORK5CYII= "
height="16"
width="16" />
<image
y="-787.57947"
x="-342.35602"
id="image3857"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUNJREFU
-OI2lk89qAjEQh79klZ56EuylB0+CXgutz+ET+ADSx+i1CILP1BcQvHr0tIfgrskk00Ob7XaxtX8C
-w8yEzG8+ZohRVf5z7L+qgV47McaYSwXaQTbALXADFD9segD2qpryxV1d12UIIYqIfmd1Xet6vV4B
-I8CqKj2gKIri2ntvY4yoKv1+n0wqIqSU8N4zGAyYz+ePAMvl8tkYswe4z+pVVWlVVXo6nZrYOadl
-WerhcFAR0ePxqM453Ww2K2Bk3gVeYozsdjtCCFhr88BQVWKMeO+ZzWafN9DrPTRbsNYynU67EyfG
-2FhZlqSUEBGGw+GbSLMOY9hut+fWRoyRlFLjx+PxB0X7cZegLZIF8qDPCpwjyCel1AhNJpPfEWSK
-tv2JIAu1G10k6P7Wbm4Wi8WTc+5KRPjKQgiNz7GIoKqnV4ZMMuP74A8FAAAAAElFTkSuQmCC
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAUNJREFU OI2lk89qAjEQh79klZ56EuylB0+CXgutz+ET+ADSx+i1CILP1BcQvHr0tIfgrskk00Ob7XaxtX8C w8yEzG8+ZohRVf5z7L+qgV47McaYSwXaQTbALXADFD9segD2qpryxV1d12UIIYqIfmd1Xet6vV4B I8CqKj2gKIri2ntvY4yoKv1+n0wqIqSU8N4zGAyYz+ePAMvl8tkYswe4z+pVVWlVVXo6nZrYOadl WerhcFAR0ePxqM453Ww2K2Bk3gVeYozsdjtCCFhr88BQVWKMeO+ZzWafN9DrPTRbsNYynU67EyfG 2FhZlqSUEBGGw+GbSLMOY9hut+fWRoyRlFLjx+PxB0X7cZegLZIF8qDPCpwjyCel1AhNJpPfEWSK tv2JIAu1G10k6P7Wbm4Wi8WTc+5KRPjKQgiNz7GIoKqnV4ZMMuP74A8FAAAAAElFTkSuQmCC "
height="16"
width="16"
transform="scale(-1,-1)" />
@@ -5604,29 +5570,13 @@
y="771.07178"
x="267.13602"
id="image3790"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVZJREFU
-OI2FkbFuwjAQhr9zLNgYGNqtYu5e+j6IgamvUlViYOqz8BLsbScUJBBQhTS+9DqUpE6IykmWLfvu
-8/3/CXAH3ALCZaTAh5l9d7zV8VAUxZeqWrzyPLf5fP4CjABnZnQtgLGq2ul0suPxaLvdztI0NVW1
-LMtssVi8AKOrgDzPLcsyOxwOttls6k5CCAY8Au4sU2KAr3QkSVLv/X6f1WrFer1mMBgA3J/TDEBE
-Gt6M49+qTpbLpRVFYde8qTs4k+tOnHM45wghoKqoKiEEhsMhk8nkyXvPbDZ7du2RiAgignOuAU2S
-BJHfSfd6PabT6RNwcwGIIZUnzrnam/1+z3a7rXMbEqqxVJC2rAqsqt2AqqjrHEuI3zyQeu8f2yqA
-e1V9bcuKQQDezN5E5L0DcBGxLw0JFov/S6zvurxpAK5FuwigLMtPoJTW53HRCLj5h1sC6Q9MlgFW
-OwAOYwAAAABJRU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVZJREFU OI2FkbFuwjAQhr9zLNgYGNqtYu5e+j6IgamvUlViYOqz8BLsbScUJBBQhTS+9DqUpE6IykmWLfvu 8/3/CXAH3ALCZaTAh5l9d7zV8VAUxZeqWrzyPLf5fP4CjABnZnQtgLGq2ul0suPxaLvdztI0NVW1 LMtssVi8AKOrgDzPLcsyOxwOttls6k5CCAY8Au4sU2KAr3QkSVLv/X6f1WrFer1mMBgA3J/TDEBE Gt6M49+qTpbLpRVFYde8qTs4k+tOnHM45wghoKqoKiEEhsMhk8nkyXvPbDZ7du2RiAgignOuAU2S BJHfSfd6PabT6RNwcwGIIZUnzrnam/1+z3a7rXMbEqqxVJC2rAqsqt2AqqjrHEuI3zyQeu8f2yqA e1V9bcuKQQDezN5E5L0DcBGxLw0JFov/S6zvurxpAK5FuwigLMtPoJTW53HRCLj5h1sC6Q9MlgFW OwAOYwAAAABJRU5ErkJggg== "
height="16"
width="16" />
<image
width="16"
height="16"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXpJREFU
-OI2Nk7GOGjEQhn9veAbSXMRV0FEQcdfQ8BQ810lQ8EQooqOkIykQ27CIBS/rmflTsOuw5CAZaSR7
-rP/7x2PZkYRz7gXAVwBf8DxSAD9JWqyQBIDvRVFkIQQVEX6WRVFwOp1+AHgFkJC8aivAWwhB8zzn
-6XSKeTgcuN/vudvtKCLcbreczWYNCAA4AG8iQu89L5cLvff03vN4PDLLMqZpShHh+Xxmnuecz+cf
-AF5JwlWAoYj8UFUsFguUZYmyLBFCiDmZTBrDaLVa7wCWrdtikiQYjUZxNqoKVYWIIMsymBlEBO12
-+w/oFuCcw3K5RAgBIoKyLCEiEWRmGI/HzU7u32k4HDb2dSdmBlWth/4YsFqtICIN51poZvGKDwH9
-fv++FMX1+ilgvV7HwZlZbB0AzAyDweA5oNvtNpzuHe/jL8Bms4nOdd5Cer3eQwABuE6n89SxCqu6
-Y8Ir3lTV1wf/EqvqGYACgKu+8zdcv3PyP/aVOCX56zfInVxa8Hj31gAAAABJRU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAXpJREFU OI2Nk7GOGjEQhn9veAbSXMRV0FEQcdfQ8BQ810lQ8EQooqOkIykQ27CIBS/rmflTsOuw5CAZaSR7 rP/7x2PZkYRz7gXAVwBf8DxSAD9JWqyQBIDvRVFkIQQVEX6WRVFwOp1+AHgFkJC8aivAWwhB8zzn 6XSKeTgcuN/vudvtKCLcbreczWYNCAA4AG8iQu89L5cLvff03vN4PDLLMqZpShHh+Xxmnuecz+cf AF5JwlWAoYj8UFUsFguUZYmyLBFCiDmZTBrDaLVa7wCWrdtikiQYjUZxNqoKVYWIIMsymBlEBO12 +w/oFuCcw3K5RAgBIoKyLCEiEWRmGI/HzU7u32k4HDb2dSdmBlWth/4YsFqtICIN51poZvGKDwH9 fv++FMX1+ilgvV7HwZlZbB0AzAyDweA5oNvtNpzuHe/jL8Bms4nOdd5Cer3eQwABuE6n89SxCqu6 Y8Ir3lTV1wf/EqvqGYACgKu+8zdcv3PyP/aVOCX56zfInVxa8Hj31gAAAABJRU5ErkJggg== "
id="image3860"
x="281"
y="-814.36218"
@@ -5634,15 +5584,7 @@
<image
width="16"
height="16"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVRJREFU
-OI2Vk7FqAkEQhr+5XbQULLQLSZvGKuZ9xOIqXyWIFlelVPIcgpAyT2CSRmIhCAHN7ZhJEU9Os8Zk
-YdiF2f3/b2Z3BbgAmoDwcyyAVzP7jOT24ybP8w9VtSJCCLZer20wGPSBK8CZGbEQoK2qjyEEZrMZ
-8/mcEAK1Wo0QAqPR6CHLsjHwdIqmraq22WxsMplYnuf2HxpfqCRJsp9jNK1Wq5emaTPLsrGIHNC0
-C6fpdGq/0RS54XDYBy6BxJdrEZEojaqiqoQQqNfrdDqdnveeNE3vkti1iAjOuYO1c25vUKlU6Ha7
-PaARFSjTOOdIkgTnHNVqldVqxXK53O87KMHMztKICKoaFyhcT4kU+fI+Dyy897d8P+VrVb2P0RTu
-ZSEAb2bPIvLC0V+I0ZT7clCCfduZiLydozkWPm7in2m22+07sJVY53eHLoFGNLnTABZfqoEJ24bE
-i/YAAAAASUVORK5CYII=
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAVRJREFU OI2Vk7FqAkEQhr+5XbQULLQLSZvGKuZ9xOIqXyWIFlelVPIcgpAyT2CSRmIhCAHN7ZhJEU9Os8Zk YdiF2f3/b2Z3BbgAmoDwcyyAVzP7jOT24ybP8w9VtSJCCLZer20wGPSBK8CZGbEQoK2qjyEEZrMZ 8/mcEAK1Wo0QAqPR6CHLsjHwdIqmraq22WxsMplYnuf2HxpfqCRJsp9jNK1Wq5emaTPLsrGIHNC0 C6fpdGq/0RS54XDYBy6BxJdrEZEojaqiqoQQqNfrdDqdnveeNE3vkti1iAjOuYO1c25vUKlU6Ha7 PaARFSjTOOdIkgTnHNVqldVqxXK53O87KMHMztKICKoaFyhcT4kU+fI+Dyy897d8P+VrVb2P0RTu ZSEAb2bPIvLC0V+I0ZT7clCCfduZiLydozkWPm7in2m22+07sJVY53eHLoFGNLnTABZfqoEJ24bE i/YAAAAASUVORK5CYII= "
id="image3862"
x="253.74442"
y="789.65729" />
@@ -5661,30 +5603,14 @@
<image
width="16"
height="11"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABHNCSVQICAgIfAhkiAAAAgNJREFU
-KJFdkrtuE1EQhr85e7zedby+kDiGOCbCSBEtz8ADUPMEtDwAD0BNSYlEQTokkCIogkSKCEGfIkgJ
-NjFZX5J4s7b3eihsEsRIo/mnGc3365fnrw72nJL3cBgkK1fzVOUGcgxZbsiNITOGPF/syzZIliTT
-y2H38OhIN+rV9tPH25UoMeIULf4t+V/LYs6i1JpF2caTF9Fc+ZO0E6e5vNnr0x3GhJHhZJTTHef0
-LnL6lzl+YBiGhiSD3ijm5fs+52GkvEb7vgqjTIoFRetOhY/ffS6uEpoVoWCBbQm2FmwNNVcYTWJ2
-9s+o3aqwWisCiJrOUwA6t8tsNivsfvM5DxLWygpbg21B1RHGQczOvs/aaoVOq4yYBZoK5xkA2oLO
-RplGvcTbz13GQUzVETxHGAUxrz91qVZLdDbKuPrGGxXOFh+IQJqkODrnbqvGh68+veGc3nDOuwOf
-dquGZ2cok2LrG2f1NMowQBynnI0D2k0P2y7QHzt8OZyggO12neaqSziP6Q8D1uoexgBG0NMoNVlu
-xB8FtBserlMAA/fWS9xdLyGALLOhSzZ63eN0MGFWc8HkRofjX8dRnG492HSl7CoRlaGWSCJynYG/
-OQDNVt3Lj38H8WTQO9Xx1eDk0bPdetFbWdFFS7S2UJZgKVBKUHp5QK6xTZbG8ezyfDT40f35B/6e
-83OfcJ+mAAAAAElFTkSuQmCC
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABHNCSVQICAgIfAhkiAAAAgNJREFU KJFdkrtuE1EQhr85e7zedby+kDiGOCbCSBEtz8ADUPMEtDwAD0BNSYlEQTokkCIogkSKCEGfIkgJ NjFZX5J4s7b3eihsEsRIo/mnGc3365fnrw72nJL3cBgkK1fzVOUGcgxZbsiNITOGPF/syzZIliTT y2H38OhIN+rV9tPH25UoMeIULf4t+V/LYs6i1JpF2caTF9Fc+ZO0E6e5vNnr0x3GhJHhZJTTHef0 LnL6lzl+YBiGhiSD3ijm5fs+52GkvEb7vgqjTIoFRetOhY/ffS6uEpoVoWCBbQm2FmwNNVcYTWJ2 9s+o3aqwWisCiJrOUwA6t8tsNivsfvM5DxLWygpbg21B1RHGQczOvs/aaoVOq4yYBZoK5xkA2oLO RplGvcTbz13GQUzVETxHGAUxrz91qVZLdDbKuPrGGxXOFh+IQJqkODrnbqvGh68+veGc3nDOuwOf dquGZ2cok2LrG2f1NMowQBynnI0D2k0P2y7QHzt8OZyggO12neaqSziP6Q8D1uoexgBG0NMoNVlu xB8FtBserlMAA/fWS9xdLyGALLOhSzZ63eN0MGFWc8HkRofjX8dRnG492HSl7CoRlaGWSCJynYG/ OQDNVt3Lj38H8WTQO9Xx1eDk0bPdetFbWdFFS7S2UJZgKVBKUHp5QK6xTZbG8ezyfDT40f35B/6e 83OfcJ+mAAAAAElFTkSuQmCC "
id="image4023"
x="301"
y="799.36218" />
<image
width="16"
height="9"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAJCAYAAAA7KqwyAAAABHNCSVQICAgIfAhkiAAAAMZJREFU
-KJGNkr2Kg2AQRc/niC5h+7BFsNPOwtoib553sLST7fYBsgjfHVP4g2sg2QsDw8A9d2AmMOsCfPF/
-CfgBvtNlcB7H8WZmH0DyxuyS7nmeX1dAABIzOwF0XUeMkRgjkraapgl3p23bJMuyT8CAkB7xdV0/
-Ra7mtd/rCdD3PZKIMeLuuDuS5t3daZrmNaAsyz9Jx8Sj9oAJCMMwbMlr7SFVVQH46kkXo0v6NbNT
-URQvEwEk3ZlPSVhmF+DM+xNuDJY/eACnnm1bpLVzVgAAAABJRU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAJCAYAAAA7KqwyAAAABHNCSVQICAgIfAhkiAAAAMZJREFU KJGNkr2Kg2AQRc/niC5h+7BFsNPOwtoib553sLST7fYBsgjfHVP4g2sg2QsDw8A9d2AmMOsCfPF/ CfgBvtNlcB7H8WZmH0DyxuyS7nmeX1dAABIzOwF0XUeMkRgjkraapgl3p23bJMuyT8CAkB7xdV0/ Ra7mtd/rCdD3PZKIMeLuuDuS5t3daZrmNaAsyz9Jx8Sj9oAJCMMwbMlr7SFVVQH46kkXo0v6NbNT URQvEwEk3ZlPSVhmF+DM+xNuDJY/eACnnm1bpLVzVgAAAABJRU5ErkJggg== "
id="image3993"
x="301"
y="805.36218" />
@@ -5706,30 +5632,14 @@
y="799.36218"
x="301"
id="image4035"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABHNCSVQICAgIfAhkiAAAAgNJREFU
-KJFdkrtuE1EQhr85e7zedby+kDiGOCbCSBEtz8ADUPMEtDwAD0BNSYlEQTokkCIogkSKCEGfIkgJ
-NjFZX5J4s7b3eihsEsRIo/mnGc3365fnrw72nJL3cBgkK1fzVOUGcgxZbsiNITOGPF/syzZIliTT
-y2H38OhIN+rV9tPH25UoMeIULf4t+V/LYs6i1JpF2caTF9Fc+ZO0E6e5vNnr0x3GhJHhZJTTHef0
-LnL6lzl+YBiGhiSD3ijm5fs+52GkvEb7vgqjTIoFRetOhY/ffS6uEpoVoWCBbQm2FmwNNVcYTWJ2
-9s+o3aqwWisCiJrOUwA6t8tsNivsfvM5DxLWygpbg21B1RHGQczOvs/aaoVOq4yYBZoK5xkA2oLO
-RplGvcTbz13GQUzVETxHGAUxrz91qVZLdDbKuPrGGxXOFh+IQJqkODrnbqvGh68+veGc3nDOuwOf
-dquGZ2cok2LrG2f1NMowQBynnI0D2k0P2y7QHzt8OZyggO12neaqSziP6Q8D1uoexgBG0NMoNVlu
-xB8FtBserlMAA/fWS9xdLyGALLOhSzZ63eN0MGFWc8HkRofjX8dRnG492HSl7CoRlaGWSCJynYG/
-OQDNVt3Lj38H8WTQO9Xx1eDk0bPdetFbWdFFS7S2UJZgKVBKUHp5QK6xTZbG8ezyfDT40f35B/6e
-83OfcJ+mAAAAAElFTkSuQmCC
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABHNCSVQICAgIfAhkiAAAAgNJREFU KJFdkrtuE1EQhr85e7zedby+kDiGOCbCSBEtz8ADUPMEtDwAD0BNSYlEQTokkCIogkSKCEGfIkgJ NjFZX5J4s7b3eihsEsRIo/mnGc3365fnrw72nJL3cBgkK1fzVOUGcgxZbsiNITOGPF/syzZIliTT y2H38OhIN+rV9tPH25UoMeIULf4t+V/LYs6i1JpF2caTF9Fc+ZO0E6e5vNnr0x3GhJHhZJTTHef0 LnL6lzl+YBiGhiSD3ijm5fs+52GkvEb7vgqjTIoFRetOhY/ffS6uEpoVoWCBbQm2FmwNNVcYTWJ2 9s+o3aqwWisCiJrOUwA6t8tsNivsfvM5DxLWygpbg21B1RHGQczOvs/aaoVOq4yYBZoK5xkA2oLO RplGvcTbz13GQUzVETxHGAUxrz91qVZLdDbKuPrGGxXOFh+IQJqkODrnbqvGh68+veGc3nDOuwOf dquGZ2cok2LrG2f1NMowQBynnI0D2k0P2y7QHzt8OZyggO12neaqSziP6Q8D1uoexgBG0NMoNVlu xB8FtBserlMAA/fWS9xdLyGALLOhSzZ63eN0MGFWc8HkRofjX8dRnG492HSl7CoRlaGWSCJynYG/ OQDNVt3Lj38H8WTQO9Xx1eDk0bPdetFbWdFFS7S2UJZgKVBKUHp5QK6xTZbG8ezyfDT40f35B/6e 83OfcJ+mAAAAAElFTkSuQmCC "
height="11"
width="16" />
<image
y="805.36218"
x="301"
id="image4037"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAJCAYAAAA7KqwyAAAABHNCSVQICAgIfAhkiAAAAMZJREFU
-KJGNkr2Kg2AQRc/niC5h+7BFsNPOwtoib553sLST7fYBsgjfHVP4g2sg2QsDw8A9d2AmMOsCfPF/
-CfgBvtNlcB7H8WZmH0DyxuyS7nmeX1dAABIzOwF0XUeMkRgjkraapgl3p23bJMuyT8CAkB7xdV0/
-Ra7mtd/rCdD3PZKIMeLuuDuS5t3daZrmNaAsyz9Jx8Sj9oAJCMMwbMlr7SFVVQH46kkXo0v6NbNT
-URQvEwEk3ZlPSVhmF+DM+xNuDJY/eACnnm1bpLVzVgAAAABJRU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAJCAYAAAA7KqwyAAAABHNCSVQICAgIfAhkiAAAAMZJREFU KJGNkr2Kg2AQRc/niC5h+7BFsNPOwtoib553sLST7fYBsgjfHVP4g2sg2QsDw8A9d2AmMOsCfPF/ CfgBvtNlcB7H8WZmH0DyxuyS7nmeX1dAABIzOwF0XUeMkRgjkraapgl3p23bJMuyT8CAkB7xdV0/ Ra7mtd/rCdD3PZKIMeLuuDuS5t3daZrmNaAsyz9Jx8Sj9oAJCMMwbMlr7SFVVQH46kkXo0v6NbNT URQvEwEk3ZlPSVhmF+DM+xNuDJY/eACnnm1bpLVzVgAAAABJRU5ErkJggg== "
height="9"
width="16" />
</g>
@@ -5744,21 +5654,7 @@
y="836.36218"
x="300"
id="image4103"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAqNJREFU
-OI2FkU9oXGUUxX/3e997M5PM2LQlatJMps3CFrqorioUxFKXQkERcas7NxZcqMuKFZRsXNisrBux
-lKBFNCIq6qIbDf5BKKaWtEkmRpMxkzj/3sx73/uui0mCQwNeuJvDufeec66oKvvVe1+tnbWh/SYQ
-IUndC88/MXZlX6Kq3tNvzS5emr2xrkvrXV2r93Ru/m99e/bO1f249wCvf3j7u8/nN7QRe+051dSp
-dlOvN27W9eIHt+9OX18Z/y9fdi28O1d92Ih8f/r4SPTQkWEQodnNADhQMFgDy7UuX/+yxXbHPfXa
-05PXgf6Cdz5ZefnwgWj65t3ari+8glfFOU/iPIdKIa3YocDpkxMsrMYzF5+rvMjlz6rZ3Pym/rnt
-9NUrv+r/1YWZH7URe/3y5y1949pyZtO4VT13arzSSxXv+3ZmfhsMeqGWstrI+OjJPF5BNCPutPj2
-px9W7EbDTSbOc+nqrb2BZycSREAVXOaJDzlasQPyVNfbvPL+Ai+dn6Q0Wq6Ydi+TXGg480gZkb4C
-ERAgMBAGhnwUkI8CVKE4FHHyeJnDIzkAMZ2uA2DqwSJnTh3j8qeLCICAiBAEQhQGDOUsb177nbOP
-nmDqSJGdW9j2zqtsAFPjRXJByvTHdwgDGcghccr5x44SZ+EAbtux25PtUkeSKs88fgwbDhJdmnJr
-tcHY6H3Y0PZBAdPpZSiQJI71epPyAyWiaHAYwIYhR8dK1LebeOdQBVSwnZ7TzKtsbDYpj5Yo5ENQ
-UCDrH0EUPIodirD3l1irNYhHCqBebbv+x1IvcZUTEwUpFoyIyTC7nxDZVboXLFgqB0t+6a9m0qit
-rtmkVVs+d+GLg7nS8LDNBWJtgAmEwIAxgrE7C2TPtmYuSeJ/tjZri9WVfwH1K4zAd92YdQAAAABJ
-RU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAqNJREFU OI2FkU9oXGUUxX/3e997M5PM2LQlatJMps3CFrqorioUxFKXQkERcas7NxZcqMuKFZRsXNisrBux lKBFNCIq6qIbDf5BKKaWtEkmRpMxkzj/3sx73/uui0mCQwNeuJvDufeec66oKvvVe1+tnbWh/SYQ IUndC88/MXZlX6Kq3tNvzS5emr2xrkvrXV2r93Ru/m99e/bO1f249wCvf3j7u8/nN7QRe+051dSp dlOvN27W9eIHt+9OX18Z/y9fdi28O1d92Ih8f/r4SPTQkWEQodnNADhQMFgDy7UuX/+yxXbHPfXa 05PXgf6Cdz5ZefnwgWj65t3ari+8glfFOU/iPIdKIa3YocDpkxMsrMYzF5+rvMjlz6rZ3Pym/rnt 9NUrv+r/1YWZH7URe/3y5y1949pyZtO4VT13arzSSxXv+3ZmfhsMeqGWstrI+OjJPF5BNCPutPj2 px9W7EbDTSbOc+nqrb2BZycSREAVXOaJDzlasQPyVNfbvPL+Ai+dn6Q0Wq6Ydi+TXGg480gZkb4C ERAgMBAGhnwUkI8CVKE4FHHyeJnDIzkAMZ2uA2DqwSJnTh3j8qeLCICAiBAEQhQGDOUsb177nbOP nmDqSJGdW9j2zqtsAFPjRXJByvTHdwgDGcghccr5x44SZ+EAbtux25PtUkeSKs88fgwbDhJdmnJr tcHY6H3Y0PZBAdPpZSiQJI71epPyAyWiaHAYwIYhR8dK1LebeOdQBVSwnZ7TzKtsbDYpj5Yo5ENQ UCDrH0EUPIodirD3l1irNYhHCqBebbv+x1IvcZUTEwUpFoyIyTC7nxDZVboXLFgqB0t+6a9m0qit rtmkVVs+d+GLg7nS8LDNBWJtgAmEwIAxgrE7C2TPtmYuSeJ/tjZri9WVfwH1K4zAd92YdQAAAABJ RU5ErkJggg== "
height="16"
width="16"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/email.png"
@@ -5767,21 +5663,7 @@
<image
width="16"
height="16"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAqNJREFU
-OI2FkU9oXGUUxX/3e997M5PM2LQlatJMps3CFrqorioUxFKXQkERcas7NxZcqMuKFZRsXNisrBux
-lKBFNCIq6qIbDf5BKKaWtEkmRpMxkzj/3sx73/uui0mCQwNeuJvDufeec66oKvvVe1+tnbWh/SYQ
-IUndC88/MXZlX6Kq3tNvzS5emr2xrkvrXV2r93Ru/m99e/bO1f249wCvf3j7u8/nN7QRe+051dSp
-dlOvN27W9eIHt+9OX18Z/y9fdi28O1d92Ih8f/r4SPTQkWEQodnNADhQMFgDy7UuX/+yxXbHPfXa
-05PXgf6Cdz5ZefnwgWj65t3ari+8glfFOU/iPIdKIa3YocDpkxMsrMYzF5+rvMjlz6rZ3Pym/rnt
-9NUrv+r/1YWZH7URe/3y5y1949pyZtO4VT13arzSSxXv+3ZmfhsMeqGWstrI+OjJPF5BNCPutPj2
-px9W7EbDTSbOc+nqrb2BZycSREAVXOaJDzlasQPyVNfbvPL+Ai+dn6Q0Wq6Ydi+TXGg480gZkb4C
-ERAgMBAGhnwUkI8CVKE4FHHyeJnDIzkAMZ2uA2DqwSJnTh3j8qeLCICAiBAEQhQGDOUsb177nbOP
-nmDqSJGdW9j2zqtsAFPjRXJByvTHdwgDGcghccr5x44SZ+EAbtux25PtUkeSKs88fgwbDhJdmnJr
-tcHY6H3Y0PZBAdPpZSiQJI71epPyAyWiaHAYwIYhR8dK1LebeOdQBVSwnZ7TzKtsbDYpj5Yo5ENQ
-UCDrH0EUPIodirD3l1irNYhHCqBebbv+x1IvcZUTEwUpFoyIyTC7nxDZVboXLFgqB0t+6a9m0qit
-rtmkVVs+d+GLg7nS8LDNBWJtgAmEwIAxgrE7C2TPtmYuSeJ/tjZri9WVfwH1K4zAd92YdQAAAABJ
-RU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAqNJREFU OI2FkU9oXGUUxX/3e997M5PM2LQlatJMps3CFrqorioUxFKXQkERcas7NxZcqMuKFZRsXNisrBux lKBFNCIq6qIbDf5BKKaWtEkmRpMxkzj/3sx73/uui0mCQwNeuJvDufeec66oKvvVe1+tnbWh/SYQ IUndC88/MXZlX6Kq3tNvzS5emr2xrkvrXV2r93Ru/m99e/bO1f249wCvf3j7u8/nN7QRe+051dSp dlOvN27W9eIHt+9OX18Z/y9fdi28O1d92Ih8f/r4SPTQkWEQodnNADhQMFgDy7UuX/+yxXbHPfXa 05PXgf6Cdz5ZefnwgWj65t3ari+8glfFOU/iPIdKIa3YocDpkxMsrMYzF5+rvMjlz6rZ3Pym/rnt 9NUrv+r/1YWZH7URe/3y5y1949pyZtO4VT13arzSSxXv+3ZmfhsMeqGWstrI+OjJPF5BNCPutPj2 px9W7EbDTSbOc+nqrb2BZycSREAVXOaJDzlasQPyVNfbvPL+Ai+dn6Q0Wq6Ydi+TXGg480gZkb4C ERAgMBAGhnwUkI8CVKE4FHHyeJnDIzkAMZ2uA2DqwSJnTh3j8qeLCICAiBAEQhQGDOUsb177nbOP nmDqSJGdW9j2zqtsAFPjRXJByvTHdwgDGcghccr5x44SZ+EAbtux25PtUkeSKs88fgwbDhJdmnJr tcHY6H3Y0PZBAdPpZSiQJI71epPyAyWiaHAYwIYhR8dK1LebeOdQBVSwnZ7TzKtsbDYpj5Yo5ENQ UCDrH0EUPIodirD3l1irNYhHCqBebbv+x1IvcZUTEwUpFoyIyTC7nxDZVboXLFgqB0t+6a9m0qit rtmkVVs+d+GLg7nS8LDNBWJtgAmEwIAxgrE7C2TPtmYuSeJ/tjZri9WVfwH1K4zAd92YdQAAAABJ RU5ErkJggg== "
id="image4106"
x="300"
y="856.36218"
@@ -5809,30 +5691,14 @@
y="799.36218"
x="301"
id="image4114"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABHNCSVQICAgIfAhkiAAAAgNJREFU
-KJFdkrtuE1EQhr85e7zedby+kDiGOCbCSBEtz8ADUPMEtDwAD0BNSYlEQTokkCIogkSKCEGfIkgJ
-NjFZX5J4s7b3eihsEsRIo/mnGc3365fnrw72nJL3cBgkK1fzVOUGcgxZbsiNITOGPF/syzZIliTT
-y2H38OhIN+rV9tPH25UoMeIULf4t+V/LYs6i1JpF2caTF9Fc+ZO0E6e5vNnr0x3GhJHhZJTTHef0
-LnL6lzl+YBiGhiSD3ijm5fs+52GkvEb7vgqjTIoFRetOhY/ffS6uEpoVoWCBbQm2FmwNNVcYTWJ2
-9s+o3aqwWisCiJrOUwA6t8tsNivsfvM5DxLWygpbg21B1RHGQczOvs/aaoVOq4yYBZoK5xkA2oLO
-RplGvcTbz13GQUzVETxHGAUxrz91qVZLdDbKuPrGGxXOFh+IQJqkODrnbqvGh68+veGc3nDOuwOf
-dquGZ2cok2LrG2f1NMowQBynnI0D2k0P2y7QHzt8OZyggO12neaqSziP6Q8D1uoexgBG0NMoNVlu
-xB8FtBserlMAA/fWS9xdLyGALLOhSzZ63eN0MGFWc8HkRofjX8dRnG492HSl7CoRlaGWSCJynYG/
-OQDNVt3Lj38H8WTQO9Xx1eDk0bPdetFbWdFFS7S2UJZgKVBKUHp5QK6xTZbG8ezyfDT40f35B/6e
-83OfcJ+mAAAAAElFTkSuQmCC
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABHNCSVQICAgIfAhkiAAAAgNJREFU KJFdkrtuE1EQhr85e7zedby+kDiGOCbCSBEtz8ADUPMEtDwAD0BNSYlEQTokkCIogkSKCEGfIkgJ NjFZX5J4s7b3eihsEsRIo/mnGc3365fnrw72nJL3cBgkK1fzVOUGcgxZbsiNITOGPF/syzZIliTT y2H38OhIN+rV9tPH25UoMeIULf4t+V/LYs6i1JpF2caTF9Fc+ZO0E6e5vNnr0x3GhJHhZJTTHef0 LnL6lzl+YBiGhiSD3ijm5fs+52GkvEb7vgqjTIoFRetOhY/ffS6uEpoVoWCBbQm2FmwNNVcYTWJ2 9s+o3aqwWisCiJrOUwA6t8tsNivsfvM5DxLWygpbg21B1RHGQczOvs/aaoVOq4yYBZoK5xkA2oLO RplGvcTbz13GQUzVETxHGAUxrz91qVZLdDbKuPrGGxXOFh+IQJqkODrnbqvGh68+veGc3nDOuwOf dquGZ2cok2LrG2f1NMowQBynnI0D2k0P2y7QHzt8OZyggO12neaqSziP6Q8D1uoexgBG0NMoNVlu xB8FtBserlMAA/fWS9xdLyGALLOhSzZ63eN0MGFWc8HkRofjX8dRnG492HSl7CoRlaGWSCJynYG/ OQDNVt3Lj38H8WTQO9Xx1eDk0bPdetFbWdFFS7S2UJZgKVBKUHp5QK6xTZbG8ezyfDT40f35B/6e 83OfcJ+mAAAAAElFTkSuQmCC "
height="11"
width="16" />
<image
y="805.36218"
x="301"
id="image4116"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAJCAYAAAA7KqwyAAAABHNCSVQICAgIfAhkiAAAAMZJREFU
-KJGNkr2Kg2AQRc/niC5h+7BFsNPOwtoib553sLST7fYBsgjfHVP4g2sg2QsDw8A9d2AmMOsCfPF/
-CfgBvtNlcB7H8WZmH0DyxuyS7nmeX1dAABIzOwF0XUeMkRgjkraapgl3p23bJMuyT8CAkB7xdV0/
-Ra7mtd/rCdD3PZKIMeLuuDuS5t3daZrmNaAsyz9Jx8Sj9oAJCMMwbMlr7SFVVQH46kkXo0v6NbNT
-URQvEwEk3ZlPSVhmF+DM+xNuDJY/eACnnm1bpLVzVgAAAABJRU5ErkJggg==
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAJCAYAAAA7KqwyAAAABHNCSVQICAgIfAhkiAAAAMZJREFU KJGNkr2Kg2AQRc/niC5h+7BFsNPOwtoib553sLST7fYBsgjfHVP4g2sg2QsDw8A9d2AmMOsCfPF/ CfgBvtNlcB7H8WZmH0DyxuyS7nmeX1dAABIzOwF0XUeMkRgjkraapgl3p23bJMuyT8CAkB7xdV0/ Ra7mtd/rCdD3PZKIMeLuuDuS5t3daZrmNaAsyz9Jx8Sj9oAJCMMwbMlr7SFVVQH46kkXo0v6NbNT URQvEwEk3ZlPSVhmF+DM+xNuDJY/eACnnm1bpLVzVgAAAABJRU5ErkJggg== "
height="9"
width="16" />
</g>
Modified: trunk/img/webtemplate/theme-palettes.svg
===================================================================
--- trunk/img/webtemplate/theme-palettes.svg 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/img/webtemplate/theme-palettes.svg 2011-10-03 12:31:04 UTC (rev 1541)
@@ -27,7 +27,7 @@
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="346.17698"
- inkscape:cy="-246.02205"
+ inkscape:cy="-314.02205"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -2319,5 +2319,152 @@
x="560.34814"
id="tspan4233"
sodipodi:role="line">lorem </tspan></text>
+ <rect
+ style="color:#000000;fill:#b8d0e1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect7236"
+ width="150"
+ height="40"
+ x="24"
+ y="1205.3622" />
+ <rect
+ y="1245.3622"
+ x="24"
+ height="40"
+ width="150"
+ id="rect7238"
+ style="color:#000000;fill:#dfe9f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect7240"
+ width="150"
+ height="40"
+ x="24"
+ y="1285.3622" />
+ <rect
+ y="1325.3622"
+ x="24"
+ height="40"
+ width="150"
+ id="rect7242"
+ style="color:#000000;fill:#e0eaf2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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;baseline-shift:baseline;color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ x="38"
+ y="1230.3622"
+ id="text7244"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7246"
+ x="38"
+ y="1230.3622">lorem </tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text7248"
+ y="1270.3622"
+ x="38"
+ style="font-size:18px;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;baseline-shift:baseline;color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ xml:space="preserve"><tspan
+ y="1270.3622"
+ x="38"
+ id="tspan7250"
+ sodipodi:role="line">lorem </tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ x="38"
+ y="1310.3622"
+ id="text7252"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7254"
+ x="38"
+ y="1310.3622"><tspan
+ style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold"
+ id="tspan7256">lorem </tspan></tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text7258"
+ y="1350.3622"
+ x="38"
+ style="font-size:18px;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;baseline-shift:baseline;color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ xml:space="preserve"><tspan
+ y="1350.3622"
+ x="38"
+ id="tspan7260"
+ sodipodi:role="line"
+ style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold;fill:#181870;fill-opacity:1">lorem </tspan></text>
+ <rect
+ y="1205.3622"
+ x="177"
+ height="40"
+ width="150"
+ id="rect7262"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#b8d0e1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect7264"
+ width="150"
+ height="40"
+ x="177"
+ y="1245.3622" />
+ <rect
+ y="1285.3622"
+ x="177"
+ height="40"
+ width="150"
+ id="rect7266"
+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="color:#000000;fill:#dfe9f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect7268"
+ width="150"
+ height="40"
+ x="177"
+ y="1325.3622" />
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="191"
+ y="1270.3622"
+ id="text7270"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7272"
+ x="191"
+ y="1270.3622">lorem </tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text7274"
+ y="1312.3622"
+ x="190"
+ style="font-size:18px;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;baseline-shift:baseline;color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ xml:space="preserve"><tspan
+ y="1312.3622"
+ x="190"
+ id="tspan7276"
+ sodipodi:role="line">lorem </tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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;baseline-shift:baseline;color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ x="191"
+ y="1350.3622"
+ id="text7278"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan7280"
+ x="191"
+ y="1350.3622">lorem </tspan></text>
+ <text
+ sodipodi:linespacing="125%"
+ id="text7282"
+ y="1234.3622"
+ x="189"
+ 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;baseline-shift:baseline;color:#000000;fill:#181870;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ xml:space="preserve"><tspan
+ y="1234.3622"
+ x="189"
+ id="tspan7284"
+ sodipodi:role="line">lorem </tspan></text>
</g>
</svg>
Modified: trunk/img/webtemplate/web_template-2011.svg
===================================================================
--- trunk/img/webtemplate/web_template-2011.svg 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/img/webtemplate/web_template-2011.svg 2011-10-03 12:31:04 UTC (rev 1541)
@@ -78,17 +78,17 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="2"
- inkscape:cx="509.97457"
- inkscape:cy="579.66806"
+ inkscape:zoom="0.16135477"
+ inkscape:cx="512"
+ inkscape:cy="384"
inkscape:current-layer="g8450"
inkscape:document-units="px"
showgrid="false"
- inkscape:window-width="1920"
- inkscape:window-height="984"
+ inkscape:window-width="1078"
+ inkscape:window-height="897"
inkscape:window-x="0"
- inkscape:window-y="21"
- inkscape:window-maximized="1"
+ inkscape:window-y="947"
+ inkscape:window-maximized="0"
inkscape:snap-bbox="false"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
@@ -123,7 +123,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -258,7 +258,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"
@@ -268,7 +268,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"
@@ -546,7 +546,7 @@
transform="translate(-751,-12)">
<path
transform="translate(0,-3)"
- d="m 333,232 c 0,6.07513 -4.92487,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.07513,0 11,4.92487 11,11 z"
+ d="m 333,232 a 11,11 0 1 1 -22,0 11,11 0 1 1 22,0 z"
sodipodi:ry="11"
sodipodi:rx="11"
sodipodi:cy="232"
@@ -2177,7 +2177,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(0.475,0,0,0.95,-21.570622,377.21335)"
- d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
+ d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z"
sodipodi:ry="10"
sodipodi:rx="20"
sodipodi:cy="32.362183"
@@ -2190,7 +2190,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,8.0842525,364.37023)"
- d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="16.362183"
@@ -2209,14 +2209,14 @@
sodipodi:cy="16.362183"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.7154875,362.20909)" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,7.7663825,370.24449)"
- d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="16.362183"
@@ -2235,14 +2235,14 @@
sodipodi:cy="16.362183"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.2467045,371.75097)" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,-0.8112855,366.96948)"
- d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+ d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="16.362183"
@@ -3688,7 +3688,7 @@
id="text6270"
y="-1168.2301"
x="244.21739"
- style="font-size:22px;font-style:italic;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;opacity:0.82999997999999997;color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077561999999999px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Italic"
+ style="font-size:22px;font-style:italic;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;opacity:0.82999998;color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Italic"
xml:space="preserve"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
inkscape:export-xdpi="90"
@@ -3897,6 +3897,144 @@
id="tspan6481"
x="676.19073"
y="-1096.9503">wave this!</tspan></text>
+ <rect
+ style="opacity:0.97800024;color:#000000;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.70832396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect5346"
+ width="212.09114"
+ height="34.230644"
+ x="-506.99774"
+ y="-13.367081"
+ ry="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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.82999998;color:#000000;fill:#782121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="-498.22992"
+ y="10.527695"
+ id="text6256-6"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ sodipodi:role="line"
+ id="tspan6258-9"
+ x="-498.22992"
+ y="10.527695"
+ style="font-weight:normal">item 2</tspan></text>
+ <rect
+ ry="0"
+ y="-47.367081"
+ x="-506.99774"
+ height="34.230644"
+ width="212.09114"
+ id="rect5350"
+ style="opacity:0.97800024;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cccccc;stroke-width:1.70832396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <text
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
+ sodipodi:linespacing="100%"
+ id="text5356"
+ y="-25.472305"
+ x="-498.22992"
+ style="font-size:18px;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.82999998;color:#000000;fill:#782121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ xml:space="preserve"><tspan
+ style="font-weight:normal"
+ y="-25.472305"
+ x="-498.22992"
+ id="tspan5358"
+ sodipodi:role="line">item 1</tspan></text>
+ <rect
+ style="opacity:0.97800024;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#aa4400;stroke-width:1.99479878;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3983"
+ width="212.56139"
+ height="29.070845"
+ x="-506.18716"
+ y="28.154282"
+ ry="3.5237386" />
+ <text
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
+ sodipodi:linespacing="100%"
+ id="text5368"
+ y="48.527695"
+ x="-498.22992"
+ style="font-size:18px;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.82999998;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ xml:space="preserve"><tspan
+ style="font-weight:normal;fill:#000000"
+ y="48.527695"
+ x="-498.22992"
+ id="tspan5370"
+ sodipodi:role="line">item 2</tspan></text>
+ <rect
+ ry="3.5237386"
+ y="29.154282"
+ x="-505.18716"
+ height="29.070845"
+ width="212.56139"
+ id="rect5384"
+ style="opacity:0.97800024;color:#000000;fill:none;stroke:#f2f2f2;stroke-width:1.99479878;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <text
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
+ sodipodi:linespacing="100%"
+ id="text5388"
+ y="145.52769"
+ x="-420.22992"
+ style="font-size:18px;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.82999998;color:#000000;fill:#782121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ xml:space="preserve"><tspan
+ style="font-weight:normal"
+ y="145.52769"
+ x="-420.22992"
+ id="tspan5390"
+ sodipodi:role="line">item 2</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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.82999998;color:#000000;fill:#782121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="-506.22992"
+ y="145.52769"
+ id="text5394"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ sodipodi:role="line"
+ id="tspan5396"
+ x="-506.22992"
+ y="145.52769"
+ style="font-weight:normal">item 1</tspan></text>
+ <rect
+ ry="3.5237386"
+ y="158.15428"
+ x="-506.18716"
+ height="29.070845"
+ width="212.56139"
+ id="rect5398"
+ style="opacity:0.97800024;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#aa4400;stroke-width:1.99479878;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <text
+ xml:space="preserve"
+ style="font-size:18px;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.82999998;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52077562px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="-498.22992"
+ y="178.52769"
+ id="text5400"
+ sodipodi:linespacing="100%"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/chat-revisited.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ sodipodi:role="line"
+ id="tspan5402"
+ x="-498.22992"
+ y="178.52769"
+ style="font-weight:normal;fill:#000000">item 2</tspan></text>
+ <rect
+ style="opacity:0.97800024;color:#000000;fill:none;stroke:#f2f2f2;stroke-width:1.99479878;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect5404"
+ width="212.56139"
+ height="29.070845"
+ x="-505.18716"
+ y="159.15428"
+ ry="3.5237386" />
</g>
<g
inkscape:groupmode="layer"
@@ -4485,7 +4623,7 @@
height="205.09827"
width="476.85486"
id="rect8452"
- style="opacity:1;color:#000000;fill:#653616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ style="color:#000000;fill:#653616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
@@ -4605,19 +4743,20 @@
inkscape:transform-center-x="-5.9580116"
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" />
<path
- style="color:#000000;fill:#a05a2c;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 738 124 C 736.338 124 735 125.338 735 127 L 735 142 C 735 143.662 736.338 145 738 145 L 751 145 C 752.662 145 754 143.662 754 142 L 754 127 C 754 125.338 752.662 124 751 124 L 738 124 z "
+ style="color:#000000;fill:#a05a2c;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 738,124 c -1.662,0 -3,1.338 -3,3 l 0,15 c 0,1.662 1.338,3 3,3 l 13,0 c 1.662,0 3,-1.338 3,-3 l 0,-15 c 0,-1.662 -1.338,-3 -3,-3 l -13,0 z"
id="rect4000"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
+ inkscape:export-ydpi="90"
+ inkscape:connector-curvature="0" />
<rect
y="124"
x="742.76031"
height="21"
width="11.239679"
id="rect4002"
- style="color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ style="color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
@@ -4625,30 +4764,60 @@
y="-71.70166"
x="737.84711"
id="image6818"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAoFJREFU
-OI2lkstPE3EQx+e3rtACTVrA0NKWAlKLbAjYQkMfQFYU8FWQQBoR43/hxZjwL3j1qCiUJkKitKUN
-oWjwFcSLB6Pd4gMjPjBd7G4X9vHzQNq0PA7GSebynZlPJvMdhDGG/wlir+AemDrl7JsyH9TcNRhs
-6hwKnDgU0Hkx6OjrbQh5usxLHecfmvJrXt8kZXdWz7e0VEe7hx9YszqZo/sC9jP99Y8ou16/S8VL
-7p5g17OFka9e3yTldNWEWzvMJkXBgAHHPJcDPcszfia3gaqs6Farw6DnBAnYjAhe2lLv7NYvdVwI
-nnW5LGG722zmRQUECYCyG4zFJHkDAABlj0jTcbKqKRP2X23uYQUJKRhDmYqEdSbFVdVqSzlBBgAE
-6bQgR2ffBebvDYxhDBjlu0DTcVJPCZGRUeo0K8hIUQBIAsGOjGFbVIBlBelJ6P10dGJwDGPABRvk
-Q441ZhavXGv2/uYl4LYl+MmKQCoyXo4kZmL3B4ezwwfaKGq+2RqsunpelOHTLx6YDQ5SvAgigZCu
-Qm1r750qcKcA4PZNNno8tRHzycrq1WQKOEECQ7kKEACk0jLUtZkoi1UXzv+THKD93ITNYTdGKm1a
-E/M9DYhAUFl8RHr++EOiooRQEALY4mWobTNRNVZtKAvJATQa9e1GR5XlB7sNBIFAryalp2FmlvmT
-oV7Or0V0KqQghHabEVKBohwtAGwJm0PxueQLo1YNhtIiaTGUmA0ff+N/Oz2yk/msGViJJaPlxaCs
-vV5PfGQ2+l/FRpP7XGjz3SmpM5oWMrz8Ze7uJX/+tWk6TirlmxNcJn1zJXSdyQ1hjAvS5ZpWw/g4
-sVc/LPf9wb/GX4vjPAuggBABAAAAAElFTkSuQmCC
-"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAoFJREFU OI2lkstPE3EQx+e3rtACTVrA0NKWAlKLbAjYQkMfQFYU8FWQQBoR43/hxZjwL3j1qCiUJkKitKUN oWjwFcSLB6Pd4gMjPjBd7G4X9vHzQNq0PA7GSebynZlPJvMdhDGG/wlir+AemDrl7JsyH9TcNRhs 6hwKnDgU0Hkx6OjrbQh5usxLHecfmvJrXt8kZXdWz7e0VEe7hx9YszqZo/sC9jP99Y8ou16/S8VL 7p5g17OFka9e3yTldNWEWzvMJkXBgAHHPJcDPcszfia3gaqs6Farw6DnBAnYjAhe2lLv7NYvdVwI nnW5LGG722zmRQUECYCyG4zFJHkDAABlj0jTcbKqKRP2X23uYQUJKRhDmYqEdSbFVdVqSzlBBgAE 6bQgR2ffBebvDYxhDBjlu0DTcVJPCZGRUeo0K8hIUQBIAsGOjGFbVIBlBelJ6P10dGJwDGPABRvk Q441ZhavXGv2/uYl4LYl+MmKQCoyXo4kZmL3B4ezwwfaKGq+2RqsunpelOHTLx6YDQ5SvAgigZCu Qm1r750qcKcA4PZNNno8tRHzycrq1WQKOEECQ7kKEACk0jLUtZkoi1UXzv+THKD93ITNYTdGKm1a E/M9DYhAUFl8RHr++EOiooRQEALY4mWobTNRNVZtKAvJATQa9e1GR5XlB7sNBIFAryalp2FmlvmT oV7Or0V0KqQghHabEVKBohwtAGwJm0PxueQLo1YNhtIiaTGUmA0ff+N/Oz2yk/msGViJJaPlxaCs vV5PfGQ2+l/FRpP7XGjz3SmpM5oWMrz8Ze7uJX/+tWk6TirlmxNcJn1zJXSdyQ1hjAvS5ZpWw/g4 sVc/LPf9wb/GX4vjPAuggBABAAAAAElFTkSuQmCC "
height="16"
width="16"
style="fill:#ffffff;stroke:#ffffff" />
<path
- style="color:#000000;fill:#181817;fill-opacity:1;fill-rule:nonzero;stroke:#181817;stroke-width:1.40678155000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="M 741.5625 129.375 L 740.5 130.4375 L 744.125 134.0625 L 740.5 137.6875 L 741.5625 138.75 L 745.1875 135.125 L 748.8125 138.75 L 749.84375 137.6875 L 746.21875 134.0625 L 749.84375 130.4375 L 748.8125 129.375 L 745.1875 133 L 741.5625 129.375 z "
+ style="color:#000000;fill:#181817;fill-opacity:1;fill-rule:nonzero;stroke:#181817;stroke-width:1.40678155;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 741.5625,129.375 -1.0625,1.0625 3.625,3.625 -3.625,3.625 1.0625,1.0625 3.625,-3.625 3.625,3.625 1.03125,-1.0625 -3.625,-3.625 3.625,-3.625 -1.03125,-1.0625 -3.625,3.625 -3.625,-3.625 z"
id="rect6837"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
+ inkscape:export-ydpi="90"
+ inkscape:connector-curvature="0" />
+ <image
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== "
+ width="16"
+ height="16"
+ id="image2770"
+ x="-322.46912"
+ y="34.81517" />
+ <image
+ y="-5.1848292"
+ x="-322.46912"
+ id="image5348"
+ height="16"
+ width="16"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== " />
+ <image
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== "
+ width="16"
+ height="16"
+ id="image5360"
+ x="-322.46912"
+ y="-39.18483" />
+ <image
+ y="164.81517"
+ x="-322.46912"
+ id="image5406"
+ height="16"
+ width="16"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== " />
+ <image
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== "
+ width="16"
+ height="16"
+ id="image5408"
+ x="-365.46912"
+ y="121.81517" />
+ <image
+ y="126.81517"
+ x="-450.46909"
+ id="image5410"
+ height="16"
+ width="16"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== " />
</g>
<g
inkscape:groupmode="layer"
Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-10-03 12:31:04 UTC (rev 1541)
@@ -15,6 +15,7 @@
<inherits name="cc.kune.tasks.KuneTasks" />
<inherits name="cc.kune.lists.KuneLists" />
<inherits name="cc.kune.pspace.PSpace" />
+ <inherits name="cc.kune.hspace.HSpace" />
<inherits name="com.calclab.suco.Suco" />
<inherits name="org.adamtacy.GWTEffects"></inherits>
<source path='client'
Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -93,6 +93,7 @@
ginjector.getCoreParts();
ginjector.getGSpaceParts();
ginjector.getPSpaceParts();
+ ginjector.getHSpaceParts();
ginjector.getXmlActionsParser();
ginjector.getContentViewerSelector().init();
}
Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java
===================================================================
--- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -59,6 +59,9 @@
import cc.kune.events.client.EventsGinjector;
import cc.kune.gspace.client.GSpaceGinModule;
import cc.kune.gspace.client.GSpaceGinjector;
+import cc.kune.hspace.client.HSpaceGinModule;
+import cc.kune.hspace.client.HSpaceParts;
+import cc.kune.hspace.client.HSpacePresenter;
import cc.kune.lists.client.ListsGinModule;
import cc.kune.lists.client.ListsGinjector;
import cc.kune.pspace.client.PSpaceGinModule;
@@ -79,9 +82,9 @@
import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler;
@GinModules({ KuneGinModule.class, CoreGinModule.class, WaveGinModule.class, PSpaceGinModule.class,
- GSpaceGinModule.class, DocsGinModule.class, BlogsGinModule.class, ChatGinModule.class,
- WikiGinModule.class, BartersGinModule.class, EventsGinModule.class, TasksGinModule.class,
- ListsGinModule.class })
+ HSpaceGinModule.class, GSpaceGinModule.class, DocsGinModule.class, BlogsGinModule.class,
+ ChatGinModule.class, WikiGinModule.class, BartersGinModule.class, EventsGinModule.class,
+ TasksGinModule.class, ListsGinModule.class })
public interface KuneGinjector extends Ginjector, GSpaceGinjector, DocsGinjector, BlogsGinjector,
WikiGinjector, BartersGinjector, EventsGinjector, ChatGinjector, TasksGinjector, ListsGinjector {
@@ -116,6 +119,10 @@
GxtGuiProvider getGxtGuiProvider();
+ HSpaceParts getHSpaceParts();
+
+ AsyncProvider<HSpacePresenter> getHSpacePresenter();
+
I18nTranslationService getI18n();
AsyncProvider<NewGroupPresenter> getNewGroupPresenter();
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -28,6 +28,6 @@
@RemoteServiceRelativePath("SiteService")
public interface SiteService extends RemoteService {
- InitDataDTO getInitData(String userHash) throws DefaultException;
+ InitDataDTO getInitData(String userHash) throws DefaultException;
}
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -19,13 +19,12 @@
*/
package cc.kune.core.client.rpcservices;
-
import cc.kune.core.shared.dto.InitDataDTO;
import com.google.gwt.user.client.rpc.AsyncCallback;
public interface SiteServiceAsync {
- void getInitData(String userHash, AsyncCallback<InitDataDTO> callback);
+ void getInitData(String userHash, AsyncCallback<InitDataDTO> callback);
}
Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -56,6 +56,7 @@
import cc.kune.core.server.rest.UserJSONService;
import cc.kune.docs.server.DocumentServerModule;
import cc.kune.events.server.EventsServerModule;
+import cc.kune.hspace.client.ClientStatsService;
import cc.kune.lists.client.rpc.ListsService;
import cc.kune.lists.server.ListsServerModule;
import cc.kune.tasks.server.TaskServerModule;
@@ -145,7 +146,7 @@
builder.installGWTServices("^" + suffix + "/", SiteService.class, GroupService.class,
ContentService.class, UserService.class, SocialNetworkService.class, I18nService.class,
- ListsService.class);
+ ListsService.class, ClientStatsService.class);
builder.installRESTServices("^" + suffix + "/json/", TestJSONService.class, GroupJSONService.class,
UserJSONService.class, I18nTranslationJSONService.class, ContentJSONService.class);
builder.installServlet("^" + suffix + "/servlets/", FileUploadManager.class,
Modified: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -92,9 +92,12 @@
import cc.kune.core.server.rpc.I18nRPC;
import cc.kune.core.server.rpc.SiteRPC;
import cc.kune.core.server.rpc.SocialNetworkRPC;
+import cc.kune.core.server.rpc.StatsRPC;
import cc.kune.core.server.rpc.UserRPC;
import cc.kune.core.server.state.StateService;
import cc.kune.core.server.state.StateServiceDefault;
+import cc.kune.core.server.stats.StatsService;
+import cc.kune.core.server.stats.StatsServiceDefault;
import cc.kune.core.server.tool.ServerToolRegistry;
import cc.kune.core.server.users.UserInfoService;
import cc.kune.core.server.users.UserInfoServiceDefault;
@@ -102,6 +105,7 @@
import cc.kune.core.server.xmpp.XmppManagerDefault;
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.domain.SocialNetwork;
+import cc.kune.hspace.client.ClientStatsService;
import cc.kune.lists.client.rpc.ListsService;
import cc.kune.lists.server.rpc.ListsRPC;
import cc.kune.wave.server.KuneWaveService;
@@ -149,6 +153,7 @@
bind(SocialNetworkService.class).to(SocialNetworkRPC.class);
bind(I18nService.class).to(I18nRPC.class);
bind(ListsService.class).to(ListsRPC.class);
+ bind(ClientStatsService.class).to(StatsRPC.class);
}
private void bindServices() {
@@ -162,6 +167,7 @@
bind(KuneWaveService.class).to(KuneWaveServiceDefault.class);
bind(MailService.class).to(MailServiceDefault.class);
bind(XMLActionReader.class);
+ bind(StatsService.class).to(StatsServiceDefault.class);
}
@Override
Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -150,4 +150,5 @@
data.setSiteShortName(kuneProperties.get(KuneProperties.SITE_SHORTNAME));
return data;
}
+
}
Added: trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/server/rpc/StatsRPC.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,38 @@
+package cc.kune.core.server.rpc;
+
+import cc.kune.core.server.UserSessionManager;
+import cc.kune.core.server.auth.Authenticated;
+import cc.kune.core.server.mapper.Mapper;
+import cc.kune.core.server.stats.StatsService;
+import cc.kune.core.shared.dto.HomeStatsDTO;
+import cc.kune.hspace.client.ClientStatsService;
+
+import com.google.inject.Inject;
+
+public class StatsRPC implements RPC, ClientStatsService {
+
+ private final Mapper mapper;
+ private final StatsService statsService;
+ private final UserSessionManager userSessionManager;
+
+ @Inject
+ public StatsRPC(final StatsService statsService, final UserSessionManager userSessionManager,
+ final Mapper mapper) {
+ this.statsService = statsService;
+ this.userSessionManager = userSessionManager;
+ this.mapper = mapper;
+ }
+
+ @Override
+ public HomeStatsDTO getHomeStats() {
+ return mapper.map(statsService.getHomeStats(), HomeStatsDTO.class);
+ }
+
+ @Override
+ @Authenticated
+ public HomeStatsDTO getHomeStats(final String userHash) {
+ return mapper.map(statsService.getHomeStats(userSessionManager.getUser().getUserGroup()),
+ HomeStatsDTO.class);
+ }
+
+}
Added: trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/server/stats/HomeStats.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,59 @@
+package cc.kune.core.server.stats;
+
+import java.util.List;
+
+import cc.kune.domain.Content;
+import cc.kune.domain.Group;
+
+public class HomeStats {
+
+ private List<Content> lastContentsOfMyGroups;
+ private List<Group> lastGroups;
+ private List<Content> lastPublishedContents;
+ private Long totalGroups;
+ private Long totalUsers;
+
+ public HomeStats() {
+ }
+
+ public List<Content> getLastContentsOfMyGroups() {
+ return lastContentsOfMyGroups;
+ }
+
+ public List<Group> getLastGroups() {
+ return lastGroups;
+ }
+
+ public List<Content> getLastPublishedContents() {
+ return lastPublishedContents;
+ }
+
+ public Long getTotalGroups() {
+ return totalGroups;
+ }
+
+ public Long getTotalUsers() {
+ return totalUsers;
+ }
+
+ public void setLastContentsOfMyGroups(final List<Content> lastContentsOfMyGroups) {
+ this.lastContentsOfMyGroups = lastContentsOfMyGroups;
+ }
+
+ public void setLastGroups(final List<Group> lastGroups) {
+ this.lastGroups = lastGroups;
+ }
+
+ public void setLastPublishedContents(final List<Content> lastPublishedContents) {
+ this.lastPublishedContents = lastPublishedContents;
+ }
+
+ public void setTotalGroups(final Long totalGroups) {
+ this.totalGroups = totalGroups;
+ }
+
+ public void setTotalUsers(final Long totalUsers) {
+ this.totalUsers = totalUsers;
+ }
+
+}
Added: trunk/src/main/java/cc/kune/core/server/stats/StatsService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/stats/StatsService.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/server/stats/StatsService.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,11 @@
+package cc.kune.core.server.stats;
+
+import cc.kune.domain.Group;
+
+public interface StatsService {
+
+ HomeStats getHomeStats();
+
+ HomeStats getHomeStats(Group userGroup);
+
+}
Added: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,46 @@
+package cc.kune.core.server.stats;
+
+import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.dto.GroupType;
+import cc.kune.domain.Group;
+import cc.kune.domain.finders.ContentFinder;
+import cc.kune.domain.finders.GroupFinder;
+import cc.kune.domain.finders.UserFinder;
+
+import com.google.inject.Inject;
+
+public class StatsServiceDefault implements StatsService {
+
+ private static final int LIMIT = 20;
+ private final ContentFinder contentFinder;
+ private final GroupFinder groupFinder;
+ private final UserFinder userFinder;
+
+ @Inject
+ public StatsServiceDefault(final UserFinder userFinder, final GroupFinder groupFinder,
+ final ContentFinder contentFinder) {
+ this.userFinder = userFinder;
+ this.groupFinder = groupFinder;
+ this.contentFinder = contentFinder;
+ }
+
+ @Override
+ public HomeStats getHomeStats() {
+ return getHomeStats(Group.NO_GROUP);
+ }
+
+ @Override
+ public HomeStats getHomeStats(final Group userGroup) {
+ final HomeStats stats = new HomeStats();
+ stats.setLastGroups(groupFinder.lastGroups(LIMIT, GroupType.CLOSED, GroupType.PERSONAL));
+ stats.setTotalGroups(groupFinder.count());
+ stats.setTotalUsers(userFinder.count());
+ stats.setLastPublishedContents(contentFinder.lastModifiedContents(LIMIT,
+ ContentStatus.publishedOnline));
+ if (userGroup != Group.NO_GROUP) {
+ stats.setLastContentsOfMyGroups(contentFinder.lastModifiedContentsInUserGroup(LIMIT,
+ userGroup.getId()));
+ }
+ return stats;
+ }
+}
Added: trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/shared/dto/HomeStatsDTO.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,58 @@
+package cc.kune.core.shared.dto;
+
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+public class HomeStatsDTO implements IsSerializable {
+
+ private List<ContentSimpleDTO> lastContentsOfMyGroups;
+ private List<GroupDTO> lastGroups;
+ private List<ContentSimpleDTO> lastPublishedContents;
+ private Long totalGroups;
+ private Long totalUsers;
+
+ public HomeStatsDTO() {
+ }
+
+ public List<ContentSimpleDTO> getLastContentsOfMyGroups() {
+ return lastContentsOfMyGroups;
+ }
+
+ public List<GroupDTO> getLastGroups() {
+ return lastGroups;
+ }
+
+ public List<ContentSimpleDTO> getLastPublishedContents() {
+ return lastPublishedContents;
+ }
+
+ public Long getTotalGroups() {
+ return totalGroups;
+ }
+
+ public Long getTotalUsers() {
+ return totalUsers;
+ }
+
+ public void setLastContentsOfMyGroups(final List<ContentSimpleDTO> lastContentsOfMyGroups) {
+ this.lastContentsOfMyGroups = lastContentsOfMyGroups;
+ }
+
+ public void setLastGroups(final List<GroupDTO> lastGroups) {
+ this.lastGroups = lastGroups;
+ }
+
+ public void setLastPublishedContents(final List<ContentSimpleDTO> lastPublishedContents) {
+ this.lastPublishedContents = lastPublishedContents;
+ }
+
+ public void setTotalGroups(final Long totalGroups) {
+ this.totalGroups = totalGroups;
+ }
+
+ public void setTotalUsers(final Long totalUsers) {
+ this.totalUsers = totalUsers;
+ }
+
+}
Modified: trunk/src/main/java/cc/kune/domain/finders/ContentFinder.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/finders/ContentFinder.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/domain/finders/ContentFinder.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.List;
+import cc.kune.core.shared.domain.ContentStatus;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
@@ -35,23 +36,39 @@
import com.google.inject.persist.finder.MaxResults;
public interface ContentFinder {
- @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC", returnAs = ArrayList.class)
- public List<Content> find2Mime(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title,
- @Named(MIMETYPE) final String mimetype, @Named("mimetype2") final String mimetype2,
- @FirstResult final int offset, @MaxResults final int limit);
+ @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC", returnAs = ArrayList.class)
+ public List<Content> find2Mime(@Named(GROUP) final String groupShortName,
+ @Named(TITLE) final String title, @Named(MIMETYPE) final String mimetype,
+ @Named("mimetype2") final String mimetype2, @FirstResult final int offset,
+ @MaxResults final int limit);
- @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null")
- public Long find2MimeCount(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title,
- @Named(MIMETYPE) final String mimetype, @Named("mimetype2") final String mimetype2);
+ @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null")
+ public Long find2MimeCount(@Named(GROUP) final String groupShortName,
+ @Named(TITLE) final String title, @Named(MIMETYPE) final String mimetype,
+ @Named("mimetype2") final String mimetype2);
- @Finder(query = "SELECT count(*) from Container ctx, Content ctn where ctn.container.id = ctx.id and ctx = :container and ctn.lastRevision.title LIKE :title")
- public Long findIfExistsTitle(@Named("container") final Container container, @Named(TITLE) final String title);
+ @Finder(query = "SELECT count(*) from Container ctx, Content ctn where ctn.container.id = ctx.id and ctx = :container and ctn.lastRevision.title LIKE :title")
+ public Long findIfExistsTitle(@Named("container") final Container container,
+ @Named(TITLE) final String title);
- @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC", returnAs = ArrayList.class)
- public List<Content> findMime(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title,
- @Named(MIMETYPE) final String mimetype, @FirstResult final int offset, @MaxResults final int limit);
+ @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC", returnAs = ArrayList.class)
+ public List<Content> findMime(@Named(GROUP) final String groupShortName,
+ @Named(TITLE) final String title, @Named(MIMETYPE) final String mimetype,
+ @FirstResult final int offset, @MaxResults final int limit);
- @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null")
- public Long findMimeCount(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title,
- @Named(MIMETYPE) final String mimetype);
+ @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null")
+ public Long findMimeCount(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title,
+ @Named(MIMETYPE) final String mimetype);
+
+ @Finder(query = "FROM Content c WHERE c.status = :status ORDER BY c.modifiedOn DESC", returnAs = ArrayList.class)
+ public List<Content> lastModifiedContents(@MaxResults final int limit,
+ @Named("status") final ContentStatus status);
+
+ @Finder(query = "FROM Content c WHERE " + "((c.container.owner.id IN (SELECT ed.id FROM "
+ + "c.container.owner.socialNetwork.accessLists.editors.list AS ed WHERE ed.id = :groupid)) OR"
+ + "(c.container.owner.id IN (SELECT ad.id FROM "
+ + "c.container.owner.socialNetwork.accessLists.admins.list AS ad WHERE ad.id = :groupid)))"
+ + "ORDER BY c.modifiedOn DESC", returnAs = ArrayList.class)
+ public List<Content> lastModifiedContentsInUserGroup(@MaxResults final int limit,
+ @Named("groupid") Long groupId);
}
Modified: trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -24,13 +24,18 @@
import java.util.List;
import java.util.Set;
+import cc.kune.core.shared.dto.GroupType;
import cc.kune.domain.Group;
import com.google.inject.name.Named;
import com.google.inject.persist.finder.Finder;
+import com.google.inject.persist.finder.MaxResults;
public interface GroupFinder {
+ @Finder(query = "SELECT count(*) FROM Group g")
+ public Long count();
+
@Finder(query = "SELECT count(*) FROM Group g WHERE g.longName = :longName")
public Long countByLongName(@Named("longName") final String longName);
@@ -57,4 +62,11 @@
@Finder(query = "FROM Group", returnAs = ArrayList.class)
public List<Group> getAll();
+
+ @Finder(query = "FROM Group g "
+ + " WHERE (g.groupType != :notgrouptype1 AND g.groupType != :notgrouptype2)"
+ + " ORDER BY createdOn DESC", returnAs = ArrayList.class)
+ public List<Group> lastGroups(@MaxResults final int limit,
+ @Named("notgrouptype1") final GroupType excludedGroupType1,
+ @Named("notgrouptype2") final GroupType excludedGroupType2);
}
Modified: trunk/src/main/java/cc/kune/domain/finders/UserFinder.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/finders/UserFinder.java 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/java/cc/kune/domain/finders/UserFinder.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -29,6 +29,9 @@
public interface UserFinder {
+ @Finder(query = "SELECT count(*) FROM User u")
+ public Long count();
+
@Finder(query = "select count (*) from User where email = :email")
public Long countByEmail(@Named("email") final String email);
Added: trunk/src/main/java/cc/kune/hspace/HSpace.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/hspace/HSpace.gwt.xml (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/HSpace.gwt.xml 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.1/distro-source/core/…">
+<module>
+ <inherits name="com.google.gwt.user.User" />
+<!-- <source path="client"/> -->
+</module>
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/hspace/client/ClientStatsService.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/ClientStatsService.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/ClientStatsService.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,34 @@
+/*
+ *
+ * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.hspace.client;
+
+import cc.kune.core.shared.dto.HomeStatsDTO;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+
+@RemoteServiceRelativePath("ClientStatsService")
+public interface ClientStatsService extends RemoteService {
+
+ HomeStatsDTO getHomeStats();
+
+ HomeStatsDTO getHomeStats(String userHash);
+
+}
Added: trunk/src/main/java/cc/kune/hspace/client/ClientStatsServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/ClientStatsServiceAsync.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/ClientStatsServiceAsync.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,31 @@
+/*
+ *
+ * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.hspace.client;
+
+import cc.kune.core.shared.dto.HomeStatsDTO;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface ClientStatsServiceAsync {
+
+ void getHomeStats(AsyncCallback<HomeStatsDTO> callback);
+
+ void getHomeStats(String userHash, AsyncCallback<HomeStatsDTO> callback);
+}
Added: trunk/src/main/java/cc/kune/hspace/client/HSpaceGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpaceGinModule.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpaceGinModule.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,38 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.hspace.client;
+
+import com.gwtplatform.mvp.client.gin.AbstractPresenterModule;
+
+public class HSpaceGinModule extends AbstractPresenterModule {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.google.gwt.inject.client.AbstractGinModule#configure()
+ */
+ @Override
+ protected void configure() {
+ bindPresenter(HSpacePresenter.class, HSpacePresenter.HSpaceView.class, HSpacePanel.class,
+ HSpacePresenter.HSpaceProxy.class);
+ bind(HSpaceParts.class).asEagerSingleton();
+ }
+
+}
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,28 @@
+package cc.kune.hspace.client;
+
+import cc.kune.hspace.client.HSpacePresenter.HSpaceView;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Widget;
+import com.gwtplatform.mvp.client.ViewImpl;
+
+public class HSpacePanel extends ViewImpl implements HSpaceView {
+
+ interface HSpacePanelUiBinder extends UiBinder<Widget, HSpacePanel> {
+ }
+
+ private static HSpacePanelUiBinder uiBinder = GWT.create(HSpacePanelUiBinder.class);
+
+ private final Widget widget;
+
+ public HSpacePanel() {
+ widget = uiBinder.createAndBindUi(this);
+ }
+
+ @Override
+ public Widget asWidget() {
+ return widget;
+ }
+
+}
Added: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,13 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui">
+ <ui:style>
+ .important {
+ font-weight: bold;
+ }
+ </ui:style>
+ <g:HTMLPanel>
+ Hello,
+ <g:Button styleName="{style.important}" ui:field="button"/>
+ </g:HTMLPanel>
+</ui:UiBinder>
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/hspace/client/HSpaceParts.java
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpaceParts.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpaceParts.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,40 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.hspace.client;
+
+import cc.kune.core.client.init.AppStartEvent;
+import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
+import cc.kune.core.client.state.Session;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class HSpaceParts {
+
+ @Inject
+ public HSpaceParts(final Session session, final Provider<HSpacePresenter> hSpacePresenter) {
+ session.onAppStart(true, new AppStartHandler() {
+ @Override
+ public void onAppStart(final AppStartEvent event) {
+ hSpacePresenter.get();
+ }
+ });
+ }
+}
Copied: trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java (from rev 1538, trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java)
===================================================================
--- trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java (rev 0)
+++ trunk/src/main/java/cc/kune/hspace/client/HSpacePresenter.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,77 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.hspace.client;
+
+import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.HomeStatsDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.google.gwt.event.shared.EventBus;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.gwtplatform.mvp.client.Presenter;
+import com.gwtplatform.mvp.client.View;
+import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
+import com.gwtplatform.mvp.client.proxy.Proxy;
+import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent;
+
+public class HSpacePresenter extends Presenter<HSpacePresenter.HSpaceView, HSpacePresenter.HSpaceProxy> {
+
+ @ProxyCodeSplit
+ public interface HSpaceProxy extends Proxy<HSpacePresenter> {
+ }
+ public interface HSpaceView extends View {
+ }
+
+ private final I18nTranslationService i18n;
+
+ @Inject
+ public HSpacePresenter(final Session session, final EventBus eventBus, final HSpaceView view,
+ final HSpaceProxy proxy, final I18nTranslationService i18n,
+ final Provider<ClientStatsServiceAsync> statsService) {
+ super(eventBus, view, proxy);
+ this.i18n = i18n;
+ final AsyncCallbackSimple<HomeStatsDTO> callback = new AsyncCallbackSimple<HomeStatsDTO>() {
+ @Override
+ public void onSuccess(final HomeStatsDTO result) {
+ NotifyUser.info(
+ "Total groups: " + result.getTotalGroups() + " total users: " + result.getTotalUsers(), true);
+ }
+ };
+ if (session.isLogged()) {
+ statsService.get().getHomeStats(session.getUserHash(), callback);
+ } else {
+ statsService.get().getHomeStats(callback);
+ }
+ }
+
+ @Override
+ protected void onReveal() {
+ super.onReveal();
+ }
+
+ @Override
+ protected void revealInParent() {
+ RevealRootContentEvent.fire(this, this);
+ }
+
+}
Modified: trunk/src/main/resources/dozerBeanMapping.xml
===================================================================
--- trunk/src/main/resources/dozerBeanMapping.xml 2011-09-28 14:04:57 UTC (rev 1540)
+++ trunk/src/main/resources/dozerBeanMapping.xml 2011-10-03 12:31:04 UTC (rev 1541)
@@ -237,4 +237,20 @@
<class-a> cc.kune.core.shared.dto.SocialNetworkDataDTO </class-a>
<class-b> cc.kune.domain.utils.SocialNetworkData </class-b>
</mapping>
+ <mapping>
+ <class-a> cc.kune.core.shared.dto.HomeStatsDTO </class-a>
+ <class-b> cc.kune.core.server.stats.HomeStats </class-b>
+ <field>
+ <a>lastPublishedContents</a>
+ <b>lastPublishedContents</b>
+ <a-hint> cc.kune.core.shared.dto.ContentSimpleDTO </a-hint>
+ <b-hint> cc.kune.domain.Content </b-hint>
+ </field>
+ <field>
+ <a>lastContentsOfMyGroups</a>
+ <b>lastContentsOfMyGroups</b>
+ <a-hint> cc.kune.core.shared.dto.ContentSimpleDTO </a-hint>
+ <b-hint> cc.kune.domain.Content </b-hint>
+ </field>
+ </mapping>
</mappings>
\ No newline at end of file
Added: trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java
===================================================================
--- trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java (rev 0)
+++ trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java 2011-10-03 12:31:04 UTC (rev 1541)
@@ -0,0 +1,59 @@
+/*
+ *
+ * Copyright (C) 2007-2011 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.server.integration;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import cc.kune.core.server.stats.HomeStats;
+import cc.kune.core.server.stats.StatsService;
+import cc.kune.domain.finders.GroupFinder;
+
+import com.google.inject.Inject;
+import com.google.inject.persist.Transactional;
+
+public class StatsServiceTest extends IntegrationTest {
+ @Inject
+ GroupFinder groupFinder;
+ @Inject
+ StatsService statsService;
+
+ private void checkStats(final HomeStats homeStats) {
+ assertTrue(homeStats.getTotalGroups() > 0);
+ assertTrue(homeStats.getTotalUsers() > 0);
+ }
+
+ @Transactional
+ @Before
+ public void init() {
+ new IntegrationTestHelper(this);
+ }
+
+ @Test
+ public void testBasicStats() {
+ HomeStats homeStats = statsService.getHomeStats();
+ checkStats(homeStats);
+ homeStats = statsService.getHomeStats(groupFinder.findByShortName(getDefSiteShortName()));
+ checkStats(homeStats);
+ }
+
+}
1
0