[kune-commits] r1325 - in trunk: dev-utils script src/main/java/cc/kune/common/client/ui src/main/java/cc/kune/common/client/ui/dialogs src/main/java/cc/kune/common/public src/main/java/cc/kune/core/client/sitebar/spaces src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace/client src/main/java/cc/kune/gspace/client/actions src/main/java/cc/kune/gspace/client/resources src/main/java/cc/kune/gspace/client/tool/selector src/main/java/cc/kune/gspace/client/viewers
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Thu Apr 28 15:50:23 CEST 2011
Author: vjrj_
Date: 2011-04-28 15:50:23 +0200 (Thu, 28 Apr 2011)
New Revision: 1325
Modified:
trunk/dev-utils/kune.formatter.eclipse.preferences.xml
trunk/script/repopubli.sh
trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml
trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java
trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml
trunk/src/main/java/cc/kune/common/public/kune-common.css
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java
trunk/src/main/java/cc/kune/core/public/ws.css
trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml
trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java
trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java
trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css
trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml
trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java
trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java
trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java
trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml
trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java
trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java
Log:
Minor style issues
Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml
===================================================================
--- trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2011-04-28 13:50:23 UTC (rev 1325)
@@ -2,6 +2,7 @@
<profiles version="11">
<profile kind="CodeFormatterProfile" name="kune-formatter" version="11">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
@@ -9,11 +10,13 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
@@ -48,9 +51,10 @@
<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
@@ -70,15 +74,16 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="70"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
@@ -88,6 +93,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
@@ -95,6 +101,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
@@ -120,6 +127,7 @@
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
@@ -129,7 +137,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
@@ -180,6 +188,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
@@ -201,6 +210,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
@@ -210,8 +220,8 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
@@ -229,6 +239,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
@@ -255,6 +266,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
Modified: trunk/script/repopubli.sh
===================================================================
--- trunk/script/repopubli.sh 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/script/repopubli.sh 2011-04-28 13:50:23 UTC (rev 1325)
@@ -5,6 +5,8 @@
echo "$0 -j target/emite-0.4.6-emiteuimodule.jar -g com.calclab.emite -a emite -v 0.4.6"
}
+PACKAGING=jar
+
while getopts “hg:a:v:j:s” OPTION
do
case $OPTION in
@@ -25,7 +27,7 @@
JAR=$OPTARG
;;
s)
- SOURCE='-Dclassifier=sources'
+ PACKAGING=java-source
;;
?)
usage
@@ -40,4 +42,10 @@
exit 1
fi
-mvn deploy:deploy-file -DgroupId=$GROUP -DartifactId=$ARTIFACT -Dversion=$VER $SOURCE -Dpackaging=jar -Dfile=$JAR -Durl=scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/ -DrepositoryId=kune.ourproject.org
+mvn deploy:deploy-file -DgroupId=$GROUP \
+ -DartifactId=$ARTIFACT \
+ -Dversion=$VER \
+ -Dpackaging=$PACKAGING \
+ -Dfile=$JAR \
+ -DrepositoryId=kune.ourproject.org \
+ -Durl=scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/
Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -40,127 +40,129 @@
public class IconLabel extends Composite implements HasWidgets, HasDirectionalText {
- interface IconTitleUiBinder extends UiBinder<Widget, IconLabel> {
- }
+ interface IconTitleUiBinder extends UiBinder<Widget, IconLabel> {
+ }
- private static IconTitleUiBinder uiBinder = GWT.create(IconTitleUiBinder.class);
+ private static IconTitleUiBinder uiBinder = GWT.create(IconTitleUiBinder.class);
- @UiField
- FlowPanel flow;
- @UiField
- Image iconLeft;
- @UiField
- Image iconRight;
- @UiField
- InlineLabel label;
- @UiField
- FocusPanel self;
+ @UiField
+ FlowPanel flow;
+ @UiField
+ Image iconLeft;
+ @UiField
+ Image iconRight;
+ @UiField
+ InlineLabel label;
+ @UiField
+ FocusPanel self;
- public IconLabel() {
- this("");
- }
+ public IconLabel() {
+ this("");
+ }
- public IconLabel(final ImageResource imgRes, final String text) {
- this(text);
- iconLeft.setResource(imgRes);
+ public IconLabel(final ImageResource imgRes, final String text) {
+ this(text);
+ if (imgRes != null) {
+ iconLeft.setResource(imgRes);
}
+ }
- public IconLabel(final String text) {
- initWidget(uiBinder.createAndBindUi(this));
- label.setText(text);
- label.addStyleName("k-space-nowrap");
- label.addStyleName("k-iconlabel-text");
- }
+ public IconLabel(final String text) {
+ initWidget(uiBinder.createAndBindUi(this));
+ label.setText(text);
+ label.addStyleName("k-space-nowrap");
+ label.addStyleName("k-iconlabel-text");
+ }
- @Override
- public void add(final Widget w) {
- flow.add(w);
- }
+ @Override
+ public void add(final Widget w) {
+ flow.add(w);
+ }
- @Override
- public void addStyleName(final String style) {
- flow.addStyleName(style);
- }
+ @Override
+ public void addStyleName(final String style) {
+ flow.addStyleName(style);
+ }
- public void addTextStyleName(final String style) {
- label.addStyleName(style);
- }
+ public void addTextStyleName(final String style) {
+ label.addStyleName(style);
+ }
- @Override
- public void clear() {
- flow.clear();
- }
+ @Override
+ public void clear() {
+ flow.clear();
+ }
- public HasClickHandlers getFocus() {
- return self;
- }
+ public HasClickHandlers getFocus() {
+ return self;
+ }
- @Override
- public String getText() {
- return label.getText();
- }
+ @Override
+ public String getText() {
+ return label.getText();
+ }
- @Override
- public Direction getTextDirection() {
- return label.getTextDirection();
- }
+ @Override
+ public Direction getTextDirection() {
+ return label.getTextDirection();
+ }
- @Override
- public Iterator<Widget> iterator() {
- return flow.iterator();
- }
+ @Override
+ public Iterator<Widget> iterator() {
+ return flow.iterator();
+ }
- @Override
- public boolean remove(final Widget w) {
- return flow.remove(w);
- }
+ @Override
+ public boolean remove(final Widget w) {
+ return flow.remove(w);
+ }
- public void setLabelText(final String text) {
- label.setText(text);
- }
+ public void setLabelText(final String text) {
+ label.setText(text);
+ }
- public void setLeftIcon(final String imgCss) {
- iconLeft.setUrl("images/clear.gif");
- iconLeft.setStyleName(imgCss);
- iconLeft.addStyleName("k-iconlabel-left");
- iconLeft.addStyleName("oc-ico-pad");
- }
+ public void setLeftIcon(final String imgCss) {
+ iconLeft.setUrl("images/clear.gif");
+ iconLeft.setStyleName(imgCss);
+ iconLeft.addStyleName("k-iconlabel-left");
+ iconLeft.addStyleName("oc-ico-pad");
+ }
- public void setLeftIconResource(final ImageResource res) {
- iconLeft.setResource(res);
- iconLeft.addStyleName("k-iconlabel-left");
- }
+ public void setLeftIconResource(final ImageResource res) {
+ iconLeft.setResource(res);
+ iconLeft.addStyleName("k-iconlabel-left");
+ }
- public void setRightIcon(final String imgCss) {
- iconRight.setUrl("images/clear.gif");
- iconRight.setStyleName(imgCss);
- iconRight.addStyleName("oc-ico-pad");
- iconRight.addStyleName("k-iconlabel-right");
- }
+ public void setRightIcon(final String imgCss) {
+ iconRight.setUrl("images/clear.gif");
+ iconRight.setStyleName(imgCss);
+ iconRight.addStyleName("oc-ico-pad");
+ iconRight.addStyleName("k-iconlabel-right");
+ }
- public void setRightIconResource(final ImageResource res) {
- iconRight.setResource(res);
- iconRight.addStyleName("k-iconlabel-right");
- }
+ public void setRightIconResource(final ImageResource res) {
+ iconRight.setResource(res);
+ iconRight.addStyleName("k-iconlabel-right");
+ }
- @Override
- public void setStyleName(final String style) {
- flow.setStyleName(style);
- }
+ @Override
+ public void setStyleName(final String style) {
+ flow.setStyleName(style);
+ }
- @Override
- public void setText(final String text) {
- label.setText(text);
- }
+ @Override
+ public void setText(final String text) {
+ label.setText(text);
+ }
- @Override
- public void setText(final String text, final Direction dir) {
- label.setText(text, dir);
- }
+ @Override
+ public void setText(final String text, final Direction dir) {
+ label.setText(text, dir);
+ }
- public void setTooltip(final String text) {
- Tooltip.to(label, text);
- // Tooltip.to(iconRight, text);
- // Tooltip.to(iconLeft, text);
- }
+ public void setTooltip(final String text) {
+ Tooltip.to(label, text);
+ // Tooltip.to(iconRight, text);
+ // Tooltip.to(iconLeft, text);
+ }
}
Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-04-28 13:50:23 UTC (rev 1325)
@@ -12,7 +12,7 @@
}
.pad {
- white-space: nowrap;
+ /* white-space: nowrap; */
}
</ui:style>
<g:FocusPanel ui:field="self">
Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -38,121 +38,121 @@
public class BasicDialog extends Composite implements BasicDialogView {
- interface BasicDialogUiBinder extends UiBinder<Widget, BasicDialog> {
- }
- private static BasicDialogUiBinder uiBinder = GWT.create(BasicDialogUiBinder.class);
- @UiField
- VerticalPanel bottomPanel;
- @UiField
- FlowPanel btnPanel;
- @UiField
- Button firstBtn;
- @UiField
- Button secondBtn;
- @UiField
- IconLabel title;
- @UiField
- VerticalPanel vp;
+ interface BasicDialogUiBinder extends UiBinder<Widget, BasicDialog> {
+ }
+ private static BasicDialogUiBinder uiBinder = GWT.create(BasicDialogUiBinder.class);
+ @UiField
+ VerticalPanel bottomPanel;
+ @UiField
+ FlowPanel btnPanel;
+ @UiField
+ Button firstBtn;
+ @UiField
+ Button secondBtn;
+ @UiField
+ IconLabel title;
+ @UiField
+ VerticalPanel vp;
- public BasicDialog() {
- initWidget(uiBinder.createAndBindUi(this));
- }
+ public BasicDialog() {
+ initWidget(uiBinder.createAndBindUi(this));
+ }
- public void ensureDebugIdFirstBtn(final String id) {
- if (id != null && id.length() > 0) {
- firstBtn.ensureDebugId(id);
- }
+ public void ensureDebugIdFirstBtn(final String id) {
+ if (id != null && id.length() > 0) {
+ firstBtn.ensureDebugId(id);
}
+ }
- public void ensureDebugIdSecondBtn(final String id) {
- if (id != null && id.length() > 0) {
- secondBtn.ensureDebugId(id);
- }
+ public void ensureDebugIdSecondBtn(final String id) {
+ if (id != null && id.length() > 0) {
+ secondBtn.ensureDebugId(id);
}
+ }
- @Override
- public ForIsWidget getBottomPanel() {
- return bottomPanel;
- }
+ @Override
+ public ForIsWidget getBottomPanel() {
+ return bottomPanel;
+ }
- @Override
- public HasClickHandlers getFirstBtn() {
- return firstBtn;
- }
+ @Override
+ public HasClickHandlers getFirstBtn() {
+ return firstBtn;
+ }
- @Override
- public HasText getFirstBtnText() {
- return firstBtn;
- }
+ @Override
+ public HasText getFirstBtnText() {
+ return firstBtn;
+ }
- @Override
- public ForIsWidget getInnerPanel() {
- return vp;
- }
+ @Override
+ public ForIsWidget getInnerPanel() {
+ return vp;
+ }
- @Override
- public HasClickHandlers getSecondBtn() {
- return secondBtn;
- }
+ @Override
+ public HasClickHandlers getSecondBtn() {
+ return secondBtn;
+ }
- @Override
- public HasText getSecondBtnText() {
- return secondBtn;
- }
+ @Override
+ public HasText getSecondBtnText() {
+ return secondBtn;
+ }
- @Override
- public HasDirectionalText getTitleText() {
- return title;
- }
+ @Override
+ public HasDirectionalText getTitleText() {
+ return title;
+ }
- public void setFirstBtnId(final String id) {
- firstBtn.ensureDebugId(id);
- }
+ public void setFirstBtnId(final String id) {
+ firstBtn.ensureDebugId(id);
+ }
- public void setFirstBtnTabIndex(final int index) {
- firstBtn.setTabIndex(index);
- }
+ public void setFirstBtnTabIndex(final int index) {
+ firstBtn.setTabIndex(index);
+ }
- @Override
- public void setFirstBtnTitle(final String title) {
- firstBtn.setTitle(title);
- }
+ @Override
+ public void setFirstBtnTitle(final String title) {
+ firstBtn.setTitle(title);
+ }
- @Override
- public void setFirstBtnVisible(final boolean visible) {
- firstBtn.setVisible(visible);
- }
+ @Override
+ public void setFirstBtnVisible(final boolean visible) {
+ firstBtn.setVisible(visible);
+ }
- public void setSecondBtnId(final String id) {
- secondBtn.ensureDebugId(id);
- }
+ public void setSecondBtnId(final String id) {
+ secondBtn.ensureDebugId(id);
+ }
- public void setSecondBtnTabIndex(final int index) {
- secondBtn.setTabIndex(index);
- }
+ public void setSecondBtnTabIndex(final int index) {
+ secondBtn.setTabIndex(index);
+ }
- @Override
- public void setSecondBtnTitle(final String title) {
- secondBtn.setTitle(title);
- }
+ @Override
+ public void setSecondBtnTitle(final String title) {
+ secondBtn.setTitle(title);
+ }
- @Override
- public void setSecondBtnVisible(final boolean visible) {
- secondBtn.setVisible(visible);
- }
+ @Override
+ public void setSecondBtnVisible(final boolean visible) {
+ secondBtn.setVisible(visible);
+ }
- public void setTitleIcon(final ImageResource img) {
- title.setLeftIconResource(img);
- }
+ public void setTitleIcon(final ImageResource img) {
+ title.setLeftIconResource(img);
+ }
- public void setTitleIcon(final String icon) {
- if (TextUtils.notEmpty(icon)) {
- title.setLeftIcon(icon);
- }
+ public void setTitleIcon(final String icon) {
+ if (TextUtils.notEmpty(icon)) {
+ title.setLeftIcon(icon);
}
+ }
- public void setTitleId(final String id) {
- title.ensureDebugId(id);
- }
+ public void setTitleId(final String id) {
+ title.ensureDebugId(id);
+ }
}
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-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-04-28 13:50:23 UTC (rev 1325)
@@ -13,9 +13,9 @@
</g:SimplePanel>
<g:FlowPanel ui:field="btnPanel" addStyleNames="k-dialog-btn-area">
<g:Button ui:field="firstBtn"
- addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners " />
+ addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners, k-button " />
<g:Button ui:field="secondBtn"
- addStyleNames="k-dialog-btn,k-dialog-secondBtn, k-5corners" />
+ addStyleNames="k-dialog-btn,k-dialog-secondBtn, k-5corners, k-button" />
</g:FlowPanel>
</g:VerticalPanel>
</ui:UiBinder>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css
===================================================================
--- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-04-28 13:50:23 UTC (rev 1325)
@@ -8,522 +8,527 @@
}
.k-floatleft,.k-fl {
- float: left;
+ float: left;
}
.k-floatright,.k-fr {
- float: right;
+ float: right;
}
.k-pointer {
- cursor: pointer;
- cursor: hand;
+ cursor: pointer;
+ cursor: hand;
}
.k-opacity80 {
- kfilter: alpha(opacity = 80);
- -moz-opacity: 0.80;
- -khtml-opacity: 0.80;
- opacity: 0.80;
+ kfilter: alpha(opacity = 80);
+ -moz-opacity: 0.80;
+ -khtml-opacity: 0.80;
+ opacity: 0.80;
}
.k-opacity90 {
- kfilter: alpha(opacity = 90);
- -moz-opacity: 0.90;
- -khtml-opacity: 0.90;
- opacity: 0.90;
+ kfilter: alpha(opacity = 90);
+ -moz-opacity: 0.90;
+ -khtml-opacity: 0.90;
+ opacity: 0.90;
}
.k-opacity95 {
- kfilter: alpha(opacity = 95);
- -moz-opacity: 0.95;
- -khtml-opacity: 0.95;
- opacity: 0.95;
+ kfilter: alpha(opacity = 95);
+ -moz-opacity: 0.95;
+ -khtml-opacity: 0.95;
+ opacity: 0.95;
}
.gwt-PopupPanelGlass {
- background-color: #f7ebe3 !important;
- kfilter: alpha(opacity = 68)
- !important;
- -moz-opacity: 0.68 !important;
- -khtml-opacity: 0.68 !important;
- opacity: 0.68 !important;
+ background-color: #f7ebe3 !important;
+ kfilter: alpha(opacity = 68)
+ !important;
+ -moz-opacity: 0.68 !important;
+ -khtml-opacity: 0.68 !important;
+ opacity: 0.68 !important;
}
.k-box-3shadow {
- -webkit-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
- box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
+ box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
}
.k-box-5shadow {
- -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+ box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
}
.k-box-10shadow {
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
}
.k-bottom-5corners {
- -webkit-border-bottom-right-radius: 5px;
- -moz-border-radius-bottomright: 5px;
- border-bottom-right-radius: 5px;
- -webkit-border-bottom-left-radius: 5px;
- -moz-border-radius-bottomleft: 5px;
- border-bottom-left-radius: 5px;
+ -webkit-border-bottom-right-radius: 5px;
+ -moz-border-radius-bottomright: 5px;
+ border-bottom-right-radius: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ border-bottom-left-radius: 5px;
}
.k-bottom-10corners {
- -webkit-border-bottom-right-radius: 10px;
- -moz-border-radius-bottomright: 10px;
- border-bottom-right-radius: 10px;
- -webkit-border-bottom-left-radius: 10px;
- -moz-border-radius-bottomleft: 10px;
- border-bottom-left-radius: 10px;
+ -webkit-border-bottom-right-radius: 10px;
+ -moz-border-radius-bottomright: 10px;
+ border-bottom-right-radius: 10px;
+ -webkit-border-bottom-left-radius: 10px;
+ -moz-border-radius-bottomleft: 10px;
+ border-bottom-left-radius: 10px;
}
.k-top-5corners {
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topright: 5px;
- border-top-right-radius: 5px;
- -webkit-border-top-left-radius: 5px;
- -moz-border-radius-topleft: 5px;
- border-top-left-radius: 5px;
+ -webkit-border-top-right-radius: 5px;
+ -moz-border-radius-topright: 5px;
+ border-top-right-radius: 5px;
+ -webkit-border-top-left-radius: 5px;
+ -moz-border-radius-topleft: 5px;
+ border-top-left-radius: 5px;
}
.k-top-10corners {
- -webkit-border-top-right-radius: 10px;
- -moz-border-radius-topright: 10px;
- border-top-right-radius: 10px;
- -webkit-border-top-left-radius: 10px;
- -moz-border-radius-topleft: 10px;
- border-top-left-radius: 10px;
+ -webkit-border-top-right-radius: 10px;
+ -moz-border-radius-topright: 10px;
+ border-top-right-radius: 10px;
+ -webkit-border-top-left-radius: 10px;
+ -moz-border-radius-topleft: 10px;
+ border-top-left-radius: 10px;
}
.k-2corners {
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ border-radius: 2px;
}
.k-3corners {
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
}
.k-5corners {
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
}
.k-10corners {
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ border-radius: 10px;
}
.k-dialog-outerp {
- background-color: #552200;
- border-top: 4px solid #000;
- padding: 22px 4px 3px 4px;
+ background-color: #552200;
+ border-top: 4px solid #000;
+ padding: 22px 4px 3px 4px;
}
.k-dialog-title span {
- color: #552200;
- font-size: 20px;
- font-weight: bold;
- margin: 0 0 0 6px;
+ color: #552200;
+ font-size: 20px;
+ font-weight: bold;
+ margin: 0 0 0 6px;
}
.k-dialog-innerp {
- background-color: #FFFFFF;
- border: solid 1px #F2F2F2;
- margin: 34px 16px 20px 16px;
+ background-color: #FFFFFF;
+ border: solid 1px #F2F2F2;
+ margin: 34px 16px 20px 16px;
}
.k-dialog-btn-area {
- padding: 0 15px 15px 15px;
- margin-bottom: 30px;
+ padding: 0 15px 15px 15px;
+ margin-bottom: 30px;
}
.k-dialog-btn-area div {
- margin: 10px
+ margin: 10px
}
.k-dialog-innerp table {
- margin: 5px;
+ margin: 5px;
}
.k-dialog-btn {
- text-shadow: 1px 1px 1px #FFFFFF;
- font-weight: bold;
- -moz-user-select: none;
- -khtml-user-select: none;
+ text-shadow: 1px 1px 1px #FFFFFF;
+ font-weight: bold;
+ -moz-user-select: none;
+ -khtml-user-select: none;
}
.k-dialog-firstBtn {
- float: left;
+ float: left;
}
.k-dialog-secondBtn {
- float: right;
+ float: right;
}
.k-z100000 {
- z-index: 100000;
+ z-index: 100000;
}
.k-z10000 {
- z-index: 10000;
+ z-index: 10000;
}
.k-z1000 {
- z-index: 1000;
+ z-index: 1000;
}
.oc-user-msg {
- background-color: #FFCC00;
- padding: 3px;
+ background-color: #FFCC00;
+ padding: 3px;
}
.oc-user-msg-popup {
- padding: 0px;
- border: 0px;
+ padding: 0px;
+ border: 0px;
}
.oc-floatleft {
- float: left;
+ float: left;
}
.oc-floatright {
- float: right;
+ float: right;
}
.x-toolbar {
- background: none !important;
- border-color: transparent !important;
+ background: none !important;
+ border-color: transparent !important;
}
.oc-testico {
- background-image: url(images/ico.png) !important;
- -moz-background-clip: border;
- -moz-background-inline-policy: continuous;
- -moz-background-origin: padding;
- background-attachment: scroll;
- background-color: transparent;
- background-position: 0 0;
- background-repeat: no-repeat;
- height: 16px;
- widows: 16px;
+ background-image: url(images/ico.png) !important;
+ -moz-background-clip: border;
+ -moz-background-inline-policy: continuous;
+ -moz-background-origin: padding;
+ background-attachment: scroll;
+ background-color: transparent;
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ height: 16px;
+ widows: 16px;
}
.oc-tb-spacer {
- margin: 2px;
- width: 2px;
+ margin: 2px;
+ width: 2px;
}
.oc-tb-bottom-line {
- border-bottom-color: rgb(208, 208, 208);
- border-bottom-style: solid;
- border-bottom-width: 1px;
+ border-bottom-color: rgb(208, 208, 208);
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
}
.oc-blank-toolbar {
- background: #FFF none repeat scroll 0% 50%;
+ background: #FFF none repeat scroll 0% 50%;
}
.oc-tb-sep {
- padding-top: 4px;
- padding-left: 5px;
+ padding-top: 4px;
+ padding-left: 5px;
}
.oc-transp .x-panel-body {
- background: transparent;
+ background: transparent;
}
.oc-menu {
- cursor: default;
- -moz-user-select: none;
- -khtml-user-select: none;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
- border: 1 px solid #BBBBBB;
- font: 16px 'Ubuntu', arial;
- /* font-weight: bold; */
- -webkit-border-bottom-right-radius: 5px;
- -moz-border-radius-bottomright: 5px;
- border-bottom-right-radius: 5px;
- -webkit-border-bottom-left-radius: 5px;
- -moz-border-radius-bottomleft: 5px;
- border-bottom-left-radius: 5px;
- background-color: #280b0b;
+ cursor: default;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.5);
+ border: 1 px solid #BBBBBB;
+ font: 16px 'Ubuntu', arial;
+ /* font-weight: bold; */
+ -webkit-border-bottom-right-radius: 5px;
+ -moz-border-radius-bottomright: 5px;
+ border-bottom-right-radius: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ border-bottom-left-radius: 5px;
+ background-color: #280b0b;
}
.gwt-PopupPanel .oc-menu {
- border: 2px solid #552200;
- background-color: #280b0b;
+ border: 2px solid #552200;
+ background-color: #280b0b;
}
.oc-menu .gwt-MenuBar-vertical,.gwt-MenuBar-vertical {
- background-color: #280b0b;
- border: 2px solid #552200;
- padding: 3px;
- font: 16px 'Ubuntu', arial;
- color: white;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topright: 5px;
- border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 5px;
- -moz-border-radius-bottomright: 5px;
- border-bottom-right-radius: 5px;
- -webkit-border-bottom-left-radius: 5px;
- -moz-border-radius-bottomleft: 5px;
- border-bottom-left-radius: 5px;
- kfilter: alpha(opacity = 90);
- -moz-opacity: 0.90;
- -khtml-opacity: 0.90;
- opacity: 0.90;
+ background-color: #280b0b;
+ border: 2px solid #552200;
+ padding: 3px;
+ font: 16px 'Ubuntu', arial;
+ color: white;
+ -webkit-border-top-right-radius: 5px;
+ -moz-border-radius-topright: 5px;
+ border-top-right-radius: 5px;
+ -webkit-border-bottom-right-radius: 5px;
+ -moz-border-radius-bottomright: 5px;
+ border-bottom-right-radius: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ border-bottom-left-radius: 5px;
+ kfilter: alpha(opacity = 90);
+ -moz-opacity: 0.90;
+ -khtml-opacity: 0.90;
+ opacity: 0.90;
}
.gwt-MenuBar .gwt-MenuItem-selected {
- background-color: #c87137 !important;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
+ background-color: #c87137 !important;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
}
.gwt-MenuBar .gwt-MenuItem {
- padding: 4px 4px 3px !important;
+ padding: 4px 4px 3px !important;
}
+.oc-noselect {
+ -moz-user-select: none;
+ -khtml-user-select: none;
+}
+
.oc-menu .gwt-MenuItem {
- cursor: pointer;
- -moz-user-select: none;
- -khtml-user-select: none;
- /* background-color: #c87137; */
- color: white;
+ cursor: pointer;
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ /* background-color: #c87137; */
+ color: white;
}
.oc-button {
- padding: 2px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
- text-decoration: none;
- vertical-align: middle;
- background-color: #F2F2F2;
- white-space: nowrap;
- margin-right: 3px;
+ padding: 2px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ text-decoration: none;
+ vertical-align: middle;
+ background-color: #F2F2F2;
+ white-space: nowrap;
+ margin-right: 3px;
}
.oc-button:hover {
- border: 2px orange solid;
- background: #f0f0f0;
- color: #855585;
+ border: 2px orange solid;
+ background: #f0f0f0;
+ color: #855585;
}
.oc-button:active {
- border-top-color: #ffffff;
- background: #ffffff;
+ border-top-color: #ffffff;
+ background: #ffffff;
}
#oc-mshortcut {
- position: absolute;
- right: 10px;
+ position: absolute;
+ right: 10px;
}
#oc-mshortcut-hidden {
- visibility: hidden;
+ visibility: hidden;
}
#oc-mshortcut a {
- text-decoration: none;
- color: black;
+ text-decoration: none;
+ color: black;
}
.oc-user-msg {
- background-color: #FFCC00;
- padding: 3px;
+ background-color: #FFCC00;
+ padding: 3px;
}
.oc-user-msg-popup {
- padding: 0px;
- border: 0px;
+ padding: 0px;
+ border: 0px;
}
.oc-floatleft {
- float: left;
+ float: left;
}
.oc-floatright {
- float: right;
+ float: right;
}
.x-toolbar {
- background: none !important;
- border-color: transparent !important;
+ background: none !important;
+ border-color: transparent !important;
}
.oc-testico {
- background-image: url(images/ico.png) !important;
- -moz-background-clip: border;
- -moz-background-inline-policy: continuous;
- -moz-background-origin: padding;
- background-attachment: scroll;
- background-color: transparent;
- background-position: 0 0;
- background-repeat: no-repeat;
- height: 16px;
- widows: 16px;
+ background-image: url(images/ico.png) !important;
+ -moz-background-clip: border;
+ -moz-background-inline-policy: continuous;
+ -moz-background-origin: padding;
+ background-attachment: scroll;
+ background-color: transparent;
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ height: 16px;
+ widows: 16px;
}
.oc-ico-pad { /* padding-right: 20px; */
- white-space: normal;
+ white-space: normal;
}
.oc-tb-spacer {
- margin: 2px;
- width: 2px;
+ margin: 2px;
+ width: 2px;
}
.oc-tb-bottom-line {
- border-bottom-color: rgb(208, 208, 208);
- border-bottom-style: solid;
- border-bottom-width: 1px;
+ border-bottom-color: rgb(208, 208, 208);
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
}
.oc-blank-toolbar {
- background: #FFF none repeat scroll 0% 50%;
+ background: #FFF none repeat scroll 0% 50%;
}
.oc-tb-sep {
- padding-top: 4px;
- padding-left: 5px;
+ padding-top: 4px;
+ padding-left: 5px;
}
.oc-transp .x-panel-body {
- background: transparent;
+ background: transparent;
}
#oc-mshortcut {
- position: absolute;
- right: 10px;
+ position: absolute;
+ right: 10px;
}
#oc-mshortcut-hidden {
- visibility: hidden;
+ visibility: hidden;
}
#oc-mshortcut a {
- text-decoration: none;
- color: black;
+ text-decoration: none;
+ color: black;
}
.k-no-backimage,.k-no-backimage td {
- background-image: none;
+ background-image: none;
}
.k-nobackcolor {
- background-color: transparent !important;
+ background-color: transparent !important;
}
.k-noborder {
- border: 0px !important;
+ border: 0px !important;
}
.k-space-nowrap {
- white-space: nowrap;
+ white-space: nowrap;
}
.k-iconlabel-text {
- vertical-align: top;
- padding-left: 3px;
- float: left;
+ vertical-align: top;
+ padding-left: 3px;
+ float: left;
}
.k-menuimtem-title {
- color: white;
- font-size: 15px;
- font-weight: bold;
- padding: 2px 3px 2px 0;
+ color: white;
+ font-size: 15px;
+ font-weight: bold;
+ padding: 2px 3px 2px 0;
}
.k-tb-sep {
- border-left: 1px solid #B3B3B3;
- height: 10px;
- margin-top: 4px;
+ border-left: 1px solid #B3B3B3;
+ height: 10px;
+ margin-top: 4px;
}
.k-iconlabel-left {
- float: left;
+ float: left;
}
.k-iconlabel-right {
- float: left;
- /* margin-left: 5px; */
+ float: left;
+ /* margin-left: 5px; */
}
.gwt-MenuBar-vertical .subMenuIcon-selected {
- background: none repeat scroll 0 0 #808080;
+ background: none repeat scroll 0 0 #808080;
}
.gwt-Button {
- background: url("images/hborder.png") repeat-x scroll 0 -27px
- transparent;
+ background: url("images/hborder.png") repeat-x scroll 0 -27px
+ transparent;
}
/* tooltips, adaptation of http://jonrohan.me/guide/css/creating-triangles-in-css/ */
.k-tooltip {
- background-color: #FEFFF1;
- border: 2px solid #666666;
- line-height: 1.3em;
- padding: 5px;
+ background-color: #FEFFF1;
+ border: 2px solid #666666;
+ line-height: 1.3em;
+ padding: 5px;
}
.k-tooltip-arrow-border {
- border-style: solid;
- border-width: 7px;
- height: 0;
- width: 0;
- position: absolute;
+ border-style: solid;
+ border-width: 7px;
+ height: 0;
+ width: 0;
+ position: absolute;
}
.k-tooltip-arrow-border-n {
- border-color: transparent transparent #666666 transparent;
+ border-color: transparent transparent #666666 transparent;
}
.k-tooltip-arrow-border-s {
- border-color: #666666 transparent transparent transparent;
+ border-color: #666666 transparent transparent transparent;
}
.k-tooltip-arrow {
- border-style: solid;
- border-width: 7px;
- height: 0;
- width: 0;
- position: absolute;
+ border-style: solid;
+ border-width: 7px;
+ height: 0;
+ width: 0;
+ position: absolute;
}
.k-tooltip-arrow-n {
- border-color: transparent transparent #FEFFF1 transparent;
+ border-color: transparent transparent #FEFFF1 transparent;
}
.k-tooltip-arrow-s {
- border-color: #FEFFF1 transparent transparent transparent;
+ border-color: #FEFFF1 transparent transparent transparent;
}
/* IE6 */
.k-tooltip-arrow {
- _border-left-color: pink;
- _border-bottom-color: pink;
- _border-right-color: pink;
- _filter: chroma(color = pink);
+ _border-left-color: pink;
+ _border-bottom-color: pink;
+ _border-right-color: pink;
+ _filter: chroma(color = pink);
}
/* end tooltip */
\ No newline at end of file
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 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -19,7 +19,8 @@
*/
package cc.kune.core.client.sitebar.spaces;
-import cc.kune.common.client.notify.NotifyUser;
+import cc.kune.common.client.notify.NotifyLevel;
+import cc.kune.core.client.auth.SignIn;
import cc.kune.core.client.init.AppStartEvent;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.SiteTokens;
@@ -33,6 +34,7 @@
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.shared.EventBus;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.gwtplatform.mvp.client.Presenter;
import com.gwtplatform.mvp.client.View;
import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
@@ -72,16 +74,19 @@
private String homeToken;
private String publicToken;
private final Session session;
+ private final Provider<SignIn> signIn;
private final StateManager stateManager;
private String userToken;
@Inject
public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager,
- final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, final Session session) {
+ final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor,
+ final Session session, final Provider<SignIn> signIn) {
super(eventBus, view, proxy);
this.stateManager = stateManager;
this.armor = armor;
this.session = session;
+ this.signIn = signIn;
currentSpace = null;
homeToken = SiteTokens.HOME;
userToken = SiteTokens.WAVEINBOX;
@@ -205,11 +210,10 @@
getView().setPublicBtnDown(false);
currentSpace = Space.userSpace;
} else {
+ signIn.get().setErrorMessage("Sign in to access to your workspace", NotifyLevel.info);
stateManager.gotoHistoryToken(TokenUtils.addRedirect(SiteTokens.SIGNIN, userToken));
getView().setUserBtnDown(false);
- NotifyUser.info("Sign in to access to your workspace");
- // signIn.get().setErrorMessage("Sign in to access to your workspace",
- // NotifyLevel.info);
+ // NotifyUser.info("Sign in to access to your workspace");
}
}
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -36,74 +36,77 @@
import com.gwtplatform.mvp.client.ViewImpl;
public class SpaceSelectorViewImpl extends ViewImpl implements SpaceSelectorView {
- interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> {
- }
- private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class);
- @UiField
- ToggleButton groupButton;
- @UiField
- ToggleButton homeButton;
- @UiField
- HorizontalPanel panel;
- @UiField
- ToggleButton publicButton;
- @UiField
- ToggleButton userButton;
+ interface SpaceSelectorViewImplUiBinder extends UiBinder<Widget, SpaceSelectorViewImpl> {
+ }
+ private static SpaceSelectorViewImplUiBinder uiBinder = GWT.create(SpaceSelectorViewImplUiBinder.class);
+ @UiField
+ ToggleButton groupButton;
+ @UiField
+ ToggleButton homeButton;
+ @UiField
+ HorizontalPanel panel;
+ @UiField
+ ToggleButton publicButton;
+ @UiField
+ ToggleButton userButton;
- @Inject
- public SpaceSelectorViewImpl(final GSpaceArmor armor, final I18nTranslationService i18n, final WsArmorResources res) {
- armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0);
- Tooltip.to(homeButton, i18n.t("Your home page in this site"));
- Tooltip.to(userButton, i18n.t("User space: it shows a list of all your documents and contents "
- + "in which you participate"));
- Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create "
- + "and publish contents for your personal or group web spaces"));
- Tooltip.to(publicButton, i18n.t("Public space: In this space you can see a preview of how the Personal o"
- + "r Group Space looks like on the web, outside this site"));
- }
+ @Inject
+ public SpaceSelectorViewImpl(final GSpaceArmor armor, final I18nTranslationService i18n,
+ final WsArmorResources res) {
+ armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0);
+ homeButton.setVisible(false);
+ Tooltip.to(homeButton, i18n.t("Your home page in this site"));
+ Tooltip.to(userButton, i18n.t("User space: it shows a list of all your documents and contents "
+ + "in which you participate"));
+ Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create "
+ + "and publish contents for your personal or group web spaces"));
+ Tooltip.to(publicButton,
+ i18n.t("Public space: In this space you can see a preview of how the Personal o"
+ + "r Group Space looks like on the web, outside this site"));
+ }
- @Override
- public Widget asWidget() {
- return panel;
- }
+ @Override
+ public Widget asWidget() {
+ return panel;
+ }
- @Override
- public HasClickHandlers getGroupBtn() {
- return groupButton;
- }
+ @Override
+ public HasClickHandlers getGroupBtn() {
+ return groupButton;
+ }
- @Override
- public HasClickHandlers getHomeBtn() {
- return homeButton;
- }
+ @Override
+ public HasClickHandlers getHomeBtn() {
+ return homeButton;
+ }
- @Override
- public HasClickHandlers getPublicBtn() {
- return publicButton;
- }
+ @Override
+ public HasClickHandlers getPublicBtn() {
+ return publicButton;
+ }
- @Override
- public HasClickHandlers getUserBtn() {
- return userButton;
- }
+ @Override
+ public HasClickHandlers getUserBtn() {
+ return userButton;
+ }
- @Override
- public void setGroupBtnDown(final boolean down) {
- groupButton.setDown(down);
- }
+ @Override
+ public void setGroupBtnDown(final boolean down) {
+ groupButton.setDown(down);
+ }
- @Override
- public void setHomeBtnDown(final boolean down) {
- homeButton.setDown(down);
- }
+ @Override
+ public void setHomeBtnDown(final boolean down) {
+ homeButton.setDown(down);
+ }
- @Override
- public void setPublicBtnDown(final boolean down) {
- publicButton.setDown(down);
- }
+ @Override
+ public void setPublicBtnDown(final boolean down) {
+ publicButton.setDown(down);
+ }
- @Override
- public void setUserBtnDown(final boolean down) {
- userButton.setDown(down);
- }
+ @Override
+ public void setUserBtnDown(final boolean down) {
+ userButton.setDown(down);
+ }
}
Modified: trunk/src/main/java/cc/kune/core/public/ws.css
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-04-28 13:50:23 UTC (rev 1325)
@@ -1,20 +1,20 @@
@CHARSET "UTF-8";
body {
- background-color: white;
- color: black;
- font-family: 'Ubuntu', Arial;
- font-size: small;
- margin: 5px;
- overflow: hidden;
+ background-color: white;
+ color: black;
+ font-family: 'Ubuntu', Arial;
+ font-size: small;
+ margin: 5px;
+ overflow: hidden;
}
* {
- font-family: 'Ubuntu', Arial;
+ font-family: 'Ubuntu', Arial;
}
body.fontface {
- font: 'Ubuntu', Arial;
+ font: 'Ubuntu', Arial;
}
/*
@@ -27,32 +27,32 @@
}
*/
.gwt-DialogBox {
- border: 2px solid #AAAAAA;
- background-color: white;
+ border: 2px solid #AAAAAA;
+ background-color: white;
}
.gwt-DialogBox .Caption {
- background-image: url(gray_gradient.gif);
- background-repeat: repeat-x;
- padding: 4px;
- padding-bottom: 8px;
- font-weight: bold;
- cursor: default;
+ background-image: url(gray_gradient.gif);
+ background-repeat: repeat-x;
+ padding: 4px;
+ padding-bottom: 8px;
+ font-weight: bold;
+ cursor: default;
}
.gwt-MenuBar {
- background-color: #C3D9FF;
- cursor: default;
+ background-color: #C3D9FF;
+ cursor: default;
}
.gwt-MenuItem {
- font-size: 14px;
- margin: 1px;
- cursor: default;
+ font-size: 14px;
+ margin: 1px;
+ cursor: default;
}
.gwt-MenuItem-selected {
- background-color: #E8EEF7;
+ background-color: #E8EEF7;
}
.gwt-Tree {
@@ -60,26 +60,26 @@
}
.gwt-Tree .gwt-TreeItem {
- font-size: 14px;
- cursor: default;
+ font-size: 14px;
+ cursor: default;
}
.gwt-Tree .gwt-TreeItem-selected {
- background-color: #C3D9FF;
+ background-color: #C3D9FF;
}
.gwt-StackPanel {
- background-color: white;
- border: 1px solid #AAAAAA;
- width: 15em;
+ background-color: white;
+ border: 1px solid #AAAAAA;
+ width: 15em;
}
.gwt-StackPanel .gwt-StackPanelItem {
- background-image: url(blue_gradient.gif);
- background-repeat: repeat-x;
- background-color: #EEEEEE;
- cursor: pointer;
- cursor: hand;
+ background-image: url(blue_gradient.gif);
+ background-repeat: repeat-x;
+ background-color: #EEEEEE;
+ cursor: pointer;
+ cursor: hand;
}
.gwt-StackPanel .gwt-StackPanelItem-selected {
@@ -91,236 +91,236 @@
}
.gwt-TabPanelBottom {
- border-left: 1px solid #87b3ff;
- border-right: 1px solid #87b3ff;
- border-bottom: 1px solid #87b3ff;
+ border-left: 1px solid #87b3ff;
+ border-right: 1px solid #87b3ff;
+ border-bottom: 1px solid #87b3ff;
}
.gwt-TabBar {
- font-size: smaller;
+ font-size: smaller;
}
.gwt-TabBar .gwt-TabBarFirst {
- height: 100%;
- border-bottom: 1px solid #87b3ff;
- border-right: 1px solid #87b3ff;
- padding-left: 3px;
+ height: 100%;
+ border-bottom: 1px solid #87b3ff;
+ border-right: 1px solid #87b3ff;
+ padding-left: 3px;
}
.gwt-TabBar .gwt-TabBarRest {
- border-bottom: 1px solid #87b3ff;
- padding-right: 3px;
+ border-bottom: 1px solid #87b3ff;
+ padding-right: 3px;
}
.gwt-TabBar .gwt-TabBarItem {
- border-top: 1px solid #87b3ff;
- border-bottom: 1px solid #87b3ff;
- padding: 2px;
- cursor: hand;
- white-space: nowrap;
- border-right: 1px solid #87b3ff;
+ border-top: 1px solid #87b3ff;
+ border-bottom: 1px solid #87b3ff;
+ padding: 2px;
+ cursor: hand;
+ white-space: nowrap;
+ border-right: 1px solid #87b3ff;
}
.gwt-TabBar .gwt-TabBarItem-selected {
- font-weight: bold;
- background-color: #e8eef7;
- border-top: 1px solid #87b3ff;
- border-right: 1px solid #87b3ff;
- border-bottom: 1px solid #e8eef7;
- padding: 2px;
- cursor: default;
- white-space: nowrap;
+ font-weight: bold;
+ background-color: #e8eef7;
+ border-top: 1px solid #87b3ff;
+ border-right: 1px solid #87b3ff;
+ border-bottom: 1px solid #e8eef7;
+ padding: 2px;
+ cursor: default;
+ white-space: nowrap;
}
.gwt-PushButton-up {
- background-color: #C3D9FF;
- padding: 2px;
- border: 2px solid transparent;
- border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
- rgb(232, 241, 255);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ border: 2px solid transparent;
+ border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
+ rgb(232, 241, 255);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-PushButton-up-hovering {
- background-color: #C3D9FF;
- padding: 2px;
- border: 2px solid transparent;
- border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
- rgb(232, 241, 255);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ border: 2px solid transparent;
+ border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
+ rgb(232, 241, 255);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-PushButton-down {
- background-color: #C3D9FF;
- padding: 2px;
- border: 2px solid transparent;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ border: 2px solid transparent;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-PushButton-down-hovering {
- background-color: #C3D9FF;
- padding: 2px;
- border: 2px solid transparent;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ border: 2px solid transparent;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-ToggleButton-up {
- background-color: #C3D9FF;
- padding: 2px;
- border: 2px solid transparent;
- border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
- rgb(232, 241, 255);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ border: 2px solid transparent;
+ border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
+ rgb(232, 241, 255);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-ToggleButton-up-hovering {
- background-color: #C3D9FF;
- padding: 2px;
- border: 2px solid transparent;
- border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
- rgb(232, 241, 255);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ border: 2px solid transparent;
+ border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
+ rgb(232, 241, 255);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-ToggleButton-down {
- background-color: #C3D9FF;
- padding: 2px;
- background-color: #E8F1FF;
- border: 2px solid transparent;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ background-color: #E8F1FF;
+ border: 2px solid transparent;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-ToggleButton-down-hovering {
- background-color: #C3D9FF;
- padding: 2px;
- background-color: #E8F1FF;
- border: 2px solid transparent;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
- cursor: pointer;
- cursor: hand;
+ background-color: #C3D9FF;
+ padding: 2px;
+ background-color: #E8F1FF;
+ border: 2px solid transparent;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
+ cursor: pointer;
+ cursor: hand;
}
.gwt-RichTextArea {
- border: 1px solid black;
- background-color: white;
+ border: 1px solid black;
+ background-color: white;
}
.gwt-RichTextToolbar {
- background-color: #C3D9FF;
- padding: 2px;
+ background-color: #C3D9FF;
+ padding: 2px;
}
.gwt-RichTextToolbar .gwt-PushButton-up {
- margin-right: 2px;
- border: 1px solid #C3D9FF;
+ margin-right: 2px;
+ border: 1px solid #C3D9FF;
}
.gwt-RichTextToolbar .gwt-PushButton-up-hovering {
- margin-right: 2px;
- border: 1px solid #C3D9FF;
- border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
- rgb(232, 241, 255);
+ margin-right: 2px;
+ border: 1px solid #C3D9FF;
+ border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
+ rgb(232, 241, 255);
}
.gwt-RichTextToolbar .gwt-PushButton-down {
- margin-right: 2px;
- border: 1px solid #C3D9FF;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
+ margin-right: 2px;
+ border: 1px solid #C3D9FF;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
}
.gwt-RichTextToolbar .gwt-PushButton-down-hovering {
- margin-right: 2px;
- border: 1px solid #C3D9FF;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
+ margin-right: 2px;
+ border: 1px solid #C3D9FF;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
}
.gwt-RichTextToolbar .gwt-ToggleButton-up {
- margin-right: 2px;
- border: 1px solid #C3D9FF;
+ margin-right: 2px;
+ border: 1px solid #C3D9FF;
}
.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering {
- margin-right: 2px;
- border: 1px solid #C3D9FF;
- border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
- rgb(232, 241, 255);
+ margin-right: 2px;
+ border: 1px solid #C3D9FF;
+ border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205)
+ rgb(232, 241, 255);
}
.gwt-RichTextToolbar .gwt-ToggleButton-down {
- margin-right: 2px;
- background-color: #E8F1FF;
- border: 1px solid #C3D9FF;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
+ margin-right: 2px;
+ background-color: #E8F1FF;
+ border: 1px solid #C3D9FF;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
}
.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering {
- margin-right: 2px;
- background-color: #E8F1FF;
- border: 1px solid #C3D9FF;
- border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
- rgb(157, 174, 205);
+ margin-right: 2px;
+ background-color: #E8F1FF;
+ border: 1px solid #C3D9FF;
+ border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255)
+ rgb(157, 174, 205);
}
.gwt-HorizontalSplitPanel {
- border: 8px solid #C3D9FF;
+ border: 8px solid #C3D9FF;
}
.gwt-HorizontalSplitPanel .splitter {
- background-color: #C3D9FF;
- cursor: move;
+ background-color: #C3D9FF;
+ cursor: move;
}
.gwt-HorizontalSplitPanel .left {
- background-color: #E8EEF7;
+ background-color: #E8EEF7;
}
.gwt-VerticalSplitPanel {
- border: 8px solid #C3D9FF;
+ border: 8px solid #C3D9FF;
}
.gwt-VerticalSplitPanel .splitter {
- background-color: #C3D9FF;
- height: 8px;
- cursor: move;
+ background-color: #C3D9FF;
+ height: 8px;
+ cursor: move;
}
.gwt-SuggestBoxPopup {
- border: 2px solid #C3D9FF;
+ border: 2px solid #C3D9FF;
}
.gwt-SuggestBoxPopup .item {
- padding: 2px;
+ padding: 2px;
}
.gwt-SuggestBoxPopup .item-selected {
- background-color: #C3D9FF;
- padding: 2px;
+ background-color: #C3D9FF;
+ padding: 2px;
}
.gwt-DisclosurePanel {
- border: 2px solid #C3D9FF;
+ border: 2px solid #C3D9FF;
}
.gwt-DisclosurePanel .header {
- background-color: #e8eef7;
- cursor: hand;
+ background-color: #e8eef7;
+ cursor: hand;
}
.gwt-SplitLayoutPanel {
@@ -328,85 +328,89 @@
}
.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger {
- background-color: transparent;
- background: url("images/spliter-top.png") no-repeat scroll center bottom
- transparent;
- cursor: col-resize;
+ background-color: transparent;
+ background: url("images/spliter-top.png") no-repeat scroll center bottom
+ transparent;
+ cursor: col-resize;
}
.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger {
- background-color: white;
- background: none;
- cursor: row-resize;
+ background-color: white;
+ background: none;
+ cursor: row-resize;
}
.kLoadingPanel {
- background-color: #FF9999;
- -webkit-border-bottom-left-radius: 4px;
- -moz-border-radius-bottomleft: 4px;
- border-bottom-left-radius: 4px;
- -webkit-border-bottom-right-radius: 4px;
- -moz-border-radius-bottomright: 4px;
- border-bottom-right-radius: 4px;
- padding: 0 1px 0 3px;
- border-collapse: separate;
- border-spacing: 2px;
+ background-color: #FF9999;
+ -webkit-border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomleft: 4px;
+ border-bottom-left-radius: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
+ border-bottom-right-radius: 4px;
+ padding: 0 1px 0 3px;
+ border-collapse: separate;
+ border-spacing: 2px;
}
.kLoadingLabel {
- font-size: 14px;
- color: white;
- font-weight: bold;
- padding: 0 5px 0 5px;
+ font-size: 14px;
+ color: white;
+ font-weight: bold;
+ padding: 0 5px 0 5px;
}
.k-space-tooltip {
- border-collapse: separate;
- border-spacing: 5px;
- vertical-align: middle;
- line-height: 1.1em;
+ border-collapse: separate;
+ border-spacing: 5px;
+ vertical-align: middle;
+ line-height: 1.1em;
}
.k-space-sel {
- margin-right: 10px;
- background-color: #F2F2F2;
+ margin-right: 10px;
+ background-color: #F2F2F2;
}
.k-space-sel-btn {
- padding: 0 1px 0 1px;
- margin: 0 0 -2px;
+ padding: 0 1px 0 1px;
+ margin: 0 0 -2px;
}
.k-sitebar-logo {
- margin-top: 2px;
+ margin-top: 2px;
}
.x-btn button,button { /* font: 18px/27px 'Ubuntu', arial; */
}
+.x-panel-mc {
+ font: inherit;
+}
+
.k-btn-sitebar span,.k-btn-sitebar button span,.k-sitebar button span {
- text-decoration: underline;
+ text-decoration: underline;
}
.k-btn-sitebar,.k-btn-sitebar button,.k-sitebar button {
- font: 13px 'Ubuntu', arial;
- color: #B3B3B3;
- cursor: pointer;
- white-space: nowrap;
- background: none;
- border: 0px;
- padding: 0 3px 0 0 !important;
+ font: 13px 'Ubuntu', arial;
+ color: #B3B3B3;
+ cursor: pointer;
+ white-space: nowrap;
+ background: none;
+ border: 0px;
+ padding: 0 3px 0 0 !important;
}
.k-sitebar-wave-status {
- font: 13px 'Ubuntu', arial;
- /* font-weight: bold; */
- color: #B3B3B3;
- white-space: nowrap;
- background: none;
- border: 0px;
- padding: 1px 7px 0 0 !important;
+ font: 13px 'Ubuntu', arial;
+ /* font-weight: bold; */
+ color: #B3B3B3;
+ white-space: nowrap;
+ background: none;
+ border: 0px;
+ padding: 1px 7px 0 0 !important;
}
.k-sitebar-wave-status {
@@ -414,20 +418,20 @@
}
.k-sitebar-wave-status-online {
- color: green;
+ color: green;
}
.k-sitebar-wave-status-offline {
- color: red;
+ color: red;
}
.k-sitebar button:hover {
- border: 0px;
- background: none;
+ border: 0px;
+ background: none;
}
.k-btn-sitebar button {
- margin-top: -5px;
+ margin-top: -5px;
}
.k-sitebar { /* margin-top: -30px; */
@@ -435,247 +439,247 @@
}
.k-link {
- text-decoration: underline;
- color: green;
- cursor: pointer;
+ text-decoration: underline;
+ color: green;
+ cursor: pointer;
}
/* Margins */
.kune-Margin-40-trbl {
- margin: 40px;
+ margin: 40px;
}
.kune-Margin-40-lr {
- margin-left: 40px;
- margin-right: 40px;
+ margin-left: 40px;
+ margin-right: 40px;
}
.kune-Margin-40-tl {
- margin-top: 40px;
- margin-left: 40px;
+ margin-top: 40px;
+ margin-left: 40px;
}
.kune-Margin-40-tb {
- margin-top: 40px;
- margin-bottom: 40px;
+ margin-top: 40px;
+ margin-bottom: 40px;
}
.kune-Margin-40-t {
- margin-top: 40px;
+ margin-top: 40px;
}
.kune-Margin-40-r {
- margin-right: 40px;
+ margin-right: 40px;
}
.kune-Margin-40-l {
- margin-left: 40px;
+ margin-left: 40px;
}
.kune-Margin-20-trbl {
- margin: 20px;
+ margin: 20px;
}
.kune-Margin-20-lr {
- margin-left: 20px;
- margin-right: 20px;
+ margin-left: 20px;
+ margin-right: 20px;
}
.kune-Margin-20-tl {
- margin-top: 20px;
- margin-left: 20px;
+ margin-top: 20px;
+ margin-left: 20px;
}
.kune-Margin-20-tb {
- margin-top: 20px;
- margin-bottom: 20px;
+ margin-top: 20px;
+ margin-bottom: 20px;
}
.kune-Margin-20-t {
- margin-top: 20px;
+ margin-top: 20px;
}
.kune-Margin-20-r {
- margin-right: 20px;
+ margin-right: 20px;
}
.kune-Margin-20-l {
- margin-left: 20px;
+ margin-left: 20px;
}
.kune-Margin-Large-trbl {
- margin: 10px;
+ margin: 10px;
}
.kune-Margin-Large-lr {
- margin-left: 10px;
- margin-right: 10px;
+ margin-left: 10px;
+ margin-right: 10px;
}
.kune-Margin-Large-tl {
- margin-top: 10px;
- margin-left: 10px;
+ margin-top: 10px;
+ margin-left: 10px;
}
.kune-Margin-Large-tb {
- margin-top: 10px;
- margin-bottom: 10px;
+ margin-top: 10px;
+ margin-bottom: 10px;
}
.kune-Margin-Large-t {
- margin-top: 10px;
+ margin-top: 10px;
}
.kune-Margin-Large-r {
- margin-right: 10px;
+ margin-right: 10px;
}
.kune-Margin-Large-l {
- margin-left: 10px;
+ margin-left: 10px;
}
.kune-Margin-7-trbl {
- margin: 7px;
+ margin: 7px;
}
.kune-Margin-7-lr {
- margin-left: 7px;
- margin-right: 7px;
+ margin-left: 7px;
+ margin-right: 7px;
}
.kune-Margin-7-tl {
- margin-top: 7px;
- margin-left: 7px;
+ margin-top: 7px;
+ margin-left: 7px;
}
.kune-Margin-7-tb {
- margin-top: 7px;
- margin-bottom: 7px;
+ margin-top: 7px;
+ margin-bottom: 7px;
}
.kune-Margin-7-t {
- margin-top: 7px;
+ margin-top: 7px;
}
.kune-Margin-7-r {
- margin-right: 7px;
+ margin-right: 7px;
}
.kune-Margin-7-b {
- margin-bottom: 7px;
+ margin-bottom: 7px;
}
.kune-Margin-7-l {
- margin-left: 7px;
+ margin-left: 7px;
}
.kune-Margin-Medium-trbl {
- margin: 5px;
+ margin: 5px;
}
.kune-Margin-Medium-lr {
- margin-left: 5px;
- margin-right: 5px;
+ margin-left: 5px;
+ margin-right: 5px;
}
.kune-Margin-Medium-tl {
- margin-top: 5px;
- margin-left: 5px;
+ margin-top: 5px;
+ margin-left: 5px;
}
.kune-Margin-Medium-tb {
- margin-top: 5px;
- margin-bottom: 5px;
+ margin-top: 5px;
+ margin-bottom: 5px;
}
.kune-Margin-Medium-t {
- margin-top: 5px;
+ margin-top: 5px;
}
.kune-Margin-Medium-r {
- margin-right: 5px;
+ margin-right: 5px;
}
.kune-Margin-Medium-b {
- margin-bottom: 5px;
+ margin-bottom: 5px;
}
.kune-Margin-Medium-l {
- margin-left: 5px;
+ margin-left: 5px;
}
.kune-Margin-Small-trbl {
- margin: 3px;
+ margin: 3px;
}
.kune-Margin-Small-lr {
- margin-left: 3px;
- margin-right: 3px;
+ margin-left: 3px;
+ margin-right: 3px;
}
.kune-Margin-Small-tl {
- margin-top: 3px;
- margin-left: 3px;
+ margin-top: 3px;
+ margin-left: 3px;
}
.kune-Margin-Small-tb {
- margin-top: 3px;
- margin-bottom: 3px;
+ margin-top: 3px;
+ margin-bottom: 3px;
}
.kune-Margin-Small-t {
- margin-top: 3px;
+ margin-top: 3px;
}
.kune-Margin-Small-l {
- margin-left: 3px;
+ margin-left: 3px;
}
.kune-Margin-Small-r {
- margin-right: 3px;
+ margin-right: 3px;
}
.kune-Margin-Small-b {
- margin-bottom: 3px;
+ margin-bottom: 3px;
}
.kune-Margin-Mini-trbl {
- margin: 1px;
+ margin: 1px;
}
.kune-Margin-Mini-lr {
- margin-left: 1px;
- margin-right: 1px;
+ margin-left: 1px;
+ margin-right: 1px;
}
.kune-Margin-Mini-tl {
- margin-top: 1px;
- margin-left: 1px;
+ margin-top: 1px;
+ margin-left: 1px;
}
.kune-Margin-Mini-tb {
- margin-top: 1px;
- margin-bottom: 1px;
+ margin-top: 1px;
+ margin-bottom: 1px;
}
.kune-Margin-Mini-t {
- margin-top: 1px;
+ margin-top: 1px;
}
.kune-Margin-Mini-r {
- margin-right: 1px;
+ margin-right: 1px;
}
.kune-Margin-Mini-b {
- margin-bottom: 1px;
+ margin-bottom: 1px;
}
.kune-Margin-Mini-l {
- margin-left: 1px;
+ margin-left: 1px;
}
.k-publicspace-msg {
- background-color: #E0E0E0;
+ background-color: #E0E0E0;
}
.k-publicspace-mask { /* background-color: #fff !important;
@@ -687,147 +691,147 @@
}
.k-publicspace-panel {
- margin: 5px;
- display: table-row;
+ margin: 5px;
+ display: table-row;
}
.k-publicspace-icon {
- margin: 3px 3px 3px 0;
- float: left;
+ margin: 3px 3px 3px 0;
+ float: left;
}
.k-publicspace-title {
- font-weight: bold;
- display: block;
- margin-bottom: 5px;
- font-size: 16px;
- display: table-caption;
+ font-weight: bold;
+ display: block;
+ margin-bottom: 5px;
+ font-size: 16px;
+ display: table-caption;
}
.k-publicspace-description {
- font-size: 14px;
- display: table-cell;
+ font-size: 14px;
+ display: table-cell;
}
.k-publicspace-actions {
- display: inline;
+ display: inline;
}
.k-message-panel {
- margin: 5px;
- display: table-row;
+ margin: 5px;
+ display: table-row;
}
.k-message-icon {
- margin: 3px 3px 3px 0;
- float: left;
+ margin: 3px 3px 3px 0;
+ float: left;
}
.k-message-title {
- font-weight: bold;
- display: block;
- margin-bottom: 5px;
- font-size: 16px;
- display: table-caption;
+ font-weight: bold;
+ display: block;
+ margin-bottom: 5px;
+ font-size: 16px;
+ display: table-caption;
}
.k-message-description {
- font-size: 14px;
- display: table-cell;
+ font-size: 14px;
+ display: table-cell;
}
.k-error-tb {
- background: #FFB380 none repeat scroll 0% 50%;
- /* color: #250; */
- padding: 10px;
+ background: #FFB380 none repeat scroll 0% 50%;
+ /* color: #250; */
+ padding: 10px;
}
.k-error-tb img {
- margin: 0 10px;
- float: left;
+ margin: 0 10px;
+ float: left;
}
.k-error-tb div {
- font-size: 14px;
- display: table-cell;
+ font-size: 14px;
+ display: table-cell;
}
.k-mask {
- background-color: #F2F2F2 !important;
- /* kfilter: alpha(opacity = 78) !important; */
- -moz-opacity: 0.78 !important;
- -khtml-opacity: 0.78 !important;
- opacity: 0.78 !important;
+ background-color: #F2F2F2 !important;
+ /* kfilter: alpha(opacity = 78) !important; */
+ -moz-opacity: 0.78 !important;
+ -khtml-opacity: 0.78 !important;
+ opacity: 0.78 !important;
}
.x-form-item-label {
- font-size: 14px;
- font-weight: bold;
- color: brown;
+ font-size: 14px;
+ font-weight: bold;
+ color: brown;
}
.x-form-text {
- font-size: 14px;
+ font-size: 14px;
}
.x-fieldset-header-text,.x-form-group-label,.x-form-cb-label {
- font-size: 14px;
- font-family: 'Ubuntu', Arial;
+ font-size: 14px;
+ font-family: 'Ubuntu', Arial;
}
.k-form-intro {
- font-size: 14px;
- margin-bottom: 10px;
+ font-size: 14px;
+ margin-bottom: 10px;
}
.k-form-fieldset {
- font-size: 16px;
- margin-left: 105px;
+ font-size: 16px;
+ margin-left: 105px;
}
.k-basic-thumb {
- background-color: #F2F2F2;
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
+ background-color: #F2F2F2;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ border-radius: 2px;
}
.k-basic-thumb img {
- margin: 2px 2px 0px 2px;
+ margin: 2px 2px 0px 2px;
}
.k-basic-thumb div {
- margin: -3px 0px 0px 0px;
- font-weight: normal;
- font-size: 12px;
+ margin: -3px 0px 0px 0px;
+ font-weight: normal;
+ font-size: 12px;
}
.k-sn-mainpanel {
- font-size: 16px;
- font-weight: bold;
+ font-size: 16px;
+ font-weight: bold;
}
.k-sn-maintitle {
- margin: 5px;
+ margin: 5px;
}
.k-sn-maintitle {
- color: #a05a2c;
- font-size: 20px;
+ color: #a05a2c;
+ font-size: 20px;
}
.k-sn-adminslabel,.k-sn-collabslabel,.k-sn-pendingslabel {
- color: #FFF;
- text-transform: lowercase;
- padding-left: 10px;
- float: left;
+ color: #FFF;
+ text-transform: lowercase;
+ padding-left: 10px;
+ float: left;
}
.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel
- {
- float: left;
- padding-left: 5px;
- color: #e0e0e0;
+ {
+ float: left;
+ padding-left: 5px;
+ color: #e0e0e0;
}
.k-sn-adminslabel {
@@ -835,7 +839,7 @@
}
.k-sn-mainpanel .k-basic-thumb {
- float: left;
+ float: left;
}
/*
@@ -845,41 +849,42 @@
}
*/
.k-sn-mainpanel .x-btn button,.k-sn-mainpanel button,button.k-button {
- font: 13px 'Ubuntu', arial;
- border: 2px solid #CCCCCC;
- cursor: pointer;
- margin: 0;
- padding: 3px 0;
- text-decoration: none;
- background-color: #F2F2F2;
- color: #855585;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
- vertical-align: middle;
- line-height: 2em !important;
- /* height: 26px !important; */
- font-weight: bold;
- /*
+ font: 13px 'Ubuntu', arial;
+ border: 2px solid #CCCCCC;
+ cursor: pointer;
+ margin: 0;
+ padding: 3px 0;
+ text-decoration: none;
+ background-color: #F2F2F2;
+ color: #A05A2C;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ vertical-align: middle;
+ line-height: 2em !important;
+ /* height: 26px !important; */
+ font-weight: bold;
+ /*
font-size:small;
cursor: pointer;
border: 2px gray solid;
padding-left: 25px !important; */
}
-.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover,.k-button button:hover
- {
- border: 2px orange solid;
- background: #f0f0f0;
- color: #855585;
+.k-sn-mainpanel .x-btn button:hover,.k-sn-mainpanel button:hover,button.k-button:hover {
+ border: 2px orange solid;
+ /* background: #f0f0f0; */
}
-.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active,.k-button
- button:active {
- border-top-color: #ffffff;
- background: #ffffff;
+.k-sn-mainpanel .x-btn button:hover span,.k-sn-mainpanel button:hover span,button.k-button:hover span {
+ color: brown !important;
}
+.k-sn-mainpanel .x-btn button:active,.k-sn-mainpanel button:active,button.k-button:active {
+ border-top-color: #ffffff;
+ background: #ffffff;
+}
+
.k-sn-collabslabel {
}
@@ -889,20 +894,20 @@
}
.k-sn-orphan-label {
- padding: 10px;
+ padding: 10px;
}
.k-sn-novisible-label {
- padding: 10px;
+ padding: 10px;
}
.k-sn-adminspanel { /* background-color: #a05a2c; */
- border-bottom: 2px solid #F7EBE3;
- border-top: 2px solid #F7EBE3;
+ border-bottom: 2px solid #F7EBE3;
+ border-top: 2px solid #F7EBE3;
}
.k-sn-collabspanel {
- background-color: #d38d5f;
+ background-color: #d38d5f;
}
.k-sn-pendingspanel { /* background-color: #a05a2c; */
@@ -914,7 +919,7 @@
}
.k-sn-adminsflow,.k-sn-collabsflow,.k-sn-pendingsflow {
- margin-left: 10px;
+ margin-left: 10px;
}
.k-sn-adminsscroll {
@@ -930,8 +935,8 @@
}
.k-userconfirm-label {
- width: 300px;
- margin: 10px;
+ width: 300px;
+ margin: 10px;
}
.k-sn-deck {
@@ -939,159 +944,159 @@
}
.k-sn-bottomPanel {
- padding: 8px 10px 0;
- float: left;
+ padding: 8px 10px 0;
+ float: left;
}
.k-sn-bottomPanel-actions {
- width: 100%;
+ width: 100%;
}
.k-sn-novisible-label,.k-sn-orphan-label {
- color: #FFF;
- font-size: 16px;
- font-weight: bold;
+ color: #FFF;
+ font-size: 16px;
+ font-weight: bold;
}
.k-frame-def {
- margin: 0px;
- border: 0px;
+ margin: 0px;
+ border: 0px;
}
.k-maxsize {
- width: 100%;
- height: 100%;
+ width: 100%;
+ height: 100%;
}
.k-footer-license-label {
- float: right;
- margin-top: 8px;
- cursor: pointer;
- font-weight: bold;
- font-size: 16px;
- color: #784421;
+ float: right;
+ margin-top: 8px;
+ cursor: pointer;
+ font-weight: bold;
+ font-size: 16px;
+ color: #784421;
}
.k-footer-license-label-title {
- margin-right: 5px;
- color: #280b0b;
+ margin-right: 5px;
+ color: #280b0b;
}
.k-footer-license-img {
- float: right;
- margin: 10px 15px 0px 5px;
- cursor: pointer;
+ float: right;
+ margin: 10px 15px 0px 5px;
+ cursor: pointer;
}
.k-sn-options-menu {
- float: left;
+ float: left;
}
.k-sn-options-menu button {
- background-color: none;
+ background-color: none;
}
.k-sn-join {
- float: left;
+ float: left;
}
.k-entitytextlogo-border {
- border: 2px solid #F2F2F2;
+ border: 2px solid #F2F2F2;
}
.k-entitytextlogo-no-border {
- border: none;
+ border: none;
}
.k-entitytextlogo {
- height: 60px;
- margin: 5px;
- overflow: hidden;
- width: 468px;
+ height: 60px;
+ margin: 5px;
+ overflow: hidden;
+ width: 468px;
}
.k-entitytextlogo table {
- vertical-align: middle;
+ vertical-align: middle;
}
.k-elogo-l-l {
- font-size: 46px;
+ font-size: 46px;
}
.k-elogo-l-m {
- font-size: 167%;
+ font-size: 167%;
}
.k-elogo-l-s {
- font-size: 108%;
+ font-size: 108%;
}
.k-entitytextlogo .gwt-Label {
- font-weight: 700;
- margin: 5px;
- height: 27px;
+ font-weight: 700;
+ margin: 5px;
+ height: 27px;
}
.k-entitytextlogo-default .gwt-Label {
- color: #69312F;
+ color: #69312F;
}
.k-entitytextlogo-green .gwt-Label {
- color: #250;
+ color: #250;
}
.k-entitytextlogo-blue .gwt-Label {
- color: #000080;
+ color: #000080;
}
.k-entitytextlogo-grey .gwt-Label {
- color: #1A1A1A;
+ color: #1A1A1A;
}
.k-entitytextlogo-purple .gwt-Label {
- color: #440055;
+ color: #440055;
}
.k-entitytextlogo-red .gwt-Label {
- color: #800000;
+ color: #800000;
}
.k-elogo-plink {
- color: #CCC;
- font-size: 85%;
- margin: 5px;
- text-decoration: underline;
- white-space: nowrap;
- background-color: #FFF;
+ color: #CCC;
+ font-size: 85%;
+ margin: 5px;
+ text-decoration: underline;
+ white-space: nowrap;
+ background-color: #FFF;
}
.k-elogop-expand {
- background-color: transparent;
+ background-color: transparent;
}
.k-tsp-tag {
- float: left;
- padding: 3px;
- cursor: pointer;
- color: #5B4683;
+ float: left;
+ padding: 3px;
+ cursor: pointer;
+ color: #5B4683;
}
.k-tsp-cloud {
- line-height: 1em;
- text-align: center;
+ line-height: 1em;
+ text-align: center;
}
.k-tool-panel {
- background-color: #DEAA87;
+ background-color: #DEAA87;
}
.k-tool-item {
- display: block;
- cursor: pointer;
+ display: block;
+ cursor: pointer;
}
.k-tool-item-focus {
- background-color: #d38d5f;
+ background-color: #d38d5f;
}
.k-tool-item-nofocus {
@@ -1099,26 +1104,26 @@
}
.k-tool-item-selected {
- background-color: #C87137;
+ background-color: #C87137;
}
.k-tool-item-notselected {
- background-color: inherits;
+ background-color: inherits;
}
.k-def-docbtn span {
- font-size: 13px !important;
+ font-size: 13px !important;
}
.k-empty-msg {
- font-size: 16px;
- font-style: italic;
+ font-size: 16px;
+ font-style: italic;
}
button.k-ent-header-btn {
- margin: 10px !important;
+ margin-left: 5px !important;
}
.k-ent-header-btn * {
font-size: 13px !important;
-}
+}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.ui.xml 2011-04-28 13:50:23 UTC (rev 1325)
@@ -60,7 +60,7 @@
<g:west size="10">
<g:SimplePanel />
</g:west>
- <g:east size="15">
+ <g:east size="10">
<g:SimplePanel />
</g:east>
<g:center>
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -20,53 +20,55 @@
public class NewContainerBtn extends ButtonDescriptor {
- public static class NewContainerAction extends RolAction {
+ public static class NewContainerAction extends RolAction {
- private final ContentCache cache;
- private final Provider<ContentServiceAsync> contentService;
- private final I18nTranslationService i18n;
- private final Session session;
- private final StateManager stateManager;
+ private final ContentCache cache;
+ private final Provider<ContentServiceAsync> contentService;
+ private final I18nTranslationService i18n;
+ private final Session session;
+ private final StateManager stateManager;
- @Inject
- public NewContainerAction(final Session session, final StateManager stateManager,
- final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService,
- final ContentCache cache) {
- super(AccessRolDTO.Editor, true);
- this.session = session;
- this.stateManager = stateManager;
- this.i18n = i18n;
- this.contentService = contentService;
- this.cache = cache;
- }
+ @Inject
+ public NewContainerAction(final Session session, final StateManager stateManager,
+ final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService,
+ final ContentCache cache) {
+ super(AccessRolDTO.Editor, true);
+ this.session = session;
+ this.stateManager = stateManager;
+ this.i18n = i18n;
+ this.contentService = contentService;
+ this.cache = cache;
+ }
- @Override
- public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
- stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken());
- contentService.get().addFolder(session.getUserHash(), session.getCurrentStateToken(),
- (String) getValue(NEW_NAME), (String) getValue(ID), new AsyncCallbackSimple<StateContainerDTO>() {
- @Override
- public void onSuccess(final StateContainerDTO state) {
- // contextNavigator.setEditOnNextStateChange(true);
- stateManager.setRetrievedStateAndGo(state);
- NotifyUser.hideProgress();
- }
- });
- cache.removeContent(session.getCurrentStateToken());
- }
-
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgressProcessing();
+ stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken());
+ contentService.get().addFolder(session.getUserHash(), session.getCurrentStateToken(),
+ (String) getValue(NEW_NAME), (String) getValue(ID),
+ new AsyncCallbackSimple<StateContainerDTO>() {
+ @Override
+ public void onSuccess(final StateContainerDTO state) {
+ // contextNavigator.setEditOnNextStateChange(true);
+ stateManager.setRetrievedStateAndGo(state);
+ NotifyUser.hideProgress();
+ }
+ });
+ cache.removeContent(session.getCurrentStateToken());
}
- private static final String ID = "ctnernewid";
- private static final String NEW_NAME = "ctnernewname";
+ }
- public NewContainerBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res,
- final String title, final String tooltip, final String newName, final String id) {
- super(action);
- // The name given to this new content
- action.putValue(NEW_NAME, newName);
- action.putValue(ID, id);
- this.withText(title).withToolTip(tooltip).withIcon(res.folderAdd()).withStyles("k-def-docbtn");
- }
+ private static final String ID = "ctnernewid";
+ private static final String NEW_NAME = "ctnernewname";
+
+ public NewContainerBtn(final I18nTranslationService i18n, final NewContainerAction action,
+ final NavResources res, final String title, final String tooltip, final String newName,
+ final String id) {
+ super(action);
+ // The name given to this new content
+ action.putValue(NEW_NAME, newName);
+ action.putValue(ID, id);
+ this.withText(title).withToolTip(tooltip).withIcon(res.folderAdd()).withStyles("k-def-docbtn, k-fr");
+ }
}
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentBtn.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -23,56 +23,57 @@
public class NewContentBtn extends ButtonDescriptor {
- public static class NewContentAction extends RolAction {
+ public static class NewContentAction extends RolAction {
- private final ContentCache cache;
- private final Provider<ContentServiceAsync> contentService;
- private final Session session;
- private final StateManager stateManager;
+ private final ContentCache cache;
+ private final Provider<ContentServiceAsync> contentService;
+ private final Session session;
+ private final StateManager stateManager;
- @Inject
- public NewContentAction(final Session session, final StateManager stateManager,
- final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService,
- final ContentCache cache) {
- super(AccessRolDTO.Editor, true);
- this.session = session;
- this.stateManager = stateManager;
- this.contentService = contentService;
- this.cache = cache;
- }
+ @Inject
+ public NewContentAction(final Session session, final StateManager stateManager,
+ final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService,
+ final ContentCache cache) {
+ super(AccessRolDTO.Editor, true);
+ this.session = session;
+ this.stateManager = stateManager;
+ this.contentService = contentService;
+ this.cache = cache;
+ }
- @Override
- public void actionPerformed(final ActionEvent event) {
- NotifyUser.showProgressProcessing();
- stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken());
- contentService.get().addContent(session.getUserHash(), session.getCurrentStateToken(),
- (String) getValue(NEW_NAME), (String) getValue(ID), new AsyncCallbackSimple<StateContentDTO>() {
- @Override
- public void onSuccess(final StateContentDTO state) {
- stateManager.setRetrievedStateAndGo(state);
- NotifyUser.hideProgress();
- // stateManager.refreshCurrentGroupState();
- // contextNavigator.setEditOnNextStateChange(true);
- }
- });
- cache.removeContent(session.getCurrentStateToken());
- }
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ NotifyUser.showProgressProcessing();
+ stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken());
+ contentService.get().addContent(session.getUserHash(), session.getCurrentStateToken(),
+ (String) getValue(NEW_NAME), (String) getValue(ID),
+ new AsyncCallbackSimple<StateContentDTO>() {
+ @Override
+ public void onSuccess(final StateContentDTO state) {
+ stateManager.setRetrievedStateAndGo(state);
+ NotifyUser.hideProgress();
+ // stateManager.refreshCurrentGroupState();
+ // contextNavigator.setEditOnNextStateChange(true);
+ }
+ });
+ cache.removeContent(session.getCurrentStateToken());
}
+ }
- private static final String ID = "ctnnewid";
- private static final String NEW_NAME = "ctnnewname";
+ private static final String ID = "ctnnewid";
+ private static final String NEW_NAME = "ctnnewname";
- public NewContentBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res,
- final GlobalShortcutRegister shorcutReg, final String title, final String tooltip, final String newName,
- final String id) {
- super(action);
- // The name given to this new content
- action.putValue(NEW_NAME, newName);
- action.putValue(ID, id);
- final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('N'));
- shorcutReg.put(shortcut, action);
- this.withText(title).withToolTip(tooltip).withIcon(res.pageAdd()).withShortcut(shortcut).withStyles(
- "k-def-docbtn");
- }
+ public NewContentBtn(final I18nTranslationService i18n, final NewContentAction action,
+ final NavResources res, final GlobalShortcutRegister shorcutReg, final String title,
+ final String tooltip, final String newName, final String id) {
+ super(action);
+ // The name given to this new content
+ action.putValue(NEW_NAME, newName);
+ action.putValue(ID, id);
+ final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('N'));
+ shorcutReg.put(shortcut, action);
+ this.withText(title).withToolTip(tooltip).withIcon(res.pageAdd()).withShortcut(shortcut).withStyles(
+ "k-def-docbtn, k-fr");
+ }
}
Modified: trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/resources/wsArmor.css 2011-04-28 13:50:23 UTC (rev 1325)
@@ -2,141 +2,160 @@
@external .*;
.floatLeft {
- float: left;
+ float: left;
}
.mainPanel {
- border-top: 2px solid white;
- border-bottom: 7px solid white;
- border-right: 7px solid white;
- border-left: 7px solid white;
+ border-top: 2px solid white;
+ border-bottom: 7px solid white;
+ border-right: 7px solid white;
+ border-left: 7px solid white;
}
.floatRight {
- float: right;
+ float: right;
}
.siteBar {
- overflow: hidden;
+ overflow: hidden;
}
.entityHeader {
- -webkit-border-top-right-radius: 10px;
- -moz-border-radius-topright: 10px;
- border-top-right-radius: 10px;
- background-color: #f4e3d7;
- overflow: hidden;
+ -webkit-border-top-right-radius: 10px;
+ -moz-border-radius-topright: 10px;
+ border-top-right-radius: 10px;
+ background-color: #f4e3d7;
+ overflow: hidden;
}
.entityFooter {
- -webkit-border-bottom-right-radius: 10px;
- -moz-border-radius-bottomright: 10px;
- border-bottom-right-radius: 10px;
- background-color: #f7ebe3;
- /* padding: 7px 10px 0px 17px; */
- overflow: hidden;
+ -webkit-border-bottom-right-radius: 10px;
+ -moz-border-radius-bottomright: 10px;
+ border-bottom-right-radius: 10px;
+ background-color: #f7ebe3;
+ /* padding: 7px 10px 0px 17px; */
+ overflow: hidden;
}
.entityFooter span {
- color: #784421;
- font-size: 16px;
- font-weight: bold;
+ color: #784421;
+ font-size: 16px;
+ font-weight: bold;
}
.entityHeader span {
- font-size: 56px;
+ font-size: 56px;
/* margin-left: 15px; */
- color: #550000;
- font-weight: bold;
- font: 'UbuntuBold', Arial;
+ color: #550000;
+ font-weight: bold;
+ font: 'UbuntuBold', Arial;
}
.docHeader {
- background-color: #c87137;
- overflow: hidden;
+ background-color: #D38D5F;
+ overflow: hidden;
}
.docHeaderArrow {
- position: relative;
- z-index: 10;
- top: -25px;
- left: 10px;
+ position: relative;
+ z-index: 10;
+ top: -25px;
+ left: 10px;
}
.docHeader span {
- color: #FFF;
- font-size: 28px;
- font-weight: bold;
- margin-left: 15px;
- font: 'UbuntuBold', Arial;
+ color: #FFF;
+ font-size: 26px;
+ font-weight: bold;
+ margin-left: 15px;
+ font: 'UbuntuBold', Arial;
}
+.docHeader img {
+ float: left;
+ margin: 10px -10px 0 10px;
+ background-color: white;
+}
+
.docSubheader {
- background-color: #f7ebe3;
- padding: 15px 0 0 15px;
- overflow: hidden;
+ background-color: #f7ebe3;
+ padding: 15px 0 0 0;
+ overflow: hidden;
+ border-collapse: separate;
}
+.docSubheader button.k-fr {
+ margin: 0 10px 0 0;
+}
+
+.docSubheader button.k-fl {
+ margin: 0 0 0 10px;
+}
+
+.docSubheader button {
+ margin: 0 0 0 10px;
+}
+
.docSubheaderLeft {
- position: relative;
- top: 0;
- left: -30px;
+ position: relative;
+ top: 0;
+ left: -30px;
}
.docSubheader span {
- color: #784421;
- font-size: 20px;
- font-weight: bold;
+ color: #784421;
+ font-size: 20px;
+ font-weight: bold;
}
.docEditorMargin {
- background-color: #f7ebe3;
+ background-color: #f7ebe3;
}
.docEditor {
- background-color: #FFF;
- border-left: 1px solid #959595;
- border-right: 1px solid #959595;
- border-top: 1px solid #959595;
- -webkit-border-top-left-radius: 7px;
- -moz-border-radius-topleft: 7px;
- border-top-left-radius: 7px;
- -webkit-border-top-right-radius: 7px;
- -moz-border-radius-topright: 7px;
- border-top-right-radius: 7px;
- padding: 5px;
+ background-color: #FFF;
+ border-left: 1px solid #959595;
+ border-right: 1px solid #959595;
+ border-top: 1px solid #959595;
+ -webkit-border-top-left-radius: 7px;
+ -moz-border-radius-topleft: 7px;
+ border-top-left-radius: 7px;
+ -webkit-border-top-right-radius: 7px;
+ -moz-border-radius-topright: 7px;
+ border-top-right-radius: 7px;
+ padding: 5px;
}
.docFooter {
- border-left: 1px solid #959595;
- border-right: 1px solid #959595;
- border-bottom: 1px solid #959595;
- background-color: #e3dbdb;
- -webkit-border-bottom-left-radius: 7px;
- -moz-border-radius-bottomleft: 7px;
- border-bottom-left-radius: 7px;
- -webkit-border-bottom-right-radius: 7px;
- -moz-border-radius-bottomright: 7px;
- border-bottom-right-radius: 7px;
- padding: 7px 7px 0 7px;
- overflow: hidden;
- border-collapse: separate;
+ border-left: 1px solid #959595;
+ border-right: 1px solid #959595;
+ border-bottom: 1px solid #959595;
+ background-color: #e3dbdb;
+ -webkit-border-bottom-left-radius: 7px;
+ -moz-border-radius-bottomleft: 7px;
+ border-bottom-left-radius: 7px;
+ -webkit-border-bottom-right-radius: 7px;
+ -moz-border-radius-bottomright: 7px;
+ border-bottom-right-radius: 7px;
+ padding: 7px 7px 0 7px;
+ overflow: hidden;
+ border-collapse: separate;
}
.docFooter span {
- color: #784421;
- font-size: 16px;
- font-weight: bold;
+ color: #784421;
+ font-size: 16px;
+ font-weight: bold;
}
.entityTools {
- -webkit-border-top-left-radius: 10px;
- -moz-border-radius-topleft: 10px;
- border-top-left-radius: 10px;
- -webkit-border-bottom-left-radius: 10px;
- -moz-border-radius-bottomleft: 10px;
- border-bottom-left-radius: 10px;
- background-color: #DEAA87;
+ -webkit-border-top-left-radius: 10px;
+ -moz-border-radius-topleft: 10px;
+ border-top-left-radius: 10px;
+ -webkit-border-bottom-left-radius: 10px;
+ -moz-border-radius-bottomleft: 10px;
+ border-bottom-left-radius: 10px;
+ background-color: #DEAA87;
}
.entityToolsNorth { /* margin: 10px; */
@@ -144,49 +163,49 @@
}
.entityToolsNorth span {
- color: #a05a2c;
- /* font-size: 20px;
+ color: #a05a2c;
+ /* font-size: 20px;
font-weight: bold; */
}
.entityToolsCenter { /* margin: 10px; */
- overflow: visible !important;
+ overflow: visible !important;
}
.entityToolsCenter span {
- color: #FFF;
- font-size: 22px;
- font-weight: bold;
+ color: #FFF;
+ font-size: 26px;
+ font-weight: bold;
}
.entityToolsSouth {
- border-top: 2px solid #FFF;
- padding: 10px;
- border-collapse: separate;
+ border-top: 2px solid #FFF;
+ padding: 10px;
+ border-collapse: separate;
}
.entityToolsSouth span {
- color: #a05a2c;
- font-size: 20px;
- font-weight: bold;
+ color: #a05a2c;
+ font-size: 20px;
+ font-weight: bold;
}
/* Derived from: from http://jonrohan.me/guide/css/creating-triangles-in-css/ */
.docSubheaderArrow {
- border-color: #C87137 transparent transparent transparent;
- border-style: solid;
- border-width: 7px;
- height: 0;
- width: 0;
- position: absolute;
- bottom: 47px;
- left: 36px;
+ border-color: #D38D5F transparent transparent transparent;
+ border-style: solid;
+ border-width: 7px;
+ height: 0;
+ width: 0;
+ position: absolute;
+ bottom: 47px;
+ left: 36px;
}
/* IE6 */
.docSubheaderArrow {
- _border-left-color: pink;
- _border-bottom-color: pink;
- _border-right-color: pink;
- _filter: literal("chroma(color=pink)");
+ _border-left-color: pink;
+ _border-bottom-color: pink;
+ _border-right-color: pink;
+ _filter: literal("chroma(color=pink)");
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-04-28 13:50:23 UTC (rev 1325)
@@ -3,15 +3,15 @@
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:style>
.label {
- text-decoration: none;
- font-size: 22px;
- color: white; /*
- text-shadow: 1px 1px 6px grey;
- */
+ text-decoration: none;
+ font-size: 22px;
+ color: white; /*
+ text-shadow: 1px 1px 6px grey;
+ */
}
.link a:link {
- text-decoration: none;
+ text-decoration: none;
}
.self {
@@ -19,8 +19,10 @@
}
.flow {
- min-height: 30px;
- padding: 5px 10px;
+ min-height: 30px;
+ padding: 5px 10px;
+ -moz-user-select: none;
+ -khtml-user-select: none;
}
.iconLeft {
@@ -28,13 +30,14 @@
}
.iconRight {
- float: right;
- position: relative;
- right: -17px;
- top: -6px;
+ float: right;
+ position: relative;
+ right: -17px;
+ top: -6px;
}
</ui:style>
- <ui:with field='res' type='cc.kune.gspace.client.tool.selector.ToolResources' />
+ <ui:with field='res'
+ type='cc.kune.gspace.client.tool.selector.ToolResources' />
<g:FocusPanel ui:field="self" stylePrimaryName="k-tool-item">
<g:FlowPanel styleName="{style.flow}" ui:field="flow">
<g:Image ui:field="iconLeft" styleName="{style.iconLeft}" />
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -1,66 +1,77 @@
package cc.kune.gspace.client.viewers;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
+import cc.kune.common.client.ui.IconLabel;
import cc.kune.common.client.ui.UiUtils;
+import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
+import cc.kune.core.client.registry.IconsRegistry;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.gspace.client.GSpaceArmor;
import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView;
+import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget;
import com.google.gwt.user.client.ui.Widget;
import com.gwtplatform.mvp.client.ViewImpl;
public abstract class AbstractFolderViewerPanel extends ViewImpl implements FolderViewerView {
- private final InlineLabel emptyLabel;
- protected final GSpaceArmor gsArmor;
- protected final I18nTranslationService i18n;
- protected Widget widget;
+ private final InlineLabel emptyLabel;
+ protected final GSpaceArmor gsArmor;
+ protected final I18nTranslationService i18n;
+ private final IconsRegistry iconRegistry;
+ protected Widget widget;
- public AbstractFolderViewerPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n) {
- this.gsArmor = gsArmor;
- this.i18n = i18n;
- emptyLabel = new InlineLabel(i18n.t("This folder is empty."));
- emptyLabel.setStyleName("k-empty-msg");
- }
+ public AbstractFolderViewerPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n,
+ final ContentCapabilitiesRegistry capabilitiesRegistry) {
+ this.gsArmor = gsArmor;
+ this.i18n = i18n;
+ this.iconRegistry = capabilitiesRegistry.getIconsRegistry();
+ emptyLabel = new InlineLabel(i18n.t("This folder is empty."));
+ emptyLabel.setStyleName("k-empty-msg");
+ }
- @Override
- public Widget asWidget() {
- return widget;
- }
+ @Override
+ public Widget asWidget() {
+ return widget;
+ }
- @Override
- public void attach() {
- final ForIsWidget docContainer = gsArmor.getDocContainer();
- docContainer.add(widget);
- }
+ @Override
+ public void attach() {
+ final ForIsWidget docContainer = gsArmor.getDocContainer();
+ docContainer.add(widget);
+ }
- @Override
- public void clear() {
- gsArmor.getSubheaderToolbar().clear();
- UiUtils.clear(gsArmor.getDocContainer());
- UiUtils.clear(gsArmor.getDocHeader());
- }
+ @Override
+ public void clear() {
+ gsArmor.getSubheaderToolbar().clear();
+ UiUtils.clear(gsArmor.getDocContainer());
+ UiUtils.clear(gsArmor.getDocHeader());
+ }
- @Override
- public void detach() {
- clear();
- }
+ @Override
+ public void detach() {
+ clear();
+ }
- @Override
- public void setActions(final GuiActionDescCollection actions) {
- gsArmor.getSubheaderToolbar().clear();
- gsArmor.getSubheaderToolbar().addAll(actions);
- }
+ @Override
+ public void setActions(final GuiActionDescCollection actions) {
+ gsArmor.getSubheaderToolbar().clear();
+ gsArmor.getSubheaderToolbar().addAll(actions);
+ }
- @Override
- public void setContainer(final StateContainerDTO state) {
- gsArmor.getDocHeader().add(new InlineLabel(state.getTitle()));
- }
+ @Override
+ public void setContainer(final StateContainerDTO state) {
+ // gsArmor.getDocHeader().add(new InlineLabel(state.getTitle()));
+ final IconLabel label = new IconLabel(
+ (ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId()), state.getTitle());
+ label.setStyleName("k-fl");
+ gsArmor.getDocHeader().add(label);
+ }
- @Override
- public void showEmptyMsg() {
- gsArmor.getDocContainer().add(emptyLabel);
- }
+ @Override
+ public void showEmptyMsg() {
+ gsArmor.getDocContainer().add(emptyLabel);
+ }
}
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/DocViewerPanel.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -1,150 +1,158 @@
package cc.kune.gspace.client.viewers;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
+import cc.kune.common.client.ui.IconLabel;
import cc.kune.common.client.ui.UiUtils;
+import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
+import cc.kune.core.client.registry.IconsRegistry;
import cc.kune.core.shared.dto.StateContentDTO;
import cc.kune.gspace.client.GSpaceArmor;
import cc.kune.gspace.client.viewers.DocViewerPresenter.DocViewerView;
import cc.kune.wave.client.WaveClientManager;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ImageResource;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.DeckPanel;
import com.google.gwt.user.client.ui.InlineHTML;
-import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget;
import com.google.gwt.user.client.ui.Widget;
import com.google.inject.Inject;
import com.gwtplatform.mvp.client.ViewImpl;
public class DocViewerPanel extends ViewImpl implements DocViewerView {
- interface DocsViewerPanelUiBinder extends UiBinder<Widget, DocViewerPanel> {
- }
+ interface DocsViewerPanelUiBinder extends UiBinder<Widget, DocViewerPanel> {
+ }
- private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class);
+ private static DocsViewerPanelUiBinder uiBinder = GWT.create(DocsViewerPanelUiBinder.class);
- // private RemoteViewServiceMultiplexer channel;
- @UiField
- DeckPanel deck;
- private final GSpaceArmor gsArmor;
- // private IdGenerator idGenerator;
- // private final Element loading = new LoadingIndicator().getElement();
- @UiField
- InlineHTML onlyViewPanel;
- // private ProfileManager profiles;
- /** The wave panel, if a wave is open. */
- // private StagesProvider wave;
- // private final WaveClientManager waveClientManager;
- // @UiField
- // FramedPanel waveFrame;
- // @UiField
- // ImplPanel waveHolder;
- // private final WaveStore waveStore = new SimpleWaveStore();
- private final Widget widget;
+ // private RemoteViewServiceMultiplexer channel;
+ @UiField
+ DeckPanel deck;
+ private final GSpaceArmor gsArmor;
+ private final IconsRegistry iconRegistry;
+ // private IdGenerator idGenerator;
+ // private final Element loading = new LoadingIndicator().getElement();
+ @UiField
+ InlineHTML onlyViewPanel;
+ // private ProfileManager profiles;
+ /** The wave panel, if a wave is open. */
+ // private StagesProvider wave;
+ // private final WaveClientManager waveClientManager;
+ // @UiField
+ // FramedPanel waveFrame;
+ // @UiField
+ // ImplPanel waveHolder;
+ // private final WaveStore waveStore = new SimpleWaveStore();
+ private final Widget widget;
- @Inject
- public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClientManager) {
- this.gsArmor = wsArmor;
- // this.waveClientManager = waveClientManager;
- widget = uiBinder.createAndBindUi(this);
- }
+ @Inject
+ public DocViewerPanel(final GSpaceArmor wsArmor, final WaveClientManager waveClientManager,
+ final ContentCapabilitiesRegistry capabilitiesRegistry) {
+ this.gsArmor = wsArmor;
+ this.iconRegistry = capabilitiesRegistry.getIconsRegistry();
+ // this.waveClientManager = waveClientManager;
+ widget = uiBinder.createAndBindUi(this);
+ }
- @Override
- public Widget asWidget() {
- return widget;
- }
+ @Override
+ public Widget asWidget() {
+ return widget;
+ }
- @Override
- public void attach() {
- final ForIsWidget docContainer = gsArmor.getDocContainer();
- docContainer.add(widget);
- }
+ @Override
+ public void attach() {
+ final ForIsWidget docContainer = gsArmor.getDocContainer();
+ docContainer.add(widget);
+ }
- @Override
- public void clear() {
- onlyViewPanel.setHTML("");
- gsArmor.getSubheaderToolbar().clear();
- UiUtils.clear(gsArmor.getDocContainer());
- UiUtils.clear(gsArmor.getDocHeader());
- }
+ @Override
+ public void clear() {
+ onlyViewPanel.setHTML("");
+ gsArmor.getSubheaderToolbar().clear();
+ UiUtils.clear(gsArmor.getDocContainer());
+ UiUtils.clear(gsArmor.getDocHeader());
+ }
- @Override
- public void detach() {
- clear();
- }
+ @Override
+ public void detach() {
+ clear();
+ }
- // private WaveRef getWaveRef(final String waveRefS) {
- // try {
- // return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS);
- // } catch (final InvalidWaveRefException e) {
- // throw new UIException("Invalid waveref: " + waveRefS);
- // }
- // }
- //
- // private void initWaveClientIfNeeded() {
- // if (channel == null) {
- // final WaveWebSocketClient webSocket = new
- // WaveWebSocketClient(WebClient.useSocketIO(),
- // WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL()));
- // webSocket.connect();
- // channel = new RemoteViewServiceMultiplexer(webSocket,
- // new ParticipantId(Session.get().getAddress()).getAddress());
- // profiles = new ProfileManagerImpl();
- // idGenerator = ClientIdGenerator.create();
- // }
- // }
+ // private WaveRef getWaveRef(final String waveRefS) {
+ // try {
+ // return GwtWaverefEncoder.decodeWaveRefFromPath(waveRefS);
+ // } catch (final InvalidWaveRefException e) {
+ // throw new UIException("Invalid waveref: " + waveRefS);
+ // }
+ // }
+ //
+ // private void initWaveClientIfNeeded() {
+ // if (channel == null) {
+ // final WaveWebSocketClient webSocket = new
+ // WaveWebSocketClient(WebClient.useSocketIO(),
+ // WebClient.getWebSocketBaseUrl(GWT.getModuleBaseURL()));
+ // webSocket.connect();
+ // channel = new RemoteViewServiceMultiplexer(webSocket,
+ // new ParticipantId(Session.get().getAddress()).getAddress());
+ // profiles = new ProfileManagerImpl();
+ // idGenerator = ClientIdGenerator.create();
+ // }
+ // }
- @Override
- public void setActions(final GuiActionDescCollection actions) {
- gsArmor.getSubheaderToolbar().clear();
- gsArmor.getSubheaderToolbar().addAll(actions);
- }
+ @Override
+ public void setActions(final GuiActionDescCollection actions) {
+ gsArmor.getSubheaderToolbar().clear();
+ gsArmor.getSubheaderToolbar().addAll(actions);
+ }
- @Override
- public void setContent(final StateContentDTO state) {
- final ForIsWidget docHeader = gsArmor.getDocHeader();
- UiUtils.clear(docHeader);
- docHeader.add(new InlineLabel(state.getTitle()));
- final boolean editable = state.getContentRights().isEditable();
- if (editable) {
- // initWaveClientIfNeeded();
- // setEditableWaveContent(state.getWaveRef(), false);
- // waveHolder.clear();
- // waveHolder.add(new Label(state.getContent() +
- // " (but here goes the Wave editor -we are testing it-)"));
- onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent()));
- } else {
- onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent()));
- }
- // deck.showWidget(editable ? 0 : 1);
- deck.showWidget(1);
+ @Override
+ public void setContent(final StateContentDTO state) {
+ final ForIsWidget docHeader = gsArmor.getDocHeader();
+ UiUtils.clear(docHeader);
+ // docHeader.add(new InlineLabel(state.getTitle()));
+ docHeader.add(new IconLabel((ImageResource) iconRegistry.getContentTypeIcon(state.getTypeId(),
+ state.getMimeType()), state.getTitle()));
+ final boolean editable = state.getContentRights().isEditable();
+ if (editable) {
+ // initWaveClientIfNeeded();
+ // setEditableWaveContent(state.getWaveRef(), false);
+ // waveHolder.clear();
+ // waveHolder.add(new Label(state.getContent() +
+ // " (but here goes the Wave editor -we are testing it-)"));
+ onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent()));
+ } else {
+ onlyViewPanel.setHTML(SafeHtmlUtils.fromTrustedString(state.getContent()));
}
- //
- // private void setEditableWaveContent(final String waveRefS, final boolean
- // isNewWave) {
- // final WaveRef waveRef = getWaveRef(waveRefS);
- //
- // if (wave != null) {
- // wave.destroy();
- // wave = null;
- // }
- //
- // // Release the display:none.
- // // UIObject.setVisible(waveFrame.getElement(), true);
- // waveHolder.getElement().appendChild(loading);
- // final Element holder =
- // waveHolder.getElement().appendChild(Document.get().createDivElement());
- // final StagesProvider wave = new StagesProvider(holder, waveHolder,
- // waveRef, channel, idGenerator, profiles,
- // waveStore, isNewWave);
- // this.wave = wave;
- // wave.load(new Command() {
- // @Override
- // public void execute() {
- // loading.removeFromParent();
- // }
- // });
- // }
+ // deck.showWidget(editable ? 0 : 1);
+ deck.showWidget(1);
+ }
+ //
+ // private void setEditableWaveContent(final String waveRefS, final boolean
+ // isNewWave) {
+ // final WaveRef waveRef = getWaveRef(waveRefS);
+ //
+ // if (wave != null) {
+ // wave.destroy();
+ // wave = null;
+ // }
+ //
+ // // Release the display:none.
+ // // UIObject.setVisible(waveFrame.getElement(), true);
+ // waveHolder.getElement().appendChild(loading);
+ // final Element holder =
+ // waveHolder.getElement().appendChild(Document.get().createDivElement());
+ // final StagesProvider wave = new StagesProvider(holder, waveHolder,
+ // waveRef, channel, idGenerator, profiles,
+ // waveStore, isNewWave);
+ // this.wave = wave;
+ // wave.load(new Command() {
+ // @Override
+ // public void execute() {
+ // loading.removeFromParent();
+ // }
+ // });
+ // }
}
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -26,91 +26,91 @@
public class FolderItemWidget extends Composite implements HasText {
- interface FolderItemWidgetUiBinder extends UiBinder<Widget, FolderItemWidget> {
- }
+ interface FolderItemWidgetUiBinder extends UiBinder<Widget, FolderItemWidget> {
+ }
- private static FolderItemWidgetUiBinder uiBinder = GWT.create(FolderItemWidgetUiBinder.class);
+ private static FolderItemWidgetUiBinder uiBinder = GWT.create(FolderItemWidgetUiBinder.class);
- @UiField
- FlowPanel flow;
- @UiField
- FocusPanel focusPanel;
- @UiField
- Image icon;
- @UiField
- SimplePanel menu;
- @UiField
- InlineLabel title;
+ @UiField
+ FlowPanel flow;
+ @UiField
+ FocusPanel focusPanel;
+ @UiField
+ Image icon;
+ @UiField
+ SimplePanel menu;
+ @UiField
+ InlineLabel title;
- public FolderItemWidget(final ImageResource iconResource, final String title) {
- initWidget(uiBinder.createAndBindUi(this));
- this.title.setText(title);
- icon.setResource(iconResource);
- }
+ public FolderItemWidget(final ImageResource iconResource, final String title) {
+ initWidget(uiBinder.createAndBindUi(this));
+ this.title.setText(title);
+ icon.setResource(iconResource);
+ }
- private void clearFocusStyles() {
- focusPanel.removeStyleDependentName("nofocused");
- focusPanel.removeStyleDependentName("focused");
- }
+ private void clearFocusStyles() {
+ focusPanel.removeStyleDependentName("nofocused");
+ focusPanel.removeStyleDependentName("focused");
+ }
- HasClickHandlers getRowClick() {
- return focusPanel;
- }
+ HasClickHandlers getRowClick() {
+ return focusPanel;
+ }
- HasDoubleClickHandlers getRowDoubleClick() {
- return focusPanel;
- }
+ HasDoubleClickHandlers getRowDoubleClick() {
+ return focusPanel;
+ }
- HasAllFocusHandlers getRowFocus() {
- return focusPanel;
- }
+ HasAllFocusHandlers getRowFocus() {
+ return focusPanel;
+ }
- HasAllMouseHandlers getRowMouse() {
- return focusPanel;
- }
+ HasAllMouseHandlers getRowMouse() {
+ return focusPanel;
+ }
- @Override
- public String getText() {
- return title.getText();
- }
+ @Override
+ public String getText() {
+ return title.getText();
+ }
- @UiHandler("focusPanel")
- public void onBlur(final BlurEvent event) {
- clearFocusStyles();
- focusPanel.addStyleDependentName("nofocused");
- }
+ @UiHandler("focusPanel")
+ public void onBlur(final BlurEvent event) {
+ clearFocusStyles();
+ focusPanel.addStyleDependentName("nofocused");
+ }
- @UiHandler("focusPanel")
- public void onFocus(final FocusEvent event) {
- clearFocusStyles();
- focusPanel.addStyleDependentName("focused");
- }
+ @UiHandler("focusPanel")
+ public void onFocus(final FocusEvent event) {
+ clearFocusStyles();
+ focusPanel.addStyleDependentName("focused");
+ }
- @UiHandler("focusPanel")
- public void onOut(final MouseOutEvent event) {
- clearFocusStyles();
- focusPanel.addStyleDependentName("nofocused");
- }
+ @UiHandler("focusPanel")
+ public void onOut(final MouseOutEvent event) {
+ clearFocusStyles();
+ focusPanel.addStyleDependentName("nofocused");
+ }
- @UiHandler("focusPanel")
- public void onOver(final MouseOverEvent event) {
- clearFocusStyles();
- focusPanel.addStyleDependentName("focused");
- }
+ @UiHandler("focusPanel")
+ public void onOver(final MouseOverEvent event) {
+ clearFocusStyles();
+ focusPanel.addStyleDependentName("focused");
+ }
- public void setMenu(final ActionSimplePanel toolbar) {
- menu.add(toolbar);
- }
+ public void setMenu(final ActionSimplePanel toolbar) {
+ menu.add(toolbar);
+ }
- public void setSelect(final boolean selected) {
- clearFocusStyles();
- focusPanel.removeStyleDependentName(selected ? "noselected" : "selected");
- focusPanel.addStyleDependentName(selected ? "selected" : "noselected");
- }
+ public void setSelect(final boolean selected) {
+ clearFocusStyles();
+ focusPanel.removeStyleDependentName(selected ? "noselected" : "selected");
+ focusPanel.addStyleDependentName(selected ? "selected" : "noselected");
+ }
- @Override
- public void setText(final String text) {
- title.setText(text);
- }
+ @Override
+ public void setText(final String text) {
+ title.setText(text);
+ }
}
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderItemWidget.ui.xml 2011-04-28 13:50:23 UTC (rev 1325)
@@ -8,18 +8,19 @@
@external .k-folderitem-focus-noselected;
@external .k-folderitem-focus-nofocused;
.k-folderitem-focus {
- background-color: none;
+ background-color: none;
}
.k-folderitem-focus-focused {
- background-color: #F2F5FD;
+ background-color: #F2F5FD;
}
.k-folderitem-focus-selected {
- background-color: #E3E9FF;
+ background-color: #E3E9FF;
}
.k-folderitem-focus-noselected {
+
}
.k-folderitem-focus-nofocused {
@@ -27,23 +28,27 @@
}
.flow {
- cursor: pointer;
- border-bottom: 1px solid #F3F3F3;
- line-height: 1.3em;
- height: 28px;
+ cursor: pointer;
+ border-bottom: 1px solid #F3F3F3;
+ line-height: 1.3em;
+ height: 28px;
}
.title {
- font-size: 16px;
- margin-left: 5px;
+ margin-left: 5px;
+ color: #A05A2C;
+ font-size: 19px;
+ line-height: 1.3em;
+ -moz-user-select: none;
+ -khtml-user-select: none;
}
.icon {
- margin: 5px;
+ margin: 5px;
}
.menu {
- float: right;
+ float: right;
}
</ui:style>
<g:FocusPanel ui:field="focusPanel" styleName="{style.k-folderitem-focus}">
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsFlowPanel.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -5,6 +5,7 @@
import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
import cc.kune.common.client.ui.BasicThumb;
+import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.gspace.client.GSpaceArmor;
@@ -21,63 +22,64 @@
import com.google.inject.Inject;
public class FolderViewerAsFlowPanel extends AbstractFolderViewerPanel {
- interface FolderViewerAsFlowPanelUiBinder extends UiBinder<Widget, FolderViewerAsFlowPanel> {
- }
- private static final int ICONLABELMAXSIZE = 20;
- private static final int ICONSIZE = 100;
- private static FolderViewerAsFlowPanelUiBinder uiBinder = GWT.create(FolderViewerAsFlowPanelUiBinder.class);
- @UiField
- FlowPanel flow;
+ interface FolderViewerAsFlowPanelUiBinder extends UiBinder<Widget, FolderViewerAsFlowPanel> {
+ }
+ private static final int ICONLABELMAXSIZE = 20;
+ private static final int ICONSIZE = 100;
+ private static FolderViewerAsFlowPanelUiBinder uiBinder = GWT.create(FolderViewerAsFlowPanelUiBinder.class);
+ @UiField
+ FlowPanel flow;
- @Inject
- public FolderViewerAsFlowPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n) {
- super(gsArmor, i18n);
- widget = uiBinder.createAndBindUi(this);
- }
+ @Inject
+ public FolderViewerAsFlowPanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n,
+ final ContentCapabilitiesRegistry capabilitiesRegistry) {
+ super(gsArmor, i18n, capabilitiesRegistry);
+ widget = uiBinder.createAndBindUi(this);
+ }
- @Override
- public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler,
- final DoubleClickHandler doubleClickHandler) {
- // In this viewer we don't use the clickHandler from the presenter
- flow.add(createThumb(item.getText(), item.getIcon(), item.getTooltip(), "", item.getActionCollection(),
- doubleClickHandler));
- }
+ @Override
+ public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler,
+ final DoubleClickHandler doubleClickHandler) {
+ // In this viewer we don't use the clickHandler from the presenter
+ flow.add(createThumb(item.getText(), item.getIcon(), item.getTooltip(), "",
+ item.getActionCollection(), doubleClickHandler));
+ }
- @Override
- public void clear() {
- flow.clear();
- super.clear();
- }
+ @Override
+ public void clear() {
+ flow.clear();
+ super.clear();
+ }
- public BasicThumb createThumb(final String text, final Object icon, final String tooltip,
- final String tooltipTitle, final GuiActionDescCollection menuitems,
- final DoubleClickHandler doubleClickHandler) {
- final BasicThumb thumb = new BasicThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, false);
- final MenuDescriptor menu = new MenuDescriptor();
- menu.setStandalone(true);
- menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl);
- for (final GuiActionDescrip item : menuitems) {
- item.setParent(menu);
- }
- final ClickHandler clickHand = new ClickHandler() {
- @Override
- public void onClick(final ClickEvent event) {
- menu.show(thumb);
- }
- };
- thumb.addClickHandler(clickHand);
- thumb.addDoubleClickHandler(doubleClickHandler);
- gsArmor.getSubheaderToolbar().add(menu);
- gsArmor.getSubheaderToolbar().addAll(menuitems);
- thumb.setTooltip(tooltipTitle, tooltip);
- thumb.setLabelVisible(true);
- return thumb;
+ public BasicThumb createThumb(final String text, final Object icon, final String tooltip,
+ final String tooltipTitle, final GuiActionDescCollection menuitems,
+ final DoubleClickHandler doubleClickHandler) {
+ final BasicThumb thumb = new BasicThumb(icon, ICONSIZE, text, ICONLABELMAXSIZE, false);
+ final MenuDescriptor menu = new MenuDescriptor();
+ menu.setStandalone(true);
+ menu.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl);
+ for (final GuiActionDescrip item : menuitems) {
+ item.setParent(menu);
}
+ final ClickHandler clickHand = new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ menu.show(thumb);
+ }
+ };
+ thumb.addClickHandler(clickHand);
+ thumb.addDoubleClickHandler(doubleClickHandler);
+ gsArmor.getSubheaderToolbar().add(menu);
+ gsArmor.getSubheaderToolbar().addAll(menuitems);
+ thumb.setTooltip(tooltipTitle, tooltip);
+ thumb.setLabelVisible(true);
+ return thumb;
+ }
- @Override
- public void setContainer(final StateContainerDTO state) {
- super.setContainer(state);
- gsArmor.getDocContainer().add(new HTML("<b>Note:</b> This GUI is provisional<br/>"));
- }
+ @Override
+ public void setContainer(final StateContainerDTO state) {
+ super.setContainer(state);
+ gsArmor.getDocContainer().add(new HTML("<b>Note:</b> This GUI is provisional<br/>"));
+ }
}
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-28 00:56:31 UTC (rev 1324)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-04-28 13:50:23 UTC (rev 1325)
@@ -4,6 +4,7 @@
import cc.kune.common.client.actions.ui.bind.GuiProvider;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
+import cc.kune.core.client.registry.ContentCapabilitiesRegistry;
import cc.kune.core.client.resources.CoreResources;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -26,81 +27,83 @@
public class FolderViewerAsTablePanel extends AbstractFolderViewerPanel {
- interface FolderViewerAsTablePanelUiBinder extends UiBinder<Widget, FolderViewerAsTablePanel> {
- }
+ interface FolderViewerAsTablePanelUiBinder extends UiBinder<Widget, FolderViewerAsTablePanel> {
+ }
- private static FolderViewerAsTablePanelUiBinder uiBinder = GWT.create(FolderViewerAsTablePanelUiBinder.class);
+ private static FolderViewerAsTablePanelUiBinder uiBinder = GWT.create(FolderViewerAsTablePanelUiBinder.class);
- @UiField
- FlexTable flex;
+ @UiField
+ FlexTable flex;
- private final GuiProvider guiProvider;
- private final CoreResources res;
- protected FolderItemWidget selected;
+ private final GuiProvider guiProvider;
+ private final CoreResources res;
+ protected FolderItemWidget selected;
- @Inject
- public FolderViewerAsTablePanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n,
- final GuiProvider guiProvider, final CoreResources res) {
- super(gsArmor, i18n);
- this.guiProvider = guiProvider;
- this.res = res;
- widget = uiBinder.createAndBindUi(this);
+ @Inject
+ public FolderViewerAsTablePanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n,
+ final GuiProvider guiProvider, final CoreResources res,
+ final ContentCapabilitiesRegistry capabilitiesRegistry) {
+ super(gsArmor, i18n, capabilitiesRegistry);
+ this.guiProvider = guiProvider;
+ this.res = res;
+ widget = uiBinder.createAndBindUi(this);
+ }
+
+ @Override
+ public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler,
+ final DoubleClickHandler doubleClickHandler) {
+ final int rowCount = flex.getRowCount();
+ final FolderItemWidget itemWidget = new FolderItemWidget((ImageResource) item.getIcon(),
+ item.getText());
+ final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider);
+ itemWidget.setMenu(toolbar);
+ // Tooltip.to(itemWidget, item.getTooltip());
+ final MenuDescriptor menu = new MenuDescriptor(i18n.t("Actions"));
+ menu.withIcon(res.arrowdown()).withStyles("k-def-docbtn, k-btn, k-button");
+ menu.setStandalone(false);
+ menu.setVisible(false);
+ toolbar.add(menu);
+ for (final GuiActionDescrip menuItem : item.getActionCollection()) {
+ menuItem.setParent(menu);
+ toolbar.add(menuItem);
}
-
- @Override
- public void addItem(final FolderItemDescriptor item, final ClickHandler clickHandler,
- final DoubleClickHandler doubleClickHandler) {
- final int rowCount = flex.getRowCount();
- final FolderItemWidget itemWidget = new FolderItemWidget((ImageResource) item.getIcon(), item.getText());
- final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider);
- itemWidget.setMenu(toolbar);
- // Tooltip.to(itemWidget, item.getTooltip());
- final MenuDescriptor menu = new MenuDescriptor(i18n.t("Actions"));
- menu.withIcon(res.arrowdown()).withStyles("k-def-docbtn, k-btn, k-button");
- menu.setStandalone(false);
+ itemWidget.getRowClick().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ if (selected != null) {
+ selected.setSelect(false);
+ }
+ itemWidget.setSelect(true);
+ selected = itemWidget;
+ }
+ });
+ itemWidget.getRowDoubleClick().addDoubleClickHandler(doubleClickHandler);
+ itemWidget.getRowMouse().addMouseOutHandler(new MouseOutHandler() {
+ @Override
+ public void onMouseOut(final MouseOutEvent event) {
menu.setVisible(false);
- toolbar.add(menu);
- for (final GuiActionDescrip menuItem : item.getActionCollection()) {
- menuItem.setParent(menu);
- toolbar.add(menuItem);
- }
- itemWidget.getRowClick().addClickHandler(new ClickHandler() {
- @Override
- public void onClick(final ClickEvent event) {
- if (selected != null) {
- selected.setSelect(false);
- }
- itemWidget.setSelect(true);
- selected = itemWidget;
- }
- });
- itemWidget.getRowDoubleClick().addDoubleClickHandler(doubleClickHandler);
- itemWidget.getRowMouse().addMouseOutHandler(new MouseOutHandler() {
- @Override
- public void onMouseOut(final MouseOutEvent event) {
- menu.setVisible(false);
- // itemWidget.setSelect(false);
- // menu.hide();
- }
- });
- itemWidget.getRowMouse().addMouseOverHandler(new MouseOverHandler() {
- @Override
- public void onMouseOver(final MouseOverEvent event) {
- menu.setVisible(true);
- }
- });
- flex.setWidget(rowCount + 1, 0, itemWidget);
- }
+ // itemWidget.setSelect(false);
+ // menu.hide();
+ }
+ });
+ itemWidget.getRowMouse().addMouseOverHandler(new MouseOverHandler() {
+ @Override
+ public void onMouseOver(final MouseOverEvent event) {
+ menu.setVisible(true);
+ }
+ });
+ flex.setWidget(rowCount + 1, 0, itemWidget);
+ }
- @Override
- public void clear() {
- flex.clear();
- super.clear();
- }
+ @Override
+ public void clear() {
+ flex.clear();
+ super.clear();
+ }
- @Override
- public void setContainer(final StateContainerDTO state) {
- super.setContainer(state);
- }
+ @Override
+ public void setContainer(final StateContainerDTO state) {
+ super.setContainer(state);
+ }
}
More information about the kune-commits
mailing list