Author: dongxu Date: Thu Sep 12 04:06:39 2013 New Revision: 1522299 URL: http://svn.apache.org/r1522299 Log: temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width
Removed: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/res/CssComposePanel.css Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java james/hupa/trunk/client/src/main/webapp/Hupa.css james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java?rev=1522299&r1=1522298&r2=1522299&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/__ComposePanel.java Thu Sep 12 04:06:39 2013 @@ -20,9 +20,6 @@ package org.apache.hupa.client.ui; import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.CssResource.NotStrict; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.AcceptsOneWidget; @@ -39,19 +36,6 @@ public class __ComposePanel extends Comp @UiField protected SimpleLayoutPanel composeContentContainer; @UiField protected SimplePanel composeStatusContainer; - - public interface Resources extends ClientBundle { - - Resources INSTANCE = GWT.create(Resources.class); - - @NotStrict - @Source("res/CssComposePanel.css") - public Css stylesheet(); - - public interface Css extends CssResource { - } - } - public __ComposePanel() { initWidget(binder.createAndBindUi(this)); } Modified: james/hupa/trunk/client/src/main/webapp/Hupa.css URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/webapp/Hupa.css?rev=1522299&r1=1522298&r2=1522299&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/webapp/Hupa.css (original) +++ james/hupa/trunk/client/src/main/webapp/Hupa.css Thu Sep 12 04:06:39 2013 @@ -18,6 +18,7 @@ */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /************[ Fonts ]***************************/ body,table td,select,* { font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana; @@ -45,39 +46,45 @@ body.noscroll { /* also avoids bounce ef ======= >>>>>>> first commit +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width /************[ Fonts ]***************************/ -body, table td, select, * { - font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana; - font-size: 12px; +body,table td,select,* { + font-family: arial, 'comic sans ms', sans-serif, helvetica, verdana; + font-size: 12px; } + body { - font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #333; - background: url(images/linen.jpg) repeat #d1d5d8; - margin: 0; + font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + color: #333; + background: url(images/linen.jpg) repeat #d1d5d8; + margin: 0; } -body.noscroll { - /* also avoids bounce effect in Chrome and Safari */ - overflow: hidden; +body.noscroll { /* also avoids bounce effect in Chrome and Safari */ + overflow: hidden; } - /************[ widget: MyDialogBox ]****************/ -.hupa-dialog-box td.dialogMiddleCenter { +.hupa-dialog-box td.dialogMiddleCenter { background: #fae5b0; } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-dialog-box .dialogContent .gwt-Label { font-weight: bold; margin: 15px; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD .hupa-dialog-box .Caption { font-size: 14px; @@ -89,12 +96,18 @@ body.noscroll { .hupa-dialog-box .Caption { font-size: 14px; >>>>>>> first commit +======= + +.hupa-dialog-box .Caption { + font-size: 14px; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /************[ widget: RndPanel ]****************/ .hupa-rounded { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD border: 1px solid #7FAAFF; border-radius: 5px; overflow: hidden; @@ -108,6 +121,11 @@ body.noscroll { border-radius: 5px; overflow: hidden; >>>>>>> first commit +======= + border: 1px solid #7FAAFF; + border-radius: 5px; + overflow: hidden; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /************[ widget: Loading ]*************************************/ @@ -118,12 +136,16 @@ div.hupa-loading { height: 14px; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width white-space: nowrap; margin-top: 5px; margin-left: auto; margin-right: auto; text-align: left; vertical-align: top; +<<<<<<< HEAD ======= ======= >>>>>>> first commit @@ -137,6 +159,8 @@ div.hupa-loading { >>>>>>> first commit ======= >>>>>>> first commit +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /************[ widget: EnableHyperLink ]*********/ @@ -147,6 +171,7 @@ div.hupa-loading { } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD .hupa-hyperlink .gwt-Hyperlink-disabled { color: #8d8d8d; @@ -164,6 +189,14 @@ div.gwt-Hyperlink, div.gwt-Anchor { >>>>>>> first commit ======= >>>>>>> first commit +======= + +.hupa-hyperlink .gwt-Hyperlink-disabled { + color: #8d8d8d; +} + +div.gwt-Hyperlink,div.gwt-Anchor { +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width padding-left: 4px; } @@ -180,6 +213,7 @@ div.Hupa { min-width: 400px; } +<<<<<<< HEAD * html div.Hupa { margin-top: 0px; } @@ -209,18 +243,22 @@ div.hupa-top { min-width: 400px; >>>>>>> decorate columns of messages list and related panels above and below. } +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width * html div.Hupa { - margin-top: 0px; + margin-top: 0px; } + div.hupa-logo { height: 64px; background: url(images/hupa-logo-64-transparent.png) no-repeat; } -div.hupa-top { - padding-left: 90px; - margin-right: 8px; +div.hupa-top { + padding-left: 90px; + margin-right: 8px; } +<<<<<<< HEAD * html div.hupa-top { padding-left: 0px; } @@ -228,17 +266,28 @@ div.hupa-top { >>>>>>> first commit ======= >>>>>>> first commit +======= + +* html div.hupa-top { + padding-left: 0px; +} + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width div.hupa-top-wrap { height: 64px; background-color: #C5D9FF; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width div.cgb-RPC-hupa-top-wrap { height: 59px; } @@ -246,6 +295,7 @@ div.cgb-RPC-hupa-top-wrap { table.hupa-top { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD width: 100%; margin-bottom: 0px; } @@ -260,12 +310,19 @@ table.hupa-top { margin-bottom: 0px; } >>>>>>> first commit +======= + width: 100%; + margin-bottom: 0px; +} + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width table.hupa-button-bar td div { padding-top: 12px; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD div.hupa-loginfo-label,div.hupa-loginfo-user { margin-left: 10px; margin-right: 10px; @@ -282,12 +339,20 @@ div.hupa-loginfo-label, div.hupa-loginfo margin-left: 10px; } >>>>>>> first commit +======= +div.hupa-loginfo-label,div.hupa-loginfo-user { + margin-left: 10px; + margin-right: 10px; +} + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-loginfo-user { font-style: italic; font-weight: bold; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD .hupa-menu-button { margin-right: 15px; @@ -298,9 +363,13 @@ div.hupa-header { ======= ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-menu-button { margin-right: 15px; } + div.hupa-header { <<<<<<< HEAD color: transparent; @@ -350,6 +419,7 @@ div.hupa-main { height: 500px; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD text-align: center; } @@ -367,27 +437,35 @@ div.hupa-main { ======= >>>>>>> first commit text-align: center; +======= + text-align: center; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } .hupa-flash { - background-color: #fae5b0; + background-color: #fae5b0; text-align: center; - margin: auto auto 2px auto; - width: 50%; - position: absolute; - top: 45px; - left: 25%; + margin: auto auto 2px auto; + width: 50%; + position: absolute; + top: 45px; + left: 25%; } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width * html div.hupa-flash { border: none; background: none; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD * html .hupa-flash div { background-color: #fae5b0; @@ -399,6 +477,11 @@ div.hupa-main { * html .hupa-flash div { background-color: #fae5b0; >>>>>>> first commit +======= + +* html .hupa-flash div { + background-color: #fae5b0; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } .hupa-flash div.gwt-Label { @@ -419,6 +502,7 @@ div.hupa-bottom { position: relative; left: 50%; padding: 20px; +<<<<<<< HEAD border: 1px solid #7FAAFF; box-shadow: 0 1px 4px grey; border-radius: 5px; @@ -448,6 +532,8 @@ table.hupa-login { position: relative; left: 50%; padding: 20px; +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width border: 1px solid #7FAAFF; box-shadow: 0 1px 4px grey; border-radius: 5px; @@ -457,12 +543,16 @@ table.hupa-login { text-align: center; } <<<<<<< HEAD +<<<<<<< HEAD table.hupa-login-form { <<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit ======= +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-login-form { >>>>>>> make it look more beautiful padding: 10px; @@ -472,6 +562,7 @@ table.hupa-login-form { width: 230px; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD background-color: #d8ecfd; ======= background-color: #d8ecfd; @@ -479,6 +570,9 @@ table.hupa-login-form { ======= background-color: #d8ecfd; >>>>>>> first commit +======= + background-color: #d8ecfd; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width border: 1px solid #7FAAFF; margin-left: 5px; } @@ -495,6 +589,7 @@ table.hupa-login-form { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD background-color: #deeeff; } @@ -517,29 +612,38 @@ table.hupa-login-form { ======= >>>>>>> decorate columns of messages list and related panels above and below. background-color: #deeeff; +======= + background-color: #deeeff; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /************[ view: IMAPMessageListView ]*******************/ -.hupa-msglist, .hupa-msg-top-bar, .hupa-msgtable { +.hupa-msglist,.hupa-msg-top-bar,.hupa-msgtable { width: 100%; } + .hupa-msg-top-bar { padding: 10px 4px 10px 4px; - background-color: #C3D9FF; + background-color: #C3D9FF; } .hupa-msgtable-row { +<<<<<<< HEAD text-align: left; <<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= + text-align: left; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width vertical-align: top; padding: 0px 10px 0px 10px; cursor: pointer; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD .hupa-msgtable-unseen { font-weight: bold; @@ -554,25 +658,33 @@ table.hupa-login-form { ======= ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-msgtable-unseen { - font-weight: bold; + font-weight: bold; } .hupa-msgtable-empty { - font-weight: bold; + font-weight: bold; text-align: center; padding: 20px; } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-search-box { width: 150px; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD input[type=text],input[type=file],textarea { background-color: #d8ecfd; border: 1px solid #7FAAFF; @@ -590,18 +702,27 @@ input[type=text],input[type=file],textar input[type=text], input[type=file], textarea { background-color: #d8ecfd; border: 1px solid #7FAAFF; +======= +input[type=text],input[type=file],textarea { + background-color: #d8ecfd; + border: 1px solid #7FAAFF; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } -.dragdrop-dragable{ +.dragdrop-dragable { background: red; - } +} .gwt-SuggestBoxPopup { +<<<<<<< HEAD font-size: 10px; <<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= + font-size: 10px; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } .hupa-buttons .gwt-ListBox { @@ -609,6 +730,7 @@ input[type=text], input[type=file], text <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD padding-left: 3px; ======= >>>>>>> first commit @@ -617,12 +739,16 @@ input[type=text], input[type=file], text ======= padding-left: 3px; >>>>>>> decorate columns of messages list and related panels above and below. +======= + padding-left: 3px; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /*************[ buttonbars ]*********************/ .hupa-buttons { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD white-space: nowrap; } @@ -640,6 +766,13 @@ input[type=text], input[type=file], text >>>>>>> first commit ======= >>>>>>> first commit +======= + white-space: nowrap; +} + +.hupa-buttons td { + padding-left: 3px; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } .hupa-buttons div { @@ -648,17 +781,22 @@ input[type=text], input[type=file], text } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-buttons .gwt-Hyperlink { padding-left: 6px; } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD /************[ widget: MessageHeaders ]*******************/ table.hupa-msg-headers { background-color: #C3D9FF; @@ -668,14 +806,20 @@ table.hupa-msg-headers { ======= >>>>>>> first commit +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width /************[ widget: MessageHeaders ]*******************/ table.hupa-msg-headers { - background-color: #C3D9FF; + background-color: #C3D9FF; } <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-msg-headers td.label { width: 175px; text-align: right; @@ -689,11 +833,15 @@ table.hupa-msgview { } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit ======= >>>>>>> first commit +======= + +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width div.hupa-msgview-content { padding: 20px; } @@ -719,7 +867,7 @@ div.hupa-msgview-content { >>>>>>> first commit ======= .hupa-attachment-view { - margin-left: 10px; + margin-left: 10px; } >>>>>>> merged with main trunk in apache: replacing rounded borders with gwt >>>>>>> decorator boxes, fix Hupa-93 Hupa-94, fix IE issue @@ -731,6 +879,7 @@ table.hupa-msgsend { .hupa-validate-error { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD border: 1pt solid red; background-color: #fae5b0; ======= @@ -741,6 +890,10 @@ table.hupa-msgsend { border: 1pt solid red; background-color: #fae5b0; >>>>>>> first commit +======= + border: 1pt solid red; + background-color: #fae5b0; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } /************[ view: ContactsView ]*******************/ @@ -751,12 +904,15 @@ table.hupa-contacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit ======= >>>>>>> first commit +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width /************************************************************************/ /*** Non re-factored stuff ***/ .cbg-ButtonContent { @@ -765,6 +921,7 @@ table.hupa-contacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD .hupa-ErrorLabel,.gwt-PagingOptions .errorMessage { color: #FF0000; } @@ -903,47 +1060,52 @@ div.hupa-main { >>>>>>> first commit .hupa-ErrorLabel, .gwt-PagingOptions .errorMessage { color: #FF0000; +======= +.hupa-ErrorLabel,.gwt-PagingOptions .errorMessage { + color: #FF0000; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } .gwt-ScrollTable .dataTable td { - border-top: 1pt solid #EEEEEE; - white-space: nowrap; - padding: 0px 10px 0px 10px; - overflow: hidden; - font-size: 12px; - cursor: pointer; + border-top: 1pt solid #EEEEEE; + white-space: nowrap; + padding: 0px 10px 0px 10px; + overflow: hidden; + font-size: 12px; + cursor: pointer; } - .gwt-ScrollTable .dataTable tr.highlighted { - background: #FAD163; + background: #FAD163; } .gwt-ScrollTable .dataTable tr.selected td { - background: #FFF7D7; + background: #FFF7D7; } .hupa-IMAPFolder-unseen { - font-weight: bold; + font-weight: bold; } .hupa-IMAPFolder-selected { - background: #f1e77b; - width: 100%; + background: #f1e77b; + width: 100%; } .hupa-droptarget-invalid { - color: red; + color: red; } -.hupa-editor { - border: 2px solid #C3D9FF; +.hupa-editor { + border-left: 1px solid #CCC; + border-right: 1px solid #CCC; } /**** HTML5 shadows and gradients ****/ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> first commit @@ -955,44 +1117,59 @@ body { ======= >>>>>>> refactoring theme 1 - login page +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width .hupa-rounded { - box-shadow: 0 1px 4px grey; + box-shadow: 0 1px 4px grey; } -.hupa-top-wrap, .hupa-login-box, .hupa-msg-top-bar { - background: -moz-linear-gradient(#FFFFFF, #C5D9FF); - background: -webkit-linear-gradient(#FFFFFF, #C5D9FF); - background: -o-linear-gradient(#FFFFFF, #C5D9FF); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#C5D9FF',GradientType=0 ); + +.hupa-top-wrap,.hupa-login-box,.hupa-msg-top-bar { + background: -moz-linear-gradient(#FFFFFF, #C5D9FF); + background: -webkit-linear-gradient(#FFFFFF, #C5D9FF); + background: -o-linear-gradient(#FFFFFF, #C5D9FF); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', + endColorstr='#C5D9FF', GradientType=0 ); } + .hupa-commands-bar { - background: -moz-linear-gradient(#C5D9FF, #eaeaea); - background: -webkit-linear-gradient(#C5D9FF, #eaeaea); - background: -o-linear-gradient(#C5D9FF, #eaeaea); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 ); + background: -moz-linear-gradient(#C5D9FF, #eaeaea); + background: -webkit-linear-gradient(#C5D9FF, #eaeaea); + background: -o-linear-gradient(#C5D9FF, #eaeaea); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C5D9FF', + endColorstr='#eaeaea', GradientType=0 ); } + .hupa-tree { - background: -moz-linear-gradient(#C5D9FF, #eaeaea); - background: -webkit-linear-gradient(#C5D9FF, #eaeaea); - background: -o-linear-gradient(#C5D9FF, #eaeaea); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C5D9FF', endColorstr='#eaeaea',GradientType=0 ); + background: -moz-linear-gradient(#C5D9FF, #eaeaea); + background: -webkit-linear-gradient(#C5D9FF, #eaeaea); + background: -o-linear-gradient(#C5D9FF, #eaeaea); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#C5D9FF', + endColorstr='#eaeaea', GradientType=0 ); } + div.hupa-main { - background: -moz-linear-gradient(#eaeaea, #fafafa); - background: -webkit-linear-gradient(#eaeaea, #fafafa); - background: -o-linear-gradient(#eaeaea, #fafafa); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eaeaea', endColorstr='#fafafa',GradientType=0 ); -} -.hupa-flash, .hupa-dialog-box td.dialogMiddleCenter { - background: -moz-linear-gradient(#fae5b0, #eaeaea); - background: -webkit-linear-gradient(#fae5b0, #eaeaea); - background: -o-linear-gradient(#fae5b0, #eaeaea); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fae5b0', endColorstr='#eaeaea',GradientType=0 ); + background: -moz-linear-gradient(#eaeaea, #fafafa); + background: -webkit-linear-gradient(#eaeaea, #fafafa); + background: -o-linear-gradient(#eaeaea, #fafafa); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eaeaea', + endColorstr='#fafafa', GradientType=0 ); +} + +.hupa-flash,.hupa-dialog-box td.dialogMiddleCenter { + background: -moz-linear-gradient(#fae5b0, #eaeaea); + background: -webkit-linear-gradient(#fae5b0, #eaeaea); + background: -o-linear-gradient(#fae5b0, #eaeaea); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fae5b0', + endColorstr='#eaeaea', GradientType=0 ); } -.hupa-login-form, .hupa-bottom { - text-shadow: 1px 1px 3px #666666; + +.hupa-login-form,.hupa-bottom { + text-shadow: 1px 1px 3px #666666; } + * html .hupa-bottom { - filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=1); + filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', + Direction=135, Strength=1 ); } <<<<<<< HEAD <<<<<<< HEAD @@ -1004,41 +1181,41 @@ div.hupa-main { .hupa-button { background: #FFFFFF; - background: -moz-linear-gradient(#FFFFFF, #EDEDED); - background: -webkit-linear-gradient(#FFFFFF, #EDEDED); - background: -o-linear-gradient(#FFFFFF, #EDEDED); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#EDEDED',GradientType=0 ); - border: 1px solid #B7B7B7; - color: #606060; - border-radius: 2em 2em 2em 2em; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - cursor: pointer; - display: inline-block; - font: 10px; - margin: 0 2px; - outline: medium none; - padding: 2px 10px; - text-align: center; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - vertical-align: baseline; + background: -moz-linear-gradient(#FFFFFF, #EDEDED); + background: -webkit-linear-gradient(#FFFFFF, #EDEDED); + background: -o-linear-gradient(#FFFFFF, #EDEDED); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', + endColorstr='#EDEDED', GradientType=0 ); + border: 1px solid #B7B7B7; + color: #606060; + border-radius: 2em 2em 2em 2em; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + cursor: pointer; + display: inline-block; + font: 10px; + margin: 0 2px; + outline: medium none; + padding: 2px 10px; + text-align: center; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); + vertical-align: baseline; } + .hupa-button:hover { background: #ededed; - background: -moz-linear-gradient(#FFFFFF, #dcdcdc); - background: -webkit-linear-gradient(#FFFFFF, #dcdcdc); - background: -o-linear-gradient(#FFFFFF, #dcdcdc); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#dcdcdc',GradientType=0 ); + background: -moz-linear-gradient(#FFFFFF, #dcdcdc); + background: -webkit-linear-gradient(#FFFFFF, #dcdcdc); + background: -o-linear-gradient(#FFFFFF, #dcdcdc); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', + endColorstr='#dcdcdc', GradientType=0 ); } .gwt-DecoratorPanel .middleCenter { - height: 100%; - width: 100%; -} -.gwt-SuggestBox { - border-radius: 50px; - max-height: 8px; + height: 100%; + width: 100%; } +<<<<<<< HEAD @@ -1050,3 +1227,9 @@ div.hupa-main { >>>>>>> first commit ======= >>>>>>> constantly changed by manolo +======= +.gwt-SuggestBox { + border-radius: 50px; + max-height: 8px; +} +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width Modified: james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java?rev=1522299&r1=1522298&r2=1522299&view=diff ============================================================================== --- james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java (original) +++ james/hupa/trunk/widgets/src/main/java/org/apache/hupa/widgets/editor/Editor.java Thu Sep 12 04:06:39 2013 @@ -33,6 +33,7 @@ import com.google.gwt.user.client.Elemen import com.google.gwt.user.client.Timer; <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Focusable; import com.google.gwt.user.client.ui.HasHTML; @@ -49,12 +50,21 @@ import com.google.gwt.user.client.ui.Ver >>>>>>> first commit ======= >>>>>>> first commit +======= +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.Focusable; +import com.google.gwt.user.client.ui.HasHTML; +import com.google.gwt.user.client.ui.RichTextArea; +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width /** * Wysiwyg editor for composing and editing emails in Hupa */ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width public class Editor extends FlowPanel implements HasHTML, Focusable { RichTextArea area = new RichTextArea(); @@ -66,6 +76,7 @@ public class Editor extends FlowPanel im public Editor(ToolbarConstants constants) { area.ensureDebugId("hupa-editor-area"); +<<<<<<< HEAD area.setHeight("100%"); // Toolbar toolbar = new Toolbar(area, constants); @@ -82,6 +93,22 @@ public class Editor extends FlowPanel im * * When body is available, we put the default style for messages: */ +======= + // area.setSize("100%", "234px"); + area.setHeight("100%"); + + Toolbar toolbar = new Toolbar(area, constants); + toolbar.ensureDebugId("hupa-editor-toolbar"); + + super.add(toolbar); + super.add(area); + setWidth("100%"); + + // Note: rich-area is created in an iframe, so Hupa's style sheets + // are not available, unless we inject them to the generated iframe + // + // When body is available, we put the default style for messages: +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width area.addInitializeHandler(new InitializeHandler() { public void onInitialize(InitializeEvent event) { setBodyStyleAttribute("fontFamily", "arial"); @@ -89,20 +116,31 @@ public class Editor extends FlowPanel im } }); +<<<<<<< HEAD /* * When the users writes in-line comments in replies, the text has to be * leftIdented. Right now, I've implemented this feature only in gecko * browsers, for other browsers the user has to push the leftIdent * button. */ +======= + // When the users writes in-line comments in replies, the text has to be + // leftIdented. + // Right now, I've implemented this feature only in gecko browsers, for + // other browsers + // the user has to push the leftIdent button. +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width if (getUA().equals("ff")) addNewlineHandlersForFireFox(); } +<<<<<<< HEAD public RichTextArea getArea(){ return area; } +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width @Override public void setSize(String width, String height) { @@ -111,13 +149,19 @@ public class Editor extends FlowPanel im @Override public void setWidth(String width) { +<<<<<<< HEAD super.setWidth(width); +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width area.setWidth(width); } @Override public void setHeight(String height) { +<<<<<<< HEAD super.setHeight(height); +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width area.setHeight(height); } @@ -214,7 +258,12 @@ public class Editor extends FlowPanel im event.preventDefault(); } if (!doNline +<<<<<<< HEAD && (event.getCharCode() == KeyCodes.KEY_DOWN || event.getCharCode() == KeyCodes.KEY_UP)) { +======= + && (event.getCharCode() == KeyCodes.KEY_DOWN || event + .getCharCode() == KeyCodes.KEY_UP)) { +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width doNline = true; } } @@ -238,6 +287,7 @@ public class Editor extends FlowPanel im return "other"; }-*/; +<<<<<<< HEAD ======= ======= >>>>>>> first commit @@ -418,4 +468,6 @@ public class Editor extends VerticalPane >>>>>>> first commit ======= >>>>>>> first commit +======= +>>>>>>> temporarily use the FlowPanel as Editor, the inner rich text area can not automatically adjust the height and width } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org