Author: vjrj Date: 2009-05-07 17:41:11 +0200 (Thu, 07 May 2009) New Revision: 1107 Added: trunk/src/main/java/org/ourproject/kune/platf/public/ext-load.gif Modified: trunk/CREDITS trunk/DEV-GUIDE trunk/TODO trunk/pom.xml trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java Log: Complete - task Group/user options hide bug Modified: trunk/CREDITS =================================================================== --- trunk/CREDITS 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/CREDITS 2009-05-07 15:41:11 UTC (rev 1107) @@ -11,12 +11,13 @@ Contributors -------------------------------------------------------------------------------- +* Thanks to David Trigo and http://www.esperanto-es.net/ for suggest the name of +'kune' for our initiative: + http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469 * Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo Freire staff. * Daniel Jiménez for the initial help and coordination * Javier de la Cueva and Leovigildo García-Bobadilla for the legal support * Jonathan Araña Cruz, Roxu and all the xsto staff for help with the infraestructure -* Thanks to David Trigo and http://www.esperanto-es.net/ for suggest the name of -'kune' for our initiative: - http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469 +* Johnattan Rupire for web contributions. * and ourproject.org and again xsto.info for sharing with us their resources Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/DEV-GUIDE 2009-05-07 15:41:11 UTC (rev 1107) @@ -181,7 +181,7 @@ mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:gwt -Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /kune/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": +Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /ws/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": * gwt-dev-[linux|mac|windows].jar (Add External Jar and choose it from your gwt installation directory) * java - /kune/src/main * kune (default classpath) Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/TODO 2009-05-07 15:41:11 UTC (rev 1107) @@ -119,6 +119,7 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** TODO <v> Use of command key ⌘ for Mac shortcuts ** TODO <v,s> harden our privacy policy. Goals: - permit user/projects/contents how much private or public are - APIs public only to associated sites (in study) ( http://oauth.net ? ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/pom.xml 2009-05-07 15:41:11 UTC (rev 1107) @@ -447,7 +447,7 @@ <version>2.0-beta26</version> <configuration> <logLevel>INFO</logLevel> - <style>OBF</style> + <style>PRETTY</style> <!-- <style>OBF PRETTY</style> --> <runTarget> org.ourproject.kune.app.Kune/Kune.html Added: trunk/src/main/java/org/ourproject/kune/platf/public/ext-load.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/ext-load.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderButton.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -6,12 +6,12 @@ import com.google.gwt.user.client.ui.AbstractImagePrototype; public class EntityHeaderButton extends IconLabel implements View { - public EntityHeaderButton(AbstractImagePrototype icon, String text) { + public EntityHeaderButton(final AbstractImagePrototype icon, final String text) { super(icon, text, false); setDefStyle(); } - public EntityHeaderButton(String text, AbstractImagePrototype icon) { + public EntityHeaderButton(final String text, final AbstractImagePrototype icon) { super(text, icon, false); setDefStyle(); } @@ -19,6 +19,7 @@ private void setDefStyle() { addStyleName("kune-Margin-Medium-t"); addStyleName("kune-pointer"); + addStyleName("kune-floatright"); } } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -44,12 +44,10 @@ private final VerticalPanel vp; public EntityHeaderPanel(final WorkspaceSkeleton ws, final Provider<FileDownloadUtils> downloadProvider, - Images images) { + final Images images) { this.downloadProvider = downloadProvider; this.images = images; vp = new VerticalPanel(); - vp.setWidth("100%"); - super.setWidth("100%"); vp.setHorizontalAlignment(ALIGN_RIGHT); entityTextLogo = new EntityTextLogo(); add(entityTextLogo); @@ -57,13 +55,12 @@ ws.addToEntityMainHeader(this); } - public void addWidget(View view) { + public void addWidget(final View view) { Widget widget = (Widget) view; vp.add(widget); - vp.setCellWidth(widget, "100%"); } - public void reloadImage(GroupDTO group) { + public void reloadImage(final GroupDTO group) { entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(group.getStateToken()) + "&nocache=" + new Date().getTime()); } @@ -87,11 +84,11 @@ entityTextLogo.setLargeFont(); } - public void setLogoImage(StateToken stateToken) { + public void setLogoImage(final StateToken stateToken) { entityTextLogo.setLogoImage(downloadProvider.get().getLogoImageUrl(stateToken)); } - public void setLogoImageVisible(boolean visible) { + public void setLogoImageVisible(final boolean visible) { entityTextLogo.setLogoVisible(visible); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -32,7 +32,7 @@ public class EntityOptionsPanel extends AbstractTabbedDialogPanel implements EntityOptionsView { - public static final String ENTITY_OP_PANEL_ID = "k-eop-diag"; + public static final String ENTITY_OP_PANEL_ID = "k-eop-diagpan"; public static final String GROUP_OPTIONS_ERROR_ID = "k-eop-err-mess"; public static final String GROUP_OPTIONS_ICON = "k-eop-icon"; private final I18nTranslationService i18n; @@ -43,7 +43,7 @@ private final EntityOptionsGroup entityPreferencesGroup; public EntityOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader, - I18nTranslationService i18n, Images images, EntityOptionsGroup entityOptionsGroup) { + final I18nTranslationService i18n, final Images images, final EntityOptionsGroup entityOptionsGroup) { super(ENTITY_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID); this.entityHeader = entityHeader; this.i18n = i18n; @@ -60,7 +60,7 @@ super.createAndShow(); } - public void setButtonVisible(boolean visible) { + public void setButtonVisible(final boolean visible) { optionsButton.setVisible(visible); } @@ -77,7 +77,7 @@ private void createOptionsButton() { optionsButton = new EntityHeaderButton("", images.emblemSystem()); optionsButton.addClickListener(new ClickListener() { - public void onClick(Widget arg0) { + public void onClick(final Widget arg0) { createAndShow(); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -41,7 +41,7 @@ view.setButtonVisible(true); } else { view.setButtonVisible(false); - view.destroy(); + view.hide(); } } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -19,10 +19,9 @@ */ package org.ourproject.kune.workspace.client.options; -import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogView; -public interface EntityOptionsView extends View, AbstractTabbedDialogView { +public interface EntityOptionsView extends AbstractTabbedDialogView { int HEIGHT = 270; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -45,15 +45,16 @@ private final I18nTranslationService i18n; private final StateManager stateManager; - public EntityOptionsToolsConfPresenter(StateManager stateManager, Session session, I18nTranslationService i18n, - EntityOptions entityOptions, Provider<GroupServiceAsync> groupServiceProvider) { + public EntityOptionsToolsConfPresenter(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final EntityOptions entityOptions, + final Provider<GroupServiceAsync> groupServiceProvider) { this.stateManager = stateManager; this.session = session; this.i18n = i18n; this.entityOptions = entityOptions; this.groupServiceProvider = groupServiceProvider; stateManager.onGroupChanged(new Listener2<String, String>() { - public void onEvent(String group1, String group2) { + public void onEvent(final String group1, final String group2) { setState(); } }); @@ -63,13 +64,13 @@ return view; } - public void init(EntityOptionsToolsConfView view) { + public void init(final EntityOptionsToolsConfView view) { this.view = view; setState(); entityOptions.addTab(view); } - public void onCheck(ToolSimpleDTO tool, boolean checked) { + public void onCheck(final ToolSimpleDTO tool, final boolean checked) { StateAbstractDTO state = session.getCurrentState(); String toolName = tool.getName(); if (checked) { @@ -126,12 +127,12 @@ private void setToolCheckedInServer(final boolean checked, final String toolName) { groupServiceProvider.get().setToolEnabled(session.getUserHash(), session.getCurrentStateToken(), toolName, checked, new AsyncCallback<Object>() { - public void onFailure(Throwable caught) { + public void onFailure(final Throwable caught) { view.setChecked(toolName, !checked); entityOptions.setErrorMessage(i18n.t("Error configuring the tool"), Level.error); } - public void onSuccess(Object result) { + public void onSuccess(final Object result) { stateManager.reload(); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -217,7 +217,7 @@ add(timezoneCombo); final FieldSet personalSpaceFieldSet = new FieldSet(i18n.t("Do you want a personal homepage?")); - personalSpaceFieldSet.setWidth(DEF_FIELD_WIDTH + DEF_FIELD_LABEL_WITH); + personalSpaceFieldSet.setWidth(DEF_FIELD_WIDTH + DEF_FIELD_LABEL_WITH + 65); wantPersonalHomePage = new Radio(); wantPersonalHomePage.setTabIndex(9); noPersonalHomePage = new Radio(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -47,9 +47,9 @@ public static final String WELCOME_DIALOG = "k-regp-wdiag"; public static final String REGISTER_DIALOG = "k-regp-dialog"; - public RegisterPanel(final RegisterPresenter presenter, I18nTranslationService i18n, final WorkspaceSkeleton ws, - Session session, Images images) { - super(REGISTER_DIALOG, i18n, i18n.t(PlatfMessages.REGISTER_TITLE), true, true, 390, 450, "", + public RegisterPanel(final RegisterPresenter presenter, final I18nTranslationService i18n, + final WorkspaceSkeleton ws, final Session session, final Images images) { + super(REGISTER_DIALOG, i18n, i18n.t(PlatfMessages.REGISTER_TITLE), true, true, 400, 420, "", i18n.t(PlatfMessages.REGISTER_TITLE), REGISTER_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, new Listener0() { public void onEvent() { @@ -65,17 +65,17 @@ }, images, ERRMSG, 11); super.addListener(new WindowListenerAdapter() { @Override - public void onActivate(Panel panel) { + public void onActivate(final Panel panel) { KuneUiUtils.focusOnField(registerForm.getShortNameField()); } @Override - public void onHide(Component component) { + public void onHide(final Component component) { presenter.onClose(); } @Override - public void onShow(Component component) { + public void onShow(final Component component) { KuneUiUtils.focusOnField(registerForm.getShortNameField()); } }); @@ -83,7 +83,7 @@ Panel panel = new Panel(); panel.setBorder(false); registerForm = new RegisterForm(i18n, session); - registerForm.setWidth(360); + registerForm.setWidth(370); panel.add(registerForm.getFormPanel()); add(panel); panel.setId(REGISTER_FORM); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -70,10 +70,4 @@ }); } } - - @Override - public void setVisible(final boolean visible) { - super.setVisible(visible); - } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2009-05-03 15:08:43 UTC (rev 1106) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2009-05-07 15:41:11 UTC (rev 1107) @@ -90,11 +90,6 @@ private void setState(final StateAbstractDTO state) { setTheme(new WsTheme(state.getGroup().getWorkspaceTheme())); - if (state.getGroupRights().isAdministrable()) { - view.setVisible(true); - } else { - view.setVisible(false); - } } private void setTheme(final WsTheme newTheme) {