Author: vjrj_ Date: 2011-06-17 01:33:52 +0200 (Fri, 17 Jun 2011) New Revision: 1410 Added: trunk/img/webtemplate/highcontrast.png Removed: trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatMessages.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContext.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/ trunk/src/main/java/org/ourproject/kune/chat/public/ trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java trunk/src/test/java/org/ourproject/kune/chat/server/ Modified: trunk/img/webtemplate/theme-palettes.svg trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java trunk/src/main/resources/kune.properties Log: more styles and fixes Added: trunk/img/webtemplate/highcontrast.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/highcontrast.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/webtemplate/theme-palettes.svg =================================================================== --- trunk/img/webtemplate/theme-palettes.svg 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/img/webtemplate/theme-palettes.svg 2011-06-16 23:33:52 UTC (rev 1410) @@ -26,15 +26,15 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="459.51336" - inkscape:cy="233.97795" + inkscape:cx="346.17698" + inkscape:cy="-166.02205" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1078" inkscape:window-height="807" - inkscape:window-x="3" - inkscape:window-y="1042" + inkscape:window-x="4" + inkscape:window-y="1044" inkscape:window-maximized="0" /> <metadata id="metadata7388"> @@ -53,152 +53,152 @@ inkscape:groupmode="layer" id="layer1"> <rect - y="826.14136" - x="768.34814" + y="1016.1414" + x="395.34814" height="40" width="150" id="rect7955-1" - style="color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect - style="color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7957-6" width="150" height="40" - x="768.34814" - y="866.14136" /> + x="395.34814" + y="1056.1414" /> <rect - y="906.14136" - x="768.34814" + y="1096.1414" + x="395.34814" height="40" width="150" id="rect7959-4" - style="color:#000000;fill:#e6e6e6;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#e6e6e6;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect - style="color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7961-9" width="150" height="40" - x="768.34814" - y="946.14136" /> + x="395.34814" + y="1136.1414" /> <text sodipodi:linespacing="125%" id="text7963-2" - y="851.14136" - x="782.34814" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + y="1041.1414" + x="409.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" xml:space="preserve"><tspan - y="851.14136" - x="782.34814" + y="1041.1414" + x="409.34814" id="tspan7965-7" sodipodi:role="line">lorem </tspan></text> <text xml:space="preserve" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="782.34814" - y="891.14136" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="409.34814" + y="1081.1414" id="text7967-6" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan7969-5" - x="782.34814" - y="891.14136">lorem </tspan></text> + x="409.34814" + y="1081.1414">lorem </tspan></text> <text sodipodi:linespacing="125%" id="text7971-2" - y="931.14136" - x="782.34814" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + y="1121.1414" + x="409.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" xml:space="preserve"><tspan - y="931.14136" - x="782.34814" + y="1121.1414" + x="409.34814" id="tspan7973-1" sodipodi:role="line"><tspan id="tspan7975-5" - style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold;fill:#000000">lorem </tspan></tspan></text> + style="font-weight:bold;fill:#000000;-inkscape-font-specification:Ubuntu Bold">lorem </tspan></tspan></text> <text xml:space="preserve" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="782.34814" - y="971.14136" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="409.34814" + y="1161.1414" id="text7977-4" sodipodi:linespacing="125%"><tspan - style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold;fill:#000000" + style="font-weight:bold;fill:#000000;-inkscape-font-specification:Ubuntu Bold" sodipodi:role="line" id="tspan7979-0" - x="782.34814" - y="971.14136">lorem </tspan></text> + x="409.34814" + y="1161.1414">lorem </tspan></text> <rect - style="color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7981-2" width="150" height="40" - x="921.34814" - y="826.14136" /> + x="548.34814" + y="1016.1414" /> <rect - y="866.14136" - x="921.34814" + y="1056.1414" + x="548.34814" height="40" width="150" id="rect7983-4" - style="color:#000000;fill:#e6e6e6;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#e6e6e6;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect - style="color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7985-7" width="150" height="40" - x="921.34814" - y="906.14136" /> + x="548.34814" + y="1096.1414" /> <rect - y="946.14136" - x="921.34814" + y="1136.1414" + x="548.34814" height="40" width="150" id="rect7987-4" - style="color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <text sodipodi:linespacing="125%" id="text7989-2" - y="891.14136" - x="935.34814" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + y="1081.1414" + x="562.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve"><tspan - y="891.14136" - x="935.34814" + y="1081.1414" + x="562.34814" id="tspan7991-6" sodipodi:role="line">lorem </tspan></text> <text xml:space="preserve" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="934.34814" - y="933.14136" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="561.34814" + y="1123.1414" id="text7993-3" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan7995-9" - x="934.34814" - y="933.14136">lorem </tspan></text> + x="561.34814" + y="1123.1414">lorem </tspan></text> <text sodipodi:linespacing="125%" id="text7997-0" - y="971.14136" - x="935.34814" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + y="1161.1414" + x="562.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" xml:space="preserve"><tspan - y="971.14136" - x="935.34814" + y="1161.1414" + x="562.34814" id="tspan7999-6" sodipodi:role="line">lorem </tspan></text> <text xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" - x="933.34814" - y="855.14136" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="560.34814" + y="1045.1414" id="text8001-3" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan8003-9" - x="933.34814" - y="855.14136">lorem </tspan></text> + x="560.34814" + y="1045.1414">lorem </tspan></text> <rect style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7391-2" @@ -207,11 +207,7 @@ x="24" y="25.362183" /> <image - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAAAoCAYAAAAcwQPnAAAABHNCSVQICAgIfAhkiAAAAIlJREFU -eJzt0kENgDAAwMAx8/OCKESgYCbWkJA7BX30eu71Djhsfh3APxmLhLFIGIuEsUgYi4SxSBiLhLFI -GIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiL -hLFIGIuEsUgYi4SxSBiLhLFIbCnoA1F5o8FjAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAAAoCAYAAAAcwQPnAAAABHNCSVQICAgIfAhkiAAAAIlJREFU eJzt0kENgDAAwMAx8/OCKESgYCbWkJA7BX30eu71Djhsfh3APxmLhLFIGIuEsUgYi4SxSBiLhLFI GIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiLhLFIGIuEsUgYi4SxSBiL hLFIGIuEsUgYi4SxSBiLhLFIbCnoA1F5o8FjAAAAAElFTkSuQmCC " width="150" height="40" transform="translate(24,25.362183)" @@ -505,7 +501,7 @@ x="189" y="254.36218">lorem </tspan></text> <rect - style="color:#000000;fill:#ffc0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#de8787;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7605" width="150" height="40" @@ -517,7 +513,7 @@ height="40" width="150" id="rect7607" - style="color:#000000;fill:#de8888;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect style="color:#000000;fill:#c04141;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7609" @@ -799,7 +795,7 @@ x="189" y="654.36218">lorem </tspan></text> <rect - style="color:#000000;fill:#f6f1de;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7705" width="150" height="40" @@ -1981,5 +1977,347 @@ x="919" id="tspan3370" sodipodi:role="line">lorem </tspan></text> + <rect + y="1005.3622" + x="24" + height="40" + width="150" + id="rect3367" + style="color:#000000;fill:#000055;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="color:#000000;fill:#162d50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3369" + width="150" + height="40" + x="24" + y="1045.3622" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + y="1085.3622" + x="24" + height="40" + width="150" + id="rect3371" + style="color:#000000;fill:#00002b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="color:#000000;fill:#000055;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3373" + width="150" + height="40" + x="24" + y="1125.3622" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + sodipodi:linespacing="125%" + id="text3375" + y="1030.3622" + x="38" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1030.3622" + x="38" + id="tspan3377" + sodipodi:role="line">lorem </tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="38" + y="1070.3622" + id="text3379" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3381" + x="38" + y="1070.3622">lorem </tspan></text> + <text + sodipodi:linespacing="125%" + id="text3383" + y="1110.3622" + x="38" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1110.3622" + x="38" + id="tspan3385" + sodipodi:role="line"><tspan + id="tspan3387" + style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold">lorem </tspan></tspan></text> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="38" + y="1150.3622" + id="text3389" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold" + sodipodi:role="line" + id="tspan3391" + x="38" + y="1150.3622">lorem </tspan></text> + <rect + style="color:#000000;fill:#0000aa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3393" + width="150" + height="40" + x="177" + y="1005.3622" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + y="1045.3622" + x="177" + height="40" + width="150" + id="rect3395" + style="color:#000000;fill:#00112b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3397" + width="150" + height="40" + x="177" + y="1085.3622" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + y="1125.3622" + x="177" + height="40" + width="150" + id="rect3399" + style="color:#000000;fill:#162d50;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.73427981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + sodipodi:linespacing="125%" + id="text3401" + y="1070.3622" + x="191" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1070.3622" + x="191" + id="tspan3403" + sodipodi:role="line">lorem </tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94902169999999997;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="190" + y="1112.3622" + id="text3405" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3407" + x="190" + y="1112.3622">lorem </tspan></text> + <text + sodipodi:linespacing="125%" + id="text3409" + y="1150.3622" + x="191" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.9490217;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + y="1150.3622" + x="191" + id="tspan3411" + sodipodi:role="line">lorem </tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961;fill-rule:nonzero;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="189" + y="1034.3622" + id="text3413" + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/highcontrast.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3415" + x="189" + y="1034.3622">lorem </tspan></text> + <rect + style="color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4185" + width="150" + height="40" + x="395.34814" + y="1206.1414" /> + <rect + y="1246.1414" + x="395.34814" + height="40" + width="150" + id="rect4187" + style="color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#808080;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4189" + width="150" + height="40" + x="395.34814" + y="1286.1414" /> + <rect + y="1326.1414" + x="395.34814" + height="40" + width="150" + id="rect4191" + style="color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="409.34814" + y="1231.1414" + id="text4193" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4195" + x="409.34814" + y="1231.1414">lorem </tspan></text> + <text + sodipodi:linespacing="125%" + id="text4197" + y="1271.1414" + x="409.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="1271.1414" + x="409.34814" + id="tspan4199" + sodipodi:role="line">lorem </tspan></text> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="409.34814" + y="1311.1414" + id="text4201" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4203" + x="409.34814" + y="1311.1414"><tspan + style="font-weight:bold;fill:#000000;-inkscape-font-specification:Ubuntu Bold" + id="tspan4205">lorem </tspan></tspan></text> + <text + sodipodi:linespacing="125%" + id="text4207" + y="1351.1414" + x="409.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="1351.1414" + x="409.34814" + id="tspan4209" + sodipodi:role="line" + style="font-weight:bold;fill:#ffffff;-inkscape-font-specification:Ubuntu Bold">lorem </tspan></text> + <rect + y="1206.1414" + x="548.34814" + height="40" + width="150" + id="rect4211" + style="color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#e6e6e6;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4213" + width="150" + height="40" + x="548.34814" + y="1246.1414" /> + <rect + y="1286.1414" + x="548.34814" + height="40" + width="150" + id="rect4215" + style="color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:0.73427980999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4217" + width="150" + height="40" + x="548.34814" + y="1326.1414" /> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="562.34814" + y="1271.1414" + id="text4219" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4221" + x="562.34814" + y="1271.1414">lorem </tspan></text> + <text + sodipodi:linespacing="125%" + id="text4223" + y="1313.1414" + x="561.34814" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="1313.1414" + x="561.34814" + id="tspan4225" + sodipodi:role="line">lorem </tspan></text> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="562.34814" + y="1351.1414" + id="text4227" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4229" + x="562.34814" + y="1351.1414">lorem </tspan></text> + <text + sodipodi:linespacing="125%" + id="text4231" + y="1235.1414" + x="560.34814" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="1235.1414" + x="560.34814" + id="tspan4233" + sodipodi:role="line">lorem </tspan></text> </g> </svg> Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -80,6 +80,7 @@ NotifyUser.info(i18n.t("Chatroom created")); } }); + diag.hide(); } } }); Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -167,6 +167,10 @@ iconRight.setVisible(true); } + public void setRightIconBackground(final String backgroundColor) { + DOM.setStyleAttribute(iconRight.getElement(), "backgroundColor", backgroundColor); + } + public void setRightIconResource(final ImageResource res) { iconRight.setResource(res); iconRight.addStyleName("k-iconlabel-right"); Modified: trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptor.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -32,6 +32,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; +import com.google.inject.persist.UnitOfWork; public class AuthenticatedMethodInterceptor implements MethodInterceptor { @@ -43,48 +44,59 @@ @Inject Provider<SessionService> sessionServiceProvider; + // https://code.google.com/p/google-guice/wiki/Transactions @Inject + private UnitOfWork unitOfWork; + + @Inject Provider<UserSession> userSessionProvider; @Override public Object invoke(final MethodInvocation invocation) throws Throwable { - final Object[] arguments = invocation.getArguments(); - // Some browsers getCookie returns "null" as String instead of null - final String userHash = arguments[0] == null || arguments[0].equals("null") ? null - : (String) arguments[0]; + // https://code.google.com/p/google-guice/wiki/Transactions + unitOfWork.end(); + unitOfWork.begin(); + try { + final Object[] arguments = invocation.getArguments(); + // Some browsers getCookie returns "null" as String instead of null + final String userHash = arguments[0] == null || arguments[0].equals("null") ? null + : (String) arguments[0]; - LOG.info("Method: " + invocation.getMethod().getName()); - LOG.info("Userhash received: " + userHash); - LOG.info("--------------------------------------------------------------------------------"); - final UserSession userSession = userSessionProvider.get(); - // final SessionService sessionService = sessionServiceProvider.get(); + LOG.info("Method: " + invocation.getMethod().getName()); + LOG.info("Userhash received: " + userHash); + LOG.info("--------------------------------------------------------------------------------"); + final UserSession userSession = userSessionProvider.get(); + // final SessionService sessionService = sessionServiceProvider.get(); - final Authenticated authAnnotation = invocation.getStaticPart().getAnnotation(Authenticated.class); - final boolean mandatory = authAnnotation.mandatory(); + final Authenticated authAnnotation = invocation.getStaticPart().getAnnotation(Authenticated.class); + final boolean mandatory = authAnnotation.mandatory(); - if (userHash == null && mandatory) { - // sessionService.getNewSession(); - throw new UserMustBeLoggedException(); - } else if (userSession.isUserNotLoggedIn() && mandatory) { - // sessionService.getNewSession(); - LOG.info("Session expired (not logged in server and mandatory)"); - throw new SessionExpiredException(); - } else if (userSession.isUserNotLoggedIn() && userHash == null) { - // Ok, do nothing - } else if (userSession.isUserNotLoggedIn() && userHash != null) { - // sessionService.getNewSession(); - LOG.info("Session expired (not logged in server)"); - throw new SessionExpiredException(); - } else if (!userSession.getHash().equals(userHash)) { - final String serverHash = userSession.getHash(); - userSession.logout(); - // sessionService.getNewSession(); - LOG.info("Session expired (userHash: " + userHash + " different from server hash: " + serverHash - + ")"); - throw new SessionExpiredException(); + if (userHash == null && mandatory) { + // sessionService.getNewSession(); + throw new UserMustBeLoggedException(); + } else if (userSession.isUserNotLoggedIn() && mandatory) { + // sessionService.getNewSession(); + LOG.info("Session expired (not logged in server and mandatory)"); + throw new SessionExpiredException(); + } else if (userSession.isUserNotLoggedIn() && userHash == null) { + // Ok, do nothing + } else if (userSession.isUserNotLoggedIn() && userHash != null) { + // sessionService.getNewSession(); + LOG.info("Session expired (not logged in server)"); + throw new SessionExpiredException(); + } else if (!userSession.getHash().equals(userHash)) { + final String serverHash = userSession.getHash(); + userSession.logout(); + // sessionService.getNewSession(); + LOG.info("Session expired (userHash: " + userHash + " different from server hash: " + serverHash + + ")"); + throw new SessionExpiredException(); + } + final Object result = invocation.proceed(); + return result; + } finally { + unitOfWork.end(); } - final Object result = invocation.proceed(); - return result; } } Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptionsStyleConfPanel.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -37,7 +37,6 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Label; @@ -60,11 +59,10 @@ super.setHeight(String.valueOf(EntityOptionsView.HEIGHT) + "px"); super.setWidth(String.valueOf(EntityOptionsView.WIDTH) + "px"); - final HorizontalPanel wsHP = new HorizontalPanel(); + final FlowPanel wsHP = new FlowPanel(); final Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:")); wsThemeInfo.addStyleName("kune-Margin-20-tb"); - // final Widget toolbarWsChange = (Widget) wsSelector.getView(); - // toolbarWsChange.addStyleName("kune-Margin-Medium-l"); + styleSelector.addStyleName("k-fl"); wsHP.add(wsThemeInfo); wsHP.add(styleSelector); add(wsHP); @@ -80,10 +78,11 @@ backPanel.add(currentBackLabel); backPanel.add(backImage); backPanel.add(clearBtn); - add(backPanel); + backPanel.addStyleName("oc-clean"); + // add(backPanel); final Label wsInfo = new Label(i18n.t("Select and configure the public space theme of this group:")); wsInfo.addStyleName("kune-Margin-Medium-tb"); - add(wsInfo); + // add(wsInfo); final VerticalPanel stylesPanel = new VerticalPanel(); final ClickHandler clickHandler = new ClickHandler() { @@ -99,6 +98,7 @@ thumb.setTooltip(i18n.t("Click to select and configure this theme")); // add(thumb); } + stylesPanel.addStyleName("oc-clean"); add(stylesPanel); setBackImageVisibleImpl(false); super.addStyleName("k-overflow-y-auto"); Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmorTheme.css 2011-06-16 23:33:52 UTC (rev 1410) @@ -21,7 +21,11 @@ background-color: bc1; } -.entityToolsNorth span { +.k-sn-maintitle { + color: bc3; +} + +.entityToolsNorth span ,.k-sn-deck div { color: c1; } @@ -49,6 +53,13 @@ background-color: bc1; } +.k-tool-item { +} + +.k-tool-item span { + color: c1; +} + .k-tool-item-focus { background-color: bc4; } @@ -58,7 +69,10 @@ } .k-tool-item-nofocus { +} +.k-tool-item-nofocus span { + color: c1; } .k-tool-item-selected { @@ -91,7 +105,7 @@ background-color: bc5; } -.entityHeader span { +.entityHeader span, .entityHeader div { color: c5; } @@ -128,6 +142,10 @@ background-color: bc7; } +.k-empty-msg span, .k-folder-viewer span { + color: c7; +} + .docFooter { background-color: #e3dbdb; } Modified: trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/cc/kune/gspace/client/themes/GSpaceThemeSelectorPresenter.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -29,6 +29,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.core.client.init.AppStartEvent; import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.shared.dto.GSpaceTheme; import cc.kune.core.shared.dto.InitDataDTO; @@ -67,14 +68,18 @@ private final HashMap<String, MenuRadioItemDescriptor> itemMap; private final GSpaceThemeManager manager; private MenuDescriptor menu; + private final CoreResources res; private final Session session; + private ActionExtensibleView view; @Inject public GSpaceThemeSelectorPresenter(final Session session, final I18nTranslationService i18n, - final EventBus eventBus, final GSpaceThemeManager manager, final GSpaceThemeSelectorPanel view) { + final CoreResources res, final EventBus eventBus, final GSpaceThemeManager manager, + final GSpaceThemeSelectorPanel view) { this.session = session; this.i18n = i18n; + this.res = res; this.eventBus = eventBus; this.manager = manager; this.view = view; @@ -82,8 +87,9 @@ eventBus.addHandler(GSpaceThemeChangeEvent.getType(), new GSpaceThemeChangeHandler() { @Override public void onGsThemeChange(final GSpaceThemeChangeEvent event) { - final String themeName = event.getNewTheme().getName(); - select(themeName); + final GSpaceTheme newTheme = event.getNewTheme(); + final GSpaceTheme oldTheme = event.getOldTheme(); + select(oldTheme, newTheme); } }); this.view = view; @@ -107,7 +113,8 @@ private void createMenu() { menu = new MenuDescriptor(""); - menu.putValue(Action.SMALL_ICON, "images/colors.gif"); + menu.putValue(Action.STYLES, "k-button"); + menu.putValue(Action.SMALL_ICON, res.themeChoose()); } private void createTheme(final GSpaceTheme theme) { @@ -117,9 +124,17 @@ view.add(item); } - public void select(final String themeName) { - itemMap.get(themeName).setChecked(true); - menu.setText(i18n.t(themeName)); + public void select(final GSpaceTheme oldTheme, final GSpaceTheme newTheme) { + final String oldThemeName = oldTheme.getName(); + final String newThemeName = newTheme.getName(); + itemMap.get(newThemeName).setChecked(true); + itemMap.get(newThemeName).putValue(Action.SMALL_ICON, "#FFF"); + itemMap.get(newThemeName).putValue(Action.SMALL_ICON, newTheme.getBackColors()[0]); + if (oldThemeName != null) { + itemMap.get(oldThemeName).putValue(Action.SMALL_ICON, "#FFF"); + itemMap.get(oldThemeName).putValue(Action.SMALL_ICON, oldTheme.getBackColors()[0]); + } + menu.setText(i18n.t(newThemeName)); } private void setThemes(final InitDataDTO initData) { Deleted: trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,8 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd"> -<module> - <inherits name="cc.kune.core.Core" /> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -<!-- <inherits name="com.calclab.emiteuimodule.EmiteUIModule" />--> - <source path="client" /> -</module> Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,141 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - \*/ -package org.ourproject.kune.chat.client; - -import org.ourproject.kune.chat.client.ctx.room.AddRoom; -import org.ourproject.kune.platf.client.actions.ActionEnableCondition; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; -import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.workspace.client.OldAbstractFoldableContentActions; -import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; - -import cc.kune.common.client.utils.SchedulerManager; -import cc.kune.core.client.cnt.ContentActionRegistry; -import cc.kune.core.client.i18n.I18nUITranslationService; -import cc.kune.core.client.state.Session; -import cc.kune.core.shared.domain.ContentStatus; -import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.core.shared.dto.AccessRolDTO; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.core.client.Scheduler.ScheduledCommand; - -public class ChatClientActions { - - private final Provider<AddRoom> addRoomProvider; - private final Provider<ChatEngine> chatEngineProvider; - private final ContentActionRegistry contentActionRegistry; - private final ContextActionRegistry contextActionRegistry; - private final Provider<SchedulerManager> deferredWrapper; - private final I18nUITranslationService i18n; - private final Session session; - - public ChatClientActions(final I18nUITranslationService i18n, final Session session, - final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, - final Provider<ChatEngine> chatEngine, final Provider<AddRoom> addRoomProvider, - final Provider<SchedulerManager> deferredWrapper) { - this.i18n = i18n; - this.session = session; - this.contentActionRegistry = contentActionRegistry; - this.contextActionRegistry = contextActionRegistry; - this.chatEngineProvider = chatEngine; - this.addRoomProvider = addRoomProvider; - this.deferredWrapper = deferredWrapper; - createActions(); - } - - private void createActions() { - final ActionToolbarButtonDescriptor<StateToken> chatAbout = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, OldAbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - deferredWrapper.get().addCommand(new ScheduledCommand() { - @Override - public void execute() { - final String subject = i18n.t("Chat about: [%s]", session.getContentState().getTitle()); - chatEngineProvider.get().joinRoom(token.toString().replaceAll("\\.", "-"), subject, - session.getCurrentUserInfo().getShortName()); - chatEngineProvider.get().show(); - } - }); - } - }); - // chatAbout.setTextDescription(i18n.t("Chat about")); - chatAbout.setIconUrl("images/emite-room.png"); - chatAbout.setToolTip("Chat and comment this"); - chatAbout.setLeftSeparator(ActionToolbarButtonSeparator.fill); - chatAbout.setEnableCondition(notDeleted()); - - final ActionToolbarButtonDescriptor<StateToken> joinRoom = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Viewer, OldAbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - final ChatEngine chatEngine = chatEngineProvider.get(); - chatEngine.joinRoom(session.getContainerState().getContainer().getName(), - session.getCurrentUserInfo().getShortName()); - chatEngine.show(); - } - }); - joinRoom.setTextDescription(i18n.t("Enter room")); - joinRoom.setToolTip(i18n.t("Enter in this chat room")); - joinRoom.setMustBeAuthenticated(true); - - final ActionToolbarButtonDescriptor<StateToken> addRoom = new ActionToolbarButtonDescriptor<StateToken>( - AccessRolDTO.Administrator, OldAbstractFoldableContentActions.CONTEXT_TOPBAR, new Listener<StateToken>() { - @Override - public void onEvent(final StateToken token) { - addRoomProvider.get().show(); - } - }); - addRoom.setTextDescription(i18n.t("New room")); - addRoom.setToolTip(i18n.t("Create a new chat room")); - addRoom.setMustBeAuthenticated(true); - - // contentActionRegistry.addAction(chatAbout, - // DocumentClientTool.TYPE_DOCUMENT); - // contentActionRegistry.addAction(chatAbout, - // DocumentClientTool.TYPE_UPLOADEDFILE); - // contentActionRegistry.addAction(chatAbout, - // WikiClientTool.TYPE_WIKIPAGE); - // contentActionRegistry.addAction(chatAbout, BlogClientTool.TYPE_POST); - // contentActionRegistry.addAction(chatAbout, - // WikiClientTool.TYPE_UPLOADEDFILE); - // contentActionRegistry.addAction(chatAbout, - // GalleryClientTool.TYPE_UPLOADEDFILE); - // contentActionRegistry.addAction(chatAbout, - // BlogClientTool.TYPE_UPLOADEDFILE); - // - // contextActionRegistry.addAction(addRoom, ChatClientTool.TYPE_ROOT, - // ChatClientTool.TYPE_ROOM); - // contentActionRegistry.addAction(joinRoom, ChatClientTool.TYPE_ROOM); - } - - private ActionEnableCondition<StateToken> notDeleted() { - return new ActionEnableCondition<StateToken>() { - @Override - public boolean mustBeEnabled(final StateToken token) { - final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( - ContentStatus.inTheDustbin)); - return isNotDeleted; - } - }; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,47 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client; - -import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import org.ourproject.kune.workspace.client.tool.OldFoldableAbstractClientTool; - -import cc.kune.core.client.registry.ContentCapabilitiesRegistry; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.themes.GSpaceThemeManager; -import cc.kune.gspace.client.tool.selector.ToolSelector; - -public class ChatClientTool extends OldFoldableAbstractClientTool { - public static final String NAME = "chats"; - public static final String TYPE_CHAT = "chat.chat"; - public static final String TYPE_ROOM = "chat.room"; - public static final String TYPE_ROOT = "chat.root"; - - public ChatClientTool(final I18nTranslationService i18n, final WorkspaceSkeleton ws, - final ToolSelector toolSelector, final GSpaceThemeManager wsThemePresenter, - final ContentCapabilitiesRegistry contentCapabilitiesRegistry) { - super(NAME, i18n.t("chat rooms"), toolSelector, wsThemePresenter, ws, contentCapabilitiesRegistry); - registerContentTypeIcon(TYPE_ROOM, "images/emite-room.png"); - } - - @Override - public String getName() { - return NAME; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatConnectionOptions.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,35 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client; - - -public class ChatConnectionOptions { - public final String domain; - // public UserChatOptions userOptions; - public final String httpBase; - public final String roomHost; - - public ChatConnectionOptions(final String httpBase, final String domain, final String roomHost) { - this.httpBase = httpBase; - this.domain = domain; - this.roomHost = roomHost; - // userOptions = null; - } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,55 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client; - -import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; -import com.calclab.suco.client.events.Listener0; - -public interface ChatEngine { - - void addNewBuddie(String shortName); - - void addOnRosterChanged(Listener0 slot); - - void chat(XmppURI jid); - - ChatConnectionOptions getChatOptions(); - - boolean isBuddie(String localUserName); - - boolean isBuddie(XmppURI jid); - - boolean isLoggedIn(); - - void joinRoom(String roomName, String userAlias); - - void joinRoom(String roomName, String subject, String userAlias); - - void login(String jid, String passwd); - - void logout(); - - void setAvatar(String photoBinary); - - void show(); - - void stop(); - -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,300 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client; - -class ChatEngineDefault { // implements ChatEngine { - // - // private ChatConnectionOptions chatOptions; - // private final Provider<FileDownloadUtils> downloadUtils; - // private final Provider<EmiteUIDialog> emiteUIProvider; - // private final I18nTranslationService i18n; - // private final Event0 onRosterChanged; - // private Collection<RosterItem> roster; - // private final KeyStroke shortcut; - // private ToolbarButton traybarButton; - // private final WorkspaceSkeleton wskel; - // - // public ChatEngineDefault(final I18nTranslationService i18n, final - // WorkspaceSkeleton wskel, - // final AppStarter application, final Session session, final - // Provider<EmiteUIDialog> emiteUIProvider, - // final Provider<FileDownloadUtils> downloadUtils, final - // GlobalShortcutRegister shortcutRegister) { - // this.i18n = i18n; - // this.wskel = wskel; - // this.emiteUIProvider = emiteUIProvider; - // this.downloadUtils = downloadUtils; - // this.onRosterChanged = new Event0("onRosterChanged"); - // shortcut = Shortcut.getShortcut(false, true, false, false, - // Character.valueOf('C')); - // shortcutRegister.put(shortcut, new AbstractExtendedAction() { - // @Override - // public void actionPerformed(final ActionEvent event) { - // if (isDialogStarted()) { - // toggleShow(); - // } - // - // } - // }); - // session.onInitDataReceived(new Listener<InitDataDTO>() { - // private void checkChatDomain(final String chatDomain) { - // final String httpDomain = WindowUtils.getLocation().getHostName(); - // if (!chatDomain.equals(httpDomain)) { - // Log.error("Your http domain (" + httpDomain + - // ") is different from the chat domain (" + chatDomain - // + "). This will cause problems with the chat functionality. " - // + "Please check kune.properties on the server."); - // } - // } - // - // @Override - // public void onEvent(final InitDataDTO initData) { - // checkChatDomain(initData.getChatDomain()); - // chatOptions = new ChatConnectionOptions(initData.getChatHttpBase(), - // initData.getChatDomain(), - // initData.getChatRoomHost()); - // } - // }); - // session.onUserSignOut(new Listener0() { - // @Override - // public void onEvent() { - // logout(); - // } - // }); - // session.onUserSignIn(new Listener<UserInfoDTO>() { - // @Override - // public void onEvent(final UserInfoDTO user) { - // login(user.getChatName(), user.getChatPassword()); - // } - // }); - // // application.onClosing(new Listener<ClosingEvent>() { - // // public void onEvent(final ClosingEvent event) { - // // stop(); - // // } - // // }); - // } - // - // @Override - // public void addNewBuddie(final String shortName) { - // // emiteUIProvider.get().addBuddie(getLocalUserJid(shortName), shortName, - // ""); - // } - // - // @Override - // public void addOnRosterChanged(final Listener0 slot) { - // // onRosterChanged.add(slot); - // } - // - // @Override - // public void chat(final XmppURI jid) { - // // emiteUIProvider.get().chat(jid); - // } - // - // @Override - // public ChatConnectionOptions getChatOptions() { - // return chatOptions; - // } - // - // private XmppURI getLocalUserJid(final String shortName) { - // return XmppURI.jid(shortName + "@" + chatOptions.domain); - // } - // - // private UserChatOptions getUserChatOptions(final String jid, final String - // passwd) { - // final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + - // // getGwtMetaProperty(GWT_PROPERTY_RELEASE); - // // FIXME, get this from user profile - // return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, - // resource, "blue", SubscriptionMode.manual, - // true); - // } - // - // @Override - // public boolean isBuddie(final String shortName) { - // return isBuddie(getLocalUserJid(shortName)); - // } - // - // @Override - // public boolean isBuddie(final XmppURI jid) { - // if (roster != null) { - // for (final RosterItem item : roster) { - // if (item.getJID().equalsNoResource(jid)) { - // return true; - // } - // } - // } - // return false; - // } - // - // public boolean isDialogStarted() { - // // return !emiteUIProvider.get().isDialogNotStarted(); - // } - // - // @Override - // public boolean isLoggedIn() { - // // return emiteUIProvider.get().isLoggedIn(); - // } - // - // @Override - // public void joinRoom(final String roomName, final String userAlias) { - // joinRoom(roomName, null, userAlias); - // } - // - // @Override - // public void joinRoom(final String roomName, final String subject, final - // String userAlias) { - // // if (emiteUIProvider.get().isLoggedIn()) { - // // final XmppURI roomURI = XmppURI.uri(roomName + "@" + - // chatOptions.roomHost + "/" - // // + chatOptions.userOptions.getUserJid().getNode()); - // // final Room room = (Room) emiteUIProvider.get().joinRoom(roomURI); - // // if (subject != null) { - // // Scheduler.get().scheduleDeferred(new ScheduledCommand() { - // // @Override - // // public void execute() { - // // final RoomUI roomUI = (RoomUI) room.getData(ChatUI.class); - // // if (roomUI != null) { - // // roomUI.setSubject(subject); - // // } - // // } - // // }); - // // } - // // } else { - // // NotifyUser.showAlertMessage(i18n.t("Error"), - // i18n.t("To join a chatroom you need to be 'online'")); - // // } - // } - // - // @Override - // public void login(final String jid, final String passwd) { - // final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd); - // // FIXME: Avatar provider - // final AvatarProvider avatarProvider = new AvatarProvider() { - // @Override - // public String getAvatarURL(final XmppURI userURI) { - // // if (userURI.getHost().equals(chatOptions.domain)) { - // // FIXME - // // return downloadUtils.get().getLogoImageUrl(new - // // StateToken(userURI.getNode())); - // // } else { - // // return ""; - // // } - // return "images/person-def.gif"; - // } - // }; - // final String initialWindowTitle = Window.getTitle(); - // chatOptions.userOptions = userChatOptions; - // if (emiteUIProvider.get().isDialogNotStarted()) { - // emiteUIProvider.get().onRosterChanged(new - // Listener<Collection<RosterItem>>() { - // @Override - // public void onEvent(final Collection<RosterItem> rosterChanged) { - // roster = rosterChanged; - // onRosterChanged.fire(); - // } - // }); - // emiteUIProvider.get().start(userChatOptions, chatOptions.httpBase, - // chatOptions.domain, - // chatOptions.roomHost, avatarProvider, i18n.t("Chat")); - // } else { - // emiteUIProvider.get().setEnableStatusUI(true); - // emiteUIProvider.get().refreshUserInfo(chatOptions.userOptions); - // } - // emiteUIProvider.get().show(OwnStatus.online); - // if (traybarButton == null) { - // traybarButton = new ToolbarButton(); - // traybarButton.setTooltip(i18n.t("Show/hide the chat window" + - // shortcut.toString())); - // traybarButton.setIcon("images/e-icon.gif"); - // traybarButton.addListener(new ButtonListenerAdapter() { - // @Override - // public void onClick(final Button button, final EventObject e) { - // toggleShow(); - // } - // }); - // wskel.getSiteTraybar().addButton(traybarButton); - // emiteUIProvider.get().onChatAttended(new Listener<String>() { - // @Override - // public void onEvent(final String parameter) { - // traybarButton.setIcon("images/e-icon.gif"); - // } - // }); - // emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() - // { - // @Override - // public void onEvent(final String parameter) { - // traybarButton.setIcon("images/e-icon-a.gif"); - // } - // }); - // } - // emiteUIProvider.get().hide(); - // emiteUIProvider.get().onChatAttended(new Listener<String>() { - // @Override - // public void onEvent(final String parameter) { - // Window.setTitle(initialWindowTitle); - // } - // }); - // emiteUIProvider.get().onChatUnattendedWithActivity(new Listener<String>() - // { - // @Override - // public void onEvent(final String chatTitle) { - // Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle); - // } - // }); - // } - // - // @Override - // public void logout() { - // if (!emiteUIProvider.get().isDialogNotStarted()) { - // emiteUIProvider.get().setOwnPresence(OwnStatus.offline); - // chatOptions.userOptions = getUserChatOptions("[email protected]", ""); - // emiteUIProvider.get().refreshUserInfo(chatOptions.userOptions); - // emiteUIProvider.get().setEnableStatusUI(false); - // } - // } - // - // @Override - // public void setAvatar(final String photoBinary) { - // emiteUIProvider.get().setOwnVCardAvatar(photoBinary); - // } - // - // @Override - // public void show() { - // emiteUIProvider.get().show(); - // } - // - // @Override - // public void stop() { - // if (!emiteUIProvider.get().isDialogNotStarted()) { - // emiteUIProvider.get().destroy(); - // } - // if (emiteUIProvider.get().getSession().isLoggedIn()) { - // emiteUIProvider.get().getSession().logout(); - // } - // } - // - // public void toggleShow() { - // if (emiteUIProvider.get().isVisible()) { - // emiteUIProvider.get().hide(); - // } else { - // emiteUIProvider.get().show(); - // } - // } -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ChatMessages.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatMessages.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatMessages.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,23 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client; - -public interface ChatMessages { -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContext.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContext.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContext.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,24 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client.ctx; - - -public interface ChatContext { -} Deleted: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,36 +0,0 @@ -/* - * - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat.client.ctx; - -import org.ourproject.kune.chat.client.ChatClientTool; -import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; -import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; - -import cc.kune.core.client.state.StateManager; - -import com.calclab.suco.client.ioc.Provider; - -public class ChatContextPresenter extends FoldableContextPresenter implements ChatContext { - - public ChatContextPresenter(final StateManager stateManager, - final Provider<ContextNavigator> contextNavigatorProvider) { - super(ChatClientTool.NAME, stateManager, contextNavigatorProvider); - } -} Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/main/resources/kune.properties 2011-06-16 23:33:52 UTC (rev 1410) @@ -35,7 +35,7 @@ ### Workspace enabled themes # This names are also the name of the items in the theme menu and there are translated -kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink +kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite kune.wsthemes.default = default kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7 kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c @@ -45,7 +45,7 @@ kune.wsthemes.purple.colors = #FFF, #FFF, #FFF, #FFF, #6d0c87, #FFF, #6d0c87, #6d0c87 kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7 kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d -kune.wsthemes.red.backgrounds = #ffc0c0, #de8888, #c04141, #ff8080, #ffe0e0, #b86262, #FFF, #f7e1e1 +kune.wsthemes.red.backgrounds = #de8787, #d35f5f, #c04141, #ff8080, #ffe0e0, #b86262, #FFF, #f7e1e1 kune.wsthemes.red.colors = #aa0000, #FFF, #FFF, #FFF, #a02c2c, #FFF, #a02c2c, #a02c2c kune.wsthemes.sahara.backgrounds = #ffe7d7, #eac9b3, #d59367, #eac9b3, #f7ece4, #e0ae8d, #FFF, #f7ece4 kune.wsthemes.sahara.colors = #502d16, #502d16, #552200, #502d16, #502d16, #784421, #d45500, #d45500 @@ -53,11 +53,16 @@ kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1 kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000 -kune.wsthemes.camp.backgrounds = #f6f1de, #a49e87, #3c3c3c, #f5cc22, #f6f1de, #4f472b, #FFF, #fff8dc +kune.wsthemes.camp.backgrounds = #ffe680, #a49e87, #3c3c3c, #f5cc22, #f6f1de, #4f472b, #FFF, #fff8dc kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515 kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #ff74ab, #ffddf8, #d25b8b, #FFF, #f6dee8 kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066 - +kune.wsthemes.highcontrast.backgrounds = #000055, #162d50, #00002b, #000055, #0000aa, #00112b, #b3b3b3, #162d50 +kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF +kune.wsthemes.whiteblack.backgrounds = #FFF, #FFF, #e6e6e6, #FFF, #FFF, #e6e6e6, #FFF, #FFF +kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000 +kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e6e6e6, #000, #000 +kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #FFF, #FFF ### Gallery options kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav Deleted: trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java 2011-06-16 23:29:11 UTC (rev 1409) +++ trunk/src/test/java/org/ourproject/kune/chat/ChatToolTest.java 2011-06-16 23:33:52 UTC (rev 1410) @@ -1,38 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.ourproject.kune.chat; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; -import org.ourproject.kune.chat.client.ChatClientTool; - -import cc.kune.chat.shared.ChatConstants; - -public class ChatToolTest { - - @Test - public void clientAndServerAreSync() { - assertEquals(ChatConstants.NAME, ChatClientTool.NAME); - assertEquals(ChatConstants.TYPE_ROOT, ChatClientTool.TYPE_ROOT); - assertEquals(ChatConstants.TYPE_ROOM, ChatClientTool.TYPE_ROOM); - assertEquals(ChatConstants.TYPE_CHAT, ChatClientTool.TYPE_CHAT); - } -}