Author: vjrj_ Date: 2012-02-29 19:49:28 +0100 (Wed, 29 Feb 2012) New Revision: 1728 Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/server/InitData.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/resources/kune.properties Log: Public space icon optional Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties 2012-02-29 18:49:28 UTC (rev 1728) @@ -516,7 +516,7 @@ backgroupChanged = Fondo cambiado checkYourEmailForTheConfirmationLink = Comprueba tu correo para el enlace de confirmación openTheAppointment = Abre el evento -eventsInParam = c +eventsInParam = Eventos en [%s] participateInTheEditionOfThisPage = Participa en la edición de esta página signInOrCreateAnAccountToSusbscribeToThisList = Entra o regístrate para suscribirte a esta lista joinUsInParamPublicRoom = ¡Unete a nosotros en la sala pública de [%s]! \ No newline at end of file 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 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2012-02-29 18:49:28 UTC (rev 1728) @@ -150,6 +150,11 @@ } @Override + public void setPublicVisible(final boolean visible) { + publicButton.setVisible(visible); + } + + @Override public void setUserBtnDown(final boolean down) { userButton.setDown(down); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2012-02-29 18:49:28 UTC (rev 1728) @@ -25,6 +25,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.events.AppStartEvent; +import cc.kune.core.client.events.AppStartEvent.AppStartHandler; import cc.kune.core.client.events.UserSignOutEvent; import cc.kune.core.client.events.WindowFocusEvent; import cc.kune.core.client.state.Session; @@ -84,6 +85,8 @@ void setPublicBtnDown(boolean down); + void setPublicVisible(boolean visible); + void setUserBtnDown(boolean down); void setWindowTitle(String title); @@ -173,6 +176,12 @@ } } }); + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + getView().setPublicVisible(event.getInitData().isPublicSpaceVisible()); + } + }); } @ProxyEvent Modified: trunk/src/main/java/cc/kune/core/server/InitData.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/InitData.java 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/server/InitData.java 2012-02-29 18:49:28 UTC (rev 1728) @@ -57,6 +57,7 @@ private String maxFileSizeInMb; private String mp3EmbedObject; private String oggEmbedObject; + private boolean publicSpaceVisible; private ReservedWordsRegistryDTO reservedWords; private String siteCommonName; private String siteLogoUrl; @@ -206,6 +207,10 @@ return feedbackEnabled; } + public boolean isPublicSpaceVisible() { + return publicSpaceVisible; + } + public boolean isTranslatorEnabled() { return translatorEnabled; } @@ -306,6 +311,10 @@ this.oggEmbedObject = oggEmbedObject; } + public void setPublicSpaceVisible(final boolean publicSpaceVisible) { + this.publicSpaceVisible = publicSpaceVisible; + } + public void setReservedWords(final ReservedWordsRegistryDTO reservedWords) { this.reservedWords = reservedWords; } Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2012-02-29 18:49:28 UTC (rev 1728) @@ -39,6 +39,7 @@ String KUNE_TUTORIALS_LANGS = "kune.tutorial.langs"; String MP3_EMBEDED_OBJECT = "kune.media.mp3embededobject"; String OGG_EMBEDED_OBJECT = "kune.media.oggembededobject"; + String PUBLIC_SPACE_VISIBLE = "kune.publispace.toolicon.visible"; String RESERVED_WORDS = "kune.server.names.reservedwords"; String SITE_ADMIN_EMAIL = "kune.admin.email"; String SITE_ADMIN_NAME = "kune.admin.name"; Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2012-02-29 18:49:28 UTC (rev 1728) @@ -153,6 +153,7 @@ data.setUseClientContentCache(kuneProperties.getBoolean(KuneProperties.USE_CLIENT_CONTENT_CACHE)); data.setDefTutorialLanguage(kuneProperties.get(KuneProperties.KUNE_TUTORIALS_DEFLANG)); data.setTutorialLanguages(kuneProperties.getList(KuneProperties.KUNE_TUTORIALS_LANGS)); + data.setPublicSpaceVisible(kuneProperties.getBoolean(KuneProperties.PUBLIC_SPACE_VISIBLE)); 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 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2012-02-29 18:49:28 UTC (rev 1728) @@ -50,6 +50,7 @@ private String maxFileSizeInMb; private String mp3EmbedObject; private String oggEmbedObject; + private boolean publicSpaceVisible; private ReservedWordsRegistryDTO reservedWords; private String siteLogoUrl; private String siteLogoUrlOnOver; @@ -202,6 +203,10 @@ return feedbackEnabled; } + public boolean isPublicSpaceVisible() { + return publicSpaceVisible; + } + public boolean isTranslatorEnabled() { return translatorEnabled; } @@ -302,6 +307,10 @@ this.oggEmbedObject = oggEmbedObject; } + public void setPublicSpaceVisible(final boolean publicSpaceVisible) { + this.publicSpaceVisible = publicSpaceVisible; + } + public void setReservedWords(final ReservedWordsRegistryDTO reservedWords) { this.reservedWords = reservedWords; } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-02-29 17:55:15 UTC (rev 1727) +++ trunk/src/main/resources/kune.properties 2012-02-29 18:49:28 UTC (rev 1728) @@ -8,7 +8,6 @@ kune.sitelogourl = ws/images/kune-logo-16px.png kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png - # Every kune site have a group with this name: # This group will be created in the first execution of kune. # NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly. @@ -33,7 +32,6 @@ # You can put this file in /etc/kune kune.site.email.template = src/main/resources/mail-notif-template.html - ### Database # Persistence name, choose between: @@ -102,6 +100,8 @@ kune.client.useContentCache = false +kune.publispace.toolicon.visible = false + # SVG Tutorials # The languages in with the /tutorials/ are translated into kune.tutorial.langs = en,es