[kune-commits] r1245 - in trunk: . img/webtemplate script src/main/java/cc/kune/chat/client src/main/java/cc/kune/common/client/actions/gxtui src/main/java/cc/kune/common/client/actions/ui/descrip src/main/java/cc/kune/common/client/noti src/main/java/cc/kune/common/public/gxt/css src/main/java/cc/kune/common/public/gxt-custom/css src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/logs src/main/java/cc/kune/core/client/notify/confirm src/main/java/cc/kune/core/client/sitebar src/main/java/cc/kune/core/client/sn/actions/conditions src/main/java/cc/kune/core/client/sn/actions/registry src/main/java/cc/kune/core/client/state src/main/java/cc/kune/core/client/ui/dialogs src/main/java/cc/kune/core/public src/main/java/cc/kune/core/public/images src/main/java/cc/kune/gspace/client src/main/java/org/ourproject/kune/app/public/css src/main/java/org/ourproject/kune/platf/public/images src/main/java/org/ourproject/kune/workspace/client src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin src/main/java/org/ourproject/kune/workspace/client/i18n src/main/java/org/ourproject/kune/workspace/client/options src/main/java/org/ourproject/kune/workspace/client/sitebar src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu src/test/java/cc/kune src/test/java/cc/kune/common src/test/java/cc/kune/common/client src/test/java/cc/kune/common/client/actions src/test/java/cc/kune/common/client/actions/ui src/test/java/cc/kune/common/client/actions/ui/descrip
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Fri Feb 11 04:28:35 CET 2011
Author: vjrj_
Date: 2011-02-11 04:28:34 +0100 (Fri, 11 Feb 2011)
New Revision: 1245
Added:
trunk/script/header.html
trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java
trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml
trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java
trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java
trunk/src/main/java/cc/kune/core/public/about.html
trunk/src/main/java/cc/kune/core/public/frame-def.css
trunk/src/main/java/cc/kune/core/public/images/group-def-icon.gif
trunk/src/main/java/cc/kune/core/public/logo-kune-big.png
trunk/src/test/java/cc/kune/common/
trunk/src/test/java/cc/kune/common/client/
trunk/src/test/java/cc/kune/common/client/actions/
trunk/src/test/java/cc/kune/common/client/actions/ui/
trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/
trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java
Removed:
trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java
trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java
trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css
trunk/src/main/java/org/ourproject/kune/platf/public/images/group-def-icon.gif
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java
Modified:
trunk/CREDITS
trunk/TODO
trunk/img/webtemplate/web_template-2011.svg
trunk/script/css-update.sh
trunk/script/generateAbout.sh
trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java
trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java
trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java
trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java
trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java
trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java
trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java
trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css
trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
trunk/src/main/java/cc/kune/core/client/CoreParts.java
trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java
trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java
trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java
trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java
trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java
trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java
trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java
trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java
trunk/src/main/java/cc/kune/core/public/ws.css
trunk/src/main/java/cc/kune/core/public/ws.html
trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml
trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java
Log:
SN Refactorization
Modified: trunk/CREDITS
===================================================================
--- trunk/CREDITS 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/CREDITS 2011-02-11 03:28:34 UTC (rev 1245)
@@ -18,6 +18,7 @@
Freire staff.
* Daniel Jiménez for the initial help and coordination
* Javier de la Cueva and Leovigildo García-Bobadilla for the legal support
-* Jonathan Araña Cruz, Roxu and all the xsto staff for help with the infraestructure
+* Jonathan Araña Cruz, Roxu and all the <URL:http://xsto.info> staff for help with the infraestructure
* Johnattan Rupire for web contributions.
-* and ourproject.org and again xsto.info for sharing with us their resources
+* The <URL:http://iepala.es> staff for their support
+* and <URL:http://ourproject.org> and again <URL:http://xsto.info> for sharing with us their resources
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/TODO 2011-02-11 03:28:34 UTC (rev 1245)
@@ -11,6 +11,8 @@
Use org-mode in emacs to easy manage this file
* SHORT-TERM (URGENT)
+** HelloWord with samples of extensions: sitebar, sitebar options menu, siteuseroptions, sn, ...
+** TODO Register of "reserved words" not permitted for groups/users names (in server and in client)
** TODO WIAB under proxies
https://groups.google.com/group/wave-protocol/browse_thread/thread/202dee4bfdbdeee6
** TODO StateManager #signin while already signed in NPE
Modified: trunk/img/webtemplate/web_template-2011.svg
===================================================================
--- trunk/img/webtemplate/web_template-2011.svg 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/img/webtemplate/web_template-2011.svg 2011-02-11 03:28:34 UTC (rev 1245)
@@ -52,16 +52,16 @@
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="0.78961905"
- inkscape:cx="493.46544"
- inkscape:cy="448.12343"
- inkscape:current-layer="layer7"
+ inkscape:zoom="2.7077228"
+ inkscape:cx="962.93133"
+ inkscape:cy="392.7939"
+ inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
inkscape:window-width="1280"
- inkscape:window-height="974"
+ inkscape:window-height="747"
inkscape:window-x="0"
- inkscape:window-y="21"
+ inkscape:window-y="1024"
inkscape:window-maximized="1"
inkscape:snap-bbox="false"
inkscape:bbox-paths="true"
@@ -232,7 +232,7 @@
id="g5365">
<path
transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)"
- d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z"
+ d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z"
sodipodi:ry="26.82268"
sodipodi:rx="26.82268"
sodipodi:cy="332.62314"
@@ -242,7 +242,7 @@
sodipodi:type="arc" />
<path
transform="matrix(0.05245387,0,0,0.05245387,400.1808,-0.554549)"
- d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z"
+ d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z"
sodipodi:ry="26.82268"
sodipodi:rx="26.82268"
sodipodi:cy="332.62314"
@@ -567,7 +567,7 @@
transform="translate(-751,-12)">
<path
transform="translate(0,-3)"
- d="m 333,232 a 11,11 0 1 1 -22,0 11,11 0 1 1 22,0 z"
+ d="m 333,232 c 0,6.07513 -4.92487,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.07513,0 11,4.92487 11,11 z"
sodipodi:ry="11"
sodipodi:rx="11"
sodipodi:cy="232"
@@ -2546,7 +2546,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(0.475,0,0,0.95,-21.570622,377.21335)"
- d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z"
+ d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z"
sodipodi:ry="10"
sodipodi:rx="20"
sodipodi:cy="32.362183"
@@ -2559,7 +2559,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,8.0842525,364.37023)"
- d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="16.362183"
@@ -2578,14 +2578,14 @@
sodipodi:cy="16.362183"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.7154875,362.20909)" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,7.7663825,370.24449)"
- d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="16.362183"
@@ -2604,14 +2604,14 @@
sodipodi:cy="16.362183"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.2467045,371.75097)" />
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png"
transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,-0.8112855,366.96948)"
- d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="16.362183"
@@ -2627,6 +2627,48 @@
height="113.28773"
x="-48.066803"
y="340.33881" />
+ <rect
+ style="opacity:0.84999999999999998;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect6139"
+ width="167.08397"
+ height="134.83969"
+ x="879.38934"
+ y="307.78625" />
+ <rect
+ style="opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.1996699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect6141"
+ width="164.7063"
+ height="32.31588"
+ x="880.42413"
+ y="328.24014" />
+ <text
+ xml:space="preserve"
+ style="font-size:16px;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;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ x="889.85516"
+ y="349.36758"
+ id="text24744-4"
+ sodipodi:linespacing="125%"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"><tspan
+ sodipodi:role="line"
+ id="tspan24746-6"
+ x="889.85516"
+ y="349.36758">menu item</tspan></text>
+ <text
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png"
+ sodipodi:linespacing="125%"
+ id="text6164"
+ y="379.36758"
+ x="889.85516"
+ style="font-size:16px;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;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold"
+ xml:space="preserve"><tspan
+ y="379.36758"
+ x="889.85516"
+ id="tspan6166"
+ sodipodi:role="line">menu item</tspan></text>
</g>
<g
inkscape:groupmode="layer"
Modified: trunk/script/css-update.sh
===================================================================
--- trunk/script/css-update.sh 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/script/css-update.sh 2011-02-11 03:28:34 UTC (rev 1245)
@@ -17,3 +17,4 @@
cp src/main/java/cc/kune/core/public/ws.html target/kune-0.0.7/ws/
cp src/main/webapp/templates/basic/basic.css target/kune-0.0.7/templates/basic/basic.css
cp src/main/webapp/templates/basic/docs.liquid.html target/kune-0.0.7/templates/basic/
+cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-0.0.7/ws/gxt-custom/css/gxt-op-common.css
Modified: trunk/script/generateAbout.sh
===================================================================
--- trunk/script/generateAbout.sh 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/script/generateAbout.sh 2011-02-11 03:28:34 UTC (rev 1245)
@@ -13,9 +13,9 @@
VER=`grep "<version>" pom.xml | head -1 | sed 's/..version.//g'`
-echo Kune >> $tmp
-echo "--------------------------------------------------------------------------------" >> $tmp
+#echo "kune" >> $tmp
+#echo "--------------------------------------------------------------------------------" >> $tmp
echo Version $VER '('$SVNVER')' >> $tmp
-txt2html -h 80 --preserve_indent -8 --style_url /ws/css/richtext.css --infile $tmp --infile CREDITS --infile COPYRIGHT --outfile war/ws/about.html
+txt2html --prepend_file bin/header.html -h 80 --preserve_indent -8 --style_url frame-def.css --infile $tmp --infile CREDITS --infile COPYRIGHT --outfile src/main/java/cc/kune/core/public/about.html
rm $tmp
Added: trunk/script/header.html
===================================================================
--- trunk/script/header.html (rev 0)
+++ trunk/script/header.html 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,6 @@
+<span>
+ <a target="_blank" href="http://kune.ourproject.org/" title="kune" rel="home">
+<img src="logo-kune-big.png" alt="kune-logo" height="36" width="200">
+</img>
+</a>
+</span>
Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -56,6 +56,7 @@
import com.calclab.emite.core.client.xmpp.stanzas.XmppURI;
import com.calclab.emite.im.client.chat.ChatManager;
import com.calclab.emite.im.client.roster.XmppRoster;
+import com.calclab.emite.reconnect.client.SessionReconnect;
import com.calclab.emite.xep.avatar.client.AvatarManager;
import com.calclab.emite.xep.muc.client.Room;
import com.calclab.emite.xep.muc.client.RoomManager;
@@ -133,7 +134,7 @@
xmppSession = Suco.get(XmppSession.class);
chatManager = Suco.get(ChatManager.class);
roomManager = Suco.get(RoomManager.class);
- // Suco.get(SessionReconnect.class);
+ Suco.get(SessionReconnect.class);
eventBus.addHandler(AppStartEvent.getType(), new AppStartEvent.AppStartHandler() {
@Override
Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuGui.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -31,7 +31,6 @@
import com.extjs.gxt.ui.client.widget.menu.Menu;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.extjs.gxt.ui.client.widget.menu.SeparatorMenuItem;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.UIObject;
@@ -107,7 +106,6 @@
protected String getMenuPosition() {
final MenuPosition position = (MenuPosition) descriptor.getValue(MENU_POSITION);
- GWT.log("menu position" + position == null ? "none" : position.name());
return position == null ? DEF_MENU_POSITION : position.name();
}
Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -31,6 +31,7 @@
import cc.kune.common.client.actions.ui.descrip.MenuCheckItemDescriptor;
import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor;
+import cc.kune.common.client.utils.TextUtils;
import com.extjs.gxt.ui.client.event.MenuEvent;
import com.extjs.gxt.ui.client.event.SelectionListener;
@@ -91,7 +92,6 @@
public void componentSelected(final MenuEvent ce) {
final AbstractAction action = descriptor.getAction();
if (action != null) {
-
action.actionPerformed(new ActionEvent(getItemObjectOfAction(descriptor), Event.getCurrentEvent()));
}
}
@@ -157,7 +157,7 @@
@Override
protected void setToolTipText(final String tooltip) {
- if (tooltip != null) {
+ if (TextUtils.notEmpty(tooltip)) {
item.setToolTip(new GxtDefTooltip(tooltip));
}
}
Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuGui.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -25,6 +25,7 @@
import cc.kune.common.client.actions.ui.ParentWidget;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
+import cc.kune.common.client.utils.TextUtils;
import com.extjs.gxt.ui.client.Style.ButtonScale;
import com.extjs.gxt.ui.client.event.ButtonEvent;
@@ -142,7 +143,7 @@
@Override
public void setToolTipText(final String tooltip) {
if (button != null) {
- if (tooltip != null && tooltip.length() > 0) {
+ if (TextUtils.notEmpty(tooltip)) {
button.setToolTip(new GxtDefTooltip(tooltip));
}
}
Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtSubMenuGui.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -22,6 +22,7 @@
import cc.kune.common.client.actions.ui.AbstractGuiItem;
import cc.kune.common.client.actions.ui.ParentWidget;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
+import cc.kune.common.client.utils.TextUtils;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
@@ -72,7 +73,9 @@
@Override
public void setToolTipText(final String tooltip) {
- item.setToolTip(new GxtDefTooltip(tooltip));
+ if (TextUtils.notEmpty(tooltip)) {
+ item.setToolTip(new GxtDefTooltip(tooltip));
+ }
}
@Override
Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -19,6 +19,9 @@
*/
package cc.kune.common.client.actions.ui.descrip;
+import java.util.ArrayList;
+import java.util.List;
+
import cc.kune.common.client.actions.AbstractAction;
import cc.kune.common.client.actions.Action;
import cc.kune.common.client.actions.ActionEvent;
@@ -32,7 +35,7 @@
/** The action. */
private final AbstractAction action;
- private GuiAddCondition addCondition = new GuiAddConditionAdapter();
+ private final List<GuiAddCondition> addConditions;
/** The item DOM id. */
private String id;
@@ -56,9 +59,15 @@
this.action = action;
position = NO_POSITION;
parent = NO_PARENT;
+ addConditions = new ArrayList<GuiAddCondition>();
}
@Override
+ public void add(final GuiAddCondition addCondition) {
+ addConditions.add(addCondition);
+ }
+
+ @Override
public void fire(final ActionEvent event) {
action.actionPerformed(event);
}
@@ -69,11 +78,6 @@
}
@Override
- public GuiAddCondition getAddCondition() {
- return addCondition;
- }
-
- @Override
public String getId() {
return id;
}
@@ -147,19 +151,16 @@
@Override
public boolean mustBeAdded() {
- boolean result = false;
- if (addCondition != null) {
- result = addCondition.mustBeAdded(this);
+ final boolean result = true;
+ for (final GuiAddCondition addCondition : addConditions) {
+ if (!addCondition.mustBeAdded(this)) {
+ return false;
+ }
}
return result;
}
@Override
- public void setAddCondition(final GuiAddCondition addCondition) {
- this.addCondition = addCondition;
- }
-
- @Override
public void setEnabled(final boolean enabled) {
super.putValue(Action.ENABLED, enabled);
}
Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -26,12 +26,12 @@
void addPropertyChangeListener(final PropertyChangeListener listener);
+ void add(final GuiAddCondition addCondition);
+
void fire(final ActionEvent event);
AbstractAction getAction();
- GuiAddCondition getAddCondition();
-
String getId();
Object getItem();
@@ -64,8 +64,6 @@
void removePropertyChangeListener(final PropertyChangeListener listener);
- void setAddCondition(final GuiAddCondition addCondition);
-
void setEnabled(final boolean enabled);
void setId(final String id);
Deleted: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiAddConditionAdapter.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,28 +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 cc.kune.common.client.actions.ui.descrip;
-
-
-public class GuiAddConditionAdapter implements GuiAddCondition {
- @Override
- public boolean mustBeAdded(final GuiActionDescrip descrip) {
- return true;
- }
-}
Modified: trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/client/noti/NotifyUser.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -89,7 +89,7 @@
}
public static void showAlertMessage(final String title, final String message, final SimpleCallback callback) {
- eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), i18n.t("Close"), callback));
+ eventBus.fireEvent(new ConfirmAskEvent(title, message, i18n.t("Ok"), "", callback));
}
public static void showProgress(final String text) {
Deleted: trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css
===================================================================
--- trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-op-common.css 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,2347 +0,0 @@
-body {
- background-color: #16181a;
- color: #fcfcfc;
-}
-
-.ext-el-mask {
- background-color: #ccc;
-}
-
-.ext-el-mask-msg {
- border-color: #223;
- background-color: #3f4757;
- background-image: url(../images/box/tb-blue.gif);
-}
-
-.ext-el-mask-msg div {
- background-color: #232d38;
- border-color: #556;
- color: #fff;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-mask-loading div {
- background-color: #232d38;
- background-image: url(../images/grid/loading.gif);
-}
-
-.x-item-disabled {
- color: #ddd;
-}
-
-.x-item-disabled * {
- color: #ddd !important;
-}
-
-.x-splitbar-proxy {
- background-color: #aaa;
-}
-
-.x-color-palette a {
- border-color: #fff;
-}
-
-.x-color-palette a:hover,.x-color-palette a.x-color-palette-sel {
- border-color: #8bb8f3;
- background-color: #deecfd;
-}
-
-.x-color-palette em {
- border-color: #aca899;
-}
-
-.x-ie-shadow {
- background-color: #777;
-}
-
-/*
-.x-shadow .xsmc {
- background-image: url(../images/default/shadow-c.png);
-}
-
-.x-shadow .xsml,.x-shadow .xsmr {
- background-image: url(../images/default/shadow-lr.png);
-}
-
-.x-shadow .xstl,.x-shadow .xstc,.x-shadow .xstr,.x-shadow .xsbl,.x-shadow .xsbc,.x-shadow .xsbr {
- background-image: url(../images/default/shadow.png);
-}
-*/
-.loading-indicator {
- font-size: 14px;
- background-image: url(../images/grid/loading.gif);
-}
-
-.x-spotlight {
- background-color: #ccc;
-}
-
-.x-tab-panel-header,.x-tab-panel-footer {
- background-color: #e18325;
- border-color: #8db2e3;
- overflow: hidden;
- zoom: 1;
-}
-
-.x-tab-panel-header,.x-tab-panel-footer {
- border-color: #222;
-}
-
-ul.x-tab-strip-top {
- background-color: #343843;
- background-image: url(../images/tabs/tab-strip-bg.gif);
- border-bottom-color: #343d4e;
-}
-
-ul.x-tab-strip-bottom {
- background-color: #343843;
- background-image: url(../images/tabs/tab-strip-btm-bg.gif);
- border-top-color: #343843;
-}
-
-.x-tab-panel-header-plain .x-tab-strip-spacer,.x-tab-panel-footer-plain .x-tab-strip-spacer {
- border-color: #222;
- background-color: #e18325;
-}
-
-.x-tab-strip span.x-tab-strip-text {
- font: normal 14px tahoma, arial, helvetica;
- color: #fff;
-}
-
-.x-tab-strip-over span.x-tab-strip-text {
- color: #fff;
-}
-
-.x-tab-strip-active span.x-tab-strip-text {
- color: black;
- font-weight: bold;
-}
-
-.x-tab-strip-disabled .x-tabs-text {
- color: #aaaaaa;
-}
-
-.x-tab-strip-top .x-tab-right,.x-tab-strip-top .x-tab-left,.x-tab-strip-top .x-tab-strip-inner {
- background-image: url(../images/tabs/tabs-sprite.gif);
-}
-
-.x-tab-strip-bottom .x-tab-right {
- background-image: url(../images/tabs/tab-btm-inactive-right-bg.gif);
-}
-
-.x-tab-strip-bottom .x-tab-left {
- background-image: url(../images/tabs/tab-btm-inactive-left-bg.gif);
-}
-
-.x-tab-strip-bottom .x-tab-strip-active .x-tab-right {
- background-image: url(../images/tabs/tab-btm-right-bg.gif);
-}
-
-.x-tab-strip-bottom .x-tab-strip-active .x-tab-left {
- background-image: url(../images/tabs/tab-btm-left-bg.gif);
-}
-
-.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close {
- background-image: url(../images/tabs/tab-close.gif);
-}
-
-.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover {
- background-image: url(../images/tabs/tab-close.gif);
-}
-
-.x-tab-panel-body {
- border-color: #18181a;
- background-color: #fff;
-}
-
-.x-tab-panel-body-top {
- border-top: 0 none;
-}
-
-.x-tab-panel-body-bottom {
- border-bottom: 0 none;
-}
-
-.x-tab-scroller-left {
- background-image: url(../images/tabs/scroll-left.gif);
- border-bottom-color: #8db2e3;
-}
-
-.x-tab-scroller-left-over {
- background-position: 0 0;
-}
-
-.x-tab-scroller-left-disabled {
- background-position: -18px 0;
- opacity: .5;
- -moz-opacity: .5;
- filter: alpha(opacity = 50);
- cursor: default;
-}
-
-.x-tab-scroller-right {
- background-image: url(../images/tabs/scroll-right.gif);
- border-bottom-color: #8db2e3;
-}
-
-.x-tab-panel-bbar .x-toolbar,.x-tab-panel-tbar .x-toolbar {
- border-color: #99bbe8;
-}
-
-.x-form-field {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-form-text,textarea.x-form-field {
- color: #ffffff;
- background-color: #33373d;
- background-image: url(../images/form/text-bg.gif);
- border-color: #737b8c;
- border-width: 2px;
-}
-
-.x-form-text,.ext-ie .x-form-file {
- height: 26px;
-}
-
-.ext-strict .x-form-text {
- height: 20px;
-}
-
-.x-form-select-one {
- background-color: #fff;
- border-color: #b5b8c8;
-}
-
-.x-form-check-group-label {
- border-bottom: 1px solid #99bbe8;
- color: #fff;
-}
-
-.x-editor .x-form-check-wrap {
- background-color: #fff;
-}
-
-.x-form-field-wrap .x-form-trigger {
- background-image: url(../images/form/trigger.gif);
- border-bottom-color: #737b8c;
- border-bottom-width: 2px;
- height: 24px;
- width: 20px;
-}
-
-.x-form-field-wrap .x-form-trigger.x-form-trigger-over {
- border-bottom-color: #d97e27;
-}
-
-.x-form-field-wrap .x-form-trigger.x-form-trigger-click {
- border-bottom-color: #c86e19;
-}
-
-.x-small-editor .x-form-field-wrap .x-form-trigger {
- height: 20px;
-}
-
-.x-form-field-wrap .x-form-trigger-over {
- background-position: -20px 0;
-}
-
-.x-form-field-wrap .x-form-trigger-click {
- background-position: -40px 0;
-}
-
-.x-trigger-wrap-focus .x-form-trigger {
- background-position: -60px 0;
-}
-
-.x-trigger-wrap-focus .x-form-trigger-over {
- background-position: -80px 0;
-}
-
-.x-trigger-wrap-focus .x-form-trigger-click {
- background-position: -100px 0;
-}
-
-.x-form-field-wrap .x-form-date-trigger {
- background-image: url(../images/form/date-trigger.gif);
-}
-
-.x-form-field-wrap .x-form-clear-trigger {
- background-image: url(../images/form/clear-trigger.gif);
-}
-
-.x-form-field-wrap .x-form-search-trigger {
- background-image: url(../images/form/search-trigger.gif);
-}
-
-.x-trigger-wrap-focus .x-form-trigger {
- border-bottom-color: #737b8c;
-}
-
-.x-item-disabled .x-form-trigger-over {
- border-bottom-color: #b5b8c8;
-}
-
-.x-item-disabled .x-form-trigger-click {
- border-bottom-color: #b5b8c8;
-}
-
-.x-form-focus,textarea.x-form-focus {
- border-color: #ff9c33;
-}
-
-.x-form-invalid,textarea.x-form-invalid {
- background-color: #15171a;
- background-image: url(../images/grid/invalid_line.gif);
- border-color: #c30;
-}
-
-.ext-safari .x-form-invalid {
- background-color: #fee;
- border-color: #ff7870;
-}
-
-.x-form-inner-invalid,textarea.x-form-inner-invalid {
- background-color: #fff;
- background-image: url(../images/grid/invalid_line.gif);
-}
-
-.x-form-grow-sizer {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-form-item {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-form-invalid-msg {
- color: #c0272b;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- background-image: url(../images/default/shared/warning.gif);
-}
-
-.x-form-empty-field {
- color: #dadadd;
-}
-
-.x-small-editor .x-form-text {
- height: 22px;
-}
-
-.x-small-editor .x-form-field {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.ext-safari .x-small-editor .x-form-field {
- font: normal 15px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-form-invalid-icon {
- background-image: url(../images/form/exclamation.gif);
- height: 25px;
- width: 19px;
- background-position: center right;
-}
-
-.x-fieldset {
- border-color: #737B8C;
- color: white !important;
-}
-
-.x-fieldset legend {
- font: bold 14px tahoma, arial, helvetica, sans-serif;
- color: white !important;
-}
-
-.x-btn {
- font: normal 14px tahoma, verdana, helvetica;
-}
-
-.x-btn button {
- font: normal 14px arial, tahoma, verdana, helvetica;
- color: #fffffa;
- padding-left: 6px !important;
- padding-right: 6px !important;
-}
-
-.x-btn-over .x-btn button {
- color: #fff;
-}
-
-.x-btn-noicon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-left .x-btn-text,.x-btn-icon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-right .x-btn-text
- {
- height: 18px;
-}
-
-.x-btn-icon .x-btn-small .x-btn-text {
- width: 18px;
-}
-
-.x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
- padding-left: 21px !important;
-}
-
-.x-btn-text-icon .x-btn-icon-small-right .x-btn-text {
- padding-right: 21px !important;
-}
-
-.x-btn-text-icon .x-btn-icon-medium-left .x-btn-text {
- padding-left: 29px !important;
-}
-
-.x-btn-text-icon .x-btn-icon-medium-right .x-btn-text {
- padding-right: 29px !important;
-}
-
-.x-btn-text-icon .x-btn-icon-large-left .x-btn-text {
- padding-left: 37px !important;
-}
-
-.x-btn-text-icon .x-btn-icon-large-right .x-btn-text {
- padding-right: 37px !important;
-}
-
-.x-btn em {
- font-style: normal;
- font-weight: normal;
-}
-
-.x-btn-tl,.x-btn-tr,.x-btn-tc,.x-btn-ml,.x-btn-mr,.x-btn-mc,.x-btn-bl,.x-btn-br,.x-btn-bc {
- background-image: url(../images/button/btn.gif);
-}
-
-.x-btn-click .x-btn-text,.x-btn-menu-active .x-btn-text,.x-btn-pressed .x-btn-text {
- color: #fff;
-}
-
-.x-btn-pressed .x-btn-text {
- font-style: italic;
- text-decoration: underline;
- font-weight: bold;
- color: black !important;
-}
-
-.x-btn-disabled * {
- color: #eee !important;
-}
-
-.x-btn-mc em.x-btn-arrow {
- background-image: url(../images/button/arrow.gif);
- padding-right: 13px;
-}
-
-.x-btn-mc em.x-btn-split {
- background-image: url(../images/button/s-arrow.gif);
- padding-right: 20px;
-}
-
-.x-contrast .x-btn-mc em.x-btn-split {
- padding-right: 0px;
-}
-
-.x-btn-over .x-btn-mc em.x-btn-split,.x-btn-click .x-btn-mc em.x-btn-split,.x-btn-menu-active .x-btn-mc em.x-btn-split,.x-btn-pressed .x-btn-mc em.x-btn-split
- {
- background-image: url(../images/button/s-arrow-o.gif);
-}
-
-.x-btn-mc em.x-btn-arrow-bottom {
- background-image: url(../images/button/s-arrow-b-noline.gif);
-}
-
-.x-btn-mc em.x-btn-split-bottom {
- background-image: url(../images/button/s-arrow-b.gif);
-}
-
-.x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-btn-pressed .x-btn-mc em.x-btn-split-bottom
- {
- background-image: url(../images/button/s-arrow-bo.gif);
-}
-
-.x-btn-group-header {
- color: #d2d2d2;
-}
-
-.x-btn-group-tc {
- background-image: url(../images/button/group-tb.gif);
-}
-
-.x-btn-group-tl {
- background-image: url(../images/button/group-cs.gif);
-}
-
-.x-btn-group-tr {
- background-image: url(../images/button/group-cs.gif);
-}
-
-.x-btn-group-bc {
- background-image: url(../images/button/group-tb.gif);
-}
-
-.x-btn-group-bl {
- background-image: url(../images/button/group-cs.gif);
-}
-
-.x-btn-group-br {
- background-image: url(../images/button/group-cs.gif);
-}
-
-.x-btn-group-ml {
- background-image: url(../images/button/group-lr.gif);
-}
-
-.x-btn-group-mr {
- background-image: url(../images/button/group-lr.gif);
-}
-
-.x-btn-group-notitle .x-btn-group-tc {
- background-image: url(../images/button/group-tb.gif);
-}
-
-.x-toolbar {
- border-color: #18181a;
- background-color: #393d4e;
- background-image: url(../images/toolbar/bg.gif);
-}
-
-.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-toolbar .x-item-disabled {
- color: gray;
-}
-
-.x-toolbar .x-item-disabled * {
- color: gray;
-}
-
-.x-toolbar .x-btn-mc em.x-btn-split {
- background-image: url(../images/button/s-arrow-noline.gif);
-}
-
-.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split
- {
- background-image: url(../images/button/s-arrow-o.gif);
-}
-
-.x-toolbar .x-btn-mc em.x-btn-split-bottom {
- background-image: url(../images/button/s-arrow-b-noline.gif);
-}
-
-.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom
- {
- background-image: url(../images/button/s-arrow-bo.gif);
-}
-
-.x-toolbar .xtb-sep {
- background-image: url(../images/grid/grid-blue-split.gif);
-}
-
-.x-toolbar .x-btn {
- padding-left: 3px;
- padding-right: 3px;
-}
-
-.x-toolbar .x-btn-mc em.x-btn-arrow {
- padding-right: 10px;
-}
-
-.x-toolbar .x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
- padding-left: 18px !important;
-}
-
-.x-toolbar .x-btn-mc em.x-btn-split {
- padding-right: 14px;
-}
-
-.x-tbar-page-first {
- background-image: url(../images/grid/page-first.gif) !important;
-}
-
-.x-tbar-loading {
- background-image: url(../images/grid/refresh.gif) !important;
-}
-
-.x-tbar-page-last {
- background-image: url(../images/grid/page-last.gif) !important;
-}
-
-.x-tbar-page-next {
- background-image: url(../images/grid/page-next.gif) !important;
-}
-
-.x-tbar-page-prev {
- background-image: url(../images/grid/page-prev.gif) !important;
-}
-
-.x-item-disabled .x-tbar-loading {
- background-image: url(../images/grid/loading.gif) !important;
-}
-
-.x-item-disabled .x-tbar-page-first {
- background-image: url(../images/grid/page-first-disabled.gif) !important;
-}
-
-.x-item-disabled .x-tbar-page-last {
- background-image: url(../images/grid/page-last-disabled.gif) !important;
-}
-
-.x-item-disabled .x-tbar-page-next {
- background-image: url(../images/grid/page-next-disabled.gif) !important;
-}
-
-.x-item-disabled .x-tbar-page-prev {
- background-image: url(../images/grid/page-prev-disabled.gif) !important;
-}
-
-.x-paging-info {
- color: #444;
-}
-
-.x-toolbar-more-icon {
- background-image: url(../images/toolbar/more.gif) !important;
-}
-
-.x-statusbar .x-status-busy {
- background-image: url(../images/grid/loading.gif);
-}
-
-.x-statusbar .x-status-text-panel {
- border-color: #99bbe8 #fff #fff #99bbe8;
-}
-
-.x-resizable-handle {
- background-color: #fff;
- color: #000;
-}
-
-.x-resizable-over .x-resizable-handle-east,.x-resizable-pinned .x-resizable-handle-east,.x-resizable-over .x-resizable-handle-west,.x-resizable-pinned .x-resizable-handle-west
- {
- background-image: url(../images/sizer/e-handle.gif);
-}
-
-.x-resizable-over .x-resizable-handle-south,.x-resizable-pinned .x-resizable-handle-south,.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north
- {
- background-image: url(../images/sizer/s-handle.gif);
-}
-
-.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north {
- background-image: url(../images/sizer/s-handle.gif);
-}
-
-.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast {
- background-image: url(../images/sizer/se-handle.gif);
-}
-
-.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest {
- background-image: url(../images/sizer/nw-handle.gif);
-}
-
-.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast {
- background-image: url(../images/sizer/ne-handle.gif);
-}
-
-.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest {
- background-image: url(../images/sizer/sw-handle.gif);
-}
-
-.x-resizable-proxy {
- border-color: #3b5a82;
-}
-
-.x-resizable-overlay {
- background-color: #fff;
-}
-
-.x-grid3 {
- background-color: #1f2933;
-}
-
-.x-grid-panel .x-panel-mc .x-panel-body {
- border-color: #223;
-}
-
-.x-grid3-hd-row td,.x-grid3-row td,.x-grid3-summary-row td {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-grid3-hd-row td {
- border-left-color: #556;
- border-right-color: #223;
-}
-
-.x-grid-row-loading {
- background-color: #fff;
- background-image: url(../images/default/shared/loading-balls.gif);
-}
-
-.x-grid3-row {
- border-bottom: 1px solid #111;
-}
-
-.x-grid3-row-alt {
- background-color: #1b232b;
-}
-
-.x-grid3-row-over {
- background-color: #7e5530;
- background-image: none;
-}
-
-.x-grid3-resize-proxy {
- background-color: #777;
-}
-
-.x-grid3-resize-marker {
- background-color: #777;
-}
-
-.x-grid3-header {
- background-color: #3b3f50;
- background-image: url(../images/grid/grid3-hrow.gif);
-}
-
-.x-grid3-header-pop {
- border-left-color: #d0d0d0;
-}
-
-.x-grid3-header-pop-inner {
- border-left-color: #eee;
- background-image: url(../images/default/grid/hd-pop.gif);
-}
-
-td.x-grid3-hd-over,td.sort-desc,td.sort-asc,td.x-grid3-hd-menu-open {
- border-left-color: #889;
- border-right-color: #445;
-}
-
-td.x-grid3-hd-over .x-grid3-hd-inner,td.sort-desc .x-grid3-hd-inner,td.sort-asc .x-grid3-hd-inner,td.x-grid3-hd-menu-open .x-grid3-hd-inner
- {
- background-color: #4e628a;
- background-image: url(../images/grid/grid3-hrow-over.gif);
-}
-
-.x-grid3-cell-inner,.x-grid3-hd-inner {
- color: #fff;
-}
-
-.sort-asc .x-grid3-sort-icon {
- background-image: url(../images/grid/sort_asc.gif);
- width: 15px;
- height: 9px;
- margin-left: 5px;
-}
-
-.sort-desc .x-grid3-sort-icon {
- background-image: url(../images/grid/sort_desc.gif);
- width: 15px;
- height: 9px;
- margin-left: 5px;
-}
-
-.x-grid3-cell-text,.x-grid3-hd-text {
- color: #fff;
-}
-
-.x-grid3-split {
- background-image: url(../images/default/grid/grid-split.gif);
-}
-
-.x-grid3-hd-text {
- color: fff;
-}
-
-.x-dd-drag-proxy .x-grid3-hd-inner {
- background-color: #bec7da;
- background-image: url(../images/grid/grid3-hrow-over.gif);
- border-color: #aaccf6;
-}
-
-.col-move-top {
- background-image: url(../images/default/grid/col-move-top.gif);
-}
-
-.col-move-bottom {
- background-image: url(../images/default/grid/col-move-bottom.gif);
-}
-
-.x-grid3-row-selected {
- background-color: #e5872c !important;
- background-image: none;
- border-style: solid;
- font-weight: bold !important;
- color: black !important;
-}
-
-.x-grid3-highlightrow {
- border: 1px dotted #e5872c !important;
- background-color: #666360;
- text-decoration: underline;
-}
-
-.x-grid3-group-selected {
- background-color: #e5872c !important;
-}
-
-.x-grid3-row-selected .x-grid3-cell-inner {
- color: black !important;
-}
-
-.x-grid3-cell-selected .x-grid3-cell-inner {
- background-color: #ffa340 !important;
- color: black !important;
- font-weight: bold;
-}
-
-.x-grid3-cell-selected span {
- color: black !important;
-}
-
-.x-grid3-cell-selected .x-grid3-cell-text {
- color: black;
-}
-
-.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker {
- background-color: #ebeadb !important;
- background-image: url(../images/default/grid/grid-hrow.gif) !important;
- color: #fff;
- border-top-color: #fff;
- border-right-color: #6fa0df !important;
-}
-
-.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div {
- color: fff !important;
-}
-
-.x-grid3-dirty-cell {
- background-image: url(../images/grid/dirty.gif);
-}
-
-.x-grid3-topbar,.x-grid3-bottombar {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-grid3-bottombar .x-toolbar {
- border-top-color: #a9bfd3;
-}
-
-.x-props-grid .x-grid3-td-name .x-grid3-cell-inner {
- background-image: url(../images/grid/grid3-special-col-bg.gif) !important;
- color: #fff !important;
-}
-
-.x-props-grid .x-grid3-td-value {
- color: #fff !important;
-}
-
-.x-props-grid .x-grid3-body .x-grid3-td-name {
- background-color: #263240 !important;
- border-right-color: #223;
-}
-
-.xg-hmenu-sort-asc .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-asc.gif);
-}
-
-.xg-hmenu-sort-desc .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-desc.gif);
-}
-
-.xg-hmenu-lock .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-lock.gif);
-}
-
-.xg-hmenu-unlock .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-unlock.gif);
-}
-
-.x-grid3-hd-btn {
- background-color: #c2c9d0;
- background-image: url(../images/grid/grid3-hd-btn.gif);
-}
-
-.x-grid3-body .x-grid3-td-expander {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
-}
-
-.x-grid3-row-expander {
- background-image: url(../images/grid/row-expand-sprite.gif);
-}
-
-.x-grid3-body .x-grid3-td-checker {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
-}
-
-.x-grid3-row-checker,.x-grid3-hd-checker {
- background-image: url(../images/default/grid/row-check-sprite.gif);
-}
-
-.x-grid3-body .x-grid3-td-numberer {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
-}
-
-.x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner {
- color: #fff;
-}
-
-.x-grid3-body .x-grid3-td-row-icon {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
-}
-
-.x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,.x-grid3-body .x-grid3-row-selected .x-grid3-td-expander
- {
- background-image: url(../images/grid/grid3-special-col-sel-bg.gif);
-}
-
-.x-grid3-check-col {
- background-image: url(../images/menu/unchecked.gif);
-}
-
-.x-grid3-check-col-on {
- background-image: url(../images/menu/checked.gif);
-}
-
-.x-grid-group,.x-grid-group-body,.x-grid-group-hd {
- zoom: 1;
-}
-
-.x-grid-group-hd {
- border-bottom-color: #4e628a;
-}
-
-.x-grid-group-hd div.x-grid-group-title {
- background-image: url(../images/grid/group-collapse.gif);
- background-position: 3px 6px;
- color: #ffd;
- font: bold 14px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-grid-group-collapsed .x-grid-group-hd div.x-grid-group-title {
- background-image: url(../images/grid/group-expand.gif);
-}
-
-.x-group-by-icon {
- background-image: url(../images/grid/group-by.gif);
-}
-
-.x-cols-icon {
- background-image: url(../images/grid/columns.gif);
-}
-
-.x-show-groups-icon {
- background-image: url(../images/grid/group-by.gif);
-}
-
-.x-grid-empty {
- color: gray;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-grid-with-col-lines .x-grid3-row td.x-grid3-cell {
- border-right-color: #ededed;
-}
-
-.x-grid-with-col-lines .x-grid3-row {
- border-top-color: #ededed;
-}
-
-.x-grid-with-col-lines .x-grid3-row-selected {
- border-top-color: #a3bae9;
-}
-
-.x-dd-drag-ghost {
- color: #000;
- font: normal 14px arial, helvetica, sans-serif;
- border-color: #ddd #bbb #bbb #ddd;
- background-color: #bec7da;
-}
-
-/*
-.x-dd-drop-nodrop .x-dd-drop-icon {
- background-image: url(../images/default/dd/drop-no.gif);
-}
-
-.x-dd-drop-ok .x-dd-drop-icon {
- background-image: url(../images/default/dd/drop-yes.gif);
-}
-
-.x-dd-drop-ok-add .x-dd-drop-icon {
- background-image: url(../images/default/dd/drop-add.gif);
-}
-*/
-.x-view-selector {
- background-color: #c3daf9;
- border-color: #3399bb;
-}
-
-.x-tree-node-expanded .x-tree-node-icon {
- background-image: url(../images/tree/folder-open.gif);
-}
-
-.x-tree-node-leaf .x-tree-node-icon {
- background-image: url(../images/default/tree/leaf.gif);
-}
-
-.x-tree-node-collapsed .x-tree-node-icon {
- background-image: url(../images/tree/folder.gif);
-}
-
-.x-tree-node-loading .x-tree-node-icon {
- background-image: url(../images/default/tree/loading.gif) !important;
-}
-
-.x-tree-node .x-tree-node-inline-icon {
- background-image: none;
-}
-
-.x-tree-node-loading a span {
- font-style: italic;
- color: #444444;
-}
-
-.ext-ie .x-tree-node-el input {
- width: 14px;
- height: 14px;
-}
-
-.x-tree-lines .x-tree-elbow {
- background-image: url(../images/tree/elbow.gif);
-}
-
-.x-tree-lines .x-tree-elbow-plus {
- background-image: url(../images/tree/elbow-plus.gif);
-}
-
-.x-tree-lines .x-tree-elbow-minus {
- background-image: url(../images/tree/elbow-minus.gif);
-}
-
-.x-tree-lines .x-tree-elbow-end {
- background-image: url(../images/tree/elbow-end.gif);
-}
-
-.x-tree-lines .x-tree-elbow-end-plus {
- background-image: url(../images/tree/elbow-end-plus.gif);
-}
-
-.x-tree-lines .x-tree-elbow-end-minus {
- background-image: url(../images/tree/elbow-end-minus.gif);
-}
-
-.x-tree-lines .x-tree-elbow-line {
- background-image: url(../images/tree/elbow-line.gif);
-}
-
-.x-tree-no-lines .x-tree-elbow-plus {
- background-image: url(../images/tree/elbow-plus-nl.gif);
-}
-
-.x-tree-no-lines .x-tree-elbow-minus {
- background-image: url(../images/tree/elbow-minus-nl.gif);
-}
-
-.x-tree-no-lines .x-tree-elbow-end-plus {
- background-image: url(../images/tree/elbow-end-plus-nl.gif);
-}
-
-.x-tree-no-lines .x-tree-elbow-end-minus {
- background-image: url(../images/tree/elbow-end-minus-nl.gif);
-}
-
-.x-tree-arrows .x-tree-elbow-plus {
- background-image: url(../images/tree/arrows.gif);
-}
-
-.x-tree-arrows .x-tree-elbow-minus {
- background-image: url(../images/tree/arrows.gif);
-}
-
-.x-tree-arrows .x-tree-elbow-end-plus {
- background-image: url(../images/tree/arrows.gif);
-}
-
-.x-tree-arrows .x-tree-elbow-end-minus {
- background-image: url(../images/tree/arrows.gif);
-}
-
-.x-tree-node {
- color: #000;
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-tree-node a,.x-dd-drag-ghost a {
- color: #fff;
-}
-
-.x-tree-node a span,.x-dd-drag-ghost a span {
- color: #fff;
-}
-
-.x-tree-node .x-tree-selected a,.x-dd-drag-ghost a {
- color: #fff;
-}
-
-.x-tree-node .x-tree-selected a span,.x-dd-drag-ghost a span {
- color: #fff;
-}
-
-.x-tree-node .x-tree-node-disabled a span {
- color: gray !important;
-}
-
-.x-tree-node div.x-tree-drag-insert-below {
- border-bottom-color: #36c;
-}
-
-.x-tree-node div.x-tree-drag-insert-above {
- border-top-color: #36c;
-}
-
-.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a {
- border-bottom-color: #36c;
-}
-
-.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a {
- border-top-color: #36c;
-}
-
-.x-tree-node .x-tree-drag-append a span {
- background-color: #ddd;
- border-color: gray;
-}
-
-.x-tree-node .x-tree-node-over {
- background-color: #7e5530;
-}
-
-.x-tree-node .x-tree-selected {
- background-color: #e5872c;
- font-weight: bold;
-}
-
-.x-tree-drop-ok-append .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-add.gif);
-}
-
-.x-tree-drop-ok-above .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-over.gif);
-}
-
-.x-tree-drop-ok-below .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-under.gif);
-}
-
-.x-tree-drop-ok-between .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-between.gif);
-}
-
-.x-date-picker {
- border-color: #737b8c;
- background-color: #21252e;
-}
-
-.x-date-middle,.x-date-left,.x-date-right {
- background-image: url(../images/shared/hd-sprite.gif);
- color: #fff;
- font: bold 14px "sans serif", tahoma, verdana, helvetica;
-}
-
-.x-date-middle .x-btn .x-btn-text {
- color: #fff;
-}
-
-.x-date-middle .x-btn-mc em.x-btn-arrow {
- background-image: url(../images/toolbar/btn-arrow-light.gif);
-}
-
-.x-date-right a {
- background-image: url(../images/shared/right-btn.gif);
-}
-
-.x-date-left a {
- background-image: url(../images/shared/left-btn.gif);
-}
-
-.x-date-inner th {
- background-color: #363d4a;
- background-image: url(../images/toolbar/bg.gif);
- border-bottom-color: #535b5c;
- font: normal 13px arial, helvetica, tahoma, sans-serif;
- color: #fff;
-}
-
-.x-date-inner td {
- border-color: #112;
-}
-
-.x-date-inner a {
- font: normal 14px arial, helvetica, tahoma, sans-serif;
- color: #fff;
- padding: 2px 7px 1px 3px; /* Structure to account for larger, bolder fonts in Access theme. */
-}
-
-.x-date-inner .x-date-active {
- color: #000;
-}
-
-.x-date-inner .x-date-selected a {
- background-color: #e5872c;
- background-image: none;
- border-color: #864900;
- padding: 1px 6px 1px 2px; /* Structure to account for larger, bolder fonts in Access theme. */
-}
-
-.x-date-inner .x-date-today a {
- border-color: #99a;
-}
-
-.x-date-inner .x-date-selected span {
- font-weight: bold;
-}
-
-.x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a {
- color: #aaa;
-}
-
-.x-date-bottom {
- border-top-color: #737b8c;
- background-color: #464d5a;
- background-image: url(../images/shared/glass-bg.gif);
-}
-
-.x-date-inner a:hover,.x-date-inner .x-date-disabled a:hover {
- color: #fff;
- background-color: #7e5530;
-}
-
-.x-date-inner .x-date-disabled a {
- background-color: #eee;
- color: #bbb;
-}
-
-.x-date-mmenu {
- background-color: #eee !important;
-}
-
-.x-date-mmenu .x-menu-item {
- font-size: 13px;
- color: #000;
-}
-
-.x-date-mp {
- background-color: #21252e;
-}
-
-.x-date-mp td {
- font: normal 14px arial, helvetica, tahoma, sans-serif;
-}
-
-.x-date-mp-btns button {
- background-color: #083772;
- color: #fff;
- border-color: #3366cc #000055 #000055 #3366cc;
- font: normal 14px arial, helvetica, tahoma, sans-serif;
-}
-
-.x-date-mp-btns {
- background-color: #dfecfb;
- background-image: url(../images/shared/glass-bg.gif);
-}
-
-.x-date-mp-btns td {
- border-top-color: #c5d2df;
-}
-
-td.x-date-mp-month a,td.x-date-mp-year a {
- color: #fff;
-}
-
-td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
- color: fff;
- background-color: #7e5530;
-}
-
-td.x-date-mp-sel a {
- background-color: #e5872c;
- background-image: none;
- border-color: #864900;
-}
-
-.x-date-mp-ybtn a {
- background-image: url(../images/panel/tool-sprites.gif);
-}
-
-td.x-date-mp-sep {
- border-right-color: #c5d2df;
-}
-
-.x-tip .x-tip-close {
- background-image: url(../images/qtip/close.gif);
-}
-
-.x-tip .x-tip-tc,.x-tip .x-tip-tl,.x-tip .x-tip-tr,.x-tip .x-tip-bc,.x-tip .x-tip-bl,.x-tip .x-tip-br,.x-tip .x-tip-ml,.x-tip .x-tip-mr
- {
- background-image: url(../images/qtip/tip-sprite.gif);
-}
-
-.x-tip .x-tip-mc {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-tip .x-tip-ml {
- background-color: #fff;
-}
-
-.x-tip .x-tip-header-text {
- font: bold 14px tahoma, arial, helvetica, sans-serif;
- color: #ffd;
-}
-
-.x-tip .x-tip-body {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- color: #000;
-}
-
-.x-form-invalid-tip .x-tip-tc,.x-form-invalid-tip .x-tip-tl,.x-form-invalid-tip .x-tip-tr,.x-form-invalid-tip .x-tip-bc,.x-form-invalid-tip .x-tip-bl,.x-form-invalid-tip .x-tip-br,.x-form-invalid-tip .x-tip-ml,.x-form-invalid-tip .x-tip-mr
- {
- background-image: url(../images/default/form/error-tip-corners.gif);
-}
-
-.x-form-invalid-tip .x-tip-body {
- background-image: url(../images/form/exclamation.gif);
-}
-
-.x-tip-anchor {
- background-image: url(../images/qtip/tip-anchor-sprite.gif);
-}
-
-.x-menu {
- border-color: #222;
- background-color: #414551;
- background-image: url(../images/menu/menu.gif);
-}
-
-.x-menu-nosep {
- background-image: none;
-}
-
-.x-menu-list-item {
- font: normal 14px tahoma, arial, sans-serif;
-}
-
-.x-menu-item-arrow {
- background-image: url(../images/menu/menu-parent.gif);
-}
-
-.x-menu-sep {
- background-color: #223;
- border-bottom-color: #666;
-}
-
-a.x-menu-item {
- color: #fffff6;
-}
-
-.x-menu-item-active {
- background-color: #f09134;
- background-image: none;
- border-color: #b36427;
-}
-
-.x-menu-item-active a.x-menu-item {
- border-color: #b36427;
-}
-
-.x-menu-check-item .x-menu-item-icon {
- background-image: url(../images/default/menu/unchecked.gif);
-}
-
-.x-menu-item-checked .x-menu-item-icon {
- background-image: url(../images/default/menu/checked.gif);
-}
-
-.x-menu-item-checked .x-menu-group-item .x-menu-item-icon {
- background-image: url(../images/menu/group-checked.gif);
-}
-
-.x-menu-group-item .x-menu-item-icon {
- background-image: none;
-}
-
-.x-menu-plain {
- background-color: #fff !important;
-}
-
-.x-menu .x-date-picker {
- border-color: #a3bad9;
-}
-
-.x-cycle-menu .x-menu-item-checked {
- border-color: #a3bae9 !important;
- background-color: #def8f6;
-}
-
-.x-menu-scroller-top {
- background-image: url(../images/layout/mini-top.gif);
-}
-
-.x-menu-scroller-bottom {
- background-image: url(../images/layout/mini-bottom.gif);
-}
-
-.x-box-tl {
- background-image: url(../images/default/box/corners.gif);
-}
-
-.x-box-tc {
- background-image: url(../images/default/box/tb.gif);
-}
-
-.x-box-tr {
- background-image: url(../images/default/box/corners.gif);
-}
-
-.x-box-ml {
- background-image: url(../images/default/box/l.gif);
-}
-
-.x-box-mc {
- background-color: #eee;
- background-image: url(../images/default/box/tb.gif);
- font-family: "Myriad Pro", "Myriad Web", "Tahoma", "Helvetica", "Arial", sans-serif;
- color: #393939;
- font-size: 15px;
-}
-
-.x-box-mc h3 {
- font-size: 18px;
- font-weight: bold;
-}
-
-.x-box-mr {
- background-image: url(../images/default/box/r.gif);
-}
-
-.x-box-bl {
- background-image: url(../images/default/box/corners.gif);
-}
-
-.x-box-bc {
- background-image: url(../images/default/box/tb.gif);
-}
-
-.x-box-br {
- background-image: url(../images/default/box/corners.gif);
-}
-
-.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr {
- background-image: url(../images/default/box/corners-blue.gif);
-}
-
-.x-box-blue .x-box-bc,.x-box-blue .x-box-mc,.x-box-blue .x-box-tc {
- background-image: url(../images/default/box/tb-blue.gif);
-}
-
-.x-box-blue .x-box-mc {
- background-color: #c3daf9;
-}
-
-.x-box-blue .x-box-mc h3 {
- color: #17385b;
-}
-
-.x-box-blue .x-box-ml {
- background-image: url(../images/default/box/l-blue.gif);
-}
-
-.x-box-blue .x-box-mr {
- background-image: url(../images/default/box/r-blue.gif);
-}
-
-.x-combo-list {
- border: 2px solid #232732;
- background-color: #555566 !important;
- font: normal 15px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-combo-list-inner {
- background-color: #414551;
-}
-
-.x-combo-list-hd {
- font: bold 14px tahoma, arial, helvetica, sans-serif;
- color: fff;
- background-image: url(../images/default/layout/panel-title-light-bg.gif);
- border-bottom-color: #98c0f4;
-}
-
-.x-resizable-pinned .x-combo-list-inner {
- border-bottom-color: #98c0f4;
-}
-
-.x-combo-list-item {
- border-color: #556;
-}
-
-.x-combo-list .x-combo-selected {
- border-color: #e5872c !important;
- background-color: #e5872c;
- font-weight: bold;
-}
-
-.x-combo-list .x-toolbar {
- border-top-color: #98c0f4;
-}
-
-.x-combo-list-small {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-panel {
- border-color: #18181a;
-}
-
-.x-panel-header {
- color: #fff !important;
- font-weight: bold;
- font-size: 14px;
- font-family: tahoma, arial, verdana, sans-serif;
- border-color: #18181a;
- background-image: url(../images/panel/white-top-bottom.gif);
-}
-
-.x-panel-body {
- color: #fffff6;
- border-color: #18181a;
- background-color: #232d38;
-}
-
-.x-tab-panel .x-panel-body {
- color: #fffff6;
- border-color: #18181a;
- background-color: #1f2730;
-}
-
-.x-panel-bbar .x-toolbar,.x-panel-tbar .x-toolbar {
- border-color: #223;
-}
-
-.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar {
- border-top-color: #223;
-}
-
-.x-panel-body-noheader,.x-panel-mc .x-panel-body {
- border-top-color: #223;
-}
-
-.x-panel-tl .x-panel-header {
- color: fff;
- font: bold 14px tahoma, arial, verdana, sans-serif;
-}
-
-.x-panel-tc {
- background-image: url(../images/panel/top-bottom.gif);
-}
-
-.x-panel-tl,.x-panel-tr,.x-panel-bl,.x-panel-br {
- background-image: url(../images/panel/corners-sprite.gif);
- border-bottom-color: #222224;
-}
-
-.x-panel-bc {
- background-image: url(../images/panel/top-bottom.gif);
-}
-
-.x-panel-mc {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- background-color: #3f4757;
-}
-
-.x-panel-ml {
- background-image: url(../images/panel/left-right.gif);
-}
-
-.x-panel-mr {
- background-image: url(../images/panel/left-right.gif);
-}
-
-.x-tool {
- background-image: url(../images/panel/tool-sprites.gif);
-}
-
-.x-tool-resize {
-background-position:0 -360px;
-}
-
-.x-tool-resize-over {
-background-position:-15px -360px;
-}
-
-.x-tool-move {
-background-position:0 -375px;
-}
-
-.x-tool-move-over {
-background-position:-15px -375px;
-}
-
-.x-panel-ghost {
- background-color: #3f4757;
-}
-
-.x-panel-ghost ul {
- border-color: #18181a;
-}
-
-.x-panel-dd-spacer {
- border-color: #18181a;
-}
-
-.x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-window-proxy {
- background-color: #1f2833;
- border-color: #18181a;
-}
-
-.x-window-tl .x-window-header {
- color: #fff !important;
- font: bold 14px tahoma, arial, verdana, sans-serif;
-}
-
-.x-window-tc {
- background-image: url(../images/window/top-bottom.png);
-}
-
-.x-window-tl {
- background-image: url(../images/window/left-corners.png);
-}
-
-.x-window-tr {
- background-image: url(../images/window/right-corners.png);
-}
-
-.x-window-bc {
- background-image: url(../images/window/top-bottom.png);
-}
-
-.x-window-bl {
- background-image: url(../images/window/left-corners.png);
-}
-
-.x-window-br {
- background-image: url(../images/window/right-corners.png);
-}
-
-.x-window-mc {
- border-color: #18181a;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- background-color: #1f2833;
-}
-
-.x-window-ml {
- background-image: url(../images/window/left-right.png);
-}
-
-.x-window-mr {
- background-image: url(../images/window/left-right.png);
-}
-
-.x-window-maximized .x-window-tc {
- background-color: #fff;
-}
-
-.x-window-bbar .x-toolbar {
- border-top-color: #323945;
-}
-
-.x-panel-ghost .x-window-tl {
- border-bottom-color: #323945;
-}
-
-.x-panel-collapsed .x-window-tl {
- border-bottom-color: #323945;
-}
-
-.x-dlg-mask {
- background-color: #ccc;
-}
-
-.x-window-plain .x-window-mc {
- background-color: #464f61;
- border-color: #636778;
-}
-
-.ext-ie .x-window-plain .x-window-mc {
- background-color: #3f4757;
-}
-
-.x-window-plain .x-window-body {
- color: #fffff6;
- border-color: #464F61;
-}
-
-body.x-body-masked .x-window-plain .x-window-mc {
- background-color: #464f61;
-}
-
-.x-html-editor-wrap {
- border-color: #737B8C;
- background-color: #fff;
-}
-
-.x-html-editor-wrap iframe {
- background-color: #fff;
-}
-
-.x-panel-noborder .x-panel-header-noborder {
- border-bottom-color: #343d4e;
-}
-
-.x-panel-noborder .x-panel-tbar-noborder .x-toolbar {
- border-bottom-color: #343d4e;
-}
-
-.x-panel-noborder .x-panel-bbar-noborder .x-toolbar {
- border-top-color: #343d4e;
-}
-
-.x-tab-panel-bbar-noborder .x-toolbar {
- border-top-color: #343d4e;
-}
-
-.x-tab-panel-tbar-noborder .x-toolbar {
- border-bottom-color: #343d4e;
-}
-
-.x-border-layout-ct {
- background-color: #3f4757;
-}
-
-.x-accordion-hd {
- color: #fff;
- font-weight: normal;
- background-image: url(../images/panel/light-hd.gif);
-}
-
-.x-layout-collapsed {
- background-color: #323845;
- border-color: #1a1a1c;
-}
-
-.x-layout-collapsed-over {
- background-color: #2d3440;
-}
-
-.x-layout-split-west .x-layout-mini {
- background-image: url(../images/default/layout/mini-left.gif);
-}
-
-.x-layout-split-east .x-layout-mini {
- background-image: url(../images/default/layout/mini-right.gif);
-}
-
-.x-layout-split-north .x-layout-mini {
- background-image: url(../images/default/layout/mini-top.gif);
-}
-
-.x-layout-split-south .x-layout-mini {
- background-image: url(../images/default/layout/mini-bottom.gif);
-}
-
-.x-layout-cmini-west .x-layout-mini {
- background-image: url(../images/default/layout/mini-right.gif);
-}
-
-.x-layout-cmini-east .x-layout-mini {
- background-image: url(../images/default/layout/mini-left.gif);
-}
-
-.x-layout-cmini-north .x-layout-mini {
- background-image: url(../images/default/layout/mini-bottom.gif);
-}
-
-.x-layout-cmini-south .x-layout-mini {
- background-image: url(../images/default/layout/mini-top.gif);
-}
-
-.x-progress-wrap {
- border-color: #18181a;
-}
-
-.x-progress-inner {
- background-color: #232d38;
- background-image: none;
-}
-
-.x-progress-bar {
- background-color: #f39a00;
- background-image: url(../images/progress/progress-bg.gif);
- border-top-color: #a66900;
- border-bottom-color: #a66900;
- border-right-color: #ffb941;
-}
-
-.x-progress-text {
- font-size: 14px;
- font-weight: bold;
- color: #fff;
-}
-
-.x-progress-text-back {
- color: #aaa;
- line-height: 11px;
-}
-
-.x-list-header {
- background-color: #393d4e;
- background-image: url(../images/toolbar/bg.gif);
- background-position: 0 top;
-}
-
-.x-list-header-inner div em {
- border-left-color: #667;
- font: normal 14px arial, tahoma, helvetica, sans-serif;
- line-height: 14px;
-}
-
-.x-list-body dt em {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-list-over {
- background-color: #eee;
-}
-
-.x-list-selected {
- background-color: #dfe8f6;
- font-weight: bold;
-}
-
-.x-list-resizer {
- border-left-color: #555;
- border-right-color: #555;
-}
-
-.x-list-header-inner em.sort-asc,.x-list-header-inner em.sort-desc {
- background-image: url(../images/grid/sort-hd.gif);
- border-color: #3e4e6c;
-}
-
-.x-slider-input {
- color: black;
-}
-
-.x-slider-horz,.x-slider-horz .x-slider-end,.x-slider-horz .x-slider-inner {
- background-image: url(../images/slider/slider-bg.png);
-}
-
-.x-slider-horz .x-slider-thumb {
- background-image: url(../images/slider/slider-thumb.png);
-}
-
-.x-slider-vert,.x-slider-vert .x-slider-end,.x-slider-vert .x-slider-inner {
- background-image: url(../images/slider/slider-v-bg.png);
-}
-
-.x-slider-vert .x-slider-thumb {
- background-image: url(../images/slider/slider-v-thumb.png);
-}
-
-.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text {
- font-size: 15px;
-}
-
-.x-window-dlg .ext-mb-textarea {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
-}
-
-.x-window-dlg .x-msg-box-wait {
- background-image: url(../images/grid/loading.gif);
-}
-
-.x-window-dlg .ext-mb-info {
- background-image: url(../images/window/icon-info.gif);
-}
-
-.x-window-dlg .ext-mb-warning {
- background-image: url(../images/window/icon-warning.gif);
-}
-
-.x-window-dlg .ext-mb-question {
- background-image: url(../images/window/icon-question.gif);
-}
-
-.x-window-dlg .ext-mb-error {
- background-image: url(../images/window/icon-error.gif);
-}
-
-.x-border {
- border: 1px solid #18181a;
-}
-
-.x-grid3-hd-row .x-grid3-hd {
- border-left-color: #555566;
- border-right-color: black;
-}
-
-.x-grid3-row {
- border-color: #1f2933 black black;
-}
-
-.x-grid3-row-checker,.x-grid3-hd-checker {
- background-image: url(../images/grid/row-check-sprite.gif);
-}
-
-.x-grid3-footer {
- background: none repeat scroll 0 0 black;
- border-bottom: 1px solid #393c4c;
- border-top: 1px solid #393c4c;
-}
-
-.x-grid3-footer-row {
- background: none repeat scroll 0 0 black;
-}
-
-.x-tree3 {
- background-color: #232D38;
-}
-
-.x-tree3-node-text {
- color: white;
-}
-
-.x-tree3-node {
- color: white;
- font: normal 14px arial, tahoma, helvetica, sans-serif;
-}
-
-.x-tree3-node .x-ftree2-node-over {
- background-color: #7e5530 !important;
-}
-
-.x-tree3-node .x-ftree2-selected {
- background-color: #e5872c !important;
- font-weight: bold;
- color: black !important;
-}
-
-.x-tree3-node .x-ftree2-selected .x-tree3-node-text {
- color: black !important;
-}
-
-.x-view,x-combo-list {
- background-color: #232D38;
-}
-
-.x-view {
- border: 1px solid #18181a;
-}
-
-.x-view-highlightrow {
- border: 1px dotted #e5872c !important;
- background-color: #666360;
- text-decoration: underline;
-}
-
-.x-view-item,.x-combo-list-item {
- border: 1px solid black !important;
- border-top: 1px solid #232D38 !important;
-}
-
-.x-view-item-over,.x-combo-over {
- background: #7e5530;
- border: 1px dotted #e5872c !important;
-}
-
-.x-view-item-sel,.x-combo-selected {
- background: #e5872c none repeat scroll 0%;
- border: 1px dotted #e5872c !important;
- font-weight: bold;
- color: black !important;
-}
-
-
-
-.x-date-left-icon {
- background-image: url(../images/shared/left-btn.gif);
-}
-
-.x-date-right-icon {
- background-image: url(../images/shared/right-btn.gif);
-}
-
-.x-date-days td {
- background: url(../images/shared/glass-bg.gif) 0px -5px;
- color: white;
-}
-
-.x-date-mp-btns button {
- background-color: #282f40;
- color: #fff;
- border-color: #1b1d29;
-}
-
-.x-grid-group-hd .x-grid-group-div {
- color: white;
-}
-
-.x-grid3-summary-row {
- background: none repeat scroll 0 50% #21252e !important;
-}
-
-.x-status-text-panel {
- border-color: black #fff #fff black !important;
-}
-
-.x-menubar {
- border-color: black;
- background-color: #d0def0;
- background-image: url(../images/toolbar/bg.gif);
-}
-
-.x-menubar-item-active {
- background-color: #e5872c;
-}
-
-.x-drag-proxy {
- background-color: #3f4757;
- border: 1px solid black;
-}
-
-.x-grid3-hd-row .x-grid3-hd,.x-grid3-row .x-grid3-cell,.x-grid3-summary-row .x-grid3-cell {
- font: 12px arial, tahoma, helvetica, sans-serif !important;
-}
-
-.x-grid3-row-selected,.x-grid3-row-selected .x-grid3-cell {
- font-weight: bold !important;
-}
-
-.x-tree3-node-text {
- font: 12px arial, tahoma, helvetica, sans-serif;
- font-weight: bold;
-}
-
-.x-tree3-node .x-ftree2-selected {
- font-weight: bold !important;
-}
-
-.x-grid3-row-selected .x-tree3-node-text {
- color: black !important;
-}
-
-.x-contrast .x-ftree2-selected .x-tree3-node-text {
- font-style: italic;
- text-decoration: underline;
-}
-
-.x-aria-focusframe-side {
- background-color: #ff8800;
-}
-
-.x-contrast .x-grid3-cell-selected {
- font-weight: bold !important;
- font-style: italic !important;
- font-size: 13px !important;
-}
-
-.x-contrast .x-grid3-row-selected x-tree3-node-text,.x-contrast .x-grid3-row-selected .x-tree3-node-text {
- font-weight: bold !important;
- font-style: italic !important;
- font-size: 13px !important;
-}
-
-.x-contrast .x-column-header-sel {
- font-style: italic !important;
- font-weight: bold !important;
-}
-
-.x-contrast .x-btn-tr i,.x-contrast .x-btn-tl i,.x-contrast .x-btn-mr i,.x-contrast .x-btn-ml i,.x-contrast .x-btn-br i,.x-contrast .x-btn-bl i
- {
- width: auto;
-}
-
-.x-contrast .x-btn-menu .x-btn-mr i:before {
- content: url(../images/button/arrow.gif);
-}
-
-.x-contrast .x-slider-thumb i:before {
- content: url(../images/slider/slider-thumb-single.png);
-}
-
-.x-contrast .x-slider {
- border: 1px solid yellow;
-}
-
-.x-contrast .x-form-trigger:after {
- content: url(../images/form/trigger-single.gif);
-}
-
-.x-contrast .x-panel {
- border: 1px solid yellow !important;
-}
-
-.x-contrast .x-btn {
- border: 1px solid yellow !important;
-}
-
-.x-contrast .x-grid3 .sort-asc span:after {
- content: url(../images/grid/sort_asc.gif);
- position: absolute;
- top: 8px;
-}
-
-.x-contrast .x-grid3 .sort-desc span:after {
- content: url(../images/grid/sort_desc.gif);
- position: absolute;
- top: 8px;
-}
-
-.x-contrast .x-menu-check-item:before {
- content: url(../images/grid/row-check.gif);
- position: relative;
- left: 0px;
-}
-
-.x-contrast .x-menu-checked:before {
- content: url(../images/grid/row-check-sel.gif);
- float: left;
-}
-
-.x-contrast .x-menu-item-radio:before {
- content: none;
- position: relative;
- left: 0px;
-}
-
-.x-contrast .x-menu-radio-sel:before {
- content: url(../images/menu/group-checked.gif);
- float: left;
-}
-
-.x-contrast .x-grid-group .x-grid3-group-selected .x-grid-group-div {
- font-weight: bold !important;
- font-style: italic !important;
-}
-
-.x-contrast .x-grid-group-div:before {
- content: url(../images/grid/group-expand.gif);
- padding-right: 5px;
-}
-
-.x-contrast .x-grid-group-collapsed .x-grid-group-div:before {
- content: url(../images/grid/group-collapse.gif);
- padding-right: 5px;
-}
-
-.x-contrast .x-grid3-row-collapsed .x-grid3-row-expander:after {
- content: url(../images/grid/group-expand.gif);
-}
-
-.x-contrast .x-grid3-row-expanded .x-grid3-row-expander:after {
- content: url(../images/grid/group-collapse.gif);
-}
-
-.x-contrast .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker:after {
- content: url(../images/grid/row-check.gif);
-}
-
-.x-contrast .x-grid3-row-selected .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker-on .x-grid3-hd-checker:after {
- content: url(../images/grid/row-check-sel.gif);
-}
-
-.x-contrast .x-tool-close i:before {
- content: url(../images/panel/tool-close.gif);
-}
-
-.x-contrast .x-tool-gear i:before {
- content: url(../images/panel/tool-gear.gif);
-}
-
-.x-contrast .x-tool-toggle i:before {
- content: url(../images/panel/tool-collapse.gif);
-}
-
-.x-contrast .x-panel-collapsed .x-tool-toggle i:before {
- content: url(../images/panel/tool-expand.gif);
-}
-
-.x-contrast .x-tool-maximize i:before {
- content: url(../images/panel/tool-maximize.gif);
-}
-
-.x-contrast .x-tool-minimize i:before {
- content: url(../images/panel/tool-minimize.gif);
-}
-
-.x-contrast .x-tree3-node-joint-expand .x-tree3-node-text:before {
- content: url(../images/tree/tree-expanded.png);
- position: absolute;
- left: -25px;
-}
-
-.x-contrast .x-tree3-node-joint-collapse .x-tree3-node-text:before {
- content: url(../images/tree/tree-collapsed.png);
- position: absolute;
- left: -25px;
-}
-
-.x-contrast .arrow-up i:before {
- content: url(../images/icons/top2.gif);
-}
-
-.x-contrast .arrow-double-right i:before {
- content: url(../images/icons/doubleright2.gif);
-}
-
-.x-contrast .arrow-right i:before {
- content: url(../images/icons/right2.gif);
-}
-
-.x-contrast .arrow-left i:before {
- content: url(../images/icons/left2.gif);
-}
-
-.x-contrast .arrow-double-left i:before {
- content: url(../images/icons/doubleleft2.gif);
-}
-
-.x-contrast .arrow-double-right i:before {
- content: url(../images/icons/doubleright2.gif);
-}
-
-.x-contrast .arrow-down i:before {
- content: url(../images/icons/down2.gif);
-}
-
-.x-contrast .x-date-left-icon i:before {
- content: url(../images/shared/left-btn.gif);
-}
-
-.x-contrast .x-date-right-icon i:before {
- content: url(../images/shared/right-btn.gif);
-}
-
-.x-contrast .x-grid3-hd-btn:before {
- content: url("../images/grid/grid3-hd-btn-contrast.gif");
- border: 1px solid yellow;
-}
-
-.x-contrast .x-row-editor .x-btns {
- background-color: black;
-}
-
-.x-contrast .x-html-editor-wrap .x-btn-pressed button {
- border: 3px solid black;
-}
-
-.x-contrast .x-window, .x-contrast .x-info, .x-contrast .x-tip {
- background-color: black;
- border: 1px solid black;
-}
-
-.x-contrast .x-menu-item-arrow:before {
- content: url(../images/shared/right-btn.gif);
-}
-
-.x-contrast .x-menu-scroller-top:before {
- content: url("../images/layout/mini-top.gif");
- position: absolute;
- left: 45px;
-}
-
-.x-contrast .x-menu-scroller-bottom:before {
- content: url("../images/layout/mini-bottom.gif");
- position: absolute;
- left: 45px;
-}
-
-.x-spinner-field .x-form-twin-triggers .x-form-spinner-up{
- height: 11px;
-}
-.x-spinner-field .x-form-twin-triggers .x-form-spinner-down {
- height: 11px;
-}
-
-
-.x-spinner-field .x-form-twin-triggers .x-form-spinner-down {
- top:13px;
-}
-
-
-.x-spinner-field .x-form-spinner-up {
- background-image: url('../images/form/spinner.gif');
-}
-.x-spinner-field .x-form-spinner-down {
- background-image: url('../images/form/spinner.gif');
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-.x-spinner-field .x-form-spinner-down {
- background-position:0 -13px;
-}
-
-.x-trigger-wrap-focus .x-form-spinner-up {
- background-position:-100px 0;
-}
-
-.x-trigger-wrap-focus .x-form-spinner-down {
- background-position:-100px -13px;
-}
-
-.x-form-field-wrap .x-form-spinner-overup{
- background-position:-20px 0;
-}
-.x-form-field-wrap .x-form-spinner-clickup{
- background-position:-40px 0;
-}
-
-.x-trigger-wrap-focus .x-form-spinner-overup{
- background-position:-120px 0;
-}
-
-.x-trigger-wrap-focus .x-form-spinner-clickup{
- background-position:-140px 0;
-}
-
-.x-form-field-wrap .x-form-spinner-overdown{
- background-position:-60px -13px;
-}
-.x-form-field-wrap .x-form-spinner-clickdown{
- background-position:-80px -13px;
-}
-.x-trigger-wrap-focus .x-form-spinner-overdown{
- background-position:-160px -13px;
-}
-.x-trigger-wrap-focus .x-form-spinner-clickdown{
- background-position:-180px -13px;
-}
-
-
-.x-form-field-wrap .x-form-spinner-overup,
-.x-form-field-wrap .x-form-spinner-clickup{
- border-bottom-color: #d97e27;
-}
-.x-form-field-wrap .x-form-spinner-overdown,
-.x-form-field-wrap .x-form-spinner-clickdown{
- border-bottom-color: #d97e27;
-}
-
-.x-trigger-wrap-focus .x-form-spinner-down,
-.x-trigger-wrap-focus .x-form-spinner-up{
- border-bottom-color: #d97e27;
-}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css
===================================================================
--- trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,57 +1,57 @@
-body {
- background-color: #16181a;
- color: #fcfcfc;
+body { /* background-color: #16181a;
+ color: #fcfcfc; */
+
}
.ext-el-mask {
- background-color: #ccc;
+ background-color: #ccc;
}
.ext-el-mask-msg {
- border-color: #223;
- background-color: #3f4757;
- background-image: url(../images/box/tb-blue.gif);
+ border-color: #223;
+ background-color: #3f4757;
+ background-image: url(../images/box/tb-blue.gif);
}
.ext-el-mask-msg div {
- background-color: #232d38;
- border-color: #556;
- color: #fff;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
+ background-color: #232d38;
+ border-color: #556;
+ color: #fff;
+ font: normal 14px 'Ubuntu', Arial
}
.x-mask-loading div {
- background-color: #232d38;
- background-image: url(../images/grid/loading.gif);
+ background-color: #232d38;
+ background-image: url(../images/grid/loading.gif);
}
.x-item-disabled {
- color: #ddd;
+ color: #ddd;
}
.x-item-disabled * {
- color: #ddd !important;
+ color: #ddd !important;
}
.x-splitbar-proxy {
- background-color: #aaa;
+ background-color: #aaa;
}
.x-color-palette a {
- border-color: #fff;
+ border-color: #fff;
}
.x-color-palette a:hover,.x-color-palette a.x-color-palette-sel {
- border-color: #8bb8f3;
- background-color: #deecfd;
+ border-color: #8bb8f3;
+ background-color: #deecfd;
}
.x-color-palette em {
- border-color: #aca899;
+ border-color: #aca899;
}
.x-ie-shadow {
- background-color: #777;
+ background-color: #777;
}
/*
@@ -68,893 +68,915 @@
}
*/
.loading-indicator {
- font-size: 14px;
- background-image: url(../images/grid/loading.gif);
+ font-size: 14px;
+ background-image: url(../images/grid/loading.gif);
}
.x-spotlight {
- background-color: #ccc;
+ background-color: #ccc;
}
-.x-tab-panel-header,.x-tab-panel-footer {
- background-color: #e18325;
- border-color: #8db2e3;
- overflow: hidden;
- zoom: 1;
+.x-tab-panel-header,.x-tab-panel-footer { /* background-color: #e18325;
+ border-color: #8db2e3; */
+ overflow: hidden;
+ zoom: 1;
}
.x-tab-panel-header,.x-tab-panel-footer {
- border-color: #222;
+ border-color: #552200;
}
ul.x-tab-strip-top {
- background-color: #343843;
- background-image: url(../images/tabs/tab-strip-bg.gif);
- border-bottom-color: #343d4e;
+ background-color: #343843;
+ background-image: url(../images/tabs/tab-strip-bg.gif);
+ border-bottom-color: #343d4e;
}
ul.x-tab-strip-bottom {
- background-color: #343843;
- background-image: url(../images/tabs/tab-strip-btm-bg.gif);
- border-top-color: #343843;
+ background-color: #343843;
+ background-image: url(../images/tabs/tab-strip-btm-bg.gif);
+ border-top-color: #343843;
}
-.x-tab-panel-header-plain .x-tab-strip-spacer,.x-tab-panel-footer-plain .x-tab-strip-spacer {
- border-color: #222;
- background-color: #e18325;
+.x-tab-panel-header-plain .x-tab-strip-spacer,.x-tab-panel-footer-plain .x-tab-strip-spacer
+ {
+ border-color: #552200;
+ background-color: #e18325;
}
.x-tab-strip span.x-tab-strip-text {
- font: normal 14px tahoma, arial, helvetica;
- color: #fff;
+ font: normal 14px tahoma, arial, helvetica;
+ color: #fff;
}
.x-tab-strip-over span.x-tab-strip-text {
- color: #fff;
+ color: #fff;
}
.x-tab-strip-active span.x-tab-strip-text {
- color: black;
- font-weight: bold;
+ color: black;
+ font-weight: bold;
}
.x-tab-strip-disabled .x-tabs-text {
- color: #aaaaaa;
+ color: #aaaaaa;
}
-.x-tab-strip-top .x-tab-right,.x-tab-strip-top .x-tab-left,.x-tab-strip-top .x-tab-strip-inner {
- background-image: url(../images/tabs/tabs-sprite.gif);
+.x-tab-strip-top .x-tab-right,.x-tab-strip-top .x-tab-left,.x-tab-strip-top .x-tab-strip-inner
+ {
+ background-image: url(../images/tabs/tabs-sprite.gif);
}
.x-tab-strip-bottom .x-tab-right {
- background-image: url(../images/tabs/tab-btm-inactive-right-bg.gif);
+ background-image: url(../images/tabs/tab-btm-inactive-right-bg.gif);
}
.x-tab-strip-bottom .x-tab-left {
- background-image: url(../images/tabs/tab-btm-inactive-left-bg.gif);
+ background-image: url(../images/tabs/tab-btm-inactive-left-bg.gif);
}
.x-tab-strip-bottom .x-tab-strip-active .x-tab-right {
- background-image: url(../images/tabs/tab-btm-right-bg.gif);
+ background-image: url(../images/tabs/tab-btm-right-bg.gif);
}
.x-tab-strip-bottom .x-tab-strip-active .x-tab-left {
- background-image: url(../images/tabs/tab-btm-left-bg.gif);
+ background-image: url(../images/tabs/tab-btm-left-bg.gif);
}
.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close {
- background-image: url(../images/tabs/tab-close.gif);
+ background-image: url(../images/tabs/tab-close.gif);
}
.x-tab-strip .x-tab-strip-closable a.x-tab-strip-close:hover {
- background-image: url(../images/tabs/tab-close.gif);
+ background-image: url(../images/tabs/tab-close.gif);
}
.x-tab-panel-body {
- border-color: #18181a;
- background-color: #fff;
+ border-color: #18181a;
+ background-color: #fff;
}
.x-tab-panel-body-top {
- border-top: 0 none;
+ border-top: 0 none;
}
.x-tab-panel-body-bottom {
- border-bottom: 0 none;
+ border-bottom: 0 none;
}
.x-tab-scroller-left {
- background-image: url(../images/tabs/scroll-left.gif);
- border-bottom-color: #8db2e3;
+ background-image: url(../images/tabs/scroll-left.gif);
+ border-bottom-color: #8db2e3;
}
.x-tab-scroller-left-over {
- background-position: 0 0;
+ background-position: 0 0;
}
.x-tab-scroller-left-disabled {
- background-position: -18px 0;
- opacity: .5;
- -moz-opacity: .5;
- filter: alpha(opacity = 50);
- cursor: default;
+ background-position: -18px 0;
+ opacity: .5;
+ -moz-opacity: .5;
+ filter: alpha(opacity = 50);
+ cursor: default;
}
.x-tab-scroller-right {
- background-image: url(../images/tabs/scroll-right.gif);
- border-bottom-color: #8db2e3;
+ background-image: url(../images/tabs/scroll-right.gif);
+ border-bottom-color: #8db2e3;
}
.x-tab-panel-bbar .x-toolbar,.x-tab-panel-tbar .x-toolbar {
- border-color: #99bbe8;
+ border-color: #99bbe8;
}
.x-form-field {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
+ font: normal 15px 'Ubuntu', Arial
}
-.x-form-text,textarea.x-form-field {
- color: #ffffff;
- background-color: #33373d;
- background-image: url(../images/form/text-bg.gif);
- border-color: #737b8c;
- border-width: 2px;
+.x-form-text,textarea.x-form-field { /* color: #ffffff;
+ background-color: #33373d;
+ background-image: url(../images/form/text-bg.gif); */
+ border-color: #737b8c;
+ border-width: 2px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
}
.x-form-text,.ext-ie .x-form-file {
- height: 26px;
+ height: 26px;
}
.ext-strict .x-form-text {
- height: 20px;
+ height: 20px;
}
.x-form-select-one {
- background-color: #fff;
- border-color: #b5b8c8;
+ background-color: #fff;
+ border-color: #b5b8c8;
}
.x-form-check-group-label {
- border-bottom: 1px solid #99bbe8;
- color: #fff;
+ border-bottom: 1px solid #99bbe8;
+ color: #fff;
}
.x-editor .x-form-check-wrap {
- background-color: #fff;
+ background-color: #fff;
}
.x-form-field-wrap .x-form-trigger {
- background-image: url(../images/form/trigger.gif);
- border-bottom-color: #737b8c;
- border-bottom-width: 2px;
- height: 24px;
- width: 20px;
+ background-image: url(../images/form/trigger.gif);
+ border-bottom-color: #737b8c;
+ border-bottom-width: 2px;
+ height: 24px;
+ width: 20px;
}
.x-form-field-wrap .x-form-trigger.x-form-trigger-over {
- border-bottom-color: #d97e27;
+ border-bottom-color: #d97e27;
}
.x-form-field-wrap .x-form-trigger.x-form-trigger-click {
- border-bottom-color: #c86e19;
+ border-bottom-color: #c86e19;
}
.x-small-editor .x-form-field-wrap .x-form-trigger {
- height: 20px;
+ height: 20px;
}
.x-form-field-wrap .x-form-trigger-over {
- background-position: -20px 0;
+ background-position: -20px 0;
}
.x-form-field-wrap .x-form-trigger-click {
- background-position: -40px 0;
+ background-position: -40px 0;
}
.x-trigger-wrap-focus .x-form-trigger {
- background-position: -60px 0;
+ background-position: -60px 0;
}
.x-trigger-wrap-focus .x-form-trigger-over {
- background-position: -80px 0;
+ background-position: -80px 0;
}
.x-trigger-wrap-focus .x-form-trigger-click {
- background-position: -100px 0;
+ background-position: -100px 0;
}
.x-form-field-wrap .x-form-date-trigger {
- background-image: url(../images/form/date-trigger.gif);
+ background-image: url(../images/form/date-trigger.gif);
}
.x-form-field-wrap .x-form-clear-trigger {
- background-image: url(../images/form/clear-trigger.gif);
+ background-image: url(../images/form/clear-trigger.gif);
}
.x-form-field-wrap .x-form-search-trigger {
- background-image: url(../images/form/search-trigger.gif);
+ background-image: url(../images/form/search-trigger.gif);
}
.x-trigger-wrap-focus .x-form-trigger {
- border-bottom-color: #737b8c;
+ border-bottom-color: #737b8c;
}
.x-item-disabled .x-form-trigger-over {
- border-bottom-color: #b5b8c8;
+ border-bottom-color: #b5b8c8;
}
.x-item-disabled .x-form-trigger-click {
- border-bottom-color: #b5b8c8;
+ border-bottom-color: #b5b8c8;
}
.x-form-focus,textarea.x-form-focus {
- border-color: #ff9c33;
+ border-color: #ff9c33;
}
.x-form-invalid,textarea.x-form-invalid {
- background-color: #15171a;
- background-image: url(../images/grid/invalid_line.gif);
- border-color: #c30;
+ /*background-color: #15171a; */
+ background-image: url(../images/grid/invalid_line.gif);
+ border-color: #c30;
}
.ext-safari .x-form-invalid {
- background-color: #fee;
- border-color: #ff7870;
+ background-color: #fee;
+ border-color: #ff7870;
}
.x-form-inner-invalid,textarea.x-form-inner-invalid {
- background-color: #fff;
- background-image: url(../images/grid/invalid_line.gif);
+ background-color: #fff;
+ background-image: url(../images/grid/invalid_line.gif);
}
.x-form-grow-sizer {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
+ font: normal 15px 'Ubuntu', Arial
}
.x-form-item {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
+ font: normal 15px 'Ubuntu', Arial
}
-
+/*
.x-form-invalid-msg {
- color: #c0272b;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- background-image: url(../images/default/shared/warning.gif);
+ color: #c0272b;
+ font: normal 14px 'Ubuntu', Arial background-image :
+ url(../images/default/shared/warning.gif);
}
-
+*/
.x-form-empty-field {
- color: #dadadd;
+ color: #dadadd;
}
.x-small-editor .x-form-text {
- height: 22px;
+ height: 22px;
}
.x-small-editor .x-form-field {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.ext-safari .x-small-editor .x-form-field {
- font: normal 15px arial, tahoma, helvetica, sans-serif;
+ font: normal 15px arial, tahoma, helvetica, sans-serif;
}
.x-form-invalid-icon {
- background-image: url(../images/form/exclamation.gif);
- height: 25px;
- width: 19px;
- background-position: center right;
+ background-image: url(../images/form/exclamation.gif);
+ height: 25px;
+ width: 19px;
+ background-position: center right;
}
.x-fieldset {
- border-color: #737B8C;
- color: white !important;
+ border-color: #737B8C;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ /* color: white !important; */
}
.x-fieldset legend {
- font: bold 14px tahoma, arial, helvetica, sans-serif;
- color: white !important;
+ font: bold 14px 'Ubuntu', Arial color : white !important;
}
.x-btn {
- font: normal 14px tahoma, verdana, helvetica;
+ font: normal 13px
}
.x-btn button {
- font: normal 14px arial, tahoma, verdana, helvetica;
- color: #fffffa;
- padding-left: 6px !important;
- padding-right: 6px !important;
+ font: normal 13px 'Ubuntu', Arial color : #fffffa;
+ padding-left: 6px !important;
+ padding-right: 6px !important;
}
-.x-btn-over .x-btn button {
- color: #fff;
+.x-btn-over .x-btn button { /* color: #fff; */
+
}
.x-btn-noicon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-left .x-btn-text,.x-btn-icon .x-btn-small .x-btn-text,.x-btn-text-icon .x-btn-icon-small-right .x-btn-text
- {
- height: 23px; /* 18px; */
+ {
+ height: 23px; /* 18px; */
}
.x-btn-icon .x-btn-small .x-btn-text {
- width: 23px; /* 18px; */
+ width: 23px; /* 18px; */
}
.x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
- padding-left: 21px !important;
+ padding-left: 21px !important;
}
.x-btn-text-icon .x-btn-icon-small-right .x-btn-text {
- padding-right: 21px !important;
+ padding-right: 21px !important;
}
.x-btn-text-icon .x-btn-icon-medium-left .x-btn-text {
- padding-left: 29px !important;
+ padding-left: 29px !important;
}
.x-btn-text-icon .x-btn-icon-medium-right .x-btn-text {
- padding-right: 29px !important;
+ padding-right: 29px !important;
}
.x-btn-text-icon .x-btn-icon-large-left .x-btn-text {
- padding-left: 37px !important;
+ padding-left: 37px !important;
}
.x-btn-text-icon .x-btn-icon-large-right .x-btn-text {
- padding-right: 37px !important;
+ padding-right: 37px !important;
}
.x-btn em {
- font-style: normal;
- font-weight: normal;
+ font-style: normal;
+ font-weight: normal;
}
-.x-btn-tl,.x-btn-tr,.x-btn-tc,.x-btn-ml,.x-btn-mr,.x-btn-mc,.x-btn-bl,.x-btn-br,.x-btn-bc {
- background-image: url(../images/button/btn.gif);
+.x-btn-tl,.x-btn-tr,.x-btn-tc,.x-btn-ml,.x-btn-mr,.x-btn-mc,.x-btn-bl,.x-btn-br,.x-btn-bc
+ { /* background-image: url(../images/button/btn.gif); */
+ padding: 2px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ /* text-decoration: none;
+ vertical-align: middle;
+ background-color: #F2F2F2;*/
+ background-image: none;
}
-.x-btn-click .x-btn-text,.x-btn-menu-active .x-btn-text,.x-btn-pressed .x-btn-text {
- color: #fff;
+.x-btn-click .x-btn-text,.x-btn-menu-active .x-btn-text,.x-btn-pressed .x-btn-text
+ {
+ color: orange;
}
.x-btn-pressed .x-btn-text {
- font-style: italic;
- text-decoration: underline;
- font-weight: bold;
- color: black !important;
+ font-style: italic;
+ text-decoration: underline;
+ font-weight: bold;
+ color: black !important;
}
.x-btn-disabled * {
- color: #eee !important;
+ color: #eee !important;
}
.x-btn-mc em.x-btn-arrow {
- background-image: url(../images/button/arrow.gif);
- padding-right: 13px;
+ background-image: url(../images/button/arrow.gif);
+ padding-right: 13px;
}
.x-btn-mc em.x-btn-split {
- background-image: url(../images/button/s-arrow.gif);
- padding-right: 20px;
+ background-image: url(../images/button/s-arrow.gif);
+ padding-right: 20px;
}
.x-contrast .x-btn-mc em.x-btn-split {
- padding-right: 0px;
+ padding-right: 0px;
}
.x-btn-over .x-btn-mc em.x-btn-split,.x-btn-click .x-btn-mc em.x-btn-split,.x-btn-menu-active .x-btn-mc em.x-btn-split,.x-btn-pressed .x-btn-mc em.x-btn-split
- {
- background-image: url(../images/button/s-arrow-o.gif);
+ {
+ background-image: url(../images/button/s-arrow-o.gif);
}
.x-btn-mc em.x-btn-arrow-bottom {
- background-image: url(../images/button/s-arrow-b-noline.gif);
+ background-image: url(../images/button/s-arrow-b-noline.gif);
}
.x-btn-mc em.x-btn-split-bottom {
- background-image: url(../images/button/s-arrow-b.gif);
+ background-image: url(../images/button/s-arrow-b.gif);
}
.x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-btn-pressed .x-btn-mc em.x-btn-split-bottom
- {
- background-image: url(../images/button/s-arrow-bo.gif);
+ {
+ background-image: url(../images/button/s-arrow-bo.gif);
}
.x-btn-group-header {
- color: #d2d2d2;
+ color: #d2d2d2;
}
.x-btn-group-tc {
- background-image: url(../images/button/group-tb.gif);
+ background-image: url(../images/button/group-tb.gif);
}
.x-btn-group-tl {
- background-image: url(../images/button/group-cs.gif);
+ background-image: url(../images/button/group-cs.gif);
}
.x-btn-group-tr {
- background-image: url(../images/button/group-cs.gif);
+ background-image: url(../images/button/group-cs.gif);
}
.x-btn-group-bc {
- background-image: url(../images/button/group-tb.gif);
+ background-image: url(../images/button/group-tb.gif);
}
.x-btn-group-bl {
- background-image: url(../images/button/group-cs.gif);
+ background-image: url(../images/button/group-cs.gif);
}
.x-btn-group-br {
- background-image: url(../images/button/group-cs.gif);
+ background-image: url(../images/button/group-cs.gif);
}
.x-btn-group-ml {
- background-image: url(../images/button/group-lr.gif);
+ background-image: url(../images/button/group-lr.gif);
}
.x-btn-group-mr {
- background-image: url(../images/button/group-lr.gif);
+ background-image: url(../images/button/group-lr.gif);
}
.x-btn-group-notitle .x-btn-group-tc {
- background-image: url(../images/button/group-tb.gif);
+ background-image: url(../images/button/group-tb.gif);
}
.x-toolbar {
- border-color: #18181a;
- background-color: #393d4e;
- background-image: url(../images/toolbar/bg.gif);
+ border-color: #18181a;
+ background-color: #393d4e;
+ background-image: url(../images/toolbar/bg.gif);
}
-.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label
+ {
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-toolbar .x-item-disabled {
- color: gray;
+ color: gray;
}
.x-toolbar .x-item-disabled * {
- color: gray;
+ color: gray;
}
.x-toolbar .x-btn-mc em.x-btn-split {
- background-image: url(../images/button/s-arrow-noline.gif);
+ background-image: url(../images/button/s-arrow-noline.gif);
}
.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split
- {
- background-image: url(../images/button/s-arrow-o.gif);
+ {
+ background-image: url(../images/button/s-arrow-o.gif);
}
.x-toolbar .x-btn-mc em.x-btn-split-bottom {
- background-image: url(../images/button/s-arrow-b-noline.gif);
+ background-image: url(../images/button/s-arrow-b-noline.gif);
}
.x-toolbar .x-btn-over .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-click .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split-bottom,.x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split-bottom
- {
- background-image: url(../images/button/s-arrow-bo.gif);
+ {
+ background-image: url(../images/button/s-arrow-bo.gif);
}
.x-toolbar .xtb-sep {
- background-image: url(../images/grid/grid-blue-split.gif);
+ background-image: url(../images/grid/grid-blue-split.gif);
}
.x-toolbar .x-btn {
- padding-left: 3px;
- padding-right: 3px;
+ padding-left: 3px;
+ padding-right: 3px;
}
.x-toolbar .x-btn-mc em.x-btn-arrow {
- padding-right: 10px;
+ padding-right: 10px;
}
.x-toolbar .x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
- padding-left: 18px !important;
+ padding-left: 18px !important;
}
.x-toolbar .x-btn-mc em.x-btn-split {
- padding-right: 14px;
+ padding-right: 14px;
}
.x-tbar-page-first {
- background-image: url(../images/grid/page-first.gif) !important;
+ background-image: url(../images/grid/page-first.gif) !important;
}
.x-tbar-loading {
- background-image: url(../images/grid/refresh.gif) !important;
+ background-image: url(../images/grid/refresh.gif) !important;
}
.x-tbar-page-last {
- background-image: url(../images/grid/page-last.gif) !important;
+ background-image: url(../images/grid/page-last.gif) !important;
}
.x-tbar-page-next {
- background-image: url(../images/grid/page-next.gif) !important;
+ background-image: url(../images/grid/page-next.gif) !important;
}
.x-tbar-page-prev {
- background-image: url(../images/grid/page-prev.gif) !important;
+ background-image: url(../images/grid/page-prev.gif) !important;
}
.x-item-disabled .x-tbar-loading {
- background-image: url(../images/grid/loading.gif) !important;
+ background-image: url(../images/grid/loading.gif) !important;
}
.x-item-disabled .x-tbar-page-first {
- background-image: url(../images/grid/page-first-disabled.gif) !important;
+ background-image: url(../images/grid/page-first-disabled.gif) !important;
}
.x-item-disabled .x-tbar-page-last {
- background-image: url(../images/grid/page-last-disabled.gif) !important;
+ background-image: url(../images/grid/page-last-disabled.gif) !important;
}
.x-item-disabled .x-tbar-page-next {
- background-image: url(../images/grid/page-next-disabled.gif) !important;
+ background-image: url(../images/grid/page-next-disabled.gif) !important;
}
.x-item-disabled .x-tbar-page-prev {
- background-image: url(../images/grid/page-prev-disabled.gif) !important;
+ background-image: url(../images/grid/page-prev-disabled.gif) !important;
}
.x-paging-info {
- color: #444;
+ color: #444;
}
.x-toolbar-more-icon {
- background-image: url(../images/toolbar/more.gif) !important;
+ background-image: url(../images/toolbar/more.gif) !important;
}
.x-statusbar .x-status-busy {
- background-image: url(../images/grid/loading.gif);
+ background-image: url(../images/grid/loading.gif);
}
.x-statusbar .x-status-text-panel {
- border-color: #99bbe8 #fff #fff #99bbe8;
+ border-color: #99bbe8 #fff #fff #99bbe8;
}
.x-resizable-handle {
- background-color: #fff;
- color: #000;
+ background-color: #fff;
+ color: #000;
}
.x-resizable-over .x-resizable-handle-east,.x-resizable-pinned .x-resizable-handle-east,.x-resizable-over .x-resizable-handle-west,.x-resizable-pinned .x-resizable-handle-west
- {
- background-image: url(../images/sizer/e-handle.gif);
+ {
+ background-image: url(../images/sizer/e-handle.gif);
}
.x-resizable-over .x-resizable-handle-south,.x-resizable-pinned .x-resizable-handle-south,.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north
- {
- background-image: url(../images/sizer/s-handle.gif);
+ {
+ background-image: url(../images/sizer/s-handle.gif);
}
-.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north {
- background-image: url(../images/sizer/s-handle.gif);
+.x-resizable-over .x-resizable-handle-north,.x-resizable-pinned .x-resizable-handle-north
+ {
+ background-image: url(../images/sizer/s-handle.gif);
}
-.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast {
- background-image: url(../images/sizer/se-handle.gif);
+.x-resizable-over .x-resizable-handle-southeast,.x-resizable-pinned .x-resizable-handle-southeast
+ {
+ background-image: url(../images/sizer/se-handle.gif);
}
-.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest {
- background-image: url(../images/sizer/nw-handle.gif);
+.x-resizable-over .x-resizable-handle-northwest,.x-resizable-pinned .x-resizable-handle-northwest
+ {
+ background-image: url(../images/sizer/nw-handle.gif);
}
-.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast {
- background-image: url(../images/sizer/ne-handle.gif);
+.x-resizable-over .x-resizable-handle-northeast,.x-resizable-pinned .x-resizable-handle-northeast
+ {
+ background-image: url(../images/sizer/ne-handle.gif);
}
-.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest {
- background-image: url(../images/sizer/sw-handle.gif);
+.x-resizable-over .x-resizable-handle-southwest,.x-resizable-pinned .x-resizable-handle-southwest
+ {
+ background-image: url(../images/sizer/sw-handle.gif);
}
.x-resizable-proxy {
- border-color: #3b5a82;
+ border-color: #3b5a82;
}
.x-resizable-overlay {
- background-color: #fff;
+ background-color: #fff;
}
.x-grid3 {
- background-color: #1f2933;
+ background-color: #1f2933;
}
-.x-grid-panel .x-panel-mc .x-panel-body {
- border-color: #223;
+.x-grid-panel .x-panel-mc .x-panel-body { /* border-color: #223; */
+
}
.x-grid3-hd-row td,.x-grid3-row td,.x-grid3-summary-row td {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-grid3-hd-row td {
- border-left-color: #556;
- border-right-color: #223;
+ border-left-color: #556;
+ border-right-color: #223;
}
.x-grid-row-loading {
- background-color: #fff;
- background-image: url(../images/default/shared/loading-balls.gif);
+ background-color: #fff;
+ background-image: url(../images/default/shared/loading-balls.gif);
}
.x-grid3-row {
- border-bottom: 1px solid #111;
+ border-bottom: 1px solid #111;
}
.x-grid3-row-alt {
- background-color: #1b232b;
+ background-color: #1b232b;
}
.x-grid3-row-over {
- background-color: #7e5530;
- background-image: none;
+ background-color: #7e5530;
+ background-image: none;
}
.x-grid3-resize-proxy {
- background-color: #777;
+ background-color: #777;
}
.x-grid3-resize-marker {
- background-color: #777;
+ background-color: #777;
}
.x-grid3-header {
- background-color: #3b3f50;
- background-image: url(../images/grid/grid3-hrow.gif);
+ background-color: #3b3f50;
+ background-image: url(../images/grid/grid3-hrow.gif);
}
.x-grid3-header-pop {
- border-left-color: #d0d0d0;
+ border-left-color: #d0d0d0;
}
.x-grid3-header-pop-inner {
- border-left-color: #eee;
- background-image: url(../images/default/grid/hd-pop.gif);
+ border-left-color: #eee;
+ background-image: url(../images/default/grid/hd-pop.gif);
}
td.x-grid3-hd-over,td.sort-desc,td.sort-asc,td.x-grid3-hd-menu-open {
- border-left-color: #889;
- border-right-color: #445;
+ border-left-color: #889;
+ border-right-color: #445;
}
td.x-grid3-hd-over .x-grid3-hd-inner,td.sort-desc .x-grid3-hd-inner,td.sort-asc .x-grid3-hd-inner,td.x-grid3-hd-menu-open .x-grid3-hd-inner
- {
- background-color: #4e628a;
- background-image: url(../images/grid/grid3-hrow-over.gif);
+ {
+ background-color: #4e628a;
+ background-image: url(../images/grid/grid3-hrow-over.gif);
}
.x-grid3-cell-inner,.x-grid3-hd-inner {
- color: #fff;
+ color: #fff;
}
.sort-asc .x-grid3-sort-icon {
- background-image: url(../images/grid/sort_asc.gif);
- width: 15px;
- height: 9px;
- margin-left: 5px;
+ background-image: url(../images/grid/sort_asc.gif);
+ width: 15px;
+ height: 9px;
+ margin-left: 5px;
}
.sort-desc .x-grid3-sort-icon {
- background-image: url(../images/grid/sort_desc.gif);
- width: 15px;
- height: 9px;
- margin-left: 5px;
+ background-image: url(../images/grid/sort_desc.gif);
+ width: 15px;
+ height: 9px;
+ margin-left: 5px;
}
.x-grid3-cell-text,.x-grid3-hd-text {
- color: #fff;
+ color: #fff;
}
.x-grid3-split {
- background-image: url(../images/default/grid/grid-split.gif);
+ background-image: url(../images/default/grid/grid-split.gif);
}
.x-grid3-hd-text {
- color: fff;
+ color: fff;
}
.x-dd-drag-proxy .x-grid3-hd-inner {
- background-color: #bec7da;
- background-image: url(../images/grid/grid3-hrow-over.gif);
- border-color: #aaccf6;
+ background-color: #bec7da;
+ background-image: url(../images/grid/grid3-hrow-over.gif);
+ border-color: #aaccf6;
}
.col-move-top {
- background-image: url(../images/default/grid/col-move-top.gif);
+ background-image: url(../images/default/grid/col-move-top.gif);
}
.col-move-bottom {
- background-image: url(../images/default/grid/col-move-bottom.gif);
+ background-image: url(../images/default/grid/col-move-bottom.gif);
}
.x-grid3-row-selected {
- background-color: #e5872c !important;
- background-image: none;
- border-style: solid;
- font-weight: bold !important;
- color: black !important;
+ background-color: #e5872c !important;
+ background-image: none;
+ border-style: solid;
+ font-weight: bold !important;
+ color: black !important;
}
.x-grid3-highlightrow {
- border: 1px dotted #e5872c !important;
- background-color: #666360;
- text-decoration: underline;
+ border: 1px dotted #e5872c !important;
+ background-color: #666360;
+ text-decoration: underline;
}
.x-grid3-group-selected {
- background-color: #e5872c !important;
+ background-color: #e5872c !important;
}
.x-grid3-row-selected .x-grid3-cell-inner {
- color: black !important;
+ color: black !important;
}
.x-grid3-cell-selected .x-grid3-cell-inner {
- background-color: #ffa340 !important;
- color: black !important;
- font-weight: bold;
+ background-color: #ffa340 !important;
+ color: black !important;
+ font-weight: bold;
}
.x-grid3-cell-selected span {
- color: black !important;
+ color: black !important;
}
.x-grid3-cell-selected .x-grid3-cell-text {
- color: black;
+ color: black;
}
-.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker {
- background-color: #ebeadb !important;
- background-image: url(../images/default/grid/grid-hrow.gif) !important;
- color: #fff;
- border-top-color: #fff;
- border-right-color: #6fa0df !important;
+.x-grid3-locked td.x-grid3-row-marker,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker
+ {
+ background-color: #ebeadb !important;
+ background-image: url(../images/default/grid/grid-hrow.gif) !important;
+ color: #fff;
+ border-top-color: #fff;
+ border-right-color: #6fa0df !important;
}
-.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div {
- color: fff !important;
+.x-grid3-locked td.x-grid3-row-marker div,.x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker div
+ {
+ color: fff !important;
}
.x-grid3-dirty-cell {
- background-image: url(../images/grid/dirty.gif);
+ background-image: url(../images/grid/dirty.gif);
}
.x-grid3-topbar,.x-grid3-bottombar {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-grid3-bottombar .x-toolbar {
- border-top-color: #a9bfd3;
+ border-top-color: #a9bfd3;
}
.x-props-grid .x-grid3-td-name .x-grid3-cell-inner {
- background-image: url(../images/grid/grid3-special-col-bg.gif) !important;
- color: #fff !important;
+ background-image: url(../images/grid/grid3-special-col-bg.gif)
+ !important;
+ color: #fff !important;
}
.x-props-grid .x-grid3-td-value {
- color: #fff !important;
+ color: #fff !important;
}
.x-props-grid .x-grid3-body .x-grid3-td-name {
- background-color: #263240 !important;
- border-right-color: #223;
+ background-color: #263240 !important;
+ border-right-color: #223;
}
.xg-hmenu-sort-asc .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-asc.gif);
+ background-image: url(../images/grid/hmenu-asc.gif);
}
.xg-hmenu-sort-desc .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-desc.gif);
+ background-image: url(../images/grid/hmenu-desc.gif);
}
.xg-hmenu-lock .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-lock.gif);
+ background-image: url(../images/grid/hmenu-lock.gif);
}
.xg-hmenu-unlock .x-menu-item-icon {
- background-image: url(../images/grid/hmenu-unlock.gif);
+ background-image: url(../images/grid/hmenu-unlock.gif);
}
.x-grid3-hd-btn {
- background-color: #c2c9d0;
- background-image: url(../images/grid/grid3-hd-btn.gif);
+ background-color: #c2c9d0;
+ background-image: url(../images/grid/grid3-hd-btn.gif);
}
.x-grid3-body .x-grid3-td-expander {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
+ background-image: url(../images/grid/grid3-special-col-bg.gif);
}
.x-grid3-row-expander {
- background-image: url(../images/grid/row-expand-sprite.gif);
+ background-image: url(../images/grid/row-expand-sprite.gif);
}
.x-grid3-body .x-grid3-td-checker {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
+ background-image: url(../images/grid/grid3-special-col-bg.gif);
}
.x-grid3-row-checker,.x-grid3-hd-checker {
- background-image: url(../images/default/grid/row-check-sprite.gif);
+ background-image: url(../images/default/grid/row-check-sprite.gif);
}
.x-grid3-body .x-grid3-td-numberer {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
+ background-image: url(../images/grid/grid3-special-col-bg.gif);
}
.x-grid3-body .x-grid3-td-numberer .x-grid3-cell-inner {
- color: #fff;
+ color: #fff;
}
.x-grid3-body .x-grid3-td-row-icon {
- background-image: url(../images/grid/grid3-special-col-bg.gif);
+ background-image: url(../images/grid/grid3-special-col-bg.gif);
}
.x-grid3-body .x-grid3-row-selected .x-grid3-td-numberer,.x-grid3-body .x-grid3-row-selected .x-grid3-td-checker,.x-grid3-body .x-grid3-row-selected .x-grid3-td-expander
- {
- background-image: url(../images/grid/grid3-special-col-sel-bg.gif);
+ {
+ background-image: url(../images/grid/grid3-special-col-sel-bg.gif);
}
.x-grid3-check-col {
- background-image: url(../images/menu/unchecked.gif);
+ background-image: url(../images/menu/unchecked.gif);
}
.x-grid3-check-col-on {
- background-image: url(../images/menu/checked.gif);
+ background-image: url(../images/menu/checked.gif);
}
.x-grid-group,.x-grid-group-body,.x-grid-group-hd {
- zoom: 1;
+ zoom: 1;
}
.x-grid-group-hd {
- border-bottom-color: #4e628a;
+ border-bottom-color: #4e628a;
}
.x-grid-group-hd div.x-grid-group-title {
- background-image: url(../images/grid/group-collapse.gif);
- background-position: 3px 6px;
- color: #ffd;
- font: bold 14px tahoma, arial, helvetica, sans-serif;
+ background-image: url(../images/grid/group-collapse.gif);
+ background-position: 3px 6px;
+ color: #ffd;
+ font: bold 14px 'Ubuntu', Arial
}
.x-grid-group-collapsed .x-grid-group-hd div.x-grid-group-title {
- background-image: url(../images/grid/group-expand.gif);
+ background-image: url(../images/grid/group-expand.gif);
}
.x-group-by-icon {
- background-image: url(../images/grid/group-by.gif);
+ background-image: url(../images/grid/group-by.gif);
}
.x-cols-icon {
- background-image: url(../images/grid/columns.gif);
+ background-image: url(../images/grid/columns.gif);
}
.x-show-groups-icon {
- background-image: url(../images/grid/group-by.gif);
+ background-image: url(../images/grid/group-by.gif);
}
.x-grid-empty {
- color: gray;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
+ color: gray;
+ font: normal 14px 'Ubuntu', Arial
}
.x-grid-with-col-lines .x-grid3-row td.x-grid3-cell {
- border-right-color: #ededed;
+ border-right-color: #ededed;
}
.x-grid-with-col-lines .x-grid3-row {
- border-top-color: #ededed;
+ border-top-color: #ededed;
}
.x-grid-with-col-lines .x-grid3-row-selected {
- border-top-color: #a3bae9;
+ border-top-color: #a3bae9;
}
.x-dd-drag-ghost {
- color: #000;
- font: normal 14px arial, helvetica, sans-serif;
- border-color: #ddd #bbb #bbb #ddd;
- background-color: #bec7da;
+ color: #000;
+ font: normal 14px arial, helvetica, sans-serif;
+ border-color: #ddd #bbb #bbb #ddd;
+ background-color: #bec7da;
}
/*
@@ -971,708 +993,726 @@
}
*/
.x-view-selector {
- background-color: #c3daf9;
- border-color: #3399bb;
+ background-color: #c3daf9;
+ border-color: #3399bb;
}
.x-tree-node-expanded .x-tree-node-icon {
- background-image: url(../images/tree/folder-open.gif);
+ background-image: url(../images/tree/folder-open.gif);
}
.x-tree-node-leaf .x-tree-node-icon {
- background-image: url(../images/default/tree/leaf.gif);
+ background-image: url(../images/default/tree/leaf.gif);
}
.x-tree-node-collapsed .x-tree-node-icon {
- background-image: url(../images/tree/folder.gif);
+ background-image: url(../images/tree/folder.gif);
}
.x-tree-node-loading .x-tree-node-icon {
- background-image: url(../images/default/tree/loading.gif) !important;
+ background-image: url(../images/default/tree/loading.gif) !important;
}
.x-tree-node .x-tree-node-inline-icon {
- background-image: none;
+ background-image: none;
}
.x-tree-node-loading a span {
- font-style: italic;
- color: #444444;
+ font-style: italic;
+ color: #444444;
}
.ext-ie .x-tree-node-el input {
- width: 14px;
- height: 14px;
+ width: 14px;
+ height: 14px;
}
.x-tree-lines .x-tree-elbow {
- background-image: url(../images/tree/elbow.gif);
+ background-image: url(../images/tree/elbow.gif);
}
.x-tree-lines .x-tree-elbow-plus {
- background-image: url(../images/tree/elbow-plus.gif);
+ background-image: url(../images/tree/elbow-plus.gif);
}
.x-tree-lines .x-tree-elbow-minus {
- background-image: url(../images/tree/elbow-minus.gif);
+ background-image: url(../images/tree/elbow-minus.gif);
}
.x-tree-lines .x-tree-elbow-end {
- background-image: url(../images/tree/elbow-end.gif);
+ background-image: url(../images/tree/elbow-end.gif);
}
.x-tree-lines .x-tree-elbow-end-plus {
- background-image: url(../images/tree/elbow-end-plus.gif);
+ background-image: url(../images/tree/elbow-end-plus.gif);
}
.x-tree-lines .x-tree-elbow-end-minus {
- background-image: url(../images/tree/elbow-end-minus.gif);
+ background-image: url(../images/tree/elbow-end-minus.gif);
}
.x-tree-lines .x-tree-elbow-line {
- background-image: url(../images/tree/elbow-line.gif);
+ background-image: url(../images/tree/elbow-line.gif);
}
.x-tree-no-lines .x-tree-elbow-plus {
- background-image: url(../images/tree/elbow-plus-nl.gif);
+ background-image: url(../images/tree/elbow-plus-nl.gif);
}
.x-tree-no-lines .x-tree-elbow-minus {
- background-image: url(../images/tree/elbow-minus-nl.gif);
+ background-image: url(../images/tree/elbow-minus-nl.gif);
}
.x-tree-no-lines .x-tree-elbow-end-plus {
- background-image: url(../images/tree/elbow-end-plus-nl.gif);
+ background-image: url(../images/tree/elbow-end-plus-nl.gif);
}
.x-tree-no-lines .x-tree-elbow-end-minus {
- background-image: url(../images/tree/elbow-end-minus-nl.gif);
+ background-image: url(../images/tree/elbow-end-minus-nl.gif);
}
.x-tree-arrows .x-tree-elbow-plus {
- background-image: url(../images/tree/arrows.gif);
+ background-image: url(../images/tree/arrows.gif);
}
.x-tree-arrows .x-tree-elbow-minus {
- background-image: url(../images/tree/arrows.gif);
+ background-image: url(../images/tree/arrows.gif);
}
.x-tree-arrows .x-tree-elbow-end-plus {
- background-image: url(../images/tree/arrows.gif);
+ background-image: url(../images/tree/arrows.gif);
}
.x-tree-arrows .x-tree-elbow-end-minus {
- background-image: url(../images/tree/arrows.gif);
+ background-image: url(../images/tree/arrows.gif);
}
.x-tree-node {
- color: #000;
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+ color: #000;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-tree-node a,.x-dd-drag-ghost a {
- color: #fff;
+ color: #fff;
}
.x-tree-node a span,.x-dd-drag-ghost a span {
- color: #fff;
+ color: #fff;
}
.x-tree-node .x-tree-selected a,.x-dd-drag-ghost a {
- color: #fff;
+ color: #fff;
}
.x-tree-node .x-tree-selected a span,.x-dd-drag-ghost a span {
- color: #fff;
+ color: #fff;
}
.x-tree-node .x-tree-node-disabled a span {
- color: gray !important;
+ color: gray !important;
}
.x-tree-node div.x-tree-drag-insert-below {
- border-bottom-color: #36c;
+ border-bottom-color: #36c;
}
.x-tree-node div.x-tree-drag-insert-above {
- border-top-color: #36c;
+ border-top-color: #36c;
}
.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-below a {
- border-bottom-color: #36c;
+ border-bottom-color: #36c;
}
.x-tree-dd-underline .x-tree-node div.x-tree-drag-insert-above a {
- border-top-color: #36c;
+ border-top-color: #36c;
}
.x-tree-node .x-tree-drag-append a span {
- background-color: #ddd;
- border-color: gray;
+ background-color: #ddd;
+ border-color: gray;
}
.x-tree-node .x-tree-node-over {
- background-color: #7e5530;
+ background-color: #7e5530;
}
.x-tree-node .x-tree-selected {
- background-color: #e5872c;
- font-weight: bold;
+ background-color: #e5872c;
+ font-weight: bold;
}
.x-tree-drop-ok-append .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-add.gif);
+ background-image: url(../images/default/tree/drop-add.gif);
}
.x-tree-drop-ok-above .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-over.gif);
+ background-image: url(../images/default/tree/drop-over.gif);
}
.x-tree-drop-ok-below .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-under.gif);
+ background-image: url(../images/default/tree/drop-under.gif);
}
.x-tree-drop-ok-between .x-dd-drop-icon {
- background-image: url(../images/default/tree/drop-between.gif);
+ background-image: url(../images/default/tree/drop-between.gif);
}
.x-date-picker {
- border-color: #737b8c;
- background-color: #21252e;
+ border-color: #737b8c;
+ background-color: #21252e;
}
.x-date-middle,.x-date-left,.x-date-right {
- background-image: url(../images/shared/hd-sprite.gif);
- color: #fff;
- font: bold 14px "sans serif", tahoma, verdana, helvetica;
+ background-image: url(../images/shared/hd-sprite.gif);
+ color: #fff;
+ font: bold 14px "sans serif", tahoma, verdana, helvetica;
}
.x-date-middle .x-btn .x-btn-text {
- color: #fff;
+ color: #fff;
}
.x-date-middle .x-btn-mc em.x-btn-arrow {
- background-image: url(../images/toolbar/btn-arrow-light.gif);
+ background-image: url(../images/toolbar/btn-arrow-light.gif);
}
.x-date-right a {
- background-image: url(../images/shared/right-btn.gif);
+ background-image: url(../images/shared/right-btn.gif);
}
.x-date-left a {
- background-image: url(../images/shared/left-btn.gif);
+ background-image: url(../images/shared/left-btn.gif);
}
.x-date-inner th {
- background-color: #363d4a;
- background-image: url(../images/toolbar/bg.gif);
- border-bottom-color: #535b5c;
- font: normal 13px arial, helvetica, tahoma, sans-serif;
- color: #fff;
+ background-color: #363d4a;
+ background-image: url(../images/toolbar/bg.gif);
+ border-bottom-color: #535b5c;
+ font: normal 13px arial, helvetica, tahoma, sans-serif;
+ color: #fff;
}
.x-date-inner td {
- border-color: #112;
+ border-color: #112;
}
.x-date-inner a {
- font: normal 14px arial, helvetica, tahoma, sans-serif;
- color: #fff;
- padding: 2px 7px 1px 3px; /* Structure to account for larger, bolder fonts in Access theme. */
+ font: normal 14px arial, helvetica, tahoma, sans-serif;
+ color: #fff;
+ padding: 2px 7px 1px 3px;
+ /* Structure to account for larger, bolder fonts in Access theme. */
}
.x-date-inner .x-date-active {
- color: #000;
+ color: #000;
}
.x-date-inner .x-date-selected a {
- background-color: #e5872c;
- background-image: none;
- border-color: #864900;
- padding: 1px 6px 1px 2px; /* Structure to account for larger, bolder fonts in Access theme. */
+ background-color: #e5872c;
+ background-image: none;
+ border-color: #864900;
+ padding: 1px 6px 1px 2px;
+ /* Structure to account for larger, bolder fonts in Access theme. */
}
.x-date-inner .x-date-today a {
- border-color: #99a;
+ border-color: #99a;
}
.x-date-inner .x-date-selected span {
- font-weight: bold;
+ font-weight: bold;
}
.x-date-inner .x-date-prevday a,.x-date-inner .x-date-nextday a {
- color: #aaa;
+ color: #aaa;
}
.x-date-bottom {
- border-top-color: #737b8c;
- background-color: #464d5a;
- background-image: url(../images/shared/glass-bg.gif);
+ border-top-color: #737b8c;
+ background-color: #464d5a;
+ background-image: url(../images/shared/glass-bg.gif);
}
.x-date-inner a:hover,.x-date-inner .x-date-disabled a:hover {
- color: #fff;
- background-color: #7e5530;
+ color: #fff;
+ background-color: #7e5530;
}
.x-date-inner .x-date-disabled a {
- background-color: #eee;
- color: #bbb;
+ background-color: #eee;
+ color: #bbb;
}
.x-date-mmenu {
- background-color: #eee !important;
+ background-color: #eee !important;
}
.x-date-mmenu .x-menu-item {
- font-size: 13px;
- color: #000;
+ font-size: 13px;
+ color: #000;
}
.x-date-mp {
- background-color: #21252e;
+ background-color: #21252e;
}
.x-date-mp td {
- font: normal 14px arial, helvetica, tahoma, sans-serif;
+ font: normal 14px arial, helvetica, tahoma, sans-serif;
}
.x-date-mp-btns button {
- background-color: #083772;
- color: #fff;
- border-color: #3366cc #000055 #000055 #3366cc;
- font: normal 14px arial, helvetica, tahoma, sans-serif;
+ background-color: #083772;
+ color: #fff;
+ border-color: #3366cc #000055 #000055 #3366cc;
+ font: normal 14px arial, helvetica, tahoma, sans-serif;
}
.x-date-mp-btns {
- background-color: #dfecfb;
- background-image: url(../images/shared/glass-bg.gif);
+ background-color: #dfecfb;
+ background-image: url(../images/shared/glass-bg.gif);
}
.x-date-mp-btns td {
- border-top-color: #c5d2df;
+ border-top-color: #c5d2df;
}
td.x-date-mp-month a,td.x-date-mp-year a {
- color: #fff;
+ color: #fff;
}
td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
- color: fff;
- background-color: #7e5530;
+ color: fff;
+ background-color: #7e5530;
}
td.x-date-mp-sel a {
- background-color: #e5872c;
- background-image: none;
- border-color: #864900;
+ background-color: #e5872c;
+ background-image: none;
+ border-color: #864900;
}
.x-date-mp-ybtn a {
- background-image: url(../images/panel/tool-sprites.gif);
+ background-image: url(../images/panel/tool-sprites.gif);
}
td.x-date-mp-sep {
- border-right-color: #c5d2df;
+ border-right-color: #c5d2df;
}
.x-tip .x-tip-close {
- background-image: url(../images/qtip/close.gif);
+ background-image: url(../images/qtip/close.gif);
}
.x-tip .x-tip-tc,.x-tip .x-tip-tl,.x-tip .x-tip-tr,.x-tip .x-tip-bc,.x-tip .x-tip-bl,.x-tip .x-tip-br,.x-tip .x-tip-ml,.x-tip .x-tip-mr
- {
- background-image: url(../images/qtip/tip-sprite.gif);
+ {
+ background-image: url(../images/qtip/tip-sprite.gif);
}
.x-tip .x-tip-mc {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
+ font: normal 14px 'Ubuntu', Arial
}
.x-tip .x-tip-ml {
- background-color: #fff;
+ background-color: #fff;
}
.x-tip .x-tip-header-text {
- font: bold 14px tahoma, arial, helvetica, sans-serif;
- color: #ffd;
+ font: bold 14px 'Ubuntu', Arial color : #ffd;
}
.x-tip .x-tip-body {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- color: #000;
+ font: normal 14px 'Ubuntu', Arial color : #000;
}
.x-form-invalid-tip .x-tip-tc,.x-form-invalid-tip .x-tip-tl,.x-form-invalid-tip .x-tip-tr,.x-form-invalid-tip .x-tip-bc,.x-form-invalid-tip .x-tip-bl,.x-form-invalid-tip .x-tip-br,.x-form-invalid-tip .x-tip-ml,.x-form-invalid-tip .x-tip-mr
- {
- background-image: url(../images/default/form/error-tip-corners.gif);
+ {
+ background-image: url(../../gxt/images/default/form/error-tip-corners.gif);
}
.x-form-invalid-tip .x-tip-body {
- background-image: url(../images/form/exclamation.gif);
+ background-image: url(../images/form/exclamation.gif);
}
.x-tip-anchor {
- background-image: url(../images/qtip/tip-anchor-sprite.gif);
+ background-image: url(../images/qtip/tip-anchor-sprite.gif);
}
.x-menu {
- border-color: #222;
- background-color: #414551;
- background-image: url(../images/menu/menu.gif);
+ border-color: #552200;
+ /* background-color: transparent;
+ background-image: url(../images/menu/menu.gif); */
+ font: 13px 'Ubuntu', arial;
+ kfilter: alpha(opacity = 95);
+ -moz-opacity: 0.95;
+ -khtml-opacity: 0.95;
+ opacity: 0.95;
+ -webkit-border-bottom-right-radius: 5px;
+ -moz-border-radius-bottomright: 5px;
+ border-bottom-right-radius: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ border-bottom-left-radius: 5px;
}
.x-menu-nosep {
- background-image: none;
+ background-image: none;
}
.x-menu-list-item {
- font: normal 14px tahoma, arial, sans-serif;
+ font: normal 14px tahoma, arial, sans-serif;
}
.x-menu-item-arrow {
- background-image: url(../images/menu/menu-parent.gif);
+ background-image: url(../images/menu/menu-parent.gif);
}
-.x-menu-sep {
- background-color: #223;
- border-bottom-color: #666;
+.x-menu-sep { /* background-color: #223;
+ border-bottom-color: #666; */
+
}
a.x-menu-item {
- color: #fffff6;
+ color: #fffff6;
}
.x-menu-item-active {
- background-color: #f09134;
- background-image: none;
- border-color: #b36427;
+ background-color: #f09134;
+ background-image: none;
+ border-color: #b36427;
}
.x-menu-item-active a.x-menu-item {
- border-color: #b36427;
+ border-color: #b36427;
}
.x-menu-check-item .x-menu-item-icon {
- background-image: url(../images/default/menu/unchecked.gif);
+ background-image: url(../images/default/menu/unchecked.gif);
}
.x-menu-item-checked .x-menu-item-icon {
- background-image: url(../images/default/menu/checked.gif);
+ background-image: url(../images/default/menu/checked.gif);
}
.x-menu-item-checked .x-menu-group-item .x-menu-item-icon {
- background-image: url(../images/menu/group-checked.gif);
+ background-image: url(../images/menu/group-checked.gif);
}
.x-menu-group-item .x-menu-item-icon {
- background-image: none;
+ background-image: none;
}
.x-menu-plain {
- background-color: #fff !important;
+ background-color: #fff !important;
}
.x-menu .x-date-picker {
- border-color: #a3bad9;
+ border-color: #a3bad9;
}
.x-cycle-menu .x-menu-item-checked {
- border-color: #a3bae9 !important;
- background-color: #def8f6;
+ border-color: #a3bae9 !important;
+ background-color: #def8f6;
}
.x-menu-scroller-top {
- background-image: url(../images/layout/mini-top.gif);
+ background-image: url(../images/layout/mini-top.gif);
}
.x-menu-scroller-bottom {
- background-image: url(../images/layout/mini-bottom.gif);
+ background-image: url(../images/layout/mini-bottom.gif);
}
.x-box-tl {
- background-image: url(../images/default/box/corners.gif);
+ background-image: url(../images/default/box/corners.gif);
}
.x-box-tc {
- background-image: url(../images/default/box/tb.gif);
+ background-image: url(../images/default/box/tb.gif);
}
.x-box-tr {
- background-image: url(../images/default/box/corners.gif);
+ background-image: url(../images/default/box/corners.gif);
}
.x-box-ml {
- background-image: url(../images/default/box/l.gif);
+ background-image: url(../images/default/box/l.gif);
}
.x-box-mc {
- background-color: #eee;
- background-image: url(../images/default/box/tb.gif);
- font-family: "Myriad Pro", "Myriad Web", "Tahoma", "Helvetica", "Arial", sans-serif;
- color: #393939;
- font-size: 15px;
+ background-color: #eee;
+ background-image: url(../images/default/box/tb.gif);
+ font-family: "Myriad Pro", "Myriad Web", "Tahoma", "Helvetica", "Arial",
+ sans-serif;
+ color: #393939;
+ font-size: 15px;
}
.x-box-mc h3 {
- font-size: 18px;
- font-weight: bold;
+ font-size: 18px;
+ font-weight: bold;
}
.x-box-mr {
- background-image: url(../images/default/box/r.gif);
+ background-image: url(../images/default/box/r.gif);
}
.x-box-bl {
- background-image: url(../images/default/box/corners.gif);
+ background-image: url(../images/default/box/corners.gif);
}
.x-box-bc {
- background-image: url(../images/default/box/tb.gif);
+ background-image: url(../images/default/box/tb.gif);
}
.x-box-br {
- background-image: url(../images/default/box/corners.gif);
+ background-image: url(../images/default/box/corners.gif);
}
-.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr {
- background-image: url(../images/default/box/corners-blue.gif);
+.x-box-blue .x-box-bl,.x-box-blue .x-box-br,.x-box-blue .x-box-tl,.x-box-blue .x-box-tr
+ {
+ background-image: url(../images/default/box/corners-blue.gif);
}
.x-box-blue .x-box-bc,.x-box-blue .x-box-mc,.x-box-blue .x-box-tc {
- background-image: url(../images/default/box/tb-blue.gif);
+ background-image: url(../images/default/box/tb-blue.gif);
}
.x-box-blue .x-box-mc {
- background-color: #c3daf9;
+ background-color: #c3daf9;
}
.x-box-blue .x-box-mc h3 {
- color: #17385b;
+ color: #17385b;
}
.x-box-blue .x-box-ml {
- background-image: url(../images/default/box/l-blue.gif);
+ background-image: url(../images/default/box/l-blue.gif);
}
.x-box-blue .x-box-mr {
- background-image: url(../images/default/box/r-blue.gif);
+ background-image: url(../images/default/box/r-blue.gif);
}
.x-combo-list {
- border: 2px solid #232732;
- background-color: #555566 !important;
- font: normal 15px tahoma, arial, helvetica, sans-serif;
+ border: 2px solid #232732;
+ background-color: #555566 !important;
+ font: normal 15px 'Ubuntu', Arial
}
.x-combo-list-inner {
- background-color: #414551;
+ background-color: #280b0b;
}
.x-combo-list-hd {
- font: bold 14px tahoma, arial, helvetica, sans-serif;
- color: fff;
- background-image: url(../images/default/layout/panel-title-light-bg.gif);
- border-bottom-color: #98c0f4;
+ font: bold 14px 'Ubuntu', Arial color : fff;
+ background-image: url(../images/default/layout/panel-title-light-bg.gif);
+ border-bottom-color: #98c0f4;
}
.x-resizable-pinned .x-combo-list-inner {
- border-bottom-color: #98c0f4;
+ border-bottom-color: #98c0f4;
}
.x-combo-list-item {
- border-color: #556;
+ border-color: #556;
}
.x-combo-list .x-combo-selected {
- border-color: #e5872c !important;
- background-color: #e5872c;
- font-weight: bold;
+ border-color: #e5872c !important;
+ background-color: #e5872c;
+ font-weight: bold;
}
.x-combo-list .x-toolbar {
- border-top-color: #98c0f4;
+ border-top-color: #98c0f4;
}
.x-combo-list-small {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
+ font: normal 14px 'Ubuntu', Arial
}
.x-panel {
- border-color: #18181a;
+ border-color: #18181a;
}
.x-panel-header {
- color: #fff !important;
- font-weight: bold;
- font-size: 14px;
- font-family: tahoma, arial, verdana, sans-serif;
- border-color: #18181a;
- background-image: url(../images/panel/white-top-bottom.gif);
+ color: #fff !important;
+ font-weight: bold;
+ font-size: 14px;
+ font-family: tahoma, arial, verdana, sans-serif;
+ border-color: #18181a;
+ background-image: url(../images/panel/white-top-bottom.gif);
}
-.x-panel-body {
- color: #fffff6;
- border-color: #18181a;
- background-color: #232d38;
+.x-panel-body { /* color: #fffff6; */
+ border-color: #18181a;
+ background-color: #232d38;
}
.x-tab-panel .x-panel-body {
- color: #fffff6;
- border-color: #18181a;
- background-color: #1f2730;
+ color: #fffff6;
+ border-color: #18181a;
+ background-color: #1f2730;
}
.x-panel-bbar .x-toolbar,.x-panel-tbar .x-toolbar {
- border-color: #223;
+ /* border-color: #223; */
+
}
.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar {
- border-top-color: #223;
+ /* border-top-color: #223; */
+
}
.x-panel-body-noheader,.x-panel-mc .x-panel-body {
- border-top-color: #223;
+ /* border-top-color: #223; */
+
}
.x-panel-tl .x-panel-header {
- color: fff;
- font: bold 14px tahoma, arial, verdana, sans-serif;
+ color: fff;
+ font: bold 14px tahoma, arial, verdana, sans-serif;
}
.x-panel-tc {
- background-image: url(../images/panel/top-bottom.gif);
+ /* background-image: url(../images/panel/top-bottom.gif); */
+
}
.x-panel-tl,.x-panel-tr,.x-panel-bl,.x-panel-br {
- background-image: url(../images/panel/corners-sprite.gif);
- border-bottom-color: #222224;
+ /* background-image: url(../images/panel/corners-sprite.gif);
+ border-bottom-color: #222224; */
+
}
.x-panel-bc {
- background-image: url(../images/panel/top-bottom.gif);
+ /* background-image: url(../images/panel/top-bottom.gif); */
+
}
.x-panel-mc {
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- background-color: #3f4757;
+ font: normal 14px 'Ubuntu', Arial background-color : #3f4757;
}
.x-panel-ml {
- background-image: url(../images/panel/left-right.gif);
+ /* background-image: url(../images/panel/left-right.gif); */
+
}
.x-panel-mr {
- background-image: url(../images/panel/left-right.gif);
+ /* background-image: url(../images/panel/left-right.gif); */
+
}
.x-tool {
- background-image: url(../images/panel/tool-sprites.gif);
+ background-image: url(../images/panel/tool-sprites.gif);
}
.x-tool-resize {
-background-position:0 -360px;
+ background-position: 0 -360px;
}
.x-tool-resize-over {
-background-position:-15px -360px;
+ background-position: -15px -360px;
}
.x-tool-move {
-background-position:0 -375px;
+ background-position: 0 -375px;
}
.x-tool-move-over {
-background-position:-15px -375px;
+ background-position: -15px -375px;
}
.x-panel-ghost {
- background-color: #3f4757;
+ background-color: #3f4757;
}
.x-panel-ghost ul {
- border-color: #18181a;
+ border-color: #18181a;
}
.x-panel-dd-spacer {
- border-color: #18181a;
+ border-color: #18181a;
}
-.x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+.x-panel-fbar td,.x-panel-fbar span,.x-panel-fbar input,.x-panel-fbar div,.x-panel-fbar select,.x-panel-fbar label
+ {
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-window-proxy {
- background-color: #1f2833;
- border-color: #18181a;
+ background-color: #1f2833;
+ border-color: #18181a;
}
.x-window-tl .x-window-header {
- color: #fff !important;
- font: bold 14px tahoma, arial, verdana, sans-serif;
+ color: #fff !important;
+ font: bold 14px tahoma, arial, verdana, sans-serif;
}
.x-window-tc {
- background-image: url(../images/window/top-bottom.png);
+ background-image: url(../images/window/top-bottom.png);
}
.x-window-tl {
- background-image: url(../images/window/left-corners.png);
+ background-image: url(../images/window/left-corners.png);
}
.x-window-tr {
- background-image: url(../images/window/right-corners.png);
+ background-image: url(../images/window/right-corners.png);
}
.x-window-bc {
- background-image: url(../images/window/top-bottom.png);
+ background-image: url(../images/window/top-bottom.png);
}
.x-window-bl {
- background-image: url(../images/window/left-corners.png);
+ background-image: url(../images/window/left-corners.png);
}
.x-window-br {
- background-image: url(../images/window/right-corners.png);
+ background-image: url(../images/window/right-corners.png);
}
.x-window-mc {
- border-color: #18181a;
- font: normal 14px tahoma, arial, helvetica, sans-serif;
- background-color: #1f2833;
+ border-color: #18181a;
+ font: normal 14px 'Ubuntu', Arial background-color : #1f2833;
}
.x-window-ml {
- background-image: url(../images/window/left-right.png);
+ background-image: url(../images/window/left-right.png);
}
.x-window-mr {
- background-image: url(../images/window/left-right.png);
+ background-image: url(../images/window/left-right.png);
}
.x-window-maximized .x-window-tc {
- background-color: #fff;
+ background-color: #fff;
}
.x-window-bbar .x-toolbar {
- border-top-color: #323945;
+ border-top-color: #323945;
}
.x-panel-ghost .x-window-tl {
- border-bottom-color: #323945;
+ border-bottom-color: #323945;
}
.x-panel-collapsed .x-window-tl {
- border-bottom-color: #323945;
+ border-bottom-color: #323945;
}
.x-dlg-mask {
- background-color: #ccc;
+ background-color: #ccc;
}
.x-window-plain .x-window-mc {
- background-color: #464f61;
- border-color: #636778;
+ background-color: #464f61;
+ border-color: #636778;
}
.ext-ie .x-window-plain .x-window-mc {
@@ -1680,668 +1720,664 @@
}
.x-window-plain .x-window-body {
- color: #fffff6;
- border-color: #464F61;
+ color: #fffff6;
+ border-color: #464F61;
}
body.x-body-masked .x-window-plain .x-window-mc {
- background-color: #464f61;
+ background-color: #464f61;
}
.x-html-editor-wrap {
- border-color: #737B8C;
- background-color: #fff;
+ border-color: #737B8C;
+ background-color: #fff;
}
.x-html-editor-wrap iframe {
- background-color: #fff;
+ background-color: #fff;
}
.x-panel-noborder .x-panel-header-noborder {
- border-bottom-color: #343d4e;
+ border-bottom-color: #343d4e;
}
.x-panel-noborder .x-panel-tbar-noborder .x-toolbar {
- border-bottom-color: #343d4e;
+ border-bottom-color: #343d4e;
}
.x-panel-noborder .x-panel-bbar-noborder .x-toolbar {
- border-top-color: #343d4e;
+ border-top-color: #343d4e;
}
.x-tab-panel-bbar-noborder .x-toolbar {
- border-top-color: #343d4e;
+ border-top-color: #343d4e;
}
.x-tab-panel-tbar-noborder .x-toolbar {
- border-bottom-color: #343d4e;
+ border-bottom-color: #343d4e;
}
.x-border-layout-ct {
- background-color: #3f4757;
+ background-color: #3f4757;
}
.x-accordion-hd {
- color: #fff;
- font-weight: normal;
- background-image: url(../images/panel/light-hd.gif);
+ color: #fff;
+ font-weight: normal;
+ background-image: url(../images/panel/light-hd.gif);
}
.x-layout-collapsed {
- background-color: #323845;
- border-color: #1a1a1c;
+ background-color: #323845;
+ border-color: #1a1a1c;
}
.x-layout-collapsed-over {
- background-color: #2d3440;
+ background-color: #2d3440;
}
.x-layout-split-west .x-layout-mini {
- background-image: url(../images/default/layout/mini-left.gif);
+ background-image: url(../images/default/layout/mini-left.gif);
}
.x-layout-split-east .x-layout-mini {
- background-image: url(../images/default/layout/mini-right.gif);
+ background-image: url(../images/default/layout/mini-right.gif);
}
.x-layout-split-north .x-layout-mini {
- background-image: url(../images/default/layout/mini-top.gif);
+ background-image: url(../images/default/layout/mini-top.gif);
}
.x-layout-split-south .x-layout-mini {
- background-image: url(../images/default/layout/mini-bottom.gif);
+ background-image: url(../images/default/layout/mini-bottom.gif);
}
.x-layout-cmini-west .x-layout-mini {
- background-image: url(../images/default/layout/mini-right.gif);
+ background-image: url(../images/default/layout/mini-right.gif);
}
.x-layout-cmini-east .x-layout-mini {
- background-image: url(../images/default/layout/mini-left.gif);
+ background-image: url(../images/default/layout/mini-left.gif);
}
.x-layout-cmini-north .x-layout-mini {
- background-image: url(../images/default/layout/mini-bottom.gif);
+ background-image: url(../images/default/layout/mini-bottom.gif);
}
.x-layout-cmini-south .x-layout-mini {
- background-image: url(../images/default/layout/mini-top.gif);
+ background-image: url(../images/default/layout/mini-top.gif);
}
.x-progress-wrap {
- border-color: #18181a;
+ border-color: #18181a;
}
.x-progress-inner {
- background-color: #232d38;
- background-image: none;
+ background-color: #232d38;
+ background-image: none;
}
.x-progress-bar {
- background-color: #f39a00;
- background-image: url(../images/progress/progress-bg.gif);
- border-top-color: #a66900;
- border-bottom-color: #a66900;
- border-right-color: #ffb941;
+ background-color: #f39a00;
+ background-image: url(../images/progress/progress-bg.gif);
+ border-top-color: #a66900;
+ border-bottom-color: #a66900;
+ border-right-color: #ffb941;
}
.x-progress-text {
- font-size: 14px;
- font-weight: bold;
- color: #fff;
+ font-size: 14px;
+ font-weight: bold;
+ color: #fff;
}
.x-progress-text-back {
- color: #aaa;
- line-height: 11px;
+ color: #aaa;
+ line-height: 11px;
}
.x-list-header {
- background-color: #393d4e;
- background-image: url(../images/toolbar/bg.gif);
- background-position: 0 top;
+ background-color: #393d4e;
+ background-image: url(../images/toolbar/bg.gif);
+ background-position: 0 top;
}
.x-list-header-inner div em {
- border-left-color: #667;
- font: normal 14px arial, tahoma, helvetica, sans-serif;
- line-height: 14px;
+ border-left-color: #667;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
+ line-height: 14px;
}
.x-list-body dt em {
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-list-over {
- background-color: #eee;
+ background-color: #eee;
}
.x-list-selected {
- background-color: #dfe8f6;
- font-weight: bold;
+ background-color: #dfe8f6;
+ font-weight: bold;
}
.x-list-resizer {
- border-left-color: #555;
- border-right-color: #555;
+ border-left-color: #555;
+ border-right-color: #555;
}
.x-list-header-inner em.sort-asc,.x-list-header-inner em.sort-desc {
- background-image: url(../images/grid/sort-hd.gif);
- border-color: #3e4e6c;
+ background-image: url(../images/grid/sort-hd.gif);
+ border-color: #3e4e6c;
}
.x-slider-input {
- color: black;
+ color: black;
}
-.x-slider-horz,.x-slider-horz .x-slider-end,.x-slider-horz .x-slider-inner {
- background-image: url(../images/slider/slider-bg.png);
+.x-slider-horz,.x-slider-horz .x-slider-end,.x-slider-horz .x-slider-inner
+ {
+ background-image: url(../images/slider/slider-bg.png);
}
.x-slider-horz .x-slider-thumb {
- background-image: url(../images/slider/slider-thumb.png);
+ background-image: url(../images/slider/slider-thumb.png);
}
-.x-slider-vert,.x-slider-vert .x-slider-end,.x-slider-vert .x-slider-inner {
- background-image: url(../images/slider/slider-v-bg.png);
+.x-slider-vert,.x-slider-vert .x-slider-end,.x-slider-vert .x-slider-inner
+ {
+ background-image: url(../images/slider/slider-v-bg.png);
}
.x-slider-vert .x-slider-thumb {
- background-image: url(../images/slider/slider-v-thumb.png);
+ background-image: url(../images/slider/slider-v-thumb.png);
}
.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text {
- font-size: 15px;
+ font-size: 15px;
}
.x-window-dlg .ext-mb-textarea {
- font: normal 15px tahoma, arial, helvetica, sans-serif;
+ font: normal 15px 'Ubuntu', Arial
}
.x-window-dlg .x-msg-box-wait {
- background-image: url(../images/grid/loading.gif);
+ background-image: url(../images/grid/loading.gif);
}
.x-window-dlg .ext-mb-info {
- background-image: url(../images/window/icon-info.gif);
+ background-image: url(../images/window/icon-info.gif);
}
.x-window-dlg .ext-mb-warning {
- background-image: url(../images/window/icon-warning.gif);
+ background-image: url(../images/window/icon-warning.gif);
}
.x-window-dlg .ext-mb-question {
- background-image: url(../images/window/icon-question.gif);
+ background-image: url(../images/window/icon-question.gif);
}
.x-window-dlg .ext-mb-error {
- background-image: url(../images/window/icon-error.gif);
+ background-image: url(../images/window/icon-error.gif);
}
.x-border {
- border: 1px solid #18181a;
+ border: 1px solid #18181a;
}
.x-grid3-hd-row .x-grid3-hd {
- border-left-color: #555566;
- border-right-color: black;
+ border-left-color: #555566;
+ border-right-color: black;
}
.x-grid3-row {
- border-color: #1f2933 black black;
+ border-color: #1f2933 black black;
}
.x-grid3-row-checker,.x-grid3-hd-checker {
- background-image: url(../images/grid/row-check-sprite.gif);
+ background-image: url(../images/grid/row-check-sprite.gif);
}
.x-grid3-footer {
- background: none repeat scroll 0 0 black;
- border-bottom: 1px solid #393c4c;
- border-top: 1px solid #393c4c;
+ background: none repeat scroll 0 0 black;
+ border-bottom: 1px solid #393c4c;
+ border-top: 1px solid #393c4c;
}
.x-grid3-footer-row {
- background: none repeat scroll 0 0 black;
+ background: none repeat scroll 0 0 black;
}
.x-tree3 {
- background-color: #232D38;
+ background-color: #232D38;
}
.x-tree3-node-text {
- color: white;
+ color: white;
}
.x-tree3-node {
- color: white;
- font: normal 14px arial, tahoma, helvetica, sans-serif;
+ color: white;
+ font: normal 14px arial, tahoma, helvetica, sans-serif;
}
.x-tree3-node .x-ftree2-node-over {
- background-color: #7e5530 !important;
+ background-color: #7e5530 !important;
}
.x-tree3-node .x-ftree2-selected {
- background-color: #e5872c !important;
- font-weight: bold;
- color: black !important;
+ background-color: #e5872c !important;
+ font-weight: bold;
+ color: black !important;
}
.x-tree3-node .x-ftree2-selected .x-tree3-node-text {
- color: black !important;
+ color: black !important;
}
.x-view,x-combo-list {
- background-color: #232D38;
+ background-color: #232D38;
}
.x-view {
- border: 1px solid #18181a;
+ border: 1px solid #18181a;
}
-.x-view-highlightrow {
- border: 1px dotted #e5872c !important;
- background-color: #666360;
- text-decoration: underline;
+.x-view-highlightrow {
+ border: 1px dotted #e5872c !important;
+ background-color: #666360;
+ text-decoration: underline;
}
.x-view-item,.x-combo-list-item {
- border: 1px solid black !important;
- border-top: 1px solid #232D38 !important;
+ border: 1px solid black !important;
+ border-top: 1px solid #232D38 !important;
}
.x-view-item-over,.x-combo-over {
- background: #7e5530;
- border: 1px dotted #e5872c !important;
+ background: #7e5530;
+ border: 1px dotted #e5872c !important;
}
.x-view-item-sel,.x-combo-selected {
- background: #e5872c none repeat scroll 0%;
- border: 1px dotted #e5872c !important;
- font-weight: bold;
- color: black !important;
+ background: #e5872c none repeat scroll 0%;
+ border: 1px dotted #e5872c !important;
+ font-weight: bold;
+ color: black !important;
}
-
-
.x-date-left-icon {
- background-image: url(../images/shared/left-btn.gif);
+ background-image: url(../images/shared/left-btn.gif);
}
.x-date-right-icon {
- background-image: url(../images/shared/right-btn.gif);
+ background-image: url(../images/shared/right-btn.gif);
}
.x-date-days td {
- background: url(../images/shared/glass-bg.gif) 0px -5px;
- color: white;
+ background: url(../images/shared/glass-bg.gif) 0px -5px;
+ color: white;
}
.x-date-mp-btns button {
- background-color: #282f40;
- color: #fff;
- border-color: #1b1d29;
+ background-color: #282f40;
+ color: #fff;
+ border-color: #1b1d29;
}
.x-grid-group-hd .x-grid-group-div {
- color: white;
+ color: white;
}
.x-grid3-summary-row {
- background: none repeat scroll 0 50% #21252e !important;
+ background: none repeat scroll 0 50% #21252e !important;
}
.x-status-text-panel {
- border-color: black #fff #fff black !important;
+ border-color: black #fff #fff black !important;
}
.x-menubar {
- border-color: black;
- background-color: #d0def0;
- background-image: url(../images/toolbar/bg.gif);
+ border-color: black;
+ background-color: #d0def0;
+ background-image: url(../images/toolbar/bg.gif);
}
.x-menubar-item-active {
- background-color: #e5872c;
+ background-color: #e5872c;
}
.x-drag-proxy {
- background-color: #3f4757;
- border: 1px solid black;
+ background-color: #3f4757;
+ border: 1px solid black;
}
-.x-grid3-hd-row .x-grid3-hd,.x-grid3-row .x-grid3-cell,.x-grid3-summary-row .x-grid3-cell {
- font: 12px arial, tahoma, helvetica, sans-serif !important;
+.x-grid3-hd-row .x-grid3-hd,.x-grid3-row .x-grid3-cell,.x-grid3-summary-row .x-grid3-cell
+ {
+ font: 12px arial, tahoma, helvetica, sans-serif !important;
}
.x-grid3-row-selected,.x-grid3-row-selected .x-grid3-cell {
- font-weight: bold !important;
+ font-weight: bold !important;
}
.x-tree3-node-text {
- font: 12px arial, tahoma, helvetica, sans-serif;
- font-weight: bold;
+ font: 12px arial, tahoma, helvetica, sans-serif;
+ font-weight: bold;
}
.x-tree3-node .x-ftree2-selected {
- font-weight: bold !important;
+ font-weight: bold !important;
}
.x-grid3-row-selected .x-tree3-node-text {
- color: black !important;
+ color: black !important;
}
.x-contrast .x-ftree2-selected .x-tree3-node-text {
- font-style: italic;
- text-decoration: underline;
+ font-style: italic;
+ text-decoration: underline;
}
.x-aria-focusframe-side {
- background-color: #ff8800;
+ background-color: #ff8800;
}
.x-contrast .x-grid3-cell-selected {
- font-weight: bold !important;
- font-style: italic !important;
- font-size: 13px !important;
+ font-weight: bold !important;
+ font-style: italic !important;
+ font-size: 13px !important;
}
-.x-contrast .x-grid3-row-selected x-tree3-node-text,.x-contrast .x-grid3-row-selected .x-tree3-node-text {
- font-weight: bold !important;
- font-style: italic !important;
- font-size: 13px !important;
+.x-contrast .x-grid3-row-selected x-tree3-node-text,.x-contrast .x-grid3-row-selected .x-tree3-node-text
+ {
+ font-weight: bold !important;
+ font-style: italic !important;
+ font-size: 13px !important;
}
.x-contrast .x-column-header-sel {
- font-style: italic !important;
- font-weight: bold !important;
+ font-style: italic !important;
+ font-weight: bold !important;
}
.x-contrast .x-btn-tr i,.x-contrast .x-btn-tl i,.x-contrast .x-btn-mr i,.x-contrast .x-btn-ml i,.x-contrast .x-btn-br i,.x-contrast .x-btn-bl i
- {
- width: auto;
+ {
+ width: auto;
}
.x-contrast .x-btn-menu .x-btn-mr i:before {
- content: url(../images/button/arrow.gif);
+ content: url(../images/button/arrow.gif);
}
.x-contrast .x-slider-thumb i:before {
- content: url(../images/slider/slider-thumb-single.png);
+ content: url(../images/slider/slider-thumb-single.png);
}
.x-contrast .x-slider {
- border: 1px solid yellow;
+ border: 1px solid yellow;
}
.x-contrast .x-form-trigger:after {
- content: url(../images/form/trigger-single.gif);
+ content: url(../images/form/trigger-single.gif);
}
.x-contrast .x-panel {
- border: 1px solid yellow !important;
+ border: 1px solid yellow !important;
}
.x-contrast .x-btn {
- border: 1px solid yellow !important;
+ border: 1px solid yellow !important;
}
.x-contrast .x-grid3 .sort-asc span:after {
- content: url(../images/grid/sort_asc.gif);
- position: absolute;
- top: 8px;
+ content: url(../images/grid/sort_asc.gif);
+ position: absolute;
+ top: 8px;
}
.x-contrast .x-grid3 .sort-desc span:after {
- content: url(../images/grid/sort_desc.gif);
- position: absolute;
- top: 8px;
+ content: url(../images/grid/sort_desc.gif);
+ position: absolute;
+ top: 8px;
}
.x-contrast .x-menu-check-item:before {
- content: url(../images/grid/row-check.gif);
- position: relative;
- left: 0px;
+ content: url(../images/grid/row-check.gif);
+ position: relative;
+ left: 0px;
}
.x-contrast .x-menu-checked:before {
- content: url(../images/grid/row-check-sel.gif);
- float: left;
+ content: url(../images/grid/row-check-sel.gif);
+ float: left;
}
.x-contrast .x-menu-item-radio:before {
- content: none;
- position: relative;
- left: 0px;
+ content: none;
+ position: relative;
+ left: 0px;
}
.x-contrast .x-menu-radio-sel:before {
- content: url(../images/menu/group-checked.gif);
- float: left;
+ content: url(../images/menu/group-checked.gif);
+ float: left;
}
.x-contrast .x-grid-group .x-grid3-group-selected .x-grid-group-div {
- font-weight: bold !important;
- font-style: italic !important;
+ font-weight: bold !important;
+ font-style: italic !important;
}
.x-contrast .x-grid-group-div:before {
- content: url(../images/grid/group-expand.gif);
- padding-right: 5px;
+ content: url(../images/grid/group-expand.gif);
+ padding-right: 5px;
}
.x-contrast .x-grid-group-collapsed .x-grid-group-div:before {
- content: url(../images/grid/group-collapse.gif);
- padding-right: 5px;
+ content: url(../images/grid/group-collapse.gif);
+ padding-right: 5px;
}
.x-contrast .x-grid3-row-collapsed .x-grid3-row-expander:after {
- content: url(../images/grid/group-expand.gif);
+ content: url(../images/grid/group-expand.gif);
}
.x-contrast .x-grid3-row-expanded .x-grid3-row-expander:after {
- content: url(../images/grid/group-collapse.gif);
+ content: url(../images/grid/group-collapse.gif);
}
-.x-contrast .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker:after {
- content: url(../images/grid/row-check.gif);
+.x-contrast .x-grid3-row-checker:after,.x-contrast .x-grid3-hd-checker:after
+ {
+ content: url(../images/grid/row-check.gif);
}
-.x-contrast .x-grid3-row-selected .x-grid3-row-checker:after, .x-contrast .x-grid3-hd-checker-on .x-grid3-hd-checker:after {
- content: url(../images/grid/row-check-sel.gif);
+.x-contrast .x-grid3-row-selected .x-grid3-row-checker:after,.x-contrast .x-grid3-hd-checker-on .x-grid3-hd-checker:after
+ {
+ content: url(../images/grid/row-check-sel.gif);
}
.x-contrast .x-tool-close i:before {
- content: url(../images/panel/tool-close.gif);
+ content: url(../images/panel/tool-close.gif);
}
.x-contrast .x-tool-gear i:before {
- content: url(../images/panel/tool-gear.gif);
+ content: url(../images/panel/tool-gear.gif);
}
.x-contrast .x-tool-toggle i:before {
- content: url(../images/panel/tool-collapse.gif);
+ content: url(../images/panel/tool-collapse.gif);
}
.x-contrast .x-panel-collapsed .x-tool-toggle i:before {
- content: url(../images/panel/tool-expand.gif);
+ content: url(../images/panel/tool-expand.gif);
}
.x-contrast .x-tool-maximize i:before {
- content: url(../images/panel/tool-maximize.gif);
+ content: url(../images/panel/tool-maximize.gif);
}
.x-contrast .x-tool-minimize i:before {
- content: url(../images/panel/tool-minimize.gif);
+ content: url(../images/panel/tool-minimize.gif);
}
.x-contrast .x-tree3-node-joint-expand .x-tree3-node-text:before {
- content: url(../images/tree/tree-expanded.png);
- position: absolute;
- left: -25px;
+ content: url(../images/tree/tree-expanded.png);
+ position: absolute;
+ left: -25px;
}
.x-contrast .x-tree3-node-joint-collapse .x-tree3-node-text:before {
- content: url(../images/tree/tree-collapsed.png);
- position: absolute;
- left: -25px;
+ content: url(../images/tree/tree-collapsed.png);
+ position: absolute;
+ left: -25px;
}
.x-contrast .arrow-up i:before {
- content: url(../images/icons/top2.gif);
+ content: url(../images/icons/top2.gif);
}
.x-contrast .arrow-double-right i:before {
- content: url(../images/icons/doubleright2.gif);
+ content: url(../images/icons/doubleright2.gif);
}
.x-contrast .arrow-right i:before {
- content: url(../images/icons/right2.gif);
+ content: url(../images/icons/right2.gif);
}
.x-contrast .arrow-left i:before {
- content: url(../images/icons/left2.gif);
+ content: url(../images/icons/left2.gif);
}
.x-contrast .arrow-double-left i:before {
- content: url(../images/icons/doubleleft2.gif);
+ content: url(../images/icons/doubleleft2.gif);
}
.x-contrast .arrow-double-right i:before {
- content: url(../images/icons/doubleright2.gif);
+ content: url(../images/icons/doubleright2.gif);
}
.x-contrast .arrow-down i:before {
- content: url(../images/icons/down2.gif);
+ content: url(../images/icons/down2.gif);
}
.x-contrast .x-date-left-icon i:before {
- content: url(../images/shared/left-btn.gif);
+ content: url(../images/shared/left-btn.gif);
}
.x-contrast .x-date-right-icon i:before {
- content: url(../images/shared/right-btn.gif);
+ content: url(../images/shared/right-btn.gif);
}
.x-contrast .x-grid3-hd-btn:before {
- content: url("../images/grid/grid3-hd-btn-contrast.gif");
- border: 1px solid yellow;
+ content: url("../images/grid/grid3-hd-btn-contrast.gif");
+ border: 1px solid yellow;
}
.x-contrast .x-row-editor .x-btns {
- background-color: black;
+ background-color: black;
}
.x-contrast .x-html-editor-wrap .x-btn-pressed button {
- border: 3px solid black;
+ border: 3px solid black;
}
-.x-contrast .x-window, .x-contrast .x-info, .x-contrast .x-tip {
- background-color: black;
- border: 1px solid black;
+.x-contrast .x-window,.x-contrast .x-info,.x-contrast .x-tip {
+ background-color: black;
+ border: 1px solid black;
}
.x-contrast .x-menu-item-arrow:before {
- content: url(../images/shared/right-btn.gif);
+ content: url(../images/shared/right-btn.gif);
}
-.x-contrast .x-menu-scroller-top:before {
- content: url("../images/layout/mini-top.gif");
- position: absolute;
- left: 45px;
+.x-contrast .x-menu-scroller-top:before {
+ content: url("../images/layout/mini-top.gif");
+ position: absolute;
+ left: 45px;
}
-.x-contrast .x-menu-scroller-bottom:before {
- content: url("../images/layout/mini-bottom.gif");
- position: absolute;
- left: 45px;
+.x-contrast .x-menu-scroller-bottom:before {
+ content: url("../images/layout/mini-bottom.gif");
+ position: absolute;
+ left: 45px;
}
-.x-spinner-field .x-form-twin-triggers .x-form-spinner-up{
- height: 11px;
+.x-spinner-field .x-form-twin-triggers .x-form-spinner-up {
+ height: 11px;
}
+
.x-spinner-field .x-form-twin-triggers .x-form-spinner-down {
- height: 11px;
+ height: 11px;
}
-
.x-spinner-field .x-form-twin-triggers .x-form-spinner-down {
- top:13px;
+ top: 13px;
}
-
.x-spinner-field .x-form-spinner-up {
- background-image: url('../images/form/spinner.gif');
+ background-image: url('../images/form/spinner.gif');
}
+
.x-spinner-field .x-form-spinner-down {
- background-image: url('../images/form/spinner.gif');
+ background-image: url('../images/form/spinner.gif');
}
-
-
-
-
-
-
-
-
-
-
-
-
.x-spinner-field .x-form-spinner-down {
- background-position:0 -13px;
+ background-position: 0 -13px;
}
.x-trigger-wrap-focus .x-form-spinner-up {
- background-position:-100px 0;
+ background-position: -100px 0;
}
.x-trigger-wrap-focus .x-form-spinner-down {
- background-position:-100px -13px;
+ background-position: -100px -13px;
}
-.x-form-field-wrap .x-form-spinner-overup{
- background-position:-20px 0;
+.x-form-field-wrap .x-form-spinner-overup {
+ background-position: -20px 0;
}
-.x-form-field-wrap .x-form-spinner-clickup{
- background-position:-40px 0;
+
+.x-form-field-wrap .x-form-spinner-clickup {
+ background-position: -40px 0;
}
-.x-trigger-wrap-focus .x-form-spinner-overup{
- background-position:-120px 0;
+.x-trigger-wrap-focus .x-form-spinner-overup {
+ background-position: -120px 0;
}
-.x-trigger-wrap-focus .x-form-spinner-clickup{
- background-position:-140px 0;
+.x-trigger-wrap-focus .x-form-spinner-clickup {
+ background-position: -140px 0;
}
-.x-form-field-wrap .x-form-spinner-overdown{
- background-position:-60px -13px;
+.x-form-field-wrap .x-form-spinner-overdown {
+ background-position: -60px -13px;
}
-.x-form-field-wrap .x-form-spinner-clickdown{
- background-position:-80px -13px;
+
+.x-form-field-wrap .x-form-spinner-clickdown {
+ background-position: -80px -13px;
}
-.x-trigger-wrap-focus .x-form-spinner-overdown{
- background-position:-160px -13px;
+
+.x-trigger-wrap-focus .x-form-spinner-overdown {
+ background-position: -160px -13px;
}
-.x-trigger-wrap-focus .x-form-spinner-clickdown{
- background-position:-180px -13px;
+
+.x-trigger-wrap-focus .x-form-spinner-clickdown {
+ background-position: -180px -13px;
}
-
-.x-form-field-wrap .x-form-spinner-overup,
-.x-form-field-wrap .x-form-spinner-clickup{
+.x-form-field-wrap .x-form-spinner-overup,.x-form-field-wrap .x-form-spinner-clickup
+ {
border-bottom-color: #d97e27;
}
-.x-form-field-wrap .x-form-spinner-overdown,
-.x-form-field-wrap .x-form-spinner-clickdown{
+
+.x-form-field-wrap .x-form-spinner-overdown,.x-form-field-wrap .x-form-spinner-clickdown
+ {
border-bottom-color: #d97e27;
}
-.x-trigger-wrap-focus .x-form-spinner-down,
-.x-trigger-wrap-focus .x-form-spinner-up{
+.x-trigger-wrap-focus .x-form-spinner-down,.x-trigger-wrap-focus .x-form-spinner-up
+ {
border-bottom-color: #d97e27;
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -56,8 +56,10 @@
import cc.kune.core.client.notify.msgs.UserNotifierViewImpl;
import cc.kune.core.client.notify.spiner.SpinerPresenter;
import cc.kune.core.client.notify.spiner.SpinerViewImpl;
+import cc.kune.core.client.sitebar.SiteUserOptions;
+import cc.kune.core.client.sitebar.SiteUserOptionsPresenter;
+import cc.kune.core.client.sitebar.SitebarActionsPanel;
import cc.kune.core.client.sitebar.SitebarActionsPresenter;
-import cc.kune.core.client.sitebar.SitebarActionsViewImpl;
import cc.kune.core.client.sitebar.SitebarNewGroupLink;
import cc.kune.core.client.sitebar.SitebarSignInLink;
import cc.kune.core.client.sitebar.SitebarSignOutLink;
@@ -128,7 +130,7 @@
bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class,
SiteLogoPresenter.SiteLogoProxy.class);
bindPresenter(SitebarActionsPresenter.class, SitebarActionsPresenter.SitebarActionsView.class,
- SitebarActionsViewImpl.class, SitebarActionsPresenter.SitebarActionsProxy.class);
+ SitebarActionsPanel.class, SitebarActionsPresenter.SitebarActionsProxy.class);
bindPresenter(NewGroupPresenter.class, NewGroupView.class, NewGroupPanel.class,
NewGroupPresenter.NewGroupProxy.class);
bindPresenter(GroupMembersPresenter.class, GroupMembersPresenter.GroupMembersView.class,
@@ -169,6 +171,9 @@
bind(PrefetchUtilities.class).in(Singleton.class);
bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class);
bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class);
+ bind(BeforeSignOut.class).in(Singleton.class);
+ bind(SiteTokenListeners.class).asEagerSingleton();
+ bind(CoreParts.class).asEagerSingleton();
// SN
bind(SNAdminsMenuItemsRegistry.class).in(Singleton.class);
@@ -176,11 +181,10 @@
bind(SNPendingsMenuItemsRegistry.class).in(Singleton.class);
bind(GroupMembersActionsRegistry.class).in(Singleton.class);
+ bind(SiteUserOptions.class).to(SiteUserOptionsPresenter.class).in(Singleton.class);
bind(SitebarNewGroupLink.class).in(Singleton.class);
bind(SitebarSignInLink.class).in(Singleton.class);
bind(SitebarSignOutLink.class).in(Singleton.class);
- bind(BeforeSignOut.class).in(Singleton.class);
- bind(SiteTokenListeners.class).asEagerSingleton();
- bind(CoreParts.class).asEagerSingleton();
+
}
}
Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -2,6 +2,7 @@
import cc.kune.core.client.init.AppStartEvent;
import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
+import cc.kune.core.client.sitebar.SiteUserOptionsPresenter;
import cc.kune.core.client.sn.GroupMembersPresenter;
import cc.kune.core.client.state.Session;
@@ -11,12 +12,13 @@
public class CoreParts {
@Inject
- public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter) {
+ public CoreParts(final Session session, final Provider<GroupMembersPresenter> grouMembersPresenter,
+ final Provider<SiteUserOptionsPresenter> userOptions) {
session.onInitDataReceived(new AppStartHandler() {
@Override
public void onAppStart(final AppStartEvent event) {
grouMembersPresenter.get();
- ;
+ userOptions.get();
}
});
}
Modified: trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/logs/EventBusWithLogging.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -25,7 +25,7 @@
public class EventBusWithLogging extends SimpleEventBus {
@Override
public void fireEvent(final GwtEvent<?> event) {
- Log.debug("Kune " + event.toDebugString());
+ Log.debug("Kune " + event.toDebugString() + " " + event.toString());
super.fireEvent(event);
}
}
Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -20,6 +20,7 @@
package cc.kune.core.client.notify.confirm;
import cc.kune.common.client.noti.ConfirmAskEvent;
+import cc.kune.common.client.utils.TextUtils;
import cc.kune.core.client.notify.confirm.UserConfirmPresenter.UserConfirmView;
import cc.kune.core.client.ui.dialogs.BasicTopDialog;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -57,9 +58,15 @@
@Override
public void confirmAsk(final ConfirmAskEvent ask) {
dialog.getFirstBtnText().setText(ask.getAcceptBtnMsg());
- dialog.getSecondBtnText().setText(ask.getCancelBtnMsg());
+ final String cancelBtnMsg = ask.getCancelBtnMsg();
dialog.setFirstBtnTitle(ask.getAcceptBtnTooltip());
- dialog.setSecondBtnTitle(ask.getCancelBtnTooltip());
+ if (TextUtils.notEmpty(cancelBtnMsg)) {
+ dialog.getSecondBtnText().setText(cancelBtnMsg);
+ dialog.setSecondBtnTitle(ask.getCancelBtnTooltip());
+ dialog.setSecondBtnVisible(true);
+ } else {
+ dialog.setSecondBtnVisible(false);
+ }
dialog.getTitleText().setText(ask.getTitle());
askLabel.setText(ask.getMessage());
dialog.showCentered();
Added: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,48 @@
+package cc.kune.core.client.sitebar;
+
+import cc.kune.core.client.ui.dialogs.BasicTopDialog;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.Frame;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Inject;
+
+public class AboutKuneDialog {
+
+ interface Binder extends UiBinder<Widget, AboutKuneDialog> {
+ }
+ public static final String ABOUT_KUNE_BTN_ID = "kune-about-button-diag";
+ public static final String ABOUT_KUNE_ID = "kune-about-diag";
+ private static final Binder BINDER = GWT.create(Binder.class);
+
+ public static final String SITE_OPTIONS_MENU = "kune-sop-om";
+ private final BasicTopDialog dialog;
+ @UiField
+ FlowPanel flow;
+ @UiField
+ Frame frame;
+
+ @Inject
+ public AboutKuneDialog(final I18nTranslationService i18n) {
+ dialog = new BasicTopDialog(ABOUT_KUNE_ID, i18n.t("About Kune"), true, true, false, 400, 400, "", i18n.t("Ok"),
+ ABOUT_KUNE_BTN_ID, 1);
+ dialog.getInnerPanel().add(BINDER.createAndBindUi(this));
+ dialog.getFirstBtn().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(final ClickEvent event) {
+ dialog.hide();
+ }
+ });
+ }
+
+ public void showCentered() {
+ dialog.showCentered();
+ }
+
+}
Added: trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/AboutKuneDialog.ui.xml 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
+ xmlns:g='urn:import:com.google.gwt.user.client.ui'>
+ <ui:style>
+ .panel {
+ width: 400px;
+ height: 400px;
+ }
+
+ .frame {
+ border: 0px;
+ margin: 0px;
+ width: 100%;
+ height: 400px;
+ background-color: #F2F2F2;
+ }
+ </ui:style>
+
+ <g:FlowPanel styleName="{style.panel}" ui:field="flow">
+ <g:Frame styleName="{style.frame}" url="about.html"
+ ui:field="frame" />
+ </g:FlowPanel>
+</ui:UiBinder>
Added: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptions.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,9 @@
+package cc.kune.core.client.sitebar;
+
+import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
+
+public interface SiteUserOptions {
+
+ void addAction(GuiActionDescrip descriptor);
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java (from rev 1243, trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,159 @@
+/*
+ *
+ * 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 cc.kune.core.client.sitebar;
+
+import java.util.List;
+
+import cc.kune.common.client.actions.AbstractExtendedAction;
+import cc.kune.common.client.actions.Action;
+import cc.kune.common.client.actions.ActionEvent;
+import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
+import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
+import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
+import cc.kune.core.client.resources.CoreMessages;
+import cc.kune.core.client.resources.icons.IconResources;
+import cc.kune.core.client.services.FileDownloadUtils;
+import cc.kune.core.client.sn.actions.GotoGroupAction;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.client.state.StateManager;
+import cc.kune.core.client.state.UserSignInEvent;
+import cc.kune.core.client.state.UserSignInEvent.UserSignInHandler;
+import cc.kune.core.client.state.UserSignOutEvent;
+import cc.kune.core.client.state.UserSignOutEvent.UserSignOutHandler;
+import cc.kune.core.shared.dto.GroupDTO;
+import cc.kune.core.shared.dto.UserInfoDTO;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class SiteUserOptionsPresenter implements SiteUserOptions {
+
+ public static final String LOGGED_USER_MENU = "kune-sump-lum";
+ private final Provider<FileDownloadUtils> downloadProvider;
+ private final GotoGroupAction gotoGroupAction;
+ private final I18nTranslationService i18n;
+ private final IconResources img;
+ private MenuDescriptor menuDescriptor;
+ private SubMenuDescriptor partiMenu;
+ private final Session session;
+ private final SitebarActionsPresenter siteOptions;
+ private final StateManager stateManager;
+
+ @Inject
+ public SiteUserOptionsPresenter(final Session session, final StateManager stateManager,
+ final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n,
+ final IconResources img, final SitebarActionsPresenter siteOptions, final GotoGroupAction gotoGroupAction) {
+ super();
+ this.session = session;
+ this.stateManager = stateManager;
+ this.downloadProvider = downloadProvider;
+ this.i18n = i18n;
+ this.img = img;
+ this.siteOptions = siteOptions;
+ this.gotoGroupAction = gotoGroupAction;
+ createActions();
+ if (session.isLogged()) {
+ onUserSignIn(session.getCurrentUserInfo()); // NOPMD by vjrj on 11/02/11 3:37
+ }
+ session.onUserSignIn(new UserSignInHandler() {
+ @Override
+ public void onUserSignIn(final UserSignInEvent event) {
+ SiteUserOptionsPresenter.this.onUserSignIn(event.getUserInfo());
+ }
+ });
+ session.onUserSignOut(new UserSignOutHandler() {
+
+ @Override
+ public void onUserSignOut(final UserSignOutEvent event) {
+ menuDescriptor.setVisible(false);
+ SiteUserOptionsPresenter.this.setLoggedUserName("");
+ }
+ });
+ }
+
+ @Override
+ public void addAction(final GuiActionDescrip descriptor) {
+ addActionImpl(descriptor);
+ }
+
+ private void addActionImpl(final GuiActionDescrip descriptor) {
+ descriptor.setParent(menuDescriptor);
+ siteOptions.getRightToolbar().addAction(descriptor);
+ }
+
+ private void addPartipation(final GroupDTO group) {
+ final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken())
+ : "images/group-def-icon.gif";
+ final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction);
+ participant.setItem(group);
+ participant.putValue(Action.NAME, group.getLongName());
+ participant.putValue(Action.SMALL_ICON, logoImageUrl);
+ participant.setParent(partiMenu);
+ siteOptions.getRightToolbar().addAction(participant);
+ }
+
+ private void createActions() {
+ menuDescriptor = new MenuDescriptor();
+ menuDescriptor.setId(LOGGED_USER_MENU);
+ menuDescriptor.setStyles("k-no-backimage, k-btn-sitebar");
+ siteOptions.getRightToolbar().addAction(menuDescriptor);
+
+ partiMenu = new SubMenuDescriptor(i18n.t("Your groups"));
+ addActionImpl(partiMenu);
+
+ final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() {
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ goUserHome();
+ }
+ };
+ userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE));
+ userHomeAction.putValue(Action.SMALL_ICON, img.groupHome());
+ final MenuItemDescriptor item = new MenuItemDescriptor(userHomeAction);
+ item.setPosition(0);
+ addActionImpl(item);
+ }
+
+ private void goUserHome() {
+ stateManager.gotoToken(session.getCurrentUserInfo().getShortName());
+ }
+
+ private void onUserSignIn(final UserInfoDTO userInfoDTO) {
+ menuDescriptor.setVisible(true);
+ setLoggedUserName(userInfoDTO.getShortName());
+ partiMenu.clear();
+ final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin();
+ final List<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab();
+ for (final GroupDTO group : groupsIsAdmin) {
+ addPartipation(group);
+ }
+ for (final GroupDTO group : groupsIsCollab) {
+ addPartipation(group);
+ }
+ partiMenu.setVisible(!groupsIsAdmin.isEmpty() || !groupsIsCollab.isEmpty());
+ }
+
+ private void setLoggedUserName(final String shortName) {
+ menuDescriptor.putValue(Action.NAME, shortName);
+ }
+
+}
Copied: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java (from rev 1239, trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,74 @@
+/*
+ *
+ * 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 cc.kune.core.client.sitebar;
+
+import cc.kune.common.client.actions.ui.ActionSimplePanel;
+import cc.kune.common.client.actions.ui.IsActionExtensible;
+import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView;
+import cc.kune.core.shared.i18n.I18nTranslationService;
+import cc.kune.gspace.client.WsArmor;
+
+import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.gwtplatform.mvp.client.ViewImpl;
+
+public class SitebarActionsPanel extends ViewImpl implements SitebarActionsView {
+
+ private final Provider<AboutKuneDialog> aboutPanel;
+ private final ActionSimplePanel toolbarLeft;
+ private final ActionSimplePanel toolbarRight;
+
+ @Inject
+ public SitebarActionsPanel(final WsArmor armor, final ActionSimplePanel toolbarRight,
+ final ActionSimplePanel toolbarLeft, final I18nTranslationService i18n,
+ final Provider<AboutKuneDialog> aboutPanel) {
+ this.toolbarRight = toolbarRight;
+ this.toolbarLeft = toolbarLeft;
+ this.aboutPanel = aboutPanel;
+ toolbarRight.addStyleName("k-sitebar");
+ toolbarRight.addStyleName("k-floatright");
+ toolbarLeft.addStyleName("k-sitebar");
+ toolbarLeft.addStyleName("k-floatleft");
+ armor.getSitebar().add(toolbarLeft);
+ armor.getSitebar().add(toolbarRight);
+ }
+
+ @Override
+ public Widget asWidget() {
+ return toolbarRight;
+ }
+
+ @Override
+ public IsActionExtensible getLeftBar() {
+ return toolbarLeft;
+ }
+
+ @Override
+ public IsActionExtensible getRightBar() {
+ return toolbarRight;
+ }
+
+ @Override
+ public void showAboutDialog() {
+ aboutPanel.get().showCentered();
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -19,6 +19,7 @@
*/
package cc.kune.core.client.sitebar;
+import cc.kune.common.client.actions.AbstractAction;
import cc.kune.common.client.actions.AbstractExtendedAction;
import cc.kune.common.client.actions.Action;
import cc.kune.common.client.actions.ActionEvent;
@@ -30,7 +31,6 @@
import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor;
import cc.kune.common.client.ui.KuneWindowUtils;
import cc.kune.core.client.init.AppStartEvent;
-import cc.kune.core.client.notify.msgs.UserNotifyEvent;
import cc.kune.core.client.resources.CoreResources;
import cc.kune.core.client.resources.icons.IconResources;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -56,6 +56,8 @@
IsActionExtensible getLeftBar();
IsActionExtensible getRightBar();
+
+ void showAboutDialog();
}
public static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor();
@@ -107,14 +109,6 @@
final IsActionExtensible right = getView().getRightBar();
OPTIONS_MENU.putValue(Action.NAME, i18n.t("Options"));
// OPTIONS_MENU.setParent(RIGHT_TOOLBAR);
- final AbstractExtendedAction action = new AbstractExtendedAction() {
- @Override
- public void actionPerformed(final ActionEvent event) {
- getEventBus().fireEvent(new UserNotifyEvent("Testing only"));
- }
- };
- action.putValue(Action.NAME, "Test");
- final MenuItemDescriptor testMenuItem = new MenuItemDescriptor(OPTIONS_MENU, action);
OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar");
OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl);
// final ToolbarSeparatorDescriptor separator = new
@@ -131,31 +125,40 @@
};
bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems"));
bugsAction.putValue(Action.SMALL_ICON, icons.bug());
- final MenuItemDescriptor bugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction);
+ final MenuItemDescriptor reportBugs = new MenuItemDescriptor(OPTIONS_MENU, bugsAction);
// final KeyStroke shortcut = Shortcut.getShortcut(true, true, false,
// false, Character.valueOf('K'));
final AbstractExtendedAction aboutAction = new AbstractExtendedAction() {
@Override
public void actionPerformed(final ActionEvent event) {
- // view.showAboutDialog();
+ getView().showAboutDialog();
}
};
+ final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, new AbstractAction() {
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ KuneWindowUtils.open("http://kune.ourproject.org/");
+ }
+ });
+ gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site"));
+ gotoKuneDevSite.putValue(Action.SMALL_ICON, icons.kuneIcon16());
+
aboutAction.putValue(Action.NAME, i18n.t("About kune"));
aboutAction.putValue(Action.SMALL_ICON, res.kuneIcon16());
// aboutAction.setShortcut(shortcut);
// shortcutReg.put(shortcut, aboutAction);
+ right.addAction(OPTIONS_MENU);
right.addAction(signInLink.get());
right.addAction(signOutLink.get());
// right.addAction(separator2);
right.addAction(newGroupLink.get());
// right.addAction(separator);
- right.addAction(OPTIONS_MENU);
- right.addAction(testMenuItem);
+ right.addAction(reportBugs);
+ right.addAction(gotoKuneDevSite);
right.addAction(menuSeparator);
- right.addAction(bugs);
right.addAction(new MenuItemDescriptor(OPTIONS_MENU, aboutAction));
}
@@ -164,4 +167,5 @@
protected void revealInParent() {
RevealRootContentEvent.fire(this, this);
}
+
}
Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsViewImpl.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,64 +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 cc.kune.core.client.sitebar;
-
-import cc.kune.common.client.actions.ui.ActionSimplePanel;
-import cc.kune.common.client.actions.ui.IsActionExtensible;
-import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView;
-import cc.kune.gspace.client.WsArmor;
-
-import com.google.gwt.user.client.ui.Widget;
-import com.google.inject.Inject;
-import com.gwtplatform.mvp.client.ViewImpl;
-
-public class SitebarActionsViewImpl extends ViewImpl implements SitebarActionsView {
-
- private final ActionSimplePanel toolbarLeft;
- private final ActionSimplePanel toolbarRight;
-
- @Inject
- public SitebarActionsViewImpl(final WsArmor armor, final ActionSimplePanel toolbarRight,
- final ActionSimplePanel toolbarLeft) {
- this.toolbarRight = toolbarRight;
- this.toolbarLeft = toolbarLeft;
- toolbarRight.addStyleName("k-sitebar");
- toolbarRight.addStyleName("k-floatright");
- toolbarLeft.addStyleName("k-sitebar");
- toolbarLeft.addStyleName("k-floatleft");
- armor.getSitebar().add(toolbarLeft);
- armor.getSitebar().add(toolbarRight);
- }
-
- @Override
- public Widget asWidget() {
- return toolbarRight;
- }
-
- @Override
- public IsActionExtensible getLeftBar() {
- return toolbarLeft;
- }
-
- @Override
- public IsActionExtensible getRightBar() {
- return toolbarRight;
- }
-
-}
Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrableGroupWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,25 +0,0 @@
-package cc.kune.core.client.sn.actions.conditions;
-
-import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
-import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.GroupDTO;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
- at Singleton
-public class AdministrableGroupWhenLoggedCondition implements GuiAddCondition {
-
- private final Session session;
-
- @Inject
- public AdministrableGroupWhenLoggedCondition(final Session session) {
- this.session = session;
- }
-
- @Override
- public boolean mustBeAdded(final GuiActionDescrip descr) {
- return (!((GroupDTO) descr.getItem()).isPersonal() && session.isLogged() && session.getContentState().getGroupRights().isAdministrable());
- }
-}
Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/AdministrablePersonWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,25 +0,0 @@
-package cc.kune.core.client.sn.actions.conditions;
-
-import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
-import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.GroupDTO;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
- at Singleton
-public class AdministrablePersonWhenLoggedCondition implements GuiAddCondition {
-
- private final Session session;
-
- @Inject
- public AdministrablePersonWhenLoggedCondition(final Session session) {
- this.session = session;
- }
-
- @Override
- public boolean mustBeAdded(final GuiActionDescrip descr) {
- return (((GroupDTO) descr.getItem()).isPersonal() && session.isLogged() && session.getContentState().getGroupRights().isAdministrable());
- }
-}
Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/GroupWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,25 +0,0 @@
-package cc.kune.core.client.sn.actions.conditions;
-
-import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
-import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.GroupDTO;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
- at Singleton
-public class GroupWhenLoggedCondition implements GuiAddCondition {
-
- private final Session session;
-
- @Inject
- public GroupWhenLoggedCondition(final Session session) {
- this.session = session;
- }
-
- @Override
- public boolean mustBeAdded(final GuiActionDescrip descr) {
- return (!((GroupDTO) descr.getItem()).isPersonal() && session.isLogged());
- }
-}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsAdministrableCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -3,6 +3,8 @@
import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
import com.google.inject.Inject;
@@ -20,9 +22,12 @@
@Override
public boolean mustBeAdded(final GuiActionDescrip descr) {
- if (session.getContainerState() instanceof StateContentDTO) {
- // FIXME
+ final StateAbstractDTO currentState = session.getCurrentState();
+ if (currentState instanceof StateContentDTO) {
+ return ((StateContentDTO) currentState).getGroupRights().isAdministrable();
+ } else {
+ // session.getContainerState() instanceof StateContentDTO)
+ return ((StateContainerDTO) currentState).getGroupRights().isAdministrable();
}
- return (session.getContentState().getGroupRights().isAdministrable());
}
}
Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,33 @@
+package cc.kune.core.client.sn.actions.conditions;
+
+import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
+import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+ at Singleton
+public class IsEditableCondition implements GuiAddCondition {
+
+ private final Session session;
+
+ @Inject
+ public IsEditableCondition(final Session session) {
+ this.session = session;
+ }
+
+ @Override
+ public boolean mustBeAdded(final GuiActionDescrip descr) {
+ final StateAbstractDTO currentState = session.getCurrentState();
+ if (currentState instanceof StateContentDTO) {
+ return ((StateContentDTO) currentState).getGroupRights().isEditable();
+ } else {
+ // session.getContainerState() instanceof StateContentDTO)
+ return ((StateContainerDTO) currentState).getGroupRights().isEditable();
+ }
+ }
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsEditableCondition.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsNotMeCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,26 @@
+package cc.kune.core.client.sn.actions.conditions;
+
+import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
+import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.GroupDTO;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+ at Singleton
+public class IsNotMeCondition implements GuiAddCondition {
+
+ private final Session session;
+
+ @Inject
+ public IsNotMeCondition(final Session session) {
+ this.session = session;
+ }
+
+ @Override
+ public boolean mustBeAdded(final GuiActionDescrip descr) {
+ return (session.isLogged() && !session.getCurrentUser().getShortName().equals(
+ ((GroupDTO) descr.getItem()).getShortName()));
+ }
+}
Added: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,33 @@
+package cc.kune.core.client.sn.actions.conditions;
+
+import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
+import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
+import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.core.shared.dto.StateContainerDTO;
+import cc.kune.core.shared.dto.StateContentDTO;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+ at Singleton
+public class IsVisibleCondition implements GuiAddCondition {
+
+ private final Session session;
+
+ @Inject
+ public IsVisibleCondition(final Session session) {
+ this.session = session;
+ }
+
+ @Override
+ public boolean mustBeAdded(final GuiActionDescrip descr) {
+ final StateAbstractDTO currentState = session.getCurrentState();
+ if (currentState instanceof StateContentDTO) {
+ return ((StateContentDTO) currentState).getGroupRights().isVisible();
+ } else {
+ // session.getContainerState() instanceof StateContentDTO)
+ return ((StateContainerDTO) currentState).getGroupRights().isVisible();
+ }
+ }
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/IsVisibleCondition.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/conditions/PersonWhenLoggedCondition.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,25 +0,0 @@
-package cc.kune.core.client.sn.actions.conditions;
-
-import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
-import cc.kune.common.client.actions.ui.descrip.GuiAddCondition;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.GroupDTO;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
- at Singleton
-public class PersonWhenLoggedCondition implements GuiAddCondition {
-
- private final Session session;
-
- @Inject
- public PersonWhenLoggedCondition(final Session session) {
- this.session = session;
- }
-
- @Override
- public boolean mustBeAdded(final GuiActionDescrip descr) {
- return (((GroupDTO) descr.getItem()).isPersonal() && session.isLogged());
- }
-}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupMembersActionsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -11,8 +11,8 @@
public GroupMembersActionsRegistry(final JoinGroupAction joinGroupAction, final UnJoinGroupAction unJoinGroupAction) {
final ButtonDescriptor join = new ButtonDescriptor(joinGroupAction);
final ButtonDescriptor unjoin = new ButtonDescriptor(unJoinGroupAction);
- join.setStyles("k-no-backimage");
- unjoin.setStyles("k-no-backimage");
+ // join.setStyles("k-no-backimage");
+ // unjoin.setStyles("k-no-backimage");
add(join);
add(unjoin);
}
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNAdminsMenuItemsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -11,6 +11,7 @@
import cc.kune.core.client.sn.actions.StartChatWithMemberAction;
import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition;
import cc.kune.core.client.sn.actions.conditions.IsGroupCondition;
+import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition;
import cc.kune.core.client.sn.actions.conditions.IsPersonCondition;
import cc.kune.core.client.state.Session;
@@ -22,15 +23,16 @@
@Inject
public SNAdminsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition,
final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition,
- final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction,
- final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction,
- final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithMemberAction startChatWithUserAction,
- final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) {
+ final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction,
+ final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction,
+ final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction,
+ final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction,
+ final GotoMemberAction gotoMemberAction) {
add(new Provider<MenuItemDescriptor>() {
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(changeToCollabAction);
- item.setAddCondition(isAdministrableCondition);
+ item.add(isAdministrableCondition);
return item;
}
});
@@ -38,7 +40,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction);
- item.setAddCondition(isAdministrableCondition);
+ item.add(isAdministrableCondition);
return item;
}
});
@@ -46,7 +48,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction);
- item.setAddCondition(isPersonCondition);
+ item.add(isPersonCondition);
return item;
}
});
@@ -54,7 +56,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction);
- item.setAddCondition(isGroupCondition);
+ item.add(isGroupCondition);
return item;
}
});
@@ -62,7 +64,8 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction);
- item.setAddCondition(isPersonCondition);
+ item.add(isNotMe);
+ item.add(isPersonCondition);
return item;
}
});
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNCollabsMenuItemsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -11,6 +11,7 @@
import cc.kune.core.client.sn.actions.StartChatWithMemberAction;
import cc.kune.core.client.sn.actions.conditions.IsAdministrableCondition;
import cc.kune.core.client.sn.actions.conditions.IsGroupCondition;
+import cc.kune.core.client.sn.actions.conditions.IsNotMeCondition;
import cc.kune.core.client.sn.actions.conditions.IsPersonCondition;
import cc.kune.core.client.state.Session;
@@ -22,15 +23,16 @@
@Inject
public SNCollabsMenuItemsRegistry(final Session session, final IsAdministrableCondition isAdministrableCondition,
final IsPersonCondition isPersonCondition, final IsGroupCondition isGroupCondition,
- final ChangeToCollabAction changeToCollabAction, final ChangeToAdminAction changeToAdminAction,
- final RemoveMemberAction removeMemberAction, final AcceptJoinGroupAction acceptJoinGroupAction,
- final DenyJoinGroupAction denyJoinGroupAction, final StartChatWithMemberAction startChatWithUserAction,
- final GotoGroupAction gotoGroupAction, final GotoMemberAction gotoMemberAction) {
+ final IsNotMeCondition isNotMe, final ChangeToCollabAction changeToCollabAction,
+ final ChangeToAdminAction changeToAdminAction, final RemoveMemberAction removeMemberAction,
+ final AcceptJoinGroupAction acceptJoinGroupAction, final DenyJoinGroupAction denyJoinGroupAction,
+ final StartChatWithMemberAction startChatWithUserAction, final GotoGroupAction gotoGroupAction,
+ final GotoMemberAction gotoMemberAction) {
add(new Provider<MenuItemDescriptor>() {
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(changeToAdminAction);
- item.setAddCondition(isAdministrableCondition);
+ item.add(isAdministrableCondition);
return item;
}
});
@@ -38,7 +40,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(removeMemberAction);
- item.setAddCondition(isAdministrableCondition);
+ item.add(isAdministrableCondition);
return item;
}
});
@@ -46,7 +48,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(gotoMemberAction);
- item.setAddCondition(isPersonCondition);
+ item.add(isPersonCondition);
return item;
}
});
@@ -54,7 +56,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction);
- item.setAddCondition(isGroupCondition);
+ item.add(isGroupCondition);
return item;
}
});
@@ -62,7 +64,8 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction);
- item.setAddCondition(isPersonCondition);
+ item.add(isNotMe);
+ item.add(isPersonCondition);
return item;
}
});
Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/SNPendingsMenuItemsRegistry.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -30,7 +30,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(acceptJoinGroupAction);
- item.setAddCondition(isAdministrableCondition);
+ item.add(isAdministrableCondition);
return item;
}
});
@@ -38,7 +38,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(denyJoinGroupAction);
- item.setAddCondition(isAdministrableCondition);
+ item.add(isAdministrableCondition);
return item;
}
});
@@ -46,7 +46,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(gotoPersonAction);
- item.setAddCondition(isPersonCondition);
+ item.add(isPersonCondition);
return item;
}
});
@@ -54,7 +54,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(gotoGroupAction);
- item.setAddCondition(isGroupCondition);
+ item.add(isGroupCondition);
return item;
}
});
@@ -62,7 +62,7 @@
@Override
public MenuItemDescriptor get() {
final MenuItemDescriptor item = new MenuItemDescriptor(startChatWithUserAction);
- item.setAddCondition(isPersonCondition);
+ item.add(isPersonCondition);
return item;
}
});
Modified: trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/state/SiteCommonTokens.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -24,6 +24,7 @@
*
*/
public final class SiteCommonTokens {
+ public static final String ABOUTKUNE = "about";
public final static String HOME = "";
public final static String NEWGROUP = "newgroup";
public final static String REGISTER = "register";
Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/state/SiteTokenListeners.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -24,6 +24,7 @@
import cc.kune.core.client.groups.newgroup.NewGroup;
import cc.kune.core.client.init.AppStartEvent;
import cc.kune.core.client.init.AppStartEvent.AppStartHandler;
+import cc.kune.core.client.sitebar.AboutKuneDialog;
import com.google.gwt.event.shared.EventBus;
import com.google.inject.Inject;
@@ -32,6 +33,7 @@
@Singleton
public class SiteTokenListeners {
+ private final Provider<AboutKuneDialog> aboutKuneDialog;
private final Provider<NewGroup> newGroup;
private final Provider<Register> register;
private final Provider<SignIn> signIn;
@@ -39,11 +41,13 @@
@Inject
public SiteTokenListeners(final EventBus eventBus, final Provider<StateManager> stateManager,
- final Provider<SignIn> signIn, final Provider<Register> register, final Provider<NewGroup> newGroup) {
+ final Provider<SignIn> signIn, final Provider<Register> register, final Provider<NewGroup> newGroup,
+ final Provider<AboutKuneDialog> aboutKuneDialog) {
this.stateManager = stateManager;
this.signIn = signIn;
this.register = register;
this.newGroup = newGroup;
+ this.aboutKuneDialog = aboutKuneDialog;
init();
eventBus.addHandler(AppStartEvent.getType(), new AppStartHandler() {
@Override
@@ -72,5 +76,12 @@
newGroup.get().doNewGroup();
}
});
+ stateManager.get().addSiteToken(SiteCommonTokens.ABOUTKUNE, new HistoryTokenCallback() {
+ @Override
+ public void onHistoryToken() {
+ // FIXME, something to come back
+ aboutKuneDialog.get().showCentered();
+ }
+ });
}
}
Modified: trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/client/ui/dialogs/BasicTopDialog.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -20,6 +20,7 @@
package cc.kune.core.client.ui.dialogs;
import cc.kune.common.client.ui.PopupTopPanel;
+import cc.kune.common.client.utils.TextUtils;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.logical.shared.HasCloseHandlers;
@@ -32,6 +33,14 @@
public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal,
final boolean autoscroll, final int width, final int height, final String icon,
+ final String firstButtonTitle, final String firstButtonId, final int tabIndexStart) {
+ this(dialogId, title, autohide, modal, autoscroll, width, height, icon, firstButtonTitle, firstButtonId, "",
+ "", tabIndexStart);
+ super.setSecondBtnVisible(false);
+ }
+
+ public BasicTopDialog(final String dialogId, final String title, final boolean autohide, final boolean modal,
+ final boolean autoscroll, final int width, final int height, final String icon,
final String firstButtonTitle, final String firstButtonId, final String cancelButtonTitle,
final String cancelButtonId, final int tabIndexStart) {
popup = new PopupTopPanel(autohide, modal);
@@ -43,9 +52,13 @@
GWT.log("Not setting size of dialog to: " + String.valueOf(width) + "/" + String.valueOf(height));
super.setTitleIcon(icon);
super.getFirstBtnText().setText(firstButtonTitle);
- super.getSecondBtnText().setText(cancelButtonTitle);
+ if (TextUtils.notEmpty(cancelButtonTitle)) {
+ super.getSecondBtnText().setText(cancelButtonTitle);
+ }
super.setFirstBtnId(firstButtonId);
- super.setSecondBtnId(cancelButtonId);
+ if (TextUtils.notEmpty(cancelButtonId)) {
+ super.setSecondBtnId(cancelButtonId);
+ }
super.setFirstBtnTabIndex(tabIndexStart);
super.setSecondBtnTabIndex(tabIndexStart + 1);
}
Added: trunk/src/main/java/cc/kune/core/public/about.html
===================================================================
--- trunk/src/main/java/cc/kune/core/public/about.html (rev 0)
+++ trunk/src/main/java/cc/kune/core/public/about.html 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,195 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title></title>
+<meta name="generator" content="HTML::TextToHTML v2.51"/>
+<link rel="stylesheet" type="text/css" href="frame-def.css"/>
+</head>
+<body>
+<span>
+ <a target="_blank" href="http://kune.ourproject.org/" title="kune" rel="home">
+<img src="logo-kune-big.png" alt="kune-logo" height="36" width="200">
+</img>
+</a>
+</span>
+<p>Version 0.0.7 (r1239+c71)</p>
+<h1><a name="section_1">CREDITS</a></h1>
+
+<h2><a name="section_1_1">Authors</a></h2>
+
+<p>Daniel Gómez Blasco<br/>
+Samer Hassan<br/>
+Vicente J. Ruiz Jurado
+</p>
+<h2><a name="section_1_2">Contributors</a></h2>
+
+<ul>
+ <li>Thanks to David Trigo and <a href="http://www.esperanto-es.net/">http://www.esperanto-es.net/</a> for suggest the name of
+'kune' for our initiative:
+ <a href="http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469">http://ourproject.org/forum/forum.php?thread_id=500&forum_id=469</a>
+ </li><li>Antonio Martins, Jéferson Assumção, Moacir Gadotti and the Instituto Paulo
+Freire staff.
+ </li><li>Daniel Jiménez for the initial help and coordination
+ </li><li>Javier de la Cueva and Leovigildo García-Bobadilla for the legal support
+ </li><li>Jonathan Araña Cruz, Roxu and all the <a href="http://xsto.info">http://xsto.info</a> staff for help with the infraestructure
+ </li><li>Johnattan Rupire for web contributions.
+ </li><li>The <a href="http://iepala.es">http://iepala.es</a> staff for their support
+ </li><li>and <a href="http://ourproject.org">http://ourproject.org</a> and again <a href="http://xsto.info">http://xsto.info</a> for sharing with us their resources
+</li></ul>
+<h1><a name="section_2">LICENSES</a></h1>
+
+<p>All programs are either under the GPL, LGPL, Artistic or BSD licenses, see
+below for details.
+</p>
+<p>On Debian systems, the complete text of these licenses can be found in:
+</p>
+<p>/usr/share/common-licenses/GPL-3<br/>
+/usr/share/common-licenses/Artistic<br/>
+/usr/share/common-licenses/BSD<br/>
+/usr/share/common-licenses/LGPL
+</p>
+<p>When in doubt, check the individual file, they should all have license
+headings and other identifying marks.
+</p>
+<h2><a name="section_2_1">kune software</a></h2>
+<dl>
+ <dt>Copyright</dt>
+<dd> (c) 2007-2011 The kune development team (see CREDITS for details)
+</dd></dl>
+<p> 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.
+</p>
+<p> 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.
+</p>
+<p> You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.
+</p>
+<p>See COPYRIGHT-AGPLv3 for a complete text.
+</p>
+<h2><a name="section_2_2">kune documentation</a></h2>
+<dl>
+ <dt>Copyright</dt>
+<dd>(c) The kune development team (see CREDITS an individual docs for details)
+<p> This work is licensed under the Creative Commons Attribution-Share Alike 3.0
+ License. To view a copy of this license, visit
+ <a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a>
+ or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San
+ Francisco, California, 94105, USA.
+</p>
+</dd></dl>
+<h2><a name="section_2_3">kune graphics</a></h2>
+<dl>
+ <dt>Copyright</dt>
+<dd>(c) Vicente J. Ruiz Jurado <<a href="mailto:vjrj at ourproject.org">vjrj at ourproject.org</a>>
+<p> This work is licensed under the Creative Commons Attribution-Share Alike 3.0
+ License. To view a copy of this license, visit
+ <a href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</a>
+ or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San
+ Francisco, California, 94105, USA.
+</p>
+</dd></dl>
+<h2><a name="section_2_4">some icons</a></h2>
+<p>It was downloaded from <a href="http://tango.freedesktop.org/">http://tango.freedesktop.org/</a>
+</p><dl>
+ <dt>Copyright</dt>
+<dd> Creative Commons Attribution-ShareAlike 2.5 License Agreement
+ <a href="http://creativecommons.org/licenses/by-sa/2.5/">http://creativecommons.org/licenses/by-sa/2.5/</a>
+</dd></dl>
+<p>other from: <a href="http://www.famfamfam.com/lab/icons/silk/">http://www.famfamfam.com/lab/icons/silk/</a>
+</p><dl>
+ <dt>Copyright</dt>
+<dd> Creative Commons Attribution 2.5 License Agreement
+ <a href="http://creativecommons.org/licenses/by/2.5/">http://creativecommons.org/licenses/by/2.5/</a>
+</dd></dl>
+<p>some xmpp icons from pidgin
+</p><p> Purple/Pidgin/Finch is the legal property of its developers.
+ Copyright (C) 1998-2007 under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+</p>
+<p>and others icons from openoffice.org-style-human debian package
+</p><p> Copyright 2002-2007 Sun Microsystems, Inc.
+ This product is made available subject to the terms of GNU Lesser General
+ Public License Version 2.1. A copy of the LGPL license can be found
+ <a href="http://www.openoffice.org/project/www/license.html">http://www.openoffice.org/project/www/license.html</a>
+</p>
+<h2><a name="section_2_5">others</a></h2>
+
+<p>wave / wave in a box
+</p><p> <a href="http://www.waveprotocol.org">http://www.waveprotocol.org</a> <br/>
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+ <a href="http://www.waveprotocol.org/patent-license">http://www.waveprotocol.org/patent-license</a>
+</p>
+<p>emite
+</p><p> <a href="http://emite.googlecode.com">http://emite.googlecode.com</a><br/>
+ Copyright: under GNU Lesser General Public License
+ <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a>
+</p>
+<p>suco
+</p><p> <a href="http://suco.googlecode.com">http://suco.googlecode.com</a><br/>
+ Copyright: under GNU Lesser General Public License
+ <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a>
+</p>
+<p>fonts-min.css and reset.css
+</p><p> Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+ Code licensed under the BSD License:
+ <a href="http://developer.yahoo.net/yui/license.txt">http://developer.yahoo.net/yui/license.txt</a>
+</p>
+<p>ext-gwt gxt library:
+</p><p> <a href="http://www.sencha.com/products/extgwt/">http://www.sencha.com/products/extgwt/</a>
+ Copyright: under GNU General Public License
+ <a href="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</a>
+</p>
+<p>gwt-ext (deprecated) library:
+</p><p> <a href="http://code.google.com/p/gwt-ext/">http://code.google.com/p/gwt-ext/</a><br/>
+ Copyright: under GNU Lesser General Public License
+ <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a>
+</p>
+<p>google-gin library:
+</p><p> <a href="https://code.google.com/p/google-gin/">https://code.google.com/p/google-gin/</a>
+ Copyright: under Apache License 2.0<br/>
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+</p>
+<p>gwt-platform library:
+</p><p> <a href="https://code.google.com/p/gwt-platform/">https://code.google.com/p/gwt-platform/</a>
+ Copyright: under Apache License 2.0<br/>
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+</p>
+<p>emoticons from Adium and Kopete theme
+</p><p> kopete adium theme by robotangel and original "Adiumicons" by Oscar Gruno
+ under GNU GPL license
+</p>
+<p>dom region library:
+</p><p> XWiki Platform<br/>
+ <a href="http://www.xwiki.org/">http://www.xwiki.org/</a><br/>
+ Copyright: under GNU Lesser General Public License
+ <a href="http://www.gnu.org/licenses/lgpl.html">http://www.gnu.org/licenses/lgpl.html</a>
+</p>
+<dl>
+ <dt>cortado</dt>
+<dd> A video player java applet (Ogg Theora, Ogg Vorbis)
+ <a href="http://www.flumotion.net/cortado/">http://www.flumotion.net/cortado/</a>
+ Copyright: (C) 2004 Fluendo S.L under GNU General Public License
+</dd></dl>
+<p>video embed dialog:
+</p><p> Some ideas and embeded video code from:
+ <a href="http://www.jovelstefan.de/embedded-video/">http://www.jovelstefan.de/embedded-video/</a> (GPL)
+ <a href="http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/">http://www.daburna.de/blog/2006/12/13/wordpress-video-plugin/</a>
+</p>
+<p>some license description:
+</p><p> from Wikipedia<br/>
+ Copyright: under GFDL <a href="http://www.gnu.org/copyleft/fdl.html">http://www.gnu.org/copyleft/fdl.html</a>
+</p>
+<p>some Action classes:
+</p><p> from GNU Classpath<br/>
+ Copyright: under GNU General Public License
+ <a href="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</a></p>
+
+</body>
+</html>
Copied: trunk/src/main/java/cc/kune/core/public/frame-def.css (from rev 1239, trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css)
===================================================================
--- trunk/src/main/java/cc/kune/core/public/frame-def.css (rev 0)
+++ trunk/src/main/java/cc/kune/core/public/frame-def.css 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.3.1
+*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.3.1
+*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.4.1
+*/h1{font-size:138.5%;}h2{font-size:123.099998%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:700;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:700;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;width:11.9em;}body{font-family:arial, sans;margin:5px;}.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}blockquote{border:1px dashed #DDD;padding:10px;}
\ No newline at end of file
Copied: trunk/src/main/java/cc/kune/core/public/images/group-def-icon.gif (from rev 1239, trunk/src/main/java/org/ourproject/kune/platf/public/images/group-def-icon.gif)
===================================================================
(Binary files differ)
Added: trunk/src/main/java/cc/kune/core/public/logo-kune-big.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/cc/kune/core/public/logo-kune-big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/main/java/cc/kune/core/public/ws.css
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-11 03:28:34 UTC (rev 1245)
@@ -17,6 +17,7 @@
font: 'Ubuntu', Arial;
}
+/*
a {
color: darkblue;
}
@@ -24,7 +25,7 @@
a:visited {
color: darkblue;
}
-
+*/
.gwt-DialogBox {
border: 2px solid #AAAAAA;
background-color: white;
@@ -778,10 +779,11 @@
float: left;
}
-.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel {
- float: left;
- padding-left: 5px;
- color: #e0e0e0;
+.k-sn-adminsCountlabel,.k-sn-collabsCountlabel,.k-sn-pendingsCountlabel
+ {
+ float: left;
+ padding-left: 5px;
+ color: #e0e0e0;
}
.k-sn-adminslabel {
@@ -799,19 +801,25 @@
}
*/
.k-sn-mainpanel .x-btn button {
+ font: 13px 'Ubuntu', arial;
+ border: 2px solid #CCCCCC;
cursor: pointer;
- font: 13px 'Ubuntu', arial;
- padding: 2px;
+ margin: 0;
+ padding: 3px 0;
+ text-decoration: none;
+ background-color: #F2F2F2;
+ color: #855585;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
- text-decoration: none;
vertical-align: middle;
- background-color: #F2F2F2;
+ line-height: 2em !important;
+ height: 26px !important;
+ /*
+font-size:small;
+ cursor: pointer;
border: 2px gray solid;
- height: 26px !important;
- line-height: 2em !important;
- padding-left: 25px !important;
+ padding-left: 25px !important; */
}
.k-sn-mainpanel .x-btn button:hover {
@@ -849,8 +857,8 @@
}
-.k-sn-pendingspanel {
- /* background-color: #a05a2c; */
+.k-sn-pendingspanel { /* background-color: #a05a2c; */
+
}
.k-sn-adminsscroll,.k-sn-collabsscroll,.k-sn-pendingsscroll {
Modified: trunk/src/main/java/cc/kune/core/public/ws.html
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-11 03:28:34 UTC (rev 1245)
@@ -52,6 +52,7 @@
rel='stylesheet' type='text/css'> -->
<link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css">
<link type="text/css" rel="stylesheet" href="gxt/css/gxt-gray.css">
+<link type="text/css" rel="stylesheet" href="gxt-custom/css/gxt-op-common.css">
<link type="text/css" rel="stylesheet" href="kune-hablar.css">
<link type="text/css" rel="stylesheet" href="kune-chat.css">
<link type="text/css" rel="stylesheet" href="kune-common.css">
Modified: trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/cc/kune/gspace/client/WsArmorImpl.ui.xml 2011-02-11 03:28:34 UTC (rev 1245)
@@ -27,7 +27,8 @@
<g:tab>
<g:header size='0' />
<g:SimplePanel ui:field="userSpace" width="100%"
- height="100%"></g:SimplePanel>
+ height="100%">
+ </g:SimplePanel>
</g:tab>
<g:tab>
<g:header size='0' />
Deleted: trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/richtext.css 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,16 +0,0 @@
-/*
-Copyright (c) 2007, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.3.1
-*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:400;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}/*
-Copyright (c) 2007, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.3.1
-*/body{font:13px/1.22 arial,helvetica,clean,sans-serif;font-size:small;font:x-small;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;font-size:108%;line-height:99%;}/*
-Copyright (c) 2007, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.4.1
-*/h1{font-size:138.5%;}h2{font-size:123.099998%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:700;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:700;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;width:11.9em;}body{font-family:arial, sans;margin:5px;}.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}blockquote{border:1px dashed #DDD;padding:10px;}
\ No newline at end of file
Deleted: trunk/src/main/java/org/ourproject/kune/platf/public/images/group-def-icon.gif
===================================================================
(Binary files differ)
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -74,9 +74,6 @@
import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPanel;
import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter;
-import org.ourproject.kune.workspace.client.entityheader.maxmin.MaxMinWorkspace;
-import org.ourproject.kune.workspace.client.entityheader.maxmin.MaxMinWorkspacePanel;
-import org.ourproject.kune.workspace.client.entityheader.maxmin.MaxMinWorkspacePresenter;
import org.ourproject.kune.workspace.client.i18n.I18nTranslator;
import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPanel;
import org.ourproject.kune.workspace.client.i18n.I18nTranslatorPresenter;
@@ -85,7 +82,6 @@
import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel;
import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPresenter;
import org.ourproject.kune.workspace.client.i18n.LanguageSelectorView;
-import org.ourproject.kune.workspace.client.i18n.SiteOptionsI18nTranslatorAction;
import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePanel;
import org.ourproject.kune.workspace.client.licensefoot.EntityLicensePresenter;
import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction;
@@ -114,8 +110,6 @@
import org.ourproject.kune.workspace.client.options.GroupOptionsPanel;
import org.ourproject.kune.workspace.client.options.GroupOptionsPresenter;
import org.ourproject.kune.workspace.client.options.UserOptions;
-import org.ourproject.kune.workspace.client.options.UserOptionsPanel;
-import org.ourproject.kune.workspace.client.options.UserOptionsPresenter;
import org.ourproject.kune.workspace.client.options.license.EntityOptionsDefLicensePanel;
import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicense;
import org.ourproject.kune.workspace.client.options.license.GroupOptionsDefLicensePresenter;
@@ -159,9 +153,6 @@
import org.ourproject.kune.workspace.client.site.msg.ToastMessagePanel;
import org.ourproject.kune.workspace.client.site.msg.ToastMessagePresenter;
import org.ourproject.kune.workspace.client.sitebar.sitelogo.SiteLogo;
-import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions;
-import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptionsPanel;
-import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptionsPresenter;
import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress;
import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPanel;
import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgressPresenter;
@@ -177,9 +168,6 @@
import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink;
import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPanel;
import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLinkPresenter;
-import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions;
-import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptionsPanel;
-import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptionsPresenter;
import org.ourproject.kune.workspace.client.skel.ActionCntCtxToolbarPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.tags.TagsSummary;
@@ -319,18 +307,22 @@
}
});
- register(ApplicationComponentGroup.class, new Factory<SiteUserOptions>(SiteUserOptions.class) {
- @Override
- public SiteUserOptions create() {
- final SiteUserOptionsPresenter presenter = new SiteUserOptionsPresenter(i(Session.class),
- i(StateManager.class), p(FileDownloadUtils.class), $(I18nTranslationService.class),
- $(IconResources.class));
- final SiteUserOptionsPanel panel = new SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class),
- $(GuiBindingsRegister.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ // register(ApplicationComponentGroup.class, new
+ // Factory<SiteUserOptions>(SiteUserOptions.class) {
+ // @Override
+ // public SiteUserOptions create() {
+ // final SiteUserOptionsPresenter presenter = new
+ // SiteUserOptionsPresenter(i(Session.class),
+ // i(StateManager.class), p(FileDownloadUtils.class),
+ // $(I18nTranslationService.class),
+ // $(IconResources.class));
+ // final SiteUserOptionsPanel panel = new
+ // SiteUserOptionsPanel(presenter, i(WorkspaceSkeleton.class),
+ // $(GuiBindingsRegister.class));
+ // presenter.init(panel);
+ // return presenter;
+ // }
+ // });
register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) {
@Override
@@ -354,19 +346,22 @@
return presenter;
}
});
+ //
+ // register(ApplicationComponentGroup.class, new
+ // Factory<SiteOptions>(SiteOptions.class) {
+ // @Override
+ // public SiteOptions create() {
+ // final SiteOptionsPresenter presenter = new
+ // SiteOptionsPresenter(i(I18nUITranslationService.class),
+ // i(IconResources.class));
+ // final SiteOptionsPanel panel = new
+ // SiteOptionsPanel(i(WorkspaceSkeleton.class),
+ // i(I18nUITranslationService.class), i(GuiBindingsRegister.class));
+ // presenter.init(panel);
+ // return presenter;
+ // }
+ // });
- register(ApplicationComponentGroup.class, new Factory<SiteOptions>(SiteOptions.class) {
- @Override
- public SiteOptions create() {
- final SiteOptionsPresenter presenter = new SiteOptionsPresenter(i(I18nUITranslationService.class),
- i(IconResources.class));
- final SiteOptionsPanel panel = new SiteOptionsPanel(i(WorkspaceSkeleton.class),
- i(I18nUITranslationService.class), i(GuiBindingsRegister.class));
- presenter.init(panel);
- return presenter;
- }
- });
-
register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) {
@Override
public SiteSearch create() {
@@ -631,20 +626,25 @@
return presenter;
}
});
+ //
+ // register(ApplicationComponentGroup.class, new
+ // Factory<UserOptions>(UserOptions.class) {
+ // @Override
+ // public UserOptions create() {
+ // final UserOptionsPresenter presenter = new
+ // UserOptionsPresenter(i(Session.class),
+ // i(StateManager.class), i(I18nTranslationService.class),
+ // i(IconResources.class),
+ // i(SiteUserOptions.class));
+ // final UserOptionsPanel panel = new UserOptionsPanel(presenter,
+ // i(EntityHeader.class),
+ // i(I18nTranslationService.class), i(NotifyLevelImages.class),
+ // i(UserOptionsCollection.class));
+ // presenter.init(panel);
+ // return presenter;
+ // }
+ // });
- register(ApplicationComponentGroup.class, new Factory<UserOptions>(UserOptions.class) {
- @Override
- public UserOptions create() {
- final UserOptionsPresenter presenter = new UserOptionsPresenter(i(Session.class),
- i(StateManager.class), i(I18nTranslationService.class), i(IconResources.class),
- i(SiteUserOptions.class));
- final UserOptionsPanel panel = new UserOptionsPanel(presenter, i(EntityHeader.class),
- i(I18nTranslationService.class), i(NotifyLevelImages.class), i(UserOptionsCollection.class));
- presenter.init(panel);
- return presenter;
- }
- });
-
register(GroupOptionsCollection.class, new Factory<EntityOptionsToolsConf>(EntityOptionsToolsConf.class) {
@Override
public EntityOptionsToolsConf create() {
@@ -849,14 +849,16 @@
}
});
- register(ApplicationComponentGroup.class, new Factory<SiteOptionsI18nTranslatorAction>(
- SiteOptionsI18nTranslatorAction.class) {
- @Override
- public SiteOptionsI18nTranslatorAction create() {
- return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class), i(I18nTranslationService.class),
- i(IconResources.class), p(I18nTranslator.class));
- }
- });
+ // register(ApplicationComponentGroup.class, new
+ // Factory<SiteOptionsI18nTranslatorAction>(
+ // SiteOptionsI18nTranslatorAction.class) {
+ // @Override
+ // public SiteOptionsI18nTranslatorAction create() {
+ // return new SiteOptionsI18nTranslatorAction(i(SiteOptions.class),
+ // i(I18nTranslationService.class),
+ // i(IconResources.class), p(I18nTranslator.class));
+ // }
+ // });
// register(Singleton.class, new Factory<SignIn>(SignIn.class) {
// @Override
@@ -1067,17 +1069,21 @@
}
});
- register(ApplicationComponentGroup.class, new Factory<MaxMinWorkspace>(MaxMinWorkspace.class) {
- @Override
- public MaxMinWorkspace create() {
- final MaxMinWorkspacePresenter presenter = new MaxMinWorkspacePresenter(
- i(GlobalShortcutRegister.class), i(IconResources.class), i(I18nTranslationService.class),
- i(SiteOptions.class));
- final MaxMinWorkspacePanel panel = new MaxMinWorkspacePanel(i(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ // register(ApplicationComponentGroup.class, new
+ // Factory<MaxMinWorkspace>(MaxMinWorkspace.class) {
+ // @Override
+ // public MaxMinWorkspace create() {
+ // final MaxMinWorkspacePresenter presenter = new
+ // MaxMinWorkspacePresenter(
+ // i(GlobalShortcutRegister.class), i(IconResources.class),
+ // i(I18nTranslationService.class),
+ // i(SiteOptions.class));
+ // final MaxMinWorkspacePanel panel = new
+ // MaxMinWorkspacePanel(i(WorkspaceSkeleton.class));
+ // presenter.init(panel);
+ // return presenter;
+ // }
+ // });
register(InsertLinkGroup.class, new Factory<InsertLinkLocal>(InsertLinkLocal.class) {
@Override
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -27,7 +27,6 @@
import org.ourproject.kune.platf.client.actions.Shortcut;
import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor;
import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister;
-import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions;
import cc.kune.core.client.resources.icons.IconResources;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -42,6 +41,7 @@
putValue(Action.SMALL_ICON, img);
}
+ @Override
public void actionPerformed(final ActionEvent event) {
showMaximized(true);
}
@@ -53,55 +53,39 @@
putValue(Action.SMALL_ICON, img);
}
+ @Override
public void actionPerformed(final ActionEvent event) {
showMaximized(false);
}
}
+ public static final String MAX_ICON = "mmwp-max_bt";
public static final String MIN_ICON = "mmwp-min_bt";
- public static final String MAX_ICON = "mmwp-max_bt";
- private MaxMinWorkspaceView view;
+ private final I18nTranslationService i18n;
+ private final IconResources images;
+
+ private OldMenuItemDescriptor maximizeButton;
+
private boolean maximized;
- private final IconResources images;
+ private OldMenuItemDescriptor minimizeButton;
+ // private final SiteOptions siteOptions;
- private final I18nTranslationService i18n;
-
private final GlobalShortcutRegister shortcutReg;
- private OldMenuItemDescriptor maximizeButton;
+ private MaxMinWorkspaceView view;
- private OldMenuItemDescriptor minimizeButton;
- private final SiteOptions siteOptions;
-
public MaxMinWorkspacePresenter(final GlobalShortcutRegister shortcutReg, final IconResources images,
- final I18nTranslationService i18n, final SiteOptions siteOptions) {
+ final I18nTranslationService i18n) {
this.shortcutReg = shortcutReg;
this.images = images;
this.i18n = i18n;
- this.siteOptions = siteOptions;
+ // this.siteOptions = siteOptions;
maximized = false;
}
- public View getView() {
- return view;
- }
-
- public void init(final MaxMinWorkspaceView view) {
- this.view = view;
- createActions();
- }
-
- public void maximize() {
- showMaximized(true);
- }
-
- public void minimize() {
- showMaximized(false);
- }
-
private void createActions() {
final KeyStroke shortcut = Shortcut.getShortcut(true, true, false, false, Character.valueOf('F'));
@@ -119,15 +103,35 @@
minimizeButton.setId(MIN_ICON);
shortcutReg.put(shortcut, new AbstractExtendedAction() {
+ @Override
public void actionPerformed(final ActionEvent event) {
showMaximized(!maximized);
}
});
- siteOptions.addAction(maximizeButton);
- siteOptions.addAction(minimizeButton);
+ // siteOptions.addAction(maximizeButton);
+ // siteOptions.addAction(minimizeButton);
}
+ public View getView() {
+ return view;
+ }
+
+ public void init(final MaxMinWorkspaceView view) {
+ this.view = view;
+ createActions();
+ }
+
+ @Override
+ public void maximize() {
+ showMaximized(true);
+ }
+
+ @Override
+ public void minimize() {
+ showMaximized(false);
+ }
+
private void showMaximized(final boolean maximized) {
maximizeButton.setVisible(!maximized);
minimizeButton.setVisible(maximized);
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -19,11 +19,10 @@
*/
package org.ourproject.kune.workspace.client.i18n;
-import org.ourproject.kune.platf.client.actions.OldAbstractAction;
import org.ourproject.kune.platf.client.actions.Action;
import org.ourproject.kune.platf.client.actions.ActionEvent;
+import org.ourproject.kune.platf.client.actions.OldAbstractAction;
import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor;
-import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions;
import cc.kune.core.client.resources.icons.IconResources;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -33,17 +32,18 @@
public class SiteOptionsI18nTranslatorAction extends OldAbstractAction {
private final Provider<I18nTranslator> translator;
- public SiteOptionsI18nTranslatorAction(final SiteOptions siteOptions, final I18nTranslationService i18n,
- final IconResources img, final Provider<I18nTranslator> translator) {
+ public SiteOptionsI18nTranslatorAction(final I18nTranslationService i18n, final IconResources img,
+ final Provider<I18nTranslator> translator) {
super();
this.translator = translator;
putValue(Action.NAME, i18n.t("Help with the translation"));
putValue(Action.SMALL_ICON, img.language());
final OldMenuItemDescriptor item = new OldMenuItemDescriptor(this);
item.setPosition(1);
- siteOptions.addAction(item);
+ // siteOptions.addAction(item);
}
+ @Override
public void actionPerformed(final ActionEvent event) {
translator.get().doShowTranslator();
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -24,7 +24,6 @@
import org.ourproject.kune.platf.client.actions.ActionEvent;
import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor;
import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter;
-import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions;
import cc.kune.core.client.resources.icons.IconResources;
import cc.kune.core.client.state.Session;
@@ -35,35 +34,35 @@
public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions {
- private UserOptionsView view;
+ private final I18nTranslationService i18n;
private final IconResources img;
- private final I18nTranslationService i18n;
- private final SiteUserOptions userOptions;
private final Session session;
private final StateManager stateManager;
+ // private final SiteUserOptions userOptions;
+ private UserOptionsView view;
public UserOptionsPresenter(final Session session, final StateManager stateManager,
- final I18nTranslationService i18n, final IconResources img, final SiteUserOptions userOptions) {
+ final I18nTranslationService i18n, final IconResources img) {// ,
+ // final
+ // SiteUserOptions
+ // userOptions)
+ // {
this.session = session;
this.stateManager = stateManager;
this.i18n = i18n;
this.img = img;
- this.userOptions = userOptions;
+ // this.userOptions = userOptions;
session.onUserSignOut(new Listener0() {
+ @Override
public void onEvent() {
view.hide();
}
});
}
- public void init(final UserOptionsView view) {
- super.init(view);
- this.view = view;
- createActions();
- }
-
private void createActions() {
final AbstractExtendedAction userPrefsAction = new AbstractExtendedAction() {
+ @Override
public void actionPerformed(final ActionEvent event) {
if (!session.isInCurrentUserSpace()) {
stateManager.gotoToken(session.getCurrentUser().getStateToken());
@@ -75,6 +74,12 @@
userPrefsAction.putValue(Action.SMALL_ICON, img.prefs());
final OldMenuItemDescriptor prefsItem = new OldMenuItemDescriptor(userPrefsAction);
prefsItem.setPosition(1);
- userOptions.addAction(prefsItem);
+ // userOptions.addAction(prefsItem);
}
+
+ public void init(final UserOptionsView view) {
+ super.init(view);
+ this.view = view;
+ createActions();
+ }
}
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptions.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,25 +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.workspace.client.sitebar.siteusermenu;
-
-import org.ourproject.kune.platf.client.actions.ui.IsActionExtensible;
-
-public interface SiteUserOptions extends IsActionExtensible {
-}
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPanel.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,52 +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.workspace.client.sitebar.siteusermenu;
-
-import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
-import org.ourproject.kune.platf.client.ui.AbstractToolbar;
-import org.ourproject.kune.workspace.client.sitebar.siteoptions.AbstractSiteOptionsPanel;
-import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
-
-import com.google.gwt.user.client.ui.Widget;
-
-public class SiteUserOptionsPanel extends AbstractSiteOptionsPanel implements SiteUserOptionsView {
-
- public static final String LOGGED_USER_MENU = "kune-sump-lum";
-
- private final Widget separator;
-
- public SiteUserOptionsPanel(final SiteUserOptionsPresenter presenter, final WorkspaceSkeleton wspace,
- final GuiBindingsRegister bindings) {
- super(bindings, LOGGED_USER_MENU);
- final AbstractToolbar siteBar = wspace.getSiteBar();
- siteBar.add(btn);
- separator = siteBar.addSeparator();
- }
-
- public void setLoggedUserName(final String name) {
- setBtnText(name);
- }
-
- @Override
- public void setVisible(final boolean visible) {
- btn.setVisible(visible);
- separator.setVisible(visible);
- }
-}
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-02-10 18:28:58 UTC (rev 1244)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -1,145 +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.workspace.client.sitebar.siteusermenu;
-
-import java.util.List;
-
-import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.actions.AbstractExtendedAction;
-import org.ourproject.kune.platf.client.actions.Action;
-import org.ourproject.kune.platf.client.actions.ActionEvent;
-import org.ourproject.kune.platf.client.actions.common.GotoGroupAction;
-import org.ourproject.kune.platf.client.actions.ui.AbstractActionExtensiblePresenter;
-import org.ourproject.kune.platf.client.actions.ui.OldGuiActionDescrip;
-import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor;
-import org.ourproject.kune.platf.client.actions.ui.OldMenuItemDescriptor;
-
-import cc.kune.core.client.resources.CoreMessages;
-import cc.kune.core.client.resources.icons.IconResources;
-import cc.kune.core.client.services.FileDownloadUtils;
-import cc.kune.core.client.state.Session;
-import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.UserInfoDTO;
-import cc.kune.core.shared.i18n.I18nTranslationService;
-
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-import com.calclab.suco.client.ioc.Provider;
-
-public class SiteUserOptionsPresenter extends AbstractActionExtensiblePresenter implements SiteUserOptions {
-
- private SiteUserOptionsView view;
- private final StateManager stateManager;
- private final Session session;
- private final Provider<FileDownloadUtils> downloadProvider;
- private MenuDescriptor menuDescriptor;
- private final I18nTranslationService i18n;
- private final IconResources img;
-
- private MenuDescriptor partiMenu;;
-
- public SiteUserOptionsPresenter(final Session session, final StateManager stateManager,
- final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n,
- final IconResources img) {
- super();
- this.session = session;
- this.stateManager = stateManager;
- this.downloadProvider = downloadProvider;
- this.i18n = i18n;
- this.img = img;
- session.onUserSignIn(new Listener<UserInfoDTO>() {
- public void onEvent(final UserInfoDTO userInfoDTO) {
- onUserSignIn(userInfoDTO);
- }
-
- });
- session.onUserSignOut(new Listener0() {
- public void onEvent() {
- view.setVisible(false);
- view.setLoggedUserName("");
- }
- });
- }
-
- @Override
- public void addAction(final OldGuiActionDescrip descriptor) {
- descriptor.setParent(menuDescriptor);
- view.addAction(descriptor);
- }
-
- public View getView() {
- return view;
- }
-
- public void init(final SiteUserOptionsView view) {
- this.view = view;
- createActions();
- }
-
- private void addPartipation(final GroupDTO group) {
- final String logoImageUrl = group.hasLogo() ? downloadProvider.get().getLogoImageUrl(group.getStateToken())
- : "images/group-def-icon.gif";
- final GotoGroupAction gotoGroupAction = new GotoGroupAction(logoImageUrl, group.getShortName(),
- group.getLongName(), stateManager);
- view.addAction(new OldMenuItemDescriptor(partiMenu, gotoGroupAction));
- }
-
- private void createActions() {
- menuDescriptor = new MenuDescriptor();
- menuDescriptor.setStandalone(true);
- view.addAction(menuDescriptor);
- view.setMenu(menuDescriptor);
-
- partiMenu = new MenuDescriptor(i18n.t("Your groups"));
- addAction(partiMenu);
-
- final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() {
- public void actionPerformed(final ActionEvent event) {
- goUserHome();
- }
- };
- userHomeAction.putValue(Action.NAME, i18n.t(CoreMessages.YOUR_HOMEPAGE));
- userHomeAction.putValue(Action.SMALL_ICON, img.groupHome());
- final OldMenuItemDescriptor item = new OldMenuItemDescriptor(userHomeAction);
- item.setPosition(0);
- addAction(item);
- }
-
- private void goUserHome() {
- stateManager.gotoToken(session.getCurrentUserInfo().getShortName());
- }
-
- private void onUserSignIn(final UserInfoDTO userInfoDTO) {
- view.setVisible(true);
- view.setLoggedUserName(userInfoDTO.getShortName());
- partiMenu.clear();
- final List<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin();
- final List<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab();
- for (final GroupDTO group : groupsIsAdmin) {
- addPartipation(group);
- }
- for (final GroupDTO group : groupsIsCollab) {
- addPartipation(group);
- }
- partiMenu.setVisible(!groupsIsAdmin.isEmpty() || !groupsIsCollab.isEmpty());
- }
-
-}
Added: trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java
===================================================================
--- trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java (rev 0)
+++ trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java 2011-02-11 03:28:34 UTC (rev 1245)
@@ -0,0 +1,51 @@
+package cc.kune.common.client.actions.ui.descrip;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class AbstractGuiActionDescripTest {
+
+ private GuiAddCondition addFalseCond;
+ private GuiAddCondition addTrueCond1;
+ private GuiAddCondition addTrueCond2;
+ private GuiAddCondition addTrueCond3;
+ private MenuDescriptor descriptor;
+
+ @Before
+ public void before() {
+ descriptor = new MenuDescriptor();
+ addTrueCond1 = Mockito.mock(GuiAddCondition.class);
+ addTrueCond2 = Mockito.mock(GuiAddCondition.class);
+ addTrueCond3 = Mockito.mock(GuiAddCondition.class);
+ addFalseCond = Mockito.mock(GuiAddCondition.class);
+ Mockito.stub(addTrueCond1.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(true);
+ Mockito.stub(addTrueCond2.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(true);
+ Mockito.stub(addTrueCond3.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(true);
+ Mockito.stub(addFalseCond.mustBeAdded((GuiActionDescrip) Mockito.any())).toReturn(false);
+ }
+
+ @Test
+ public void onffalseAddConditionsShouldDontBeAdded() {
+ descriptor.add(addTrueCond1);
+ descriptor.add(addTrueCond2);
+ descriptor.add(addFalseCond);
+ assertFalse(descriptor.mustBeAdded());
+ }
+
+ @Test
+ public void twoTrueAddConditionsMustBeAdded() {
+ descriptor.add(addTrueCond1);
+ descriptor.add(addTrueCond2);
+ descriptor.add(addTrueCond3);
+ assertTrue(descriptor.mustBeAdded());
+ }
+
+ @Test
+ public void withoutAddConditionsMustBeAdded() {
+ assertTrue(descriptor.mustBeAdded());
+ }
+}
Property changes on: trunk/src/test/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescripTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the kune-commits
mailing list