[kune-commits] r1375 - in trunk/src/main/java/cc/kune: common/client/ui/dialogs common/client/ui/dialogs/wizard common/public common/public/gxt-custom/css core/public gspace/client/licensewizard gspace/client/licensewizard/pages gspace/client/options gspace/client/options/license gspace/client/options/pscape gspace/client/options/tools
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Wed May 11 02:24:01 CEST 2011
Author: vjrj_
Date: 2011-05-11 02:24:00 +0200 (Wed, 11 May 2011)
New Revision: 1375
Modified:
trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml
trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java
trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css
trunk/src/main/java/cc/kune/common/public/kune-common.css
trunk/src/main/java/cc/kune/core/public/ws.css
trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java
trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java
trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java
trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java
trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java
Log:
some fixes in dialogs
Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-05-11 00:24:00 UTC (rev 1375)
@@ -1,15 +1,14 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:k="urn:import:cc.kune.common.client.ui" xmlns:g="urn:import:com.google.gwt.user.client.ui">
- <g:VerticalPanel spacing="12"
- addStyleNames="k-dialog-outerp, k-bottom-10corners">
- <g:SimplePanel>
- <g:VerticalPanel addStyleNames="k-dialog-innerp, k-3corners">
+ <g:VerticalPanel addStyleNames="k-dialog-outerp, k-bottom-10corners">
+ <g:FlowPanel>
+ <g:FlowPanel addStyleNames="k-dialog-innerp, k-3corners">
<k:IconLabel ui:field="title" addStyleNames="k-dialog-title, " />
- <g:FlowPanel ui:field="vp" addStyleNames="kune-Margin-Medium-trbl" />
+ <g:FlowPanel ui:field="vp" addStyleNames="kune-Margin-Medium-trbl" />
<g:VerticalPanel ui:field="bottomPanel" width="100%"></g:VerticalPanel>
- </g:VerticalPanel>
- </g:SimplePanel>
+ </g:FlowPanel>
+ </g:FlowPanel>
<g:FlowPanel ui:field="btnPanel" addStyleNames="k-dialog-btn-area">
<g:Button ui:field="firstBtn"
addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners, k-button " />
Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/wizard/WizardDialog.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -39,7 +39,7 @@
public class WizardDialog implements WizardDialogView {
- private final Button cancelButton;
+ private final Button backButton;
private final DeckPanel deck;
private final BasicTopDialog dialog;
private final I18nTranslationService i18n;
@@ -62,50 +62,54 @@
this.maskWidget = maskWidget;
this.listener = listener;
final Builder dialogBuilder = new BasicTopDialog.Builder(dialogId, false, modal).width(width).height(
- height).firstButtonId(backId).sndButtonId(finishId).title(header);
+ height).firstButtonId(cancelId).sndButtonId(finishId).title(header);
dialog = dialogBuilder.build();
this.i18n = i18n;
- nextButton = new Button(i18n.tWithNT("Next »", "used in button"), new ClickHandler() {
+ dialog.setFirstBtnText(i18n.tWithNT("Cancel", "used in button"));
+ dialog.getFirstBtn().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ WizardDialog.this.listener.onCancel();
+ }
+ });
+ nextButton = new Button(i18n.tWithNT("Next »", "used in button"), new ClickHandler() {
@Override
public void onClick(final ClickEvent event) {
WizardDialog.this.listener.onNext();
}
});
-
nextButton.ensureDebugId(nextId);
nextButton.addStyleName("k-dialog-btn");
- nextButton.addStyleName("k-dialog-firstBtn");
+ nextButton.addStyleName("k-dialog-secondBtn");
nextButton.addStyleName("k-5corners");
nextButton.addStyleName("k-button");
nextButton.addStyleName("kune-Margin-Medium-l");
dialog.getBtnPanel().add(nextButton);
- dialog.setFirstBtnText(i18n.tWithNT("« Back", "used in button"));
- dialog.getFirstBtn().addClickHandler(new ClickHandler() {
+ dialog.getClose().addCloseHandler(new CloseHandler<PopupPanel>() {
@Override
- public void onClick(final ClickEvent event) {
- WizardDialog.this.listener.onBack();
+ public void onClose(final CloseEvent<PopupPanel> event) {
+ WizardDialog.this.listener.onClose();
}
});
- cancelButton = new Button(i18n.tWithNT("Cancel", "used in button"), new ClickHandler() {
-
+ backButton = new Button(i18n.tWithNT("« Back", "used in button"), new ClickHandler() {
@Override
public void onClick(final ClickEvent event) {
- WizardDialog.this.listener.onCancel();
+ WizardDialog.this.listener.onBack();
}
});
- cancelButton.ensureDebugId(cancelId);
- cancelButton.addStyleName("k-dialog-btn");
- cancelButton.addStyleName("k-dialog-secondBtn");
- cancelButton.addStyleName("k-5corners");
- cancelButton.addStyleName("k-button");
- cancelButton.addStyleName("kune-Margin-Medium-l");
- dialog.getBtnPanel().add(cancelButton);
+ backButton.ensureDebugId(backId);
+ backButton.addStyleName("k-dialog-btn");
+ backButton.addStyleName("k-dialog-secondBtn");
+ backButton.addStyleName("k-5corners");
+ backButton.addStyleName("k-button");
+ backButton.addStyleName("kune-Margin-Medium-l");
+ dialog.getBtnPanel().add(backButton);
dialog.setSecondBtnId(finishId);
dialog.setSecondBtnText(i18n.tWithNT("Finish", "used in button"));
@@ -116,14 +120,6 @@
}
});
- dialog.getClose().addCloseHandler(new CloseHandler<PopupPanel>() {
-
- @Override
- public void onClose(final CloseEvent<PopupPanel> event) {
- WizardDialog.this.listener.onClose();
- }
- });
-
deck = new DeckPanel();
}
@@ -189,12 +185,12 @@
@Override
public void setEnabledBackButton(final boolean enabled) {
- dialog.setFirstBtnEnabled(enabled);
+ backButton.setEnabled(enabled);
}
@Override
public void setEnabledCancelButton(final boolean enabled) {
- cancelButton.setEnabled(enabled);
+ dialog.setFirstBtnEnabled(enabled);
}
@Override
@@ -232,12 +228,12 @@
@Override
public void setVisibleBackButton(final boolean visible) {
- dialog.setFirstBtnVisible(visible);
+ backButton.setVisible(visible);
}
@Override
public void setVisibleCancelButton(final boolean visible) {
- cancelButton.setVisible(visible);
+ dialog.setFirstBtnVisible(visible);
}
@Override
Modified: trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css
===================================================================
--- trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-05-11 00:24:00 UTC (rev 1375)
@@ -226,6 +226,7 @@
background-color: #fff;
}
+/*
.x-form-field-wrap .x-form-trigger {
background-image: url(../images/form/trigger.gif);
border-bottom-color: #737b8c;
@@ -234,36 +235,37 @@
width: 20px;
}
+*/
.x-form-field-wrap .x-form-trigger.x-form-trigger-over {
- border-bottom-color: #d97e27;
+ /* border-bottom-color: #d97e27; */
}
.x-form-field-wrap .x-form-trigger.x-form-trigger-click {
- border-bottom-color: #c86e19;
+ /* border-bottom-color: #c86e19; */
}
.x-small-editor .x-form-field-wrap .x-form-trigger {
- height: 20px;
+ /* height: 20px;*/
}
.x-form-field-wrap .x-form-trigger-over {
- background-position: -20px 0;
+ /* background-position: -20px 0; */
}
.x-form-field-wrap .x-form-trigger-click {
- background-position: -40px 0;
+ /* background-position: -40px 0; */
}
.x-trigger-wrap-focus .x-form-trigger {
- background-position: -60px 0;
+ /* background-position: -60px 0; */
}
.x-trigger-wrap-focus .x-form-trigger-over {
- background-position: -80px 0;
+ /* background-position: -80px 0; */
}
.x-trigger-wrap-focus .x-form-trigger-click {
- background-position: -100px 0;
+ /* background-position: -100px 0; */
}
.x-form-field-wrap .x-form-date-trigger {
@@ -279,7 +281,7 @@
}
.x-trigger-wrap-focus .x-form-trigger {
- border-bottom-color: #737b8c;
+ /* border-bottom-color: #737b8c; */
}
.x-item-disabled .x-form-trigger-over {
@@ -1498,37 +1500,38 @@
}
.x-combo-list {
+/*
border: 2px solid #232732;
- background-color: #555566 !important;
+ background-color: #555566 !important;*/
font: normal 15px 'Ubuntu', Arial
}
.x-combo-list-inner {
- background-color: #280b0b;
+ /* background-color: #280b0b; */
}
.x-combo-list-hd {
font: bold 14px 'Ubuntu', Arial color : fff;
- background-image: url(../images/default/layout/panel-title-light-bg.gif);
- border-bottom-color: #98c0f4;
+/* background-image: url(../images/default/layout/panel-title-light-bg.gif);
+ border-bottom-color: #98c0f4; */
}
.x-resizable-pinned .x-combo-list-inner {
- border-bottom-color: #98c0f4;
+ /* border-bottom-color: #98c0f4; */
}
.x-combo-list-item {
- border-color: #556;
+ /* border-color: #556; */
}
.x-combo-list .x-combo-selected {
- border-color: #e5872c !important;
+ /* border-color: #e5872c !important;
background-color: #e5872c;
- font-weight: bold;
+ font-weight: bold; */
}
.x-combo-list .x-toolbar {
- border-top-color: #98c0f4;
+ /* border-top-color: #98c0f4; */
}
.x-combo-list-small {
@@ -1981,7 +1984,7 @@
}
.x-view,x-combo-list {
- background-color: #232D38;
+ /* background-color: #232D38; */
}
.x-view {
@@ -1995,20 +1998,20 @@
}
.x-view-item,.x-combo-list-item {
- border: 1px solid black !important;
- border-top: 1px solid #232D38 !important;
+ /* border: 1px solid black !important;
+ border-top: 1px solid #232D38 !important; */
}
.x-view-item-over,.x-combo-over {
- background: #7e5530;
- border: 1px dotted #e5872c !important;
+ /* background: #7e5530;
+ border: 1px dotted #e5872c !important; */
}
.x-view-item-sel,.x-combo-selected {
- background: #e5872c none repeat scroll 0%;
+ /* background: #e5872c none repeat scroll 0%;
border: 1px dotted #e5872c !important;
font-weight: bold;
- color: black !important;
+ color: black !important; */
}
.x-date-left-icon {
@@ -2124,7 +2127,7 @@
}
.x-contrast .x-form-trigger:after {
- content: url(../images/form/trigger-single.gif);
+ /* content: url(../images/form/trigger-single.gif); */
}
.x-contrast .x-panel {
Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css
===================================================================
--- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-05-11 00:24:00 UTC (rev 1375)
@@ -21,21 +21,21 @@
}
.k-opacity80 {
- kfilter: alpha(opacity = 80);
+ kfilter: alpha(opacity = 80);
-moz-opacity: 0.80;
-khtml-opacity: 0.80;
opacity: 0.80;
}
.k-opacity90 {
- kfilter: alpha(opacity = 90);
+ kfilter: alpha(opacity = 90);
-moz-opacity: 0.90;
-khtml-opacity: 0.90;
opacity: 0.90;
}
.k-opacity95 {
- kfilter: alpha(opacity = 95);
+ kfilter: alpha(opacity = 95);
-moz-opacity: 0.95;
-khtml-opacity: 0.95;
opacity: 0.95;
@@ -43,7 +43,7 @@
.gwt-PopupPanelGlass {
background-color: #f7ebe3 !important;
- kfilter: alpha(opacity = 68)
+ kfilter: alpha(opacity = 68)
!important;
-moz-opacity: 0.68 !important;
-khtml-opacity: 0.68 !important;
@@ -134,28 +134,38 @@
padding: 22px 4px 3px 4px;
}
+.k-dialog-title {
+ margin: 5px;
+}
+
.k-dialog-title div {
color: #552200;
font-size: 20px;
font-weight: bold;
- margin: 10px 0 10px 10px;
+ line-height: 0.7;
+ padding: 0 0 6px 5px;
}
.k-dialog-innerp {
background-color: #FFFFFF;
border: solid 1px #F2F2F2;
- margin: 34px 16px 20px 16px;
+ margin: 29px 8px 0;
+ padding: 8px 11px 13px;
}
.k-dialog-btn-area {
padding: 0 15px 15px 15px;
- margin-bottom: 30px;
+ margin-bottom: 0 -5px 30px -5px;
}
-.k-dialog-btn-area div {
- margin: 10px
+.k-dialog-btn-area button {
+ margin: 10px 5px;
}
+.k-dialog-btn-area div { /* margin: 10px */
+
+}
+
.k-dialog-btn {
text-shadow: 1px 1px 1px #FFFFFF;
font-weight: bold;
@@ -201,6 +211,10 @@
float: right;
}
+.oc-clean {
+ clear: both;
+}
+
.x-toolbar {
background: none !important;
border-color: transparent !important;
@@ -281,7 +295,7 @@
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-left-radius: 5px;
- kfilter: alpha(opacity = 90);
+ kfilter: alpha(opacity = 90);
-moz-opacity: 0.90;
-khtml-opacity: 0.90;
opacity: 0.90;
@@ -466,9 +480,8 @@
float: left;
}
-.k-iconlabel-right {
- /* float: left; */
- /* margin-left: 5px; */
+.k-iconlabel-right { /* float: left; */ /* margin-left: 5px; */
+
}
.gwt-MenuBar-vertical .subMenuIcon-selected {
@@ -525,63 +538,74 @@
_border-left-color: pink;
_border-bottom-color: pink;
_border-right-color: pink;
- _filter: chroma(color = pink);
+ _filter: chroma(color = pink);
}
/* end tooltip */
-
/* tabbar */
+.gwt-DecoratedTabBar {
-.gwt-DecoratedTabBar {
}
+
.gwt-DecoratedTabBar .gwt-TabBarFirst {
- width: 5px; /* first tab distance from the left */
+ width: 5px; /* first tab distance from the left */
}
+
.gwt-DecoratedTabBar .gwt-TabBarRest {
+
}
+
.gwt-DecoratedTabBar .gwt-TabBarItem {
border-collapse: collapse;
margin-left: 6px;
}
+
.gwt-DecoratedTabBar .tabTopCenter {
padding: 0px;
background: #e3e3e3;
}
-.gwt-DecoratedTabBar .tabTopLeft,
-.gwt-DecoratedTabBar .tabTopRight {
+
+.gwt-DecoratedTabBar .tabTopLeft,.gwt-DecoratedTabBar .tabTopRight {
padding: 0px;
zoom: 1;
}
-.gwt-DecoratedTabBar .tabTopLeftInner,
-.gwt-DecoratedTabBar .tabTopRightInner {
+
+.gwt-DecoratedTabBar .tabTopLeftInner,.gwt-DecoratedTabBar .tabTopRightInner
+ {
width: 6px;
height: 6px;
}
+
.gwt-DecoratedTabBar .tabTopLeft {
background: url(images/corner.png) no-repeat 0px -55px;
-background: url(images/corner_ie6.png) no-repeat 0px -55px;
}
+
.gwt-DecoratedTabBar .tabTopRight {
background: url(images/corner.png) no-repeat -6px -55px;
-background: url(images/corner_ie6.png) no-repeat -6px -55px;
}
-* html .gwt-DecoratedTabBar .tabTopLeftInner,
-* html .gwt-DecoratedTabBar .tabTopRightInner {
+
+* html .gwt-DecoratedTabBar .tabTopLeftInner,* html .gwt-DecoratedTabBar .tabTopRightInner
+ {
width: 6px;
height: 6px;
overflow: hidden;
}
-.gwt-DecoratedTabBar .tabMiddleLeft,
-.gwt-DecoratedTabBar .tabMiddleRight {
+
+.gwt-DecoratedTabBar .tabMiddleLeft,.gwt-DecoratedTabBar .tabMiddleRight
+ {
width: 6px;
padding: 0px;
background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px;
}
-.gwt-DecoratedTabBar .tabMiddleLeftInner,
-.gwt-DecoratedTabBar .tabMiddleRightInner {
+
+.gwt-DecoratedTabBar .tabMiddleLeftInner,.gwt-DecoratedTabBar .tabMiddleRightInner
+ {
width: 1px;
height: 1px;
}
+
.gwt-DecoratedTabBar .tabMiddleCenter {
padding: 0px 4px 2px 4px;
cursor: pointer;
@@ -591,31 +615,36 @@
text-align: center;
background: #e3e3e3 url(images/hborder.png) repeat-x 0px -1463px;
}
+
.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopCenter {
background: #747474;
}
+
.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopLeft {
background-position: 0px -61px;
}
+
.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabTopRight {
background-position: -6px -61px;
}
-.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft,
-.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight {
+
+.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleLeft,.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleRight
+ {
background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px;
}
+
.gwt-DecoratedTabBar .gwt-TabBarItem-selected .tabMiddleCenter {
cursor: default;
background: #bcbcbc url(images/hborder.png) repeat-x 0px -2511px;
color: white;
}
+
.gwt-DecoratedTabBar .gwt-TabBarItem-disabled .tabMiddleCenter {
cursor: default;
color: #999999;
}
/* End tabbar */
-
.k-editableLabel {
font-weight: bold;
padding: 3px
@@ -639,15 +668,17 @@
.k-overflow-y-scroll {
overflow-y: scroll;
}
+
.k-overflow-y-auto {
overflow-y: auto;
}
+
.k-overflow-x-scroll {
overflow-x: scroll;
}
.k-tab-panel {
- padding: 10px;
- background-color: #F2F0F0;
- border: 1px solid #D0D0D0;
-}
+ padding: 10px;
+ background-color: #F2F0F0;
+ border: 1px solid #D0D0D0;
+}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/public/ws.css
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-05-11 00:24:00 UTC (rev 1375)
@@ -1,4 +1,4 @@
-CHARSET "UTF-8 "; body {
+CHARSET "UTF-8 "; body {
background-color: white;
color: black;
font-family: 'Ubuntu', Arial;
@@ -450,10 +450,41 @@
margin-right: 20px;
}
+.kune-Margin-20-b {
+ margin-bottom: 20px;
+}
+
.kune-Margin-20-l {
margin-left: 20px;
}
+.kune-Margin-10-trbl {
+ margin: 10px;
+}
+
+.kune-Margin-10-lr {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+.kune-Margin-10-tl {
+ margin-top: 10px;
+ margin-left: 10px;
+}
+
+.kune-Margin-10-tb {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+.kune-Margin-10-t {
+ margin-top: 10px;
+}
+
+.kune-Margin-10-r {
+ margin-right: 10px;
+}
+
.kune-Margin-Large-trbl {
margin: 10px;
}
@@ -481,6 +512,10 @@
margin-right: 10px;
}
+.kune-Margin-Large-b {
+ margin-bottom: 10px;
+}
+
.kune-Margin-Large-l {
margin-left: 10px;
}
@@ -1156,7 +1191,7 @@
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-left-radius: 5px;
- kfilter: alpha(opacity = 90);
+ kfilter: alpha(opacity = 90);
-moz-opacity: 0.90;
-khtml-opacity: 0.90;
opacity: 0.90;
@@ -1323,12 +1358,12 @@
}
.x-form-check-wrap {
- height: inherit;;
- line-height: inherit;
+ height: inherit;;
+ line-height: inherit;
}
.k-info-links {
text-decoration: underline;
color: gray;
cursor: pointer;
-}
+}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPanel.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -40,7 +40,7 @@
@Inject
public LicenseWizardPanel(final MaskWidget maskWidget, final I18nTranslationService i18n,
final CoreResources res) {
- super(LIC_WIZ_DIALOG, i18n.t("License wizard"), true, false, WIDTH, null, BACK_BTN_ID, NEXT_BTN_ID,
+ super(LIC_WIZ_DIALOG, i18n.t("License wizard"), false, false, WIDTH, null, BACK_BTN_ID, NEXT_BTN_ID,
FINISH_BTN_ID, CANCEL_BTN_ID, CLOSE_BTN_ID, i18n, maskWidget);
super.setFinishText(i18n.t("Select"));
super.setIcon(res.copyleft());
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/LicenseWizardPresenter.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -194,6 +194,7 @@
public void onClose() {
getView().hide();
+ reset();
}
void onCopyLeftLicenseSelected() {
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-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -55,7 +55,7 @@
final Label intro = new Label();
intro.setText(i18n.t("Select a license to share your group contents with other people:"));
-
+ intro.addStyleName("kune-Margin-10-b");
final FieldSet fieldSet = new FieldSet();
// fieldSet.setTitle(i18n.t("license recommended"));
fieldSet.addStyleName("margin-left: 105px");
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -38,6 +38,7 @@
public class LicenseWizardFrdForm extends DefaultForm implements LicenseWizardFrdFormView {
+ @SuppressWarnings("serial")
public class LicenseData extends BaseModel {
private static final String LONGNAME = "longname";
@@ -79,42 +80,24 @@
public LicenseWizardFrdForm(final I18nTranslationService i18n, final Session session) {
this.session = session;
- // this.onChange = new Event0("onChange");
setFrame(true);
super.setPadding(10);
- // super.setHeight(LicenseWizardView.HEIGHT);
+
super.setAutoHeight(true);
final Label intro = new Label();
intro.setText(i18n.t("Select other kind of licenses:"));
+ intro.addStyleName("kune-Margin-10-b");
- // final ListStore<LicenseDTO> store = new ListStore<LicenseDTO>();
- // store.add( Arrays.asList( new String[] { "shortname", "longname", "url"
- // });
- // getNonCCLicenses());
- // store.load();
-
- // final Template template = new
- // Template("<div class=\"x-combo-list-item\">" + "<img src=\"{url}\"> "
- // + "{longname}<div class=\"x-clear\"></div></div>");
-
super.setHideLabels(true);
cb = new ComboBox<LicenseData>();
- cb.setMinChars(1);
- // cb.setFieldLabel("Other licenses");
cb.setLabelSeparator("");
cb.setStore(createStore());
cb.setDisplayField(LicenseData.LONGNAME);
cb.setValueField(LicenseData.SHORTNAME);
- // cb.setMode(Mode.LOCAL);
cb.setTriggerAction(TriggerAction.ALL);
cb.setEmptyText(i18n.t("Select license"));
- cb.setTypeAhead(true);
- cb.setSelectOnFocus(true);
- cb.setEditable(false);
cb.setWidth(300);
- // cb.setResizable(true);
- // cb.setTpl(template);
cb.setTitle("Licenses");
cb.addListener(Events.Select, new Listener<BaseEvent>() {
@Override
Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardSndForm.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -44,6 +44,7 @@
super.setAutoHeight(true);
final Label intro = new Label();
intro.setText(i18n.t("Select the license type:"));
+ intro.addStyleName("kune-Margin-10-b");
final FieldSet fieldSet = new FieldSet();
// fieldSet.setTitle("license type");
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-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -63,6 +63,7 @@
final Label intro = new Label();
intro.setText(i18n.t("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?"));
+ intro.addStyleName("kune-Margin-10-b");
final FieldSet commercialfieldSet = new FieldSet();
commercialfieldSet.setHeading(i18n.t("Allow any uses of your work, including commercial?"));
Modified: trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/options/GroupOptionsPresenter.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -70,7 +70,7 @@
// groupPrefsAction.putValue(Action.NAME, i18n.t("Group options"));
groupPrefsAction.putValue(Action.SMALL_ICON, img.prefs());
prefsItem = new ButtonDescriptor(groupPrefsAction);
- prefsItem.withStyles("k-ent-header-btn");
+ prefsItem.withStyles("k-ent-header-btn, k-noborder, k-nobackcolor, k-btn-min");
prefsItem.setId(GROUP_OPTIONS_ICON);
prefsItem.setVisible(false);
view.addAction(prefsItem);
Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptionsDefLicensePanel.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -47,10 +47,12 @@
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.addStyleName("kune-Margin-20-tb");
flow.add(intro);
licenseImage = new Image();
flow.add(licenseImage);
licenseImage.addStyleName("kune-pointer");
+ licenseImage.addStyleName("k-fr");
change = new Button(i18n.t("Change"));
change.addStyleName("k-button");
flow.add(change);
Modified: trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -61,6 +61,7 @@
final HorizontalPanel wsHP = new HorizontalPanel();
final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:"));
+ wsThemeInfo.addStyleName("kune-Margin-20-tb");
// final Widget toolbarWsChange = (Widget) wsSelector.getView();
// toolbarWsChange.addStyleName("kune-Margin-Medium-l");
wsHP.add(wsThemeInfo);
Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-05-10 22:57:21 UTC (rev 1374)
+++ trunk/src/main/java/cc/kune/gspace/client/options/tools/EntityOptionsToolsConfPanel.java 2011-05-11 00:24:00 UTC (rev 1375)
@@ -34,10 +34,10 @@
import com.extjs.gxt.ui.client.event.BaseEvent;
import com.extjs.gxt.ui.client.event.Events;
import com.extjs.gxt.ui.client.event.Listener;
-import com.extjs.gxt.ui.client.widget.Label;
import com.extjs.gxt.ui.client.widget.form.CheckBox;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
public class EntityOptionsToolsConfPanel extends DefaultForm implements EntityOptionsToolsConfView {
@@ -88,6 +88,7 @@
fields.clear();
final Label label = new Label();
label.setText(i18n.t("Here you can select the tools used:"));
+ label.addStyleName("kune-Margin-10-tb");
super.add(label);
}
More information about the kune-commits
mailing list