You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/03/20 05:51:47 UTC
svn commit: r1458631 - in /openmeetings/trunk/singlewebapp: ./
WebContent/openmeetings/css/ WebContent/openmeetings/css/images/
WebContent/openmeetings/js/ src/org/apache/openmeetings/web/components/user/
src/org/apache/openmeetings/web/components/user...
Author: solomax
Date: Wed Mar 20 04:51:46 2013
New Revision: 1458631
URL: http://svn.apache.org/r1458631
Log:
[OPENMEETINGS-574] majority of jQuery UI components are moved to wicket-jquery-ui (with minor issues)
Added:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/animated-overlay.gif (with props)
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery-ui-1.10.2.custom.min.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.html
- copied unchanged from r1456743, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java
- copied, changed from r1456743, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentModel.java
Removed:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/fullcalendar.css
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/fullcalendar.print.css
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery-ui-1.9.0.custom.min.css
openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/fullcalendar.min.js
openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/jquery-ui-1.9.0.custom.min.js
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarForm.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_flat_15_cd0a0a_40x100.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_100_e4f1fb_1x400.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_50_3baae3_1x400.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_80_d7ebf9_1x400.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-hard_70_000000_1x100.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2694e8_256x240.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_3d80b3_256x240.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_72a7cf_256x240.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_ffffff_256x240.png
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery.ui.menubar.css
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
Added: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/animated-overlay.gif
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/animated-overlay.gif?rev=1458631&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/animated-overlay.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_flat_15_cd0a0a_40x100.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_flat_15_cd0a0a_40x100.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_100_e4f1fb_1x400.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_100_e4f1fb_1x400.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_50_3baae3_1x400.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_50_3baae3_1x400.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_80_d7ebf9_1x400.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_glass_80_d7ebf9_1x400.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-hard_70_000000_1x100.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-hard_70_000000_1x100.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2694e8_256x240.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2694e8_256x240.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_2e83ff_256x240.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_3d80b3_256x240.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_3d80b3_256x240.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_72a7cf_256x240.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_72a7cf_256x240.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_ffffff_256x240.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/ui-icons_ffffff_256x240.png?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
Binary files - no diff available.
Added: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery-ui-1.10.2.custom.min.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery-ui-1.10.2.custom.min.css?rev=1458631&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery-ui-1.10.2.custom.min.css (added)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery-ui-1.10.2.custom.min.css Wed Mar 20 04:51:46 2013
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.10.2 - 2013-03-15
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2CLucida%20Sans%2CArial%2Csans-serif&fwDefault=&fsDefault=16px&cornerRadius=6px&bgColorHeader=%23deedf7&bgTextureHeader=highlight_soft&bgImgOpacityHeader=100&borderColorHeader=%23aed0ea&fcHeader=%23222222&iconColorHeader=%2372a7cf&bgColorContent=%23f2f5f7&bgTextureContent=highlight_hard&bgImgOpacityContent=100&borderColorContent=%23dddddd&fcContent=%23362b36&iconColorContent=%2372a7cf&bgColorDefault=%23d7ebf9&bgTextureDefault=glass&bgImgOpacityDefault=80&borderColorDefault=%23aed0ea&fcDefault=%232779aa&iconColorDefault=%233d80b3&bgColorHover=%23e4f1fb&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=%2374b2e2&fcHover=%230070a3&iconColorHover=%232694e8&bgColorActive=%233baae3&bgTextureActive=glass&bgImgOpacityActive=50&borderColorActive=%232694e8&fcActive=%23ffffff&iconColorActive=%23ffffff&bgColorHighlight=%23ffef8f&bgTextureHighlight=highlight_soft&bgImgOpacityHighli
ght=25&borderColorHighlight=%23f9dd34&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=cd0a0a&bgTextureError=flat&bgImgOpacityError=15&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffffff&bgColorOverlay=%23eeeeee&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=90&opacityOverlay=80&bgColorShadow=%23000000&bgTextureShadow=highlight_hard&bgImgOpacityShadow=70&opacityShadow=30&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-
resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted #000}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-acc
ordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-pri
mary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}inp
ut.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month-year{width:10
0%}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:700;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepick
er-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepic
ker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.
ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:0}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:400}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:400;margin:-1px}.ui-menu .ui-state-disabled{font-weight:400;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margi
n:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url(images/animated-overlay.gif);height:100%;filter:alpha(opacity=25);opacity:.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slid
er-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:0;background:0;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:0;border-bottom:0;border-right:0}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;b
order-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav li a{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active a,.ui-tabs .ui-tabs-nav li.ui-state-disabled a,.ui-tabs .ui-tabs-nav li.ui-tabs-loading a{cursor:text}.ui-tabs .ui-tabs-nav li a,.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:0}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Lucida Grande,Lucida Sans,Arial,sans-serif;font-size:16px}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Lucida Grande,Lucida Sans,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;ba
ckground:#f2f5f7 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x;color:#362b36}.ui-widget-content a{color:#362b36}.ui-widget-header{border:1px solid #aed0ea;background:#deedf7 url(images/ui-bg_highlight-soft_100_deedf7_1x100.png) 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #aed0ea;background:#d7ebf9 url(images/ui-bg_glass_80_d7ebf9_1x400.png) 50% 50% repeat-x;font-weight:;color:#2779aa}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#2779aa;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #74b2e2;background:#e4f1fb url(images/ui-bg_glass_100_e4f1fb_1x400.png) 50% 50% repeat-x;font-weight:;color:#0070a3}.ui-state-hover a,.ui-stat
e-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited{color:#0070a3;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #2694e8;background:#3baae3 url(images/ui-bg_glass_50_3baae3_1x400.png) 50% 50% repeat-x;font-weight:;color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #f9dd34;background:#ffef8f url(images/ui-bg_highlight-soft_25_ffef8f_1x100.png) 50% top repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#cd0a0a url(images/ui-bg_flat_15_cd0a0a_40x100.png) 50% 50% repeat-x;color:#fff}.ui-state-error a,.ui-widge
t-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#fff}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#fff}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(images/ui-icons_72a7cf_256x240.png)}.ui-widget-header .ui-icon{background-image:url(images/ui-icons_72a7cf_256x240.png)}.ui-state-default .ui-icon{background-image:url(images/ui-icons_3d80b3_256x240.png)}.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon{background-image:url(images/ui-icons_2694e8_256x240.png)}.ui-state-active .ui-icon{background-image:url(images/ui-icons_ffffff_256x240.png)}.ui-state-highlight .ui-icon{background-image:url(images/ui-icons_2e83ff_256x240.png)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(images/ui-icons_ffffff_256x240.png)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px
}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{backgr
ound-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px
-48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-p
osition:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-i
con-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{b
ackground-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{backgr
ound-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-
battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-
208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:6px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:6px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bot
tom-left-radius:6px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:6px}.ui-widget-overlay{background:#eee url(images/ui-bg_diagonals-thick_90_eeeeee_40x40.png) 50% 50% repeat;opacity:.8;filter:Alpha(Opacity=80)}.ui-widget-shadow{margin:-7px 0 0 -7px;padding:7px;background:#000 url(images/ui-bg_highlight-hard_70_000000_1x100.png) 50% top repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery.ui.menubar.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery.ui.menubar.css?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery.ui.menubar.css (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jquery.ui.menubar.css Wed Mar 20 04:51:46 2013
@@ -9,7 +9,7 @@
.ui-menubar-item { float: left; }
-.ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; }
+.ui-menubar .ui-button { float: left; font-weight: bold; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; }
.ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; }
.ui-menubar .ui-menu { width: 200px; position: absolute; z-index: 9999; font-weight: normal; }
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Wed Mar 20 04:51:46 2013
@@ -253,6 +253,12 @@
<dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="0.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="jquery-ui-core" rev="6.2.2" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="jquery-ui-calendar" rev="6.2.2" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
<!-- iCal4j seems to need this JAR -->
<dependency org="edu.emory.mathcs" name="backport-util-concurrent" rev="3.1" conf="openmeetings->*"/>
Copied: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java (from r1456743, openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.java)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.java&r1=1456743&r2=1458631&rev=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/AboutDialog.java Wed Mar 20 04:51:46 2013
@@ -21,15 +21,20 @@ package org.apache.openmeetings.web.comp
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.components.UserPanel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
-public class AboutPanel extends UserPanel {
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
+public class AboutDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1400355222295594321L;
private static String version = null;
private static String revision = null;
@@ -73,10 +78,8 @@ public class AboutPanel extends UserPane
return buildDate;
}
- public AboutPanel(String id) {
- super(id);
- setOutputMarkupId(true);
- setMarkupId(id);
+ public AboutDialog(String id) {
+ super(id, "About"); //FIXME hardcoded
add(new Label("name", Application.getBean(ConfigurationDao.class).getConfValue(
"application.name"
@@ -86,4 +89,14 @@ public class AboutPanel extends UserPane
add(new Label("revision", getRevision()));
add(new Label("buildDate", getBuildDate()));
}
+
+ @Override
+ protected List<DialogButton> getButtons() {
+ return new ArrayList<DialogButton>();
+ }
+
+ @Override
+ protected void onClose(AjaxRequestTarget target, DialogButton button) {
+ //empty
+ }
}
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.html?rev=1458631&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.html (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.html Wed Mar 20 04:51:46 2013
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <form wicket:id="appForm">
+ <table>
+ <tr>
+ <td><wicket:ommessage key="572" /></td>
+ <td><input type="text" wicket:id="appointmentName" /></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="570" /></td>
+ <td><span wicket:id="appointmentStarttime"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="571" /></td>
+ <td><span wicket:id="appointmentEndtime"></span></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="565" /></td>
+ <td><select wicket:id="remind" ></select></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><wicket:ommessage key="1509" /></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="619" /></td>
+ <td><select wicket:id="room.roomtype" ></select></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="406" /></td>
+ <td><select wicket:id="room" ></select></td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="checkbox" wicket:id="isPasswordProtected" /><wicket:ommessage key="524" /></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="525" /></td>
+ <td><input type="password" wicket:id="password" /></td>
+ </tr>
+ <tr>
+ <td colspan="2"><wicket:ommessage key="1445" /></td>
+ </tr>
+ <!--
+ <tr>
+ <td><wicket:ommessage key="803" /></td>
+ <td><select wicket:id="meetingMember" ></select></td>
+ </tr -->
+ <tr>
+ <td><wicket:ommessage key="569" /></td>
+ <td><input type="text" wicket:id="appointmentLocation" /></td>
+ </tr>
+ <tr>
+ <td><wicket:ommessage key="573" /></td>
+ <td><textarea wicket:id="appointmentDescription"></textarea></td>
+ </tr>
+ <!-- tr>
+ <td colspan="2" style="text-align: right"><input type="button" wicket:id="save" /><input type="button" wicket:id="cancel" /></td>
+ </tr -->
+ </table>
+ </form>
+ </wicket:panel>
+</html>
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java?rev=1458631&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java Wed Mar 20 04:51:46 2013
@@ -0,0 +1,149 @@
+package org.apache.openmeetings.web.components.user.calendar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.openmeetings.data.calendar.daos.AppointmentReminderTypDao;
+import org.apache.openmeetings.data.conference.RoomManager;
+import org.apache.openmeetings.data.conference.dao.RoomDao;
+import org.apache.openmeetings.data.user.dao.UsersDao;
+import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
+import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
+import org.apache.openmeetings.persistence.beans.room.Room;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.extensions.yui.calendar.DateTimeField;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.markup.html.form.RequiredTextField;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+
+public class AppointmentDialog extends AbstractFormDialog<Appointment> {
+ private static final long serialVersionUID = 7553035786264113827L;
+ private AppointmentForm form;
+
+ public AppointmentDialog(String id, String title, IModel<Appointment> model) {
+ super(id, title, model, true);
+ form = new AppointmentForm("appForm", new CompoundPropertyModel<Appointment>(this.getModel()));
+ add(form);
+ }
+
+ @Override
+ protected DialogButton getSubmitButton() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Form<?> getForm() {
+ return this.form;
+ }
+
+ @Override
+ protected void onOpen(AjaxRequestTarget target) {
+ target.add(this.form);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ // TODO Auto-generated method stub
+
+ }
+
+ private class AppointmentForm extends Form<Appointment> {
+ private static final long serialVersionUID = -1764738237821487526L;
+ private boolean createRoom = true;
+
+ public AppointmentForm(String id, IModel<Appointment> model) {
+ super(id, model);
+ setOutputMarkupId(true);
+
+ add(new RequiredTextField<String>("appointmentName"));
+ add(new TextArea<String>("appointmentDescription"));
+ add(new TextField<String>("appointmentLocation"));
+ add(new DateTimeField("appointmentStarttime"));
+ add(new DateTimeField("appointmentEndtime"));
+ final PasswordTextField pwd = new PasswordTextField("password");
+ pwd.setEnabled(isPwdProtected());
+ pwd.setOutputMarkupId(true);
+ add(pwd);
+
+ add(new DropDownChoice<AppointmentReminderTyps>(
+ "remind"
+ , Application.getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList()
+ , new ChoiceRenderer<AppointmentReminderTyps>("name", "typId")));
+
+ final DropDownChoice<RoomType> roomType = new DropDownChoice<RoomType>(
+ "room.roomtype"
+ , Application.getBean(RoomManager.class).getAllRoomTypes()
+ , new ChoiceRenderer<RoomType>("name", "roomtypes_id"));
+ roomType.setEnabled(createRoom);
+ roomType.setOutputMarkupId(true);
+ add(roomType);
+
+ final DropDownChoice<Room> room = new DropDownChoice<Room>(
+ "room"
+ , getRoomList()
+ , new ChoiceRenderer<Room>("name", "rooms_id"));
+ room.setEnabled(!createRoom);
+ room.setOutputMarkupId(true);
+ add(room);
+ add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) {
+ private static final long serialVersionUID = -3743113990890386035L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ createRoom = getConvertedInput();
+ target.add(roomType.setEnabled(createRoom), room.setEnabled(!createRoom));
+ }
+ });
+ add(new AjaxCheckBox("isPasswordProtected") {
+ private static final long serialVersionUID = 6041200584296439976L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ AppointmentForm.this.getModelObject().setIsPasswordProtected(getConvertedInput());
+ pwd.setEnabled(isPwdProtected());
+ target.add(pwd);
+ }
+ });
+ }
+
+ private boolean isPwdProtected() {
+ return Boolean.TRUE.equals(getModelObject().getIsPasswordProtected());
+ }
+
+ private List<Room> getRoomList() {
+ //FIXME need to be reviewed
+ List<Room> result = new ArrayList<Room>();
+ RoomDao dao = Application.getBean(RoomDao.class);
+ result.addAll(dao.getPublicRooms());
+ for (Organisation_Users ou : Application.getBean(UsersDao.class).get(WebSession.getUserId()).getOrganisation_users()) {
+ result.addAll(dao.getOrganisationRooms(ou.getOrganisation().getOrganisation_id()));
+ }
+ if (getModelObject().getRoom() != null && getModelObject().getRoom().getAppointment()) { //FIXME review
+ result.add(getModelObject().getRoom());
+ }
+ return result;
+ }
+ }
+}
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentModel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentModel.java?rev=1458631&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentModel.java (added)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentModel.java Wed Mar 20 04:51:46 2013
@@ -0,0 +1,34 @@
+package org.apache.openmeetings.web.components.user.calendar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
+import org.apache.openmeetings.persistence.beans.calendar.Appointment;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.app.WebSession;
+
+import com.googlecode.wicket.jquery.ui.calendar.CalendarEvent;
+import com.googlecode.wicket.jquery.ui.calendar.CalendarModel;
+import com.googlecode.wicket.jquery.ui.calendar.ICalendarVisitor;
+
+public class AppointmentModel extends CalendarModel implements ICalendarVisitor {
+ private static final long serialVersionUID = -8707880381422490413L;
+
+ public void visit(CalendarEvent event) {
+ //every event can be customized
+ }
+
+ @Override
+ protected List<? extends CalendarEvent> load() {
+ List<CalendarEvent> list = new ArrayList<CalendarEvent>();
+ for (Appointment a : Application.getBean(AppointmentDao.class).getAppointmentsByRange(WebSession.getUserId(), this.getStart(), this.getEnd())) {
+ CalendarEvent c = new CalendarEvent(a.getAppointmentId().intValue(), a.getAppointmentName(), a.getAppointmentStarttime(), a.getAppointmentEndtime());
+ c.setAllDay(false);
+ //FIXME desc c.set
+ list.add(c);
+ }
+ return list;
+ }
+
+}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html Wed Mar 20 04:51:46 2013
@@ -20,125 +20,24 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <link media="screen" type="text/css" rel="stylesheet" href='css/fullcalendar.css' />
- <!-- link media="print" type="text/css" rel="stylesheet" href='css/fullcalendar.print.css' /--> <!-- FIXME incorrectly rendered -->
<script type="text/javascript">
function getCalendarHeight() {
return $(window).height() - $('#calendar').position().top - 20; //FIXME HACK
}
- function refetchEvents() {
- $('#calendar').fullCalendar('refetchEvents');
- window.setTimeout(refetchEvents, 10 * 1000);
- }
-
function calendarInit() {
- $('#calendar').fullCalendar({
- header: {
- left: 'prev,next today',
- center: 'title',
- right: 'month,agendaWeek,agendaDay'
- }
- , editable: true
- , allDaySlot: false
- , axisFormat: 'HH(:mm)'
- , selectable: true
- , defaultEventMinutes: 60
- , timeFormat: {
- agenda: 'HH:mm{ - HH:mm}'
- , '': 'HH(:mm)'
- }
- , height: getCalendarHeight()
- , windowResize: function() {
- //$('#calendar').data().fullCalendar.option('height', getCalendarHeight());
- this.option('height', getCalendarHeight());
- }
- , eventDrop: dropEventFunc //TODO confirm ??
- , eventResize: resizeEventFunc //TODO confirm ??
- , eventClick: eventClickFunc
- , select: selectFunc
- , eventSources: [
- {
- events: fetchEventsFunc
- //, color: '#4793E6'
- //, textColor: 'black'
- }
- ]
- });
- refetchEvents();
-
- $('#appointment').dialog({
- closeOnEscape: true
- , resizable: true
- , width: 450
- , autoOpen: false
- , modal: true
- });
}
</script>
</wicket:head>
<wicket:panel>
- <script type="text/javascript" src="js/fullcalendar.min.js"></script>
- <div wicket:id="calendar"></div>
- <!-- bottom section -->
- <div id="appointment" wicket:ommessage="title:815">
- <form wicket:id="appointment">
- <table>
- <tr>
- <td><wicket:ommessage key="572" /></td>
- <td><input type="text" wicket:id="appointmentName" /></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="570" /></td>
- <td><span wicket:id="appointmentStarttime"></span></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="571" /></td>
- <td><span wicket:id="appointmentEndtime"></span></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="565" /></td>
- <td><select wicket:id="remind" ></select></td>
- </tr>
- <tr>
- <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><wicket:ommessage key="1509" /></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="619" /></td>
- <td><select wicket:id="room.roomtype" ></select></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="406" /></td>
- <td><select wicket:id="room" ></select></td>
- </tr>
- <tr>
- <td colspan="2"><input type="checkbox" wicket:id="isPasswordProtected" /><wicket:ommessage key="524" /></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="525" /></td>
- <td><input type="password" wicket:id="password" /></td>
- </tr>
- <tr>
- <td colspan="2"><wicket:ommessage key="1445" /></td>
- </tr>
- <!--
- <tr>
- <td><wicket:ommessage key="803" /></td>
- <td><select wicket:id="meetingMember" ></select></td>
- </tr -->
- <tr>
- <td><wicket:ommessage key="569" /></td>
- <td><input type="text" wicket:id="appointmentLocation" /></td>
- </tr>
- <tr>
- <td><wicket:ommessage key="573" /></td>
- <td><textarea wicket:id="appointmentDescription"></textarea></td>
- </tr>
- <!-- tr>
- <td colspan="2" style="text-align: right"><input type="button" wicket:id="save" /><input type="button" wicket:id="cancel" /></td>
- </tr -->
- </table>
+ <div id="wrapper-panel-frame" class="ui-corner-all">
+ <form wicket:id="form">
+ <div wicket:id="calendar"></div>
+ <br/>
+ <!-- div wicket:id="feedback"></div -->
</form>
</div>
+ <div wicket:id="appointment">[appointment]</div>
+ <!-- bottom section -->
</wicket:panel>
</html>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java Wed Mar 20 04:51:46 2013
@@ -18,30 +18,19 @@
*/
package org.apache.openmeetings.web.components.user.calendar;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.context;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.resolved;
-
-import java.util.Calendar;
+import java.util.Date;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.UserPanel;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxCallListener;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONObject;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.request.handler.TextRequestHandler;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.Model;
+
+import com.googlecode.wicket.jquery.ui.Options;
+import com.googlecode.wicket.jquery.ui.calendar.Calendar;
public class CalendarPanel extends UserPanel {
@@ -54,213 +43,114 @@ public class CalendarPanel extends UserP
public CalendarPanel(String id) {
super(id);
- WebMarkupContainer calendar = new WebMarkupContainer("calendar");
- calendar.setOutputMarkupId(true);
- calendar.setMarkupId("calendar");
- add(calendar);
- final CalendarForm form = new CalendarForm("appointment", new CompoundPropertyModel<Appointment>(new Appointment()));
+ final Form<Date> form = new Form<Date>("form");
add(form);
- //fetchEvents
- add(new AbstractDefaultAjaxBehavior() {
- private static final long serialVersionUID = 6880514947331946407L;
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setDataType("json");
- attributes.setWicketAjaxResponse(false);
- attributes.getAjaxCallListeners().add(new AjaxCallListener().onSuccess("callback(data);"));
+ final AppointmentDialog dialog = new AppointmentDialog("appointment", WebSession.getString(815), Model.of(new Appointment()));
+ add(dialog);
+
+ Options options = new Options();
+ //options.set("theme", true);
+ options.set("header", "{left: 'prev,next today', center: 'title', right: 'month,agendaWeek,agendaDay'}");
+ options.set("allDaySlot", false);
+ options.set("axisFormat", "'HH(:mm)'");
+ options.set("defaultEventMinutes", 60);
+ options.set("timeFormat", "{agenda: 'HH:mm{ - HH:mm}', '': 'HH(:mm)'}");
+ options.set("height", "function() {return getCalendarHeight();}");
+ //options.set("height", "getCalendarHeight()");
+ options.set("windowResize", "function() { this.option('height', getCalendarHeight()); }");
+
+ Calendar calendar = new Calendar("calendar", new AppointmentModel(), options) {
+ private static final long serialVersionUID = 8442068089963449950L;
+
+ @Override
+ protected boolean isSelectable() {
+ return true;
}
@Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(JavaScriptHeaderItem.forScript(
- "var fetchEventsFunc = "
- + this.getCallbackFunction(
- context("start")
- , context("end")
- , context("callback")
- , resolved("_start", "start.getTime()")
- , resolved("_end", "end.getTime()")) + ";"
- , "fetchEventsFunc"));
+ protected boolean isEditable() {
+ return true;
}
-
+
@Override
- protected void respond(AjaxRequestTarget target) {
- Calendar start = WebSession.getCalendar();
- start.setTimeInMillis(getRequestCycle().getRequest().getRequestParameters().getParameterValue("_start").toLong());
- Calendar end = WebSession.getCalendar();
- end.setTimeInMillis(getRequestCycle().getRequest().getRequestParameters().getParameterValue("_end").toLong());
- JSONArray events = new JSONArray();
- for (Appointment a : Application.getBean(AppointmentDao.class).getAppointmentsByRange(WebSession.getUserId(),
- start.getTime(), end.getTime())) {
- try {
- events.put(new JSONObject()
- .put("id", a.getAppointmentId())
- .put("title", a.getAppointmentName())
- .put("description", a.getAppointmentDescription())
- .put("start", WebSession.getDateFormat().format(a.getAppointmentStarttime()))
- .put("end", WebSession.getDateFormat().format(a.getAppointmentEndtime()))
- .put("allDay", false));
- } catch (JSONException e) {
- e.printStackTrace();
- }
- }
- getRequestCycle().scheduleRequestHandlerAfterCurrent(
- new TextRequestHandler("application/json", "UTF-8", events.toString()));
- }
- });
- //dropEvent
- add(new DropResizeBehavior(true, "dropEventFunc"));
- //resizeEvent
- add(new DropResizeBehavior(false, "resizeEventFunc"));
- //create on click-and-drag
- add(new AbstractDefaultAjaxBehavior() {
- private static final long serialVersionUID = 6880514947331946407L;
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new AjaxCallListener().onSuccess("$('#appointment').dialog('open');"));
+ protected boolean isEventDropEnabled() {
+ return true;
}
@Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(JavaScriptHeaderItem.forScript(
- "var selectFunc = "
- + this.getCallbackFunction(
- context("start")
- , context("end")
- , context("allDay")
- , context("jsEvent")
- , context("view")
- , resolved("_start", "start.getTime()")
- , resolved("_end", "end.getTime()")) + ";"
- , "selectFunc"));
+ protected boolean isEventResizeEnabled() {
+ return true;
}
-
+
@Override
- protected void respond(AjaxRequestTarget target) {
- Calendar start = WebSession.getCalendar();
- start.setTimeInMillis(getRequestCycle().getRequest().getRequestParameters().getParameterValue("_start").toLong());
- Calendar end = WebSession.getCalendar();
- end.setTimeInMillis(getRequestCycle().getRequest().getRequestParameters().getParameterValue("_end").toLong());
+ protected void onDayClick(AjaxRequestTarget target, Date date) {
+ java.util.Calendar start = WebSession.getCalendar();
+ start.setTime(date);
+ java.util.Calendar end = WebSession.getCalendar();
+ end.setTime(date);
if (start.equals(end)) {
- end.add(Calendar.HOUR_OF_DAY, 1);
+ end.add(java.util.Calendar.HOUR_OF_DAY, 1);
}
Appointment a = new Appointment();
a.setAppointmentStarttime(start.getTime());
a.setAppointmentEndtime(end.getTime());
- form.setModelObject(a);
+ dialog.setModelObject(a);
- target.add(form);
+ dialog.open(target);
}
- });
- //eventClick
- add(new AbstractDefaultAjaxBehavior() {
- private static final long serialVersionUID = 6880514947331946407L;
-
+
@Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new AjaxCallListener().onSuccess("$('#appointment').dialog('open');"));
+ protected void onSelect(AjaxRequestTarget target, Date start, Date end, boolean allDay) {
+ Appointment a = new Appointment();
+ a.setAppointmentStarttime(start);
+ a.setAppointmentEndtime(end);
+ dialog.setModelObject(a);
+
+ dialog.open(target);
}
@Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(JavaScriptHeaderItem.forScript(
- "var eventClickFunc = "
- + this.getCallbackFunction(
- context("event")
- , context("jsEvent")
- , context("view")
- , resolved("_id", "event.id")) + ";"
- , "eventClickFunc"));
+ protected void onEventClick(AjaxRequestTarget target, int eventId) {
+ Appointment a = Application.getBean(AppointmentDao.class).getAppointmentById((long)eventId);
+ dialog.setModelObject(a);
+
+ dialog.open(target);
}
-
+
@Override
- protected void respond(AjaxRequestTarget target) {
- Appointment a = Application.getBean(AppointmentDao.class).getAppointmentById(
- getRequestCycle().getRequest().getRequestParameters().getParameterValue("_id").toLong());
- form.setModelObject(a);
+ protected void onEventDrop(AjaxRequestTarget target, int eventId, long delta, boolean allDay) {
+ AppointmentDao dao = Application.getBean(AppointmentDao.class);
+ Appointment a = dao.getAppointmentById((long)eventId);
- target.add(form);
- }
- });
- }
-
- private class DropResizeBehavior extends AbstractDefaultAjaxBehavior {
- private static final long serialVersionUID = -3060872155563135236L;
- private boolean drop = false;
- private String funcName;
-
- DropResizeBehavior(boolean drop, String funcName) {
- this.drop = drop;
- this.funcName = funcName;
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new AjaxCallListener().onFailure("revertFunc();"));
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- response.render(JavaScriptHeaderItem.forScript(
- "var " + funcName + " = "
- + (drop
- ? this.getCallbackFunction(
- context("event")
- , explicit("dayDelta")
- , explicit("minuteDelta")
- , context("allDay")
- , context("revertFunc")
- , context("jsEvent")
- , context("ui")
- , context("view")
- , resolved("_id", "event.id"))
- : this.getCallbackFunction(
- context("event")
- , explicit("dayDelta")
- , explicit("minuteDelta")
- , context("revertFunc")
- , context("jsEvent")
- , context("ui")
- , context("view")
- , resolved("_id", "event.id"))) + ";"
- , funcName));
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- AppointmentDao dao = Application.getBean(AppointmentDao.class);
- Appointment a = dao.getAppointmentById(
- getRequestCycle().getRequest().getRequestParameters().getParameterValue("_id").toLong());
-
- int dayDelta = getRequestCycle().getRequest().getRequestParameters().getParameterValue("dayDelta").toInt();
- int minuteDelta = getRequestCycle().getRequest().getRequestParameters().getParameterValue("minuteDelta").toInt();
-
- Calendar cal = WebSession.getCalendar();
- if (drop) {
+ java.util.Calendar cal = WebSession.getCalendar();
cal.setTime(a.getAppointmentStarttime());
- cal.add(Calendar.DATE, dayDelta);
- cal.add(Calendar.MINUTE, minuteDelta);
+ cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
a.setAppointmentStarttime(cal.getTime());
+
+ cal.setTime(a.getAppointmentEndtime());
+ cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
+ a.setAppointmentEndtime(cal.getTime());
+
+ dao.updateAppointment(a);
+ //FIXME add feedback info
}
- cal.setTime(a.getAppointmentEndtime());
- cal.add(Calendar.DATE, dayDelta);
- cal.add(Calendar.MINUTE, minuteDelta);
- a.setAppointmentEndtime(cal.getTime());
- dao.updateAppointment(a);
- }
+ @Override
+ protected void onEventResize(AjaxRequestTarget target, int eventId, long delta) {
+ AppointmentDao dao = Application.getBean(AppointmentDao.class);
+ Appointment a = dao.getAppointmentById((long)eventId);
+ java.util.Calendar cal = WebSession.getCalendar();
+ cal.setTime(a.getAppointmentEndtime());
+ cal.add(java.util.Calendar.MILLISECOND, (int)delta); //FIXME?
+ a.setAppointmentEndtime(cal.getTime());
+
+ dao.updateAppointment(a);
+ //FIXME add feedback info
+ }
+ };
+ form.add(calendar);
}
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java Wed Mar 20 04:51:46 2013
@@ -50,7 +50,6 @@ public abstract class BasePage extends W
public void renderHead(IHeaderResponse response) {
response.render(JavaScriptHeaderItem.forReference(Application.get()
.getJavaScriptLibrarySettings().getJQueryReference()));
- response.render(JavaScriptHeaderItem.forUrl("js/jquery-ui-1.9.0.custom.min.js", "jquery-ui"));
super.renderHead(response);
}
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html Wed Mar 20 04:51:46 2013
@@ -22,8 +22,7 @@
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
- <script type="text/javascript" src="js/jquery-ui-1.9.0.custom.min.js"></script>
- <link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.9.0.custom.min.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.10.2.custom.min.css"/>
<script type="text/javascript">
function showBusyIndicator() {
$('#busy_indicator').show();
@@ -31,16 +30,6 @@
function hideBusyIndicator() {
$('#busy_indicator').hide();
}
- function showAbout() {
- $('#aboutDialog').dialog({
- closeOnEscape: true
- , autoOpen: false
- , resizable: false
- , width: 400
- , modal: true
- });
- $('#aboutDialog').dialog('open');
- }
</script>
</wicket:head>
<wicket:extend>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Wed Mar 20 04:51:46 2013
@@ -22,7 +22,7 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.ConfirmableAjaxLink;
import org.apache.openmeetings.web.components.MenuPanel;
-import org.apache.openmeetings.web.components.user.AboutPanel;
+import org.apache.openmeetings.web.components.user.AboutDialog;
import org.apache.openmeetings.web.components.user.ChatPanel;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -56,15 +56,16 @@ public class MainPage extends BasePage {
setResponsePage(Application.get().getSignInPageClass());
}
});
+ final AboutDialog about = new AboutDialog("aboutDialog");
add(new AjaxLink<Void>("about") {
private static final long serialVersionUID = 4065339709905366840L;
@Override
public void onClick(AjaxRequestTarget target) {
- target.appendJavaScript("showAbout();");
+ about.open(target);
}
});
- add(new AboutPanel("aboutDialog"));
+ add(about);
add(new ChatPanel("chatPanel"));
add(new WebSocketBehavior() {
private static final long serialVersionUID = -3311970325911992958L;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.html Wed Mar 20 04:51:46 2013
@@ -21,7 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
- <link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.9.0.custom.min.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.10.2.custom.min.css"/>
<style>
#login .ui-dialog .ui-dialog-titlebar-close {
display: none;
@@ -29,7 +29,6 @@
#login input:not([type='checkbox']) {
width: 170px;
}
- #login input:
</style>
</wicket:head>
<wicket:extend>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1458631&r1=1458630&r2=1458631&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java Wed Mar 20 04:51:46 2013
@@ -32,6 +32,8 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.googlecode.wicket.jquery.ui.JQueryAbstractBehavior;
+
public class SignInPage extends BasePage {
private static final long serialVersionUID = -3843571657066167592L;
@@ -40,6 +42,14 @@ public class SignInPage extends BasePage
}
public SignInPage() {
+ add(new JQueryAbstractBehavior("name") {
+ private static final long serialVersionUID = -8915882511038880055L;
+
+ @Override
+ protected String $() {
+ return "";
+ }
+ });
add(new SignInForm("signin"));
}