Author: vjrj_ Date: 2011-10-13 14:37:59 +0200 (Thu, 13 Oct 2011) New Revision: 1559 Modified: 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/gspace/client/actions/GiveUsFeedbackAction.java trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.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 Log: Feedback btn in another place Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-10-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmor.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -35,6 +35,8 @@ ForIsWidget getDocFooter(); + IsActionExtensible getEntityFooterToolbar(); + ForIsWidget getDocHeader(); ForIsWidget getDocSubheader(); @@ -49,7 +51,7 @@ ForIsWidget getEntityToolsSouth(); - IsActionExtensible getFooterToolbar(); + IsActionExtensible getDocFooterToolbar(); IsActionExtensible getHeaderToolbar(); Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-10-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -59,12 +59,14 @@ DockLayoutPanel docContainerParent; @UiField FlowPanel docFooter; + private final ActionFlowPanel docFooterToolbar; @UiField FlowPanel docHeader; @UiField FlowPanel docSubheader; @UiField FlowPanel entityFooter; + private final ActionFlowPanel entityFooterToolbar; @UiField FlowPanel entityHeader; @UiField @@ -75,7 +77,6 @@ FlowPanel entityToolsNorth; @UiField FlowPanel entityToolsSouth; - private final ActionFlowPanel footerToolbar; @UiField SplitLayoutPanel groupSpace; private final ActionFlowPanel headerToolbar; @@ -95,7 +96,6 @@ @UiField TabLayoutPanel tabs; private final ActionFlowPanel toolsSouthToolbar; - @UiField FlowPanel userSpace; @@ -107,14 +107,16 @@ "visible"); DOM.setStyleAttribute((Element) splitEast.getWidgetContainerElement(entityToolsContainer), "overflow", "visible"); - footerToolbar = toolbarProv.get(); + docFooterToolbar = toolbarProv.get(); headerToolbar = toolbarProv.get(); subheaderToolbar = toolbarProv.get(); toolsSouthToolbar = toolbarProv.get(); + entityFooterToolbar = toolbarProv.get(); getDocHeader().add(headerToolbar); getDocSubheader().add(subheaderToolbar); - getDocFooter().add(footerToolbar); + getDocFooter().add(docFooterToolbar); getEntityToolsSouth().add(toolsSouthToolbar); + getEntityFooter().add(entityFooterToolbar); entityToolsNorth.getElement().getStyle().setPosition(Position.RELATIVE); // entityToolsSouth.setVisible(false); mainpanel.getWidgetContainerElement(tabs).addClassName("k-spaces"); @@ -152,6 +154,11 @@ } @Override + public IsActionExtensible getDocFooterToolbar() { + return docFooterToolbar; + } + + @Override public ForIsWidget getDocHeader() { return docHeader; } @@ -167,6 +174,11 @@ } @Override + public IsActionExtensible getEntityFooterToolbar() { + return entityFooterToolbar; + } + + @Override public ForIsWidget getEntityHeader() { return entityHeader; } @@ -187,11 +199,6 @@ } @Override - public IsActionExtensible getFooterToolbar() { - return footerToolbar; - } - - @Override public IsActionExtensible getHeaderToolbar() { return headerToolbar; } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java 2011-10-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackAction.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -6,13 +6,13 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.core.client.auth.SignIn; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; 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.shared.i18n.I18nTranslationService; import com.google.inject.Inject; import com.google.inject.Provider; @@ -20,14 +20,14 @@ public class GiveUsFeedbackAction extends AbstractExtendedAction { private final Provider<ContentServiceAsync> contentService; - private final I18nTranslationService i18n; + private final I18nUITranslationService i18n; private final Session session; private final Provider<SignIn> signIn; private final StateManager stateManager; @Inject public GiveUsFeedbackAction(final Session session, final Provider<SignIn> signIn, - final StateManager stateManager, final I18nTranslationService i18n, + final StateManager stateManager, final I18nUITranslationService i18n, final Provider<ContentServiceAsync> contentService) { this.session = session; this.signIn = signIn; @@ -41,8 +41,9 @@ if (session.isLogged()) { NotifyUser.askConfirmation( i18n.t("Confirm, please:"), - i18n.t("Do you want to write us with some positive or negative feedback? This can help us to improve these services"), - new SimpleResponseCallback() { + i18n.t( + "Do you want to write us with some positive or negative feedback about [%s]? This can help us to improve these services", + i18n.getSiteCommonName()), new SimpleResponseCallback() { @Override public void onCancel() { } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java 2011-10-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GiveUsFeedbackBtn.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -1,8 +1,8 @@ package cc.kune.gspace.client.actions; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; import com.google.inject.Inject; @@ -10,14 +10,15 @@ public class GiveUsFeedbackBtn extends ButtonDescriptor { @Inject - public GiveUsFeedbackBtn(final GiveUsFeedbackAction action, final I18nTranslationService i18n, + public GiveUsFeedbackBtn(final GiveUsFeedbackAction action, final I18nUITranslationService i18n, final NavResources res, final GSpaceArmor armor) { super(action); withIcon(res.refresh()); withText(i18n.t("Give us feedback!")); - withToolTip(i18n.t("Write us with some feedback for help us to improve these services")); - withStyles("k-noborder, k-nobackcolor, k-no-backimage"); - armor.getToolsSouthToolbar().add(this); + withToolTip(i18n.t("Write us with some feedback for help us to improve the services on [%s]", + i18n.getSiteCommonName())); + withStyles("k-noborder, k-nobackcolor, k-no-backimage, k-fl"); + armor.getEntityFooterToolbar().add(this); } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-10-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/options/EntityOptionsView.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -24,6 +24,6 @@ public interface EntityOptionsView extends AbstractTabbedDialogView { int HEIGHT = 270; - int WIDTH = 500; - + int WIDTH = 440; + int WIDTH_WOUT_MARGIN = 420; } 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-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -57,8 +57,8 @@ change.addStyleName("k-button"); flow.add(change); initWidget(flow); - flow.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); - flow.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + // flow.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); + flow.setWidth(String.valueOf(EntityOptionsView.WIDTH_WOUT_MARGIN) + "px"); flow.addStyleName("k-overflow-y-auto"); flow.addStyleName("k-tab-panel"); } 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-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -54,8 +54,8 @@ uploader = new EntityUploaderForm(ICON_UPLD_SERVLET, i18n.t("Choose")); initWidget(uploader); - setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); - setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + // setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); + setWidth(String.valueOf(EntityOptionsView.WIDTH_WOUT_MARGIN) + "px"); addStyleName("k-overflow-y-auto"); addStyleName("k-tab-panel"); 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-13 11:01:37 UTC (rev 1558) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-13 12:37:59 UTC (rev 1559) @@ -63,8 +63,8 @@ public EntityOptStylePanel(final I18nTranslationService i18n, final CoreResources res, final GSpaceThemeSelectorPanel styleSelector) { tabTitle = new IconLabel(res.themeChoose(), i18n.t("Style")); - super.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); - super.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); + // super.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); + super.setWidth(String.valueOf(EntityOptionsView.WIDTH_WOUT_MARGIN) + "px"); final FlowPanel flow = new FlowPanel(); final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:"));