[kune-commits] r819 - in trunk/src/main/java/org/ourproject/kune:
app/public/css chat/client platf/client/app
platf/client/services platf/client/ui/rate
workspace/client/tags workspace/client/ui/newtmp/themes
vjrj
vjrj at ourproject.org
Sun Jul 27 03:15:40 CEST 2008
Author: vjrj
Date: 2008-07-27 03:15:27 +0200 (Sun, 27 Jul 2008)
New Revision: 819
Added:
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java
Modified:
trunk/src/main/java/org/ourproject/kune/app/public/css/all.css
trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css
trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java
trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java
Log:
Complete - task 17: Theme menus with colors and other themes
Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-07-27 01:15:27 UTC (rev 819)
@@ -2934,9 +2934,25 @@
}
.k-entitytextlogo-green .gwt-Label {
+ color: #250;
+}
+
+.k-entitytextlogo-blue .gwt-Label {
color: #000080;
}
+.k-entitytextlogo-grey .gwt-Label {
+ color: #1A1A1A;
+}
+
+.k-entitytextlogo-purple .gwt-Label {
+ color: #440055;
+}
+
+.k-entitytextlogo-red .gwt-Label {
+ color: #800000;
+}
+
.k-entitytextlogo .gwt-Hyperlink a {
color: #CCC;
font-size: 85%;
@@ -2954,6 +2970,22 @@
background: #5FD35F none repeat scroll 0% 50%;
}
+.k-entity-blue .x-layout-split {
+ background: #0066FF none repeat scroll 0% 50%;
+}
+
+.k-entity-grey .x-layout-split {
+ background: #4D4D4D none repeat scroll 0% 50%;
+}
+
+.k-entity-purple .x-layout-split {
+ background: #660080 none repeat scroll 0% 50%;
+}
+
+.k-entity-red .x-layout-split {
+ background: #D40000 none repeat scroll 0% 50%;
+}
+
.k-entityworkspace .x-layout-split {
background: transparent none repeat scroll 0% 50%;
}
@@ -2966,6 +2998,22 @@
background: #DCE8AB none repeat scroll 0% 50%;
}
+.k-entityworkspace-blue .x-layout-split {
+ background: #D5D5FF none repeat scroll 0% 50%;
+}
+
+.k-entityworkspace-grey .x-layout-split {
+ background: #999999 none repeat scroll 0% 50%;
+}
+
+.k-entityworkspace-purple .x-layout-split {
+ background: #A793AC none repeat scroll 0% 50%;
+}
+
+.k-entityworkspace-red .x-layout-split {
+ background: #FF5555 none repeat scroll 0% 50%;
+}
+
.k-entity-title {
border-left-style: solid;
border-left-width: 2px;
@@ -2992,48 +3040,148 @@
background: #5FD35F;
}
+.k-entity-title-rd-blue {
+ background: #0066FF;
+}
+
+.k-entity-title-rd-grey {
+ background: #4D4D4D;
+}
+
+.k-entity-title-rd-purple {
+ background: #660080;
+}
+
+.k-entity-title-rd-red {
+ background: #D40000;
+}
+
.k-entity-title-def {
background: #F1BB59 none repeat scroll 0% 50%;
border-left-color: #DD8A3D;
}
-.k-entity-title-def div {
- color: #69312F;
-}
-
.k-entity-title-green {
background: #AFA none repeat scroll 0% 50%;
border-left-color: #5FD35F;
}
+.k-entity-title-blue {
+ background: #AFDDE9 none repeat scroll 0% 50%;
+ border-left-color: #0066FF;
+}
+
+.k-entity-title-grey {
+ background: #CCCCCC none repeat scroll 0% 50%;
+ border-left-color: #4D4D4D;
+}
+
+.k-entity-title-purple {
+ background: #DDAFE9 none repeat scroll 0% 50%;
+ border-left-color: #660080;
+}
+
+.k-entity-title-red {
+ background: #FF8080 none repeat scroll 0% 50%;
+ border-left-color: #D40000;
+}
+
+.k-entity-title-def div {
+ color: #69312F;
+}
+
.k-entity-title-green div {
color: #250;
}
+.k-entity-title-blue div {
+ color: #000080;
+}
+
+.k-entity-title-grey div {
+ color: #1A1A1A;
+}
+
+.k-entity-title-purple div {
+ color: #440055;
+}
+
+.k-entity-title-red div {
+ color: #800000;
+}
+
.k-entity-subtitle-def {
background: #DD8A3D none repeat scroll 0% 50%;
}
+.k-entity-subtitle-green {
+ background: #5FD35F none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-blue {
+ background: #0066FF none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-grey {
+ background: #4D4D4D none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-purple {
+ background: #660080 none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-red {
+ background: #D40000 none repeat scroll 0% 50%;
+}
+
.k-entity-subtitle-def div {
color: #FFF;
}
-.k-entity-subtitle-green {
- background: #5FD35F none repeat scroll 0% 50%;
+.k-entity-subtitle-green div {
+ color: #FFF;
}
-.k-entity-subtitle-green div {
+.k-entity-subtitle-blue div {
color: #FFF;
}
-.k-entity-bottom-rd-def {
+.k-entity-subtitle-grey div {
+ color: #FFF;
+}
+
+.k-entity-subtitle-purple div {
+ color: #FFF;
+}
+
+.k-entity-subtitle-red div {
+ color: #FFF;
+}
+
+.k-entity-bottom-rd-def, .k-entity-bottom-def {
background: #DD8A3D;
}
-.k-entity-bottom-rd-green {
+.k-entity-bottom-rd-green, .k-entity-bottom-green {
background: #5FD35F;
}
+.k-entity-bottom-rd-blue, .k-entity-bottom-blue {
+ background: #0066FF;
+}
+
+.k-entity-bottom-rd-grey, .k-entity-bottom-grey {
+ background: #4D4D4D;
+}
+
+.k-entity-bottom-rd-purple, .k-entity-bottom-purple {
+ background: #660080;
+}
+
+.k-entity-bottom-rd-red, .k-entity-bottom-red {
+ background: #D40000;
+}
+
.k-entitylicensepanel-licensetext {
cursor: pointer;
margin-left: 5px;
@@ -3048,23 +3196,24 @@
background: #CFA none repeat scroll 0% 50%;
}
-.k-entity-bottom div {
- line-height: 2em;
+.k-entity-container-blue div {
+ background: #AACCFF none repeat scroll 0% 50%;
}
-.k-entity-bottom-def {
- background: #DD8A3D;
+.k-entity-container-grey div {
+ background: #B3B3B3 none repeat scroll 0% 50%;
}
-.k-entity-bottom-def div {
- color: #FFF;
+.k-entity-container-purple div {
+ background: #DDAFE9 none repeat scroll 0% 50%;
}
-.k-entity-bottom-green {
- background: #5FD35F;
+.k-entity-container-red div {
+ background: #FFAAAA none repeat scroll 0% 50%;
}
-.k-entity-bottom-green div {
+.k-entity-bottom div {
+ line-height: 2em;
color: #FFF;
}
@@ -3089,9 +3238,7 @@
.k-toolbar-sep {
padding-top: 4px;
}
-
/* Custom gwt-ext styles */
-
.ytb-sep {
background-image: url(../js/ext/resources/images/default/grid/grid-split.gif);
background-position: center;
@@ -3115,11 +3262,9 @@
cursor: pointer;
padding-top: 3px;
}
-
/* Drop down */
-
.k-dropdownouter {
- background-color: gray;
+ background-color: grey;
}
.k-dropdownouter-members {
@@ -3133,6 +3278,22 @@
background-color: #008000;
}
+.k-dropdownouter-members-blue {
+ background-color: #5500D4;
+}
+
+.k-dropdownouter-members-grey {
+ background-color: #4D4D4D;
+}
+
+.k-dropdownouter-members-purple {
+ background-color: #672178;
+}
+
+.k-dropdownouter-members-red {
+ background-color: #A02C2C;
+}
+
.k-dropdownouter-part {
}
@@ -3144,6 +3305,22 @@
background-color: #00AA00;
}
+.k-dropdownouter-part-blue {
+ background-color: #6600FF;
+}
+
+.k-dropdownouter-part-grey {
+ background-color: #666666;
+}
+
+.k-dropdownouter-part-purple {
+ background-color: #892CA0;
+}
+
+.k-dropdownouter-part-red {
+ background-color: #C83737;
+}
+
.k-dropdownouter-tags {
}
@@ -3155,6 +3332,22 @@
background-color: #00D400;
}
+.k-dropdownouter-tags-blue {
+ background-color: #9955FF;
+}
+
+.k-dropdownouter-tags-grey {
+ background-color: #808080;
+}
+
+.k-dropdownouter-tags-purple {
+ background-color: #AB37C8;
+}
+
+.k-dropdownouter-tags-red {
+ background-color: #D35F5F;
+}
+
.k-dropdownouter-summary {
}
@@ -3166,6 +3359,22 @@
background-color: #4CE14C;
}
+.k-dropdownouter-summary-blue {
+ background-color: #69A5FF;
+}
+
+.k-dropdownouter-summary-grey {
+ background-color: #A6A6A6;
+}
+
+.k-dropdownouter-summary-purple {
+ background-color: #C473D8;
+}
+
+.k-dropdownouter-summary-red {
+ background-color: #E08F8F;
+}
+
.k-dropdowninner {
margin: 0 3px 1px 3px;
background: green;
@@ -3186,5 +3395,28 @@
.k-dropdownlabel img {
margin: 0 3px 0 1px;
}
+/* WsTheme */
+.k-wstheme-icon-def {
+ background: #FF8C00;
+}
+.k-wstheme-icon-green {
+ background: green;
+}
+.k-wstheme-icon-blue {
+ background: blue;
+}
+
+.k-wstheme-icon-grey {
+ background: grey;
+}
+
+.k-wstheme-icon-purple {
+ background: purple;
+}
+
+.k-wstheme-icon-red {
+ background: red;
+}
+
Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-07-27 01:15:27 UTC (rev 819)
@@ -76,9 +76,25 @@
}
.k-entitytextlogo-green .gwt-Label {
+ color: #250;
+}
+
+.k-entitytextlogo-blue .gwt-Label {
color: #000080;
}
+.k-entitytextlogo-grey .gwt-Label {
+ color: #1A1A1A;
+}
+
+.k-entitytextlogo-purple .gwt-Label {
+ color: #440055;
+}
+
+.k-entitytextlogo-red .gwt-Label {
+ color: #800000;
+}
+
.k-entitytextlogo .gwt-Hyperlink a {
color: #CCC;
font-size: 85%;
@@ -96,6 +112,22 @@
background: #5FD35F none repeat scroll 0% 50%;
}
+.k-entity-blue .x-layout-split {
+ background: #0066FF none repeat scroll 0% 50%;
+}
+
+.k-entity-grey .x-layout-split {
+ background: #4D4D4D none repeat scroll 0% 50%;
+}
+
+.k-entity-purple .x-layout-split {
+ background: #660080 none repeat scroll 0% 50%;
+}
+
+.k-entity-red .x-layout-split {
+ background: #D40000 none repeat scroll 0% 50%;
+}
+
.k-entityworkspace .x-layout-split {
background: transparent none repeat scroll 0% 50%;
}
@@ -108,6 +140,22 @@
background: #DCE8AB none repeat scroll 0% 50%;
}
+.k-entityworkspace-blue .x-layout-split {
+ background: #D5D5FF none repeat scroll 0% 50%;
+}
+
+.k-entityworkspace-grey .x-layout-split {
+ background: #999999 none repeat scroll 0% 50%;
+}
+
+.k-entityworkspace-purple .x-layout-split {
+ background: #A793AC none repeat scroll 0% 50%;
+}
+
+.k-entityworkspace-red .x-layout-split {
+ background: #FF5555 none repeat scroll 0% 50%;
+}
+
.k-entity-title {
border-left-style: solid;
border-left-width: 2px;
@@ -134,48 +182,148 @@
background: #5FD35F;
}
+.k-entity-title-rd-blue {
+ background: #0066FF;
+}
+
+.k-entity-title-rd-grey {
+ background: #4D4D4D;
+}
+
+.k-entity-title-rd-purple {
+ background: #660080;
+}
+
+.k-entity-title-rd-red {
+ background: #D40000;
+}
+
.k-entity-title-def {
background: #F1BB59 none repeat scroll 0% 50%;
border-left-color: #DD8A3D;
}
-.k-entity-title-def div {
- color: #69312F;
-}
-
.k-entity-title-green {
background: #AFA none repeat scroll 0% 50%;
border-left-color: #5FD35F;
}
+.k-entity-title-blue {
+ background: #AFDDE9 none repeat scroll 0% 50%;
+ border-left-color: #0066FF;
+}
+
+.k-entity-title-grey {
+ background: #CCCCCC none repeat scroll 0% 50%;
+ border-left-color: #4D4D4D;
+}
+
+.k-entity-title-purple {
+ background: #DDAFE9 none repeat scroll 0% 50%;
+ border-left-color: #660080;
+}
+
+.k-entity-title-red {
+ background: #FF8080 none repeat scroll 0% 50%;
+ border-left-color: #D40000;
+}
+
+.k-entity-title-def div {
+ color: #69312F;
+}
+
.k-entity-title-green div {
color: #250;
}
+.k-entity-title-blue div {
+ color: #000080;
+}
+
+.k-entity-title-grey div {
+ color: #1A1A1A;
+}
+
+.k-entity-title-purple div {
+ color: #440055;
+}
+
+.k-entity-title-red div {
+ color: #800000;
+}
+
.k-entity-subtitle-def {
background: #DD8A3D none repeat scroll 0% 50%;
}
+.k-entity-subtitle-green {
+ background: #5FD35F none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-blue {
+ background: #0066FF none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-grey {
+ background: #4D4D4D none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-purple {
+ background: #660080 none repeat scroll 0% 50%;
+}
+
+.k-entity-subtitle-red {
+ background: #D40000 none repeat scroll 0% 50%;
+}
+
.k-entity-subtitle-def div {
color: #FFF;
}
-.k-entity-subtitle-green {
- background: #5FD35F none repeat scroll 0% 50%;
+.k-entity-subtitle-green div {
+ color: #FFF;
}
-.k-entity-subtitle-green div {
+.k-entity-subtitle-blue div {
color: #FFF;
}
-.k-entity-bottom-rd-def {
+.k-entity-subtitle-grey div {
+ color: #FFF;
+}
+
+.k-entity-subtitle-purple div {
+ color: #FFF;
+}
+
+.k-entity-subtitle-red div {
+ color: #FFF;
+}
+
+.k-entity-bottom-rd-def, .k-entity-bottom-def {
background: #DD8A3D;
}
-.k-entity-bottom-rd-green {
+.k-entity-bottom-rd-green, .k-entity-bottom-green {
background: #5FD35F;
}
+.k-entity-bottom-rd-blue, .k-entity-bottom-blue {
+ background: #0066FF;
+}
+
+.k-entity-bottom-rd-grey, .k-entity-bottom-grey {
+ background: #4D4D4D;
+}
+
+.k-entity-bottom-rd-purple, .k-entity-bottom-purple {
+ background: #660080;
+}
+
+.k-entity-bottom-rd-red, .k-entity-bottom-red {
+ background: #D40000;
+}
+
.k-entitylicensepanel-licensetext {
cursor: pointer;
margin-left: 5px;
@@ -190,23 +338,24 @@
background: #CFA none repeat scroll 0% 50%;
}
-.k-entity-bottom div {
- line-height: 2em;
+.k-entity-container-blue div {
+ background: #AACCFF none repeat scroll 0% 50%;
}
-.k-entity-bottom-def {
- background: #DD8A3D;
+.k-entity-container-grey div {
+ background: #B3B3B3 none repeat scroll 0% 50%;
}
-.k-entity-bottom-def div {
- color: #FFF;
+.k-entity-container-purple div {
+ background: #DDAFE9 none repeat scroll 0% 50%;
}
-.k-entity-bottom-green {
- background: #5FD35F;
+.k-entity-container-red div {
+ background: #FFAAAA none repeat scroll 0% 50%;
}
-.k-entity-bottom-green div {
+.k-entity-bottom div {
+ line-height: 2em;
color: #FFF;
}
@@ -231,9 +380,7 @@
.k-toolbar-sep {
padding-top: 4px;
}
-
/* Custom gwt-ext styles */
-
.ytb-sep {
background-image: url(../js/ext/resources/images/default/grid/grid-split.gif);
background-position: center;
@@ -257,11 +404,9 @@
cursor: pointer;
padding-top: 3px;
}
-
/* Drop down */
-
.k-dropdownouter {
- background-color: gray;
+ background-color: grey;
}
.k-dropdownouter-members {
@@ -275,6 +420,22 @@
background-color: #008000;
}
+.k-dropdownouter-members-blue {
+ background-color: #5500D4;
+}
+
+.k-dropdownouter-members-grey {
+ background-color: #4D4D4D;
+}
+
+.k-dropdownouter-members-purple {
+ background-color: #672178;
+}
+
+.k-dropdownouter-members-red {
+ background-color: #A02C2C;
+}
+
.k-dropdownouter-part {
}
@@ -286,6 +447,22 @@
background-color: #00AA00;
}
+.k-dropdownouter-part-blue {
+ background-color: #6600FF;
+}
+
+.k-dropdownouter-part-grey {
+ background-color: #666666;
+}
+
+.k-dropdownouter-part-purple {
+ background-color: #892CA0;
+}
+
+.k-dropdownouter-part-red {
+ background-color: #C83737;
+}
+
.k-dropdownouter-tags {
}
@@ -297,6 +474,22 @@
background-color: #00D400;
}
+.k-dropdownouter-tags-blue {
+ background-color: #9955FF;
+}
+
+.k-dropdownouter-tags-grey {
+ background-color: #808080;
+}
+
+.k-dropdownouter-tags-purple {
+ background-color: #AB37C8;
+}
+
+.k-dropdownouter-tags-red {
+ background-color: #D35F5F;
+}
+
.k-dropdownouter-summary {
}
@@ -308,6 +501,22 @@
background-color: #4CE14C;
}
+.k-dropdownouter-summary-blue {
+ background-color: #69A5FF;
+}
+
+.k-dropdownouter-summary-grey {
+ background-color: #A6A6A6;
+}
+
+.k-dropdownouter-summary-purple {
+ background-color: #C473D8;
+}
+
+.k-dropdownouter-summary-red {
+ background-color: #E08F8F;
+}
+
.k-dropdowninner {
margin: 0 3px 1px 3px;
background: green;
@@ -328,3 +537,27 @@
.k-dropdownlabel img {
margin: 0 3px 0 1px;
}
+/* WsTheme */
+.k-wstheme-icon-def {
+ background: #FF8C00;
+}
+
+.k-wstheme-icon-green {
+ background: green;
+}
+
+.k-wstheme-icon-blue {
+ background: blue;
+}
+
+.k-wstheme-icon-grey {
+ background: grey;
+}
+
+.k-wstheme-icon-purple {
+ background: purple;
+}
+
+.k-wstheme-icon-red {
+ background: red;
+}
\ No newline at end of file
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientNewModule.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -6,6 +6,7 @@
import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
+import org.ourproject.kune.workspace.client.workspace.GroupMembersSummary;
import com.calclab.emiteuimodule.client.EmiteUIDialog;
import com.calclab.suco.client.container.Container;
@@ -28,7 +29,7 @@
public ChatClientTool get() {
return new ChatClientTool(builder.getInstance(Session.class), builder.getInstance(Application.class),
builder.getInstance(I18nUITranslationService.class), builder.getInstance(EmiteUIDialog.class),
- builder.getInstance(WorkspaceSkeleton.class));
+ builder.getInstance(WorkspaceSkeleton.class), builder.getProvider(GroupMembersSummary.class));
}
}, SingletonScope.class);
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -21,16 +21,21 @@
package org.ourproject.kune.chat.client;
import org.ourproject.kune.platf.client.app.Application;
+import org.ourproject.kune.platf.client.dto.GroupDTO;
import org.ourproject.kune.platf.client.dto.InitDataDTO;
import org.ourproject.kune.platf.client.dto.StateDTO;
import org.ourproject.kune.platf.client.dto.UserInfoDTO;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
import org.ourproject.kune.platf.client.state.Session;
import org.ourproject.kune.platf.client.tool.AbstractClientTool;
+import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuItem;
import org.ourproject.kune.workspace.client.component.WorkspaceComponent;
import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
+import org.ourproject.kune.workspace.client.workspace.GroupMembersSummary;
+import com.calclab.emite.client.xmpp.stanzas.XmppURI;
import com.calclab.emiteuimodule.client.EmiteUIDialog;
+import com.calclab.suco.client.container.Provider;
import com.calclab.suco.client.signal.Slot;
public class ChatClientTool extends AbstractClientTool implements ChatProvider {
@@ -42,7 +47,8 @@
private ChatEngine chat;
public ChatClientTool(final Session session, final Application application, final I18nTranslationService i18n,
- final EmiteUIDialog emiteUIDialog, final WorkspaceSkeleton ws) {
+ final EmiteUIDialog emiteUIDialog, final WorkspaceSkeleton ws,
+ final Provider<GroupMembersSummary> groupMembersSummaryProvider) {
super(i18n.t("chat rooms"));
components = new ChatToolComponents(emiteUIDialog, i18n);
session.onInitDataReceived(new Slot<InitDataDTO>() {
@@ -50,6 +56,15 @@
final ChatOptions chatOptions = new ChatOptions(initData.getChatHttpBase(), initData.getChatDomain(),
initData.getChatRoomHost());
chat = new ChatEngineXmpp(emiteUIDialog, chatOptions, i18n, ws);
+ groupMembersSummaryProvider.get().addGroupOperation(
+ new GridMenuItem<GroupDTO>("images/chat-basic.gif", i18n.t("Start a chat with this member"),
+ new Slot<GroupDTO>() {
+ public void onEvent(final GroupDTO group) {
+ emiteUIDialog.chat(XmppURI.jid(group.getShortName() + "@"
+ + initData.getChatDomain()));
+ emiteUIDialog.show();
+ }
+ }), true);
}
});
application.onApplicationStop(new Slot<Object>() {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -119,7 +119,6 @@
public void onFailure(final Throwable error) {
Site.error("Error fetching initial data");
Log.debug(error.getMessage());
- ws.unMask();
}
public void onSuccess(final InitDataDTO initData) {
@@ -127,7 +126,6 @@
session.setInitData(initData);
session.setCurrentUserInfo(initData.getUserInfo());
stateManager.reload();
- ws.unMask();
}
private void checkChatDomain(final String chatDomain) {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -33,6 +33,7 @@
import org.ourproject.kune.workspace.client.sitebar.Site;
import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
+import com.allen_sauer.gwt.log.client.Log;
import com.calclab.suco.client.container.Provider;
import com.calclab.suco.client.signal.Signal;
import com.calclab.suco.client.signal.Slot;
@@ -65,31 +66,40 @@
try {
throw caught;
} catch (final AccessViolationException e) {
+ logException(e);
Site.error(i18n.t("You don't have rights to do that"));
} catch (final SessionExpiredException e) {
+ logException(e);
doSessionExpired();
} catch (final UserMustBeLoggedException e) {
+ logException(e);
if (session.isLogged()) {
doSessionExpired();
} else {
Site.important(i18n.t("Please sign in or register to collaborate"));
}
} catch (final GroupNotFoundException e) {
+ logException(e);
Site.error(i18n.t("Group not found"));
DefaultDispatcher.getInstance().fire(PlatformEvents.GOTO, "");
} catch (final ContentNotFoundException e) {
+ logException(e);
Site.error(i18n.t("Content not found"));
DefaultDispatcher.getInstance().fire(PlatformEvents.GOTO, "");
} catch (final LastAdminInGroupException e) {
+ logException(e);
getWorkspaceSkeleton().showAlertMessage(
i18n.t("Warning"),
i18n.t("Sorry, you are the last admin of this group."
+ " Look for someone to substitute you appropriately as admin before unjoin this group."));
} catch (final AlreadyGroupMemberException e) {
+ logException(e);
Site.error(i18n.t("This group is already a group member"));
} catch (final AlreadyUserMemberException e) {
+ logException(e);
Site.error(i18n.t("This user is already a member of this group"));
} catch (final Throwable e) {
+ logException(e);
Site.error(i18n.t("Error performing operation"));
GWT.log("Other kind of exception in StateManagerDefault/processErrorException", null);
throw new RuntimeException();
@@ -102,4 +112,8 @@
i18n.t("Your session has expired. Please login again."));
}
+ private void logException(final Throwable e) {
+ Log.debug("Exception in KuneErrorHandler", e);
+ }
+
}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateIt.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -0,0 +1,11 @@
+package org.ourproject.kune.platf.client.ui.rate;
+
+import org.ourproject.kune.platf.client.dto.StateDTO;
+
+public interface RateIt {
+
+ void setState(StateDTO state);
+
+ void setVisible(boolean visible);
+
+}
Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -0,0 +1,30 @@
+package org.ourproject.kune.platf.client.ui.rate;
+
+import org.ourproject.kune.platf.client.dto.StateDTO;
+
+public class RatePresenter {
+
+ private RateView view;
+
+ public RatePresenter() {
+ }
+
+ public void init(final RateView view) {
+ this.view = view;
+ }
+
+ public void setState(final StateDTO state) {
+ if (state.isRateable()) {
+ view.setVisible(true);
+ view.setRate(state.getRate());
+ view.setByUsers(state.getRateByUsers());
+ } else {
+ view.setVisible(false);
+ }
+
+ }
+
+ public void setVisible(final boolean visible) {
+ view.setVisible(visible);
+ }
+}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -59,6 +59,7 @@
addStyleName("kune-Margin-Medium-t");
flowPanel.addStyleName("kune-Margin-Small-trbl");
ws.getEntitySummary().addInSummary(this);
+ ws.unMask();
}
public void setTags(final List<TagResultDTO> groupTags) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java 2008-07-26 20:07:21 UTC (rev 818)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePanel.java 2008-07-27 01:15:27 UTC (rev 819)
@@ -15,10 +15,12 @@
private final Menu menu;
private final WsThemePresenter presenter;
+ private final I18nUITranslationService i18n;
public WsThemePanel(final WorkspaceSkeleton ws, final WsThemePresenter presenter,
final I18nUITranslationService i18n) {
this.presenter = presenter;
+ this.i18n = i18n;
menu = new Menu();
menu.setDefaultAlign("br-tr");
@@ -37,7 +39,10 @@
for (int i = 0; i < themes.length; i++) {
final WsTheme theme = new WsTheme(themes[i]);
final MenuItem item = new MenuItem();
- item.setText(theme.toString());
+ final String name = theme.getName();
+ final String itemText = name.equals("def") ? i18n.t("default") : i18n.t(name);
+ item.setIconCls("k-wstheme-icon-" + name);
+ item.setText(itemText);
menu.addItem(item);
item.addListener(new BaseItemListenerAdapter() {
@Override
More information about the kune-commits
mailing list