[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7239] Merge 7235:7238 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7239] Merge 7235:7238 from trunk |
|
Date: |
Sat, 30 Apr 2011 18:13:46 +0000 |
Revision: 7239
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7239
Author: sigurdne
Date: 2011-04-30 18:13:44 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
Merge 7235:7238 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/autocomplete.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/button.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/calendar.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/carousel.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/colorpicker.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/container.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/datatable.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/editor.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/imagecropper.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/layout.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/logger.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/menu.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/paginator.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/profilerviewer.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/progressbar.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/resize.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/simpleeditor.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/slider.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/tabview.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/treeview.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/yuitest.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/autocomplete/assets/autocomplete-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/autocomplete/assets/skins/sam/autocomplete-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/autocomplete/assets/skins/sam/autocomplete.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/autocomplete/autocomplete-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/autocomplete/autocomplete-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/autocomplete/autocomplete.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/base/base-min.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/base/base.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/button/assets/button-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/button/assets/skins/sam/button-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/button/assets/skins/sam/button.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/button/button-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/button/button-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/button/button.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/assets/calendar-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/assets/calendar.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/assets/skins/sam/calendar-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/assets/skins/sam/calendar.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/calendar-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/calendar-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/calendar/calendar.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/carousel/assets/carousel-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/carousel/assets/skins/sam/carousel-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/carousel/assets/skins/sam/carousel.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/carousel/carousel-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/carousel/carousel-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/carousel/carousel.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/charts/assets/charts.swf
branches/Version-1_0-branch/phpgwapi/js/yahoo/charts/charts-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/charts/charts-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/charts/charts.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/colorpicker/assets/colorpicker-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/colorpicker/assets/skins/sam/colorpicker-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/colorpicker/assets/skins/sam/colorpicker.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/colorpicker/colorpicker-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/colorpicker/colorpicker-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/colorpicker/colorpicker.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/connection/connection-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/connection/connection-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/connection/connection.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/connection/connection_core-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/connection/connection_core-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/connection/connection_core.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/assets/container-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/assets/container.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/assets/skins/sam/container-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/assets/skins/sam/container.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/container-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/container-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/container.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/container_core-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/container_core-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/container/container_core.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/cookie/cookie-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/cookie/cookie-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/cookie/cookie.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datasource/datasource-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datasource/datasource-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datasource/datasource.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/assets/datatable-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/assets/datatable.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/datatable-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/datatable-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable/datatable.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datemath/datemath-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datemath/datemath-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datemath/datemath.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/dom/dom-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/dom/dom-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/dom/dom.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/dragdrop/dragdrop-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/dragdrop/dragdrop-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/dragdrop/dragdrop.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/assets/editor-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/assets/simpleeditor-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/assets/skins/sam/editor-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/assets/skins/sam/editor.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/assets/skins/sam/simpleeditor-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/assets/skins/sam/simpleeditor.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/editor-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/editor-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/editor.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/simpleeditor-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/simpleeditor-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/editor/simpleeditor.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/element/element-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/element/element-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/element/element.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/element-delegate/element-delegate-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/element-delegate/element-delegate-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/element-delegate/element-delegate.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event/event-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event/event-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event/event.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-delegate/event-delegate-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-delegate/event-delegate-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-delegate/event-delegate.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-mouseenter/event-mouseenter-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-mouseenter/event-mouseenter-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-mouseenter/event-mouseenter.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-simulate/event-simulate-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-simulate/event-simulate-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/event-simulate/event-simulate.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/assets/ysuggest_proxy.php
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/customicons.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/customicons_log.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/default_tree.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/default_tree_log.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/dynamic_tree.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/dynamic_tree_clean.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/dynamic_tree_log.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/folder_style.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/folder_style_log.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/index.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/menu_style.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/menu_style_log.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/tv_edit.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/tv_highlight.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/tv_markup.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/tv_tooltip.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/tv_tooltip_log.html
branches/Version-1_0-branch/phpgwapi/js/yahoo/fonts/fonts-min.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/fonts/fonts.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/get/get-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/get/get-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/get/get.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/grids/grids-min.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/grids/grids.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/history/history-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/history/history-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/history/history.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/imagecropper/assets/imagecropper-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/imagecropper/assets/skins/sam/imagecropper-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/imagecropper/assets/skins/sam/imagecropper.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/imagecropper/imagecropper-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/imagecropper/imagecropper-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/imagecropper/imagecropper.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/imageloader/imageloader-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/imageloader/imageloader-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/imageloader/imageloader.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/json/json-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/json/json-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/json/json.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/layout/assets/layout-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/layout/assets/skins/sam/layout-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/layout/layout-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/layout/layout-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/layout/layout.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/assets/logger-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/assets/logger.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/assets/skins/sam/logger-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/assets/skins/sam/logger.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/logger-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/logger-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/logger/logger.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/assets/menu-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/assets/menu.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/assets/skins/sam/menu-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/assets/skins/sam/menu.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/menu-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/menu-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/menu/menu.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/paginator/assets/paginator-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/paginator/paginator-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/paginator/paginator-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/paginator/paginator.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/profiler/profiler-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/profiler/profiler-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/profiler/profiler.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/profilerviewer/assets/profilerviewer-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/profilerviewer/assets/skins/sam/profilerviewer-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/profilerviewer/assets/skins/sam/profilerviewer.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/profilerviewer/profilerviewer-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/profilerviewer/profilerviewer-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/profilerviewer/profilerviewer.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/progressbar/assets/progressbar-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/progressbar/assets/skins/sam/progressbar-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/progressbar/assets/skins/sam/progressbar.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/progressbar/progressbar-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/progressbar/progressbar-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/progressbar/progressbar.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/reset/reset-min.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/reset/reset.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/reset-fonts/reset-fonts.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/reset-fonts-grids/reset-fonts-grids.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/resize/assets/resize-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/resize/assets/skins/sam/resize-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/resize/assets/skins/sam/resize.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/resize/resize-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/resize/resize-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/resize/resize.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/selector/selector-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/selector/selector-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/selector/selector.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/assets/skins/sam/slider-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/assets/skins/sam/slider.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/assets/slider-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/assets/slider-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/slider-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/slider-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/slider/slider.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/storage/storage-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/storage/storage-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/storage/storage.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/stylesheet/stylesheet-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/stylesheet/stylesheet-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/stylesheet/stylesheet.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swf/swf-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swf/swf-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swf/swf.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfdetect/swfdetect-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfdetect/swfdetect-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfdetect/swfdetect.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfstore/swfstore-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfstore/swfstore-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfstore/swfstore.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfstore/swfstore.swf
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/assets/border_tabs.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/assets/skin-sam.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/assets/skins/sam/tabview.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/assets/tabview-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/assets/tabview.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/tabview-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/tabview-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/tabview/tabview.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/treeview/assets/skins/sam/treeview-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/treeview/assets/skins/sam/treeview.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/treeview/assets/treeview-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/treeview/treeview-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/treeview/treeview-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/treeview/treeview.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/uploader/assets/uploader.swf
branches/Version-1_0-branch/phpgwapi/js/yahoo/uploader/uploader-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/uploader/uploader-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/uploader/uploader.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/utilities/utilities.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yahoo/yahoo-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yahoo/yahoo-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yahoo/yahoo.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yahoo-dom-event/yahoo-dom-event.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuiloader/yuiloader-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuiloader/yuiloader-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuiloader/yuiloader.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuiloader-dom-event/yuiloader-dom-event.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/assets/skins/sam/yuitest-skin.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/assets/skins/sam/yuitest.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/assets/testlogger.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/assets/yuitest-core.css
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/yuitest-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/yuitest-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/yuitest.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/yuitest_core-debug.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/yuitest_core-min.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/yuitest/yuitest_core.js
Added Paths:
-----------
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.contact_person.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.group.inc.php
Removed Paths:
-------------
branches/Version-1_0-branch/phpgwapi/js/yahoo/examples/treeview/assets/js/json.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/swfstore/swf.js
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,5 +1,8 @@
<?php
phpgw::import_class('activitycalendar.socommon');
+phpgw::import_class('activitycalendar.soorganization');
+phpgw::import_class('activitycalendar.sogroup');
+//phpgw::import_class('activitycalendar.socontactperson');
include_class('activitycalendar', 'activity', 'inc/model/');
@@ -93,6 +96,11 @@
}
$filter_clauses = array();
+
+ if(isset($filters[$this->get_id_field_name()])){
+ $id =
$this->marshal($filters[$this->get_id_field_name()],'int');
+ $filter_clauses[] = "activity.id = {$id}";
+ }
/*
// All parties with contracts of type X
if(isset($filters['party_type']))
@@ -127,6 +135,8 @@
$columns[] = 'activity.arena';
$columns[] = 'activity.date_start';
$columns[] = 'activity.date_end';
+ $columns[] = 'activity.create_date';
+ $columns[] = 'activity.last_change_date';
$columns[] = 'activity.contact_person_1';
$columns[] = 'activity.contact_person_2';
@@ -138,7 +148,7 @@
//$join_contracts = " {$this->left_join}
rental_contract_party c_p ON (c_p.party_id = party.id)
//{$this->left_join} rental_contract contract ON (contract.id =
c_p.contract_id)";
- //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}");
+ var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}");
return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
}
@@ -153,7 +163,8 @@
function add(&$activity)
{
// Insert a new activity
- $q ="INSERT INTO activity_activity (organization_id) VALUES
(1)";
+ $ts_now = strtotime('now');
+ $q ="INSERT INTO activity_activity (organization_id,
create_date) VALUES (1, $ts_now)";
$result = $this->db->query($q);
if(isset($result)) {
@@ -177,19 +188,21 @@
function update($activity)
{
$id = intval($activity->get_id());
+ $ts_now = strtotime('now');
$values = array(
- 'organization_id = '.
$this->marshal($activity->get_organization_id(), 'string'),
- 'group_id = ' .
$this->marshal($activity->get_group_id(), 'string'),
- 'district = ' .
$this->marshal($activity->get_district(), 'string'),
- 'category = ' .
$this->marshal($activity->get_category(), 'string'),
- 'target = ' . $this->marshal($activity->get_target(),
'string'),
+ 'organization_id = '.
$this->marshal($activity->get_organization_id(), 'int'),
+ 'group_id = ' .
$this->marshal($activity->get_group_id(), 'int'),
+ 'district = ' .
$this->marshal($activity->get_district(), 'int'),
+ 'category = ' .
$this->marshal($activity->get_category(), 'int'),
+ //'target = ' .
$this->marshal($activity->get_target(), 'string'),
'description = ' .
$this->marshal($activity->get_description(), 'string'),
- 'arena = ' .
$this->marshal($activity->get_arena(), 'string'),
- 'date_start = ' .
$this->marshal($activity->get_date_start(), 'string'),
- 'date_end = ' .
$this->marshal($activity->get_date_end(), 'string'),
- 'contact_person_1 = ' .
$this->marshal($activity->get_contact_person_1(), 'string'),
- 'contact_person_2 = ' .
$this->marshal($activity->get_contact_person_2(), 'string')
+ 'arena = ' .
$this->marshal($activity->get_arena(), 'int'),
+ 'date_start = ' .
$this->marshal($activity->get_date_start(), 'int'),
+ 'date_end = ' .
$this->marshal($activity->get_date_end(), 'int'),
+ 'last_change_date = ' . $this->marshal($ts_now,
'int'),
+ 'contact_person_1 = ' .
$this->marshal($activity->get_contact_person_1(), 'int'),
+ 'contact_person_2 = ' .
$this->marshal($activity->get_contact_person_2(), 'int')
);
$result = $this->db->query('UPDATE activity_activity SET ' .
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
@@ -223,8 +236,8 @@
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
$activity->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
-
$activity->set_district($this->unmarshal($this->db->f('district'), 'string'));
-
$activity->set_category($this->unmarshal($this->db->f('category'), 'string'));
+
$activity->set_district($this->unmarshal($this->db->f('district'), 'int'));
+
$activity->set_category($this->unmarshal($this->db->f('category'), 'int'));
$activity->set_description($this->unmarshal($this->db->f('description'),
'string'));
$activity->set_arena($this->unmarshal($this->db->f('arena'), 'string'));
$activity->set_date_start($this->unmarshal($this->db->f('date_start'), 'int'));
Modified: branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -161,6 +161,21 @@
return $arena;
}
+ function get_arena_name($arena_id)
+ {
+ $result = "Ingen";
+ if(isset($arena_id)){
+ $q1="SELECT arena_name FROM activity_arena WHERE
id={$arena_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('arena_name');
+ }
+ }
+
+ return $result;
+ }
+
+
/**
* Function for adding a new arena to the database. Updates the arena
object.
*
Copied:
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
(from rev 7238, trunk/activitycalendar/inc/class.socontactperson.inc.php)
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
(rev 0)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -0,0 +1,267 @@
+<?php
+phpgw::import_class('activitycalendar.socommon');
+
+include_class('activitycalendar', 'contact_person', 'inc/model/');
+
+class activitycalendar_socontactperson extends activitycalendar_socommon
+{
+ protected static $so;
+
+ /**
+ * Get a static reference to the storage object associated with this
model object
+ *
+ * @return rental_soparty the storage object
+ */
+ public static function get_instance()
+ {
+ if (self::$so == null) {
+ self::$so =
CreateObject('activitycalendar.socontactperson');
+ }
+ return self::$so;
+ }
+
+ /**
+ * Generate SQL query
+ *
+ * @todo Add support for filter "party_type", meaning what type of
contracts
+ * the party is involved in.
+ *
+ * @param string $sort_field
+ * @param boolean $ascending
+ * @param string $search_for
+ * @param string $search_type
+ * @param array $filters
+ * @param boolean $return_count
+ * @return string SQL
+ */
+ protected function get_query(string $sort_field, boolean $ascending,
string $search_for, string $search_type, array $filters, boolean $return_count)
+ {
+ $clauses = array('1=1');
+ $table = "";
+
+ //Add columns to this array to include them in the query
+ $columns = array();
+
+/* if($sort_field != null) {
+ $dir = $ascending ? 'ASC' : 'DESC';
+ $order = "ORDER BY id $dir";
+ }
+ */
+ if($search_for)
+ {
+ $query = $this->marshal($search_for,'string');
+ $like_pattern = "'%".$search_for."%'";
+ $like_clauses = array();
+ switch($search_type){
+ case "name":
+ $like_clauses[] = "party.first_name
$this->like $like_pattern";
+ $like_clauses[] = "party.last_name
$this->like $like_pattern";
+ $like_clauses[] = "party.company_name
$this->like $like_pattern";
+ break;
+ case "address":
+ $like_clauses[] = "party.address_1
$this->like $like_pattern";
+ $like_clauses[] = "party.address_2
$this->like $like_pattern";
+ $like_clauses[] = "party.postal_code
$this->like $like_pattern";
+ $like_clauses[] = "party.place
$this->like $like_pattern";
+ break;
+ case "identifier":
+ $like_clauses[] = "party.identifier
$this->like $like_pattern";
+ break;
+ case "reskontro":
+ $like_clauses[] = "party.reskontro
$this->like $like_pattern";
+ break;
+ case "result_unit_number":
+ $like_clauses[] =
"party.result_unit_number $this->like $like_pattern";
+ break;
+ case "all":
+ $like_clauses[] = "party.first_name
$this->like $like_pattern";
+ $like_clauses[] = "party.last_name
$this->like $like_pattern";
+ $like_clauses[] = "party.company_name
$this->like $like_pattern";
+ $like_clauses[] = "party.address_1
$this->like $like_pattern";
+ $like_clauses[] = "party.address_2
$this->like $like_pattern";
+ $like_clauses[] = "party.postal_code
$this->like $like_pattern";
+ $like_clauses[] = "party.place
$this->like $like_pattern";
+ $like_clauses[] = "party.identifier
$this->like $like_pattern";
+ $like_clauses[] = "party.comment
$this->like $like_pattern";
+ $like_clauses[] = "party.reskontro
$this->like $like_pattern";
+ break;
+ }
+
+
+ if(count($like_clauses))
+ {
+ $clauses[] = '(' . join(' OR ', $like_clauses)
. ')';
+ }
+ }
+
+ $filter_clauses = array();
+ $contact_person_id = $this->marshal($filters['id'],'int');
+ if(isset($filters['org_id']))
+ {
+ $org_id = $this->marshal($filters['org_id'],'int');
+ if(isset($org_id) && $org_id > 0)
+ {
+ $filter_clauses[] =
"organization_contact.organization_id = {$org_id}";
+ $filter_clauses[] = "organization_contact.id =
{$contact_person_id}";
+ $table = "bb_organization_contact
organization_contact";
+
+ }
+ }
+ else if(isset($filters['group_id']))
+ {
+ $group_id = $this->marshal($filters['group_id'],'int');
+ if(isset($group_id) && $group_id > 0)
+ {
+ $filter_clauses[] = "group_contact.group_id =
{$group_id}";
+ $filter_clauses[] = "group_contact.id =
{$contact_person_id}";
+ $table = "bb_group_contact group_contact";
+ }
+ }
+/*
+ // All parties with contracts of type X
+ if(isset($filters['party_type']))
+ {
+ $party_type =
$this->marshal($filters['party_type'],'int');
+ if(isset($party_type) && $party_type > 0)
+ {
+ $filter_clauses[] = "contract.location_id =
{$party_type}";
+ }
+ }
+*/
+
+ if(count($filter_clauses))
+ {
+ $clauses[] = join(' AND ', $filter_clauses);
+ }
+
+ $condition = join(' AND ', $clauses);
+
+ if($table == "bb_organization_contact")
+ {
+ if($return_count) // We should only return a count
+ {
+ $cols =
'COUNT(DISTINCT(organization_contact.id)) AS count';
+ }
+ else
+ {
+ $columns[] = 'organization_contact.id';
+ $columns[] = 'organization_contact.name';
+ $columns[] = 'organization_contact.ssn';
+ $columns[] = 'organization_contact.phone';
+ $columns[] = 'organization_contact.email';
+ $columns[] =
'organization_contact.organization_id';
+
+ $cols = implode(',',$columns);
+ }
+ }
+ else
+ {
+ if($return_count) // We should only return a count
+ {
+ $cols = 'COUNT(DISTINCT(group_contact.id)) AS
count';
+ }
+ else
+ {
+ $columns[] = 'group_contact.id';
+ $columns[] = 'group_contact.name';
+ $columns[] = 'group_contact.phone';
+ $columns[] = 'group_contact.email';
+ $columns[] = 'group_contact.group_id';
+
+ $cols = implode(',',$columns);
+ }
+ }
+
+ $tables = $table;
+
+ //$join_contracts = " {$this->left_join}
rental_contract_party c_p ON (c_p.party_id = party.id)
+ //{$this->left_join} rental_contract contract ON (contract.id =
c_p.contract_id)";
+
+ //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}");
+ return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
+ }
+
+
+ function get_group_contact_name($id)
+ {
+ $result = "Ingen";
+ if(isset($id)){
+ $q1="SELECT name FROM bb_group_contact WHERE id={$id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('name');
+ }
+ }
+ return $result;
+ }
+
+ function get_org_contact_name($id)
+ {
+ $result = "Ingen";
+ if(isset($id)){
+ $q1="SELECT name FROM bb_organization_contact WHERE id={$id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('name');
+ }
+ }
+ return $result;
+ }
+
+
+ /**
+ * Function for adding a new activity to the database. Updates the
activity object.
+ *
+ * @param activitycalendar_activity $activity the party to be added
+ * @return bool true if successful, false otherwise
+ */
+ function add(&$contact_person)
+ {
+ return false;
+ }
+
+ /**
+ * Update the database values for an existing activity object.
+ *
+ * @param $activity the activity to be updated
+ * @return boolean true if successful, false otherwise
+ */
+ function update($contact_person)
+ {
+ return false;
+ }
+
+ public function get_id_field_name($extended_info = false)
+ {
+ if(!$extended_info)
+ {
+ $ret = 'id';
+ }
+ else
+ {
+ $ret = array
+ (
+ 'table' => 'activity', // alias
+ 'field' => 'id',
+ 'translated' => 'id'
+ );
+ }
+ return $ret;
+ }
+
+ protected function populate(int $contact_person_id, &$contact_person)
+ {
+
+ if($contact_person == null) {
+ $contact_person = new
activitycalendar_contact_person((int) $contact_person_id);
+
+
$contact_person->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
+
$contact_person->set_group_id($this->unmarshal($this->db->f('group_id'),
'int'));
+
$contact_person->set_name($this->unmarshal($this->db->f('name'), 'string'));
+
$contact_person->set_phone($this->unmarshal($this->db->f('phone'), 'string'));
+
$contact_person->set_email($this->unmarshal($this->db->f('email'), 'string'));
+
$contact_person->set_ssn($this->unmarshal($this->db->f('ssn'), 'string'));
+ }
+ return $contact_person;
+ }
+}
\ No newline at end of file
Copied: branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
(from rev 7238, trunk/activitycalendar/inc/class.sogroup.inc.php)
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
(rev 0)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -0,0 +1,184 @@
+<?php
+
+phpgw::import_class('activitycalendar.socommon');
+
+include_class('activitycalendar', 'group', 'inc/model/');
+
+class activitycalendar_sogroup extends activitycalendar_socommon
+{
+ protected static $so;
+
+ /**
+ * Get a static reference to the storage object associated with this
model object
+ *
+ * @return rental_soparty the storage object
+ */
+ public static function get_instance()
+ {
+ if (self::$so == null) {
+ self::$so = CreateObject('activitycalendar.sogroup');
+ }
+ return self::$so;
+ }
+
+ /**
+ * Generate SQL query
+ *
+ * @todo Add support for filter "party_type", meaning what type of
contracts
+ * the party is involved in.
+ *
+ * @param string $sort_field
+ * @param boolean $ascending
+ * @param string $search_for
+ * @param string $search_type
+ * @param array $filters
+ * @param boolean $return_count
+ * @return string SQL
+ */
+ protected function get_query(string $sort_field, boolean $ascending,
string $search_for, string $search_type, array $filters, boolean $return_count)
+ {
+ $clauses = array('1=1');
+
+ //Add columns to this array to include them in the query
+ $columns = array();
+
+ if($sort_field != null) {
+ $dir = $ascending ? 'ASC' : 'DESC';
+ $order = "ORDER BY bb_group.id $dir";
+ }
+ if($search_for)
+ {
+ $query = $this->marshal($search_for,'string');
+ $like_pattern = "'%".$search_for."%'";
+ $like_clauses = array();
+ switch($search_type){
+ case "name":
+ $like_clauses[] = "group.name
$this->like $like_pattern";
+ $like_clauses[] = "group.shortname
$this->like $like_pattern";
+ break;
+ }
+
+
+ if(count($like_clauses))
+ {
+ $clauses[] = '(' . join(' OR ', $like_clauses)
. ')';
+ }
+ }
+
+ $filter_clauses = array();
+ $filter_clauses[] = "bb_group.show_in_portal=1";
+ if(isset($filters['org_id']))
+ {
+ $group_org_id =
$this->marshal($filters['org_id'],'int');
+ if(isset($group_org_id) && $group_org_id > 0)
+ {
+ $filter_clauses[] = "bb_group.organization_id =
{$group_org_id}";
+ }
+ }
+
+ if(count($filter_clauses))
+ {
+ $clauses[] = join(' AND ', $filter_clauses);
+ }
+
+ $condition = join(' AND ', $clauses);
+
+ if($return_count) // We should only return a count
+ {
+ $cols = 'COUNT(DISTINCT(bb_group.id)) AS count';
+ }
+ else
+ {
+ $columns[] = 'bb_group.id';
+ $columns[] = 'bb_group.name';
+ $columns[] = 'bb_group.description';
+ $columns[] = 'bb_group.organization_id';
+ $columns[] = 'bb_group.activity_id';
+ $columns[] = 'bb_group.active';
+ $columns[] = 'bb_group.shortname';
+ $columns[] = 'bb_group.show_in_portal';
+
+ $cols = implode(',',$columns);
+ }
+
+ $tables = "bb_group";
+
+ //$join_contracts = " {$this->left_join}
rental_contract_party c_p ON (c_p.party_id = party.id)
+ //{$this->left_join} rental_contract contract ON (contract.id =
c_p.contract_id)";
+
+ //var_dump("SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}");
+ return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
+ }
+
+
+
+ /**
+ * Function for adding a new party to the database. Updates the party
object.
+ *
+ * @param rental_party $party the party to be added
+ * @return bool true if successful, false otherwise
+ */
+ function add(&$group)
+ {
+ return false;
+ }
+
+ /**
+ * Update the database values for an existing party object.
+ *
+ * @param $party the party to be updated
+ * @return boolean true if successful, false otherwise
+ */
+ function update($group)
+ {
+ return false;
+ }
+
+ public function get_id_field_name($extended_info = false)
+ {
+ if(!$extended_info)
+ {
+ $ret = 'id';
+ }
+ else
+ {
+ $ret = array
+ (
+ 'table' => 'group', // alias
+ 'field' => 'id',
+ 'translated' => 'id'
+ );
+ }
+ return $ret;
+ }
+
+ function get_group_name($group_id)
+ {
+ $result = "Ingen";
+ if(isset($org_id)){
+ $q1="SELECT name FROM bb_group WHERE id={$group_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('name');
+ }
+ }
+
+ return $result;
+ }
+
+ protected function populate(int $group_id, &$group)
+ {
+
+ if($group == null) {
+ $group = new activitycalendar_group((int) $group_id);
+
+ $group->set_name($this->unmarshal($this->db->f('name'),
'string'));
+
$group->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
+
$group->set_shortname($this->unmarshal($this->db->f('shortname'), 'string'));
+
$group->set_description($this->unmarshal($this->db->f('description'),
'string'));
+
$group->set_show_in_portal($this->unmarshal($this->db->f('show_in_portal'),
'int'));
+ }
+ return $group;
+ }
+}
+?>
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -53,37 +53,15 @@
$like_clauses = array();
switch($search_type){
case "name":
- $like_clauses[] = "party.first_name
$this->like $like_pattern";
- $like_clauses[] = "party.last_name
$this->like $like_pattern";
- $like_clauses[] = "party.company_name
$this->like $like_pattern";
+ $like_clauses[] = "org.name $this->like
$like_pattern";
+ $like_clauses[] = "org.shortname
$this->like $like_pattern";
break;
- case "address":
- $like_clauses[] = "party.address_1
$this->like $like_pattern";
- $like_clauses[] = "party.address_2
$this->like $like_pattern";
- $like_clauses[] = "party.postal_code
$this->like $like_pattern";
- $like_clauses[] = "party.place
$this->like $like_pattern";
+ case "org_id":
+ $like_clauses[] =
"org.organization_number $this->like $like_pattern";
break;
- case "identifier":
- $like_clauses[] = "party.identifier
$this->like $like_pattern";
+ case "district":
+ $like_clauses[] = "org.district
$this->like $like_pattern";
break;
- case "reskontro":
- $like_clauses[] = "party.reskontro
$this->like $like_pattern";
- break;
- case "result_unit_number":
- $like_clauses[] =
"party.result_unit_number $this->like $like_pattern";
- break;
- case "all":
- $like_clauses[] = "party.first_name
$this->like $like_pattern";
- $like_clauses[] = "party.last_name
$this->like $like_pattern";
- $like_clauses[] = "party.company_name
$this->like $like_pattern";
- $like_clauses[] = "party.address_1
$this->like $like_pattern";
- $like_clauses[] = "party.address_2
$this->like $like_pattern";
- $like_clauses[] = "party.postal_code
$this->like $like_pattern";
- $like_clauses[] = "party.place
$this->like $like_pattern";
- $like_clauses[] = "party.identifier
$this->like $like_pattern";
- $like_clauses[] = "party.comment
$this->like $like_pattern";
- $like_clauses[] = "party.reskontro
$this->like $like_pattern";
- break;
}
@@ -95,6 +73,7 @@
$filter_clauses = array();
$filter_clauses[] = "show_in_portal=1";
+
/*
// All parties with contracts of type X
if(isset($filters['party_type']))
@@ -153,8 +132,20 @@
return "SELECT {$cols} FROM {$tables} WHERE {$condition}
{$order}";
}
+ function get_organization_name($org_id)
+ {
+ $result = "Ingen";
+ if(isset($org_id)){
+ $q1="SELECT name FROM bb_organization WHERE id={$org_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('name');
+ }
+ }
+
+ return $result;
+ }
-
/**
* Function for adding a new party to the database. Updates the party
object.
*
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -3,6 +3,7 @@
phpgw::import_class('activitycalendar.soactivity');
phpgw::import_class('activitycalendar.soarena');
phpgw::import_class('activitycalendar.soorganization');
+phpgw::import_class('activitycalendar.sogroup');
include_class('activitycalendar', 'activity', 'inc/model/');
@@ -21,7 +22,7 @@
public function __construct()
{
- parent::__construct();
+ //parent::__construct();
self::set_active_menu('activitycalendar::activities');
$config = CreateObject('phpgwapi.config','activitycalendar');
$config->read();
@@ -39,65 +40,6 @@
{
$this->render('activity_list.php');
}
- /*public function index()
- {
- if(phpgw::get_var('phpgw_return_as') == 'json') {
- return $this->index_json();
- }
- //$GLOBALS['phpgw_info']['apps']['manual']['section'] =
'booking_manual';
- //self::add_javascript('booking', 'booking',
'datatable.js');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('paginator');
- $data = array(
- 'datatable' => array(
- 'source' =>
self::link(array('menuaction' => 'booking.uidashboard.index', 'phpgw_return_as'
=> 'json')),
- 'field' => array(
- array(
- 'key' => 'id',
- 'label' => lang('ID'),
- 'formatter' =>
'YAHOO.booking.formatLink'
- ),
- array(
- 'key' => 'status',
- 'label' =>
lang('Status')
- ),
- array(
- 'key' => 'type',
- 'label' => lang('Type')
- ),
- array(
- 'key' => 'created',
- 'label' =>
lang('Created')
- ),
- array(
- 'key' => 'modified',
- 'label' => lang('Last
modified')
- ),
- array(
- 'key' => 'what',
- 'label' => lang('What')
- ),
- array(
- 'key' =>
'activity_name',
- 'label' =>
lang('Activity')
- ),
- array(
- 'key' => 'contact_name',
- 'label' =>
lang('Contact')
- ),
- array(
- 'key' =>
'case_officer_name',
- 'label' => lang('Case
Officer')
- ),
- array(
- 'key' => 'link',
- 'hidden' => true
- )
- )
- )
- );
- self::render_template('datatable', $data);
- }*/
/**
* Displays info about one single billing job.
@@ -127,12 +69,13 @@
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('edit');
// Get the contract part id
$activity_id = (int)phpgw::get_var('id');
+ //var_dump($activity_id);
// Retrieve the arena object or create a new one
if(isset($activity_id) && $activity_id > 0)
{
- $arena =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
+ $activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
}
else
{
@@ -141,15 +84,23 @@
$arenas = activitycalendar_soarena::get_instance()->get(null,
null, null, null, null, null, null);
$organizations =
activitycalendar_soorganization::get_instance()->get(null, null, null, null,
null, null, null);
+ $groups = activitycalendar_sogroup::get_instance()->get(null,
null, null, null, null, null, null);
if(isset($_POST['save_activity'])) // The user has pressed the
save button
{
if(isset($activity)) // If a arena object is created
{
// ... set all parameters
-
$activity->set_internal_arena_id(phpgw::get_var('internal_arena_id'));
-
$activity->set_arena_name(phpgw::get_var('arena_name'));
-
$activity->set_address(phpgw::get_var('address'));
+
$activity->set_organization_id(phpgw::get_var('organization_id'));
+
$activity->set_group_id(phpgw::get_var('group_id'));
+
$activity->set_arena(phpgw::get_var('arena_id'));
+
$activity->set_district(phpgw::get_var('district'));
+
$activity->set_category(phpgw::get_var('category'));
+
$activity->set_description(phpgw::get_var('description'));
+
$activity->set_date_start(phpgw::get_var('date_start_hidden'));
+
$activity->set_date_end(phpgw::get_var('date_end_hidden'));
+
$activity->set_contact_person_1(phpgw::get_var('contact_person_1'));
+
$activity->set_contact_person_2(phpgw::get_var('contact_person_2'));
if(activitycalendar_soactivity::get_instance()->store($activity)) // ... and
then try to store the object
{
@@ -166,6 +117,7 @@
(
'activity' => $activity,
'organizations' => $organizations,
+ 'groups' => $groups,
'arenas' => $arenas,
'editable' => true,
'message' => isset($message) ? $message :
phpgw::get_var('message'),
@@ -176,11 +128,6 @@
public function query()
{
- if(!$this->isExecutiveOfficer())
- {
- $this->render('permission_denied.php');
- return;
- }
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{
$user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
@@ -211,34 +158,21 @@
switch($query_type)
{
- case 'all_billings':
+ case 'all_activities':
$filters = array();
- if($sort_field == 'responsibility_title'){
- $sort_field = 'location_id';
- }
- $result_objects =
rental_sobilling::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
- $object_count =
rental_sobilling::get_instance()->get_count($search_for, $search_type,
$filters);
+ $result_objects =
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
+ $object_count =
activitycalendar_soactivity::get_instance()->get_count($search_for,
$search_type, $filters);
break;
- case 'invoices':
- if($sort_field == 'term_label'){
- $sort_field = 'term_id';
- }
- $filters = array('billing_id' =>
phpgw::get_var('billing_id'));
- $result_objects =
rental_soinvoice::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
- $object_count =
rental_soinvoice::get_instance()->get_count($search_for, $search_type,
$filters);
- break;
}
//Create an empty row set
$rows = array();
foreach($result_objects as $result) {
+ //var_dump($result);
if(isset($result))
{
- if($result->has_permission(PHPGW_ACL_READ))
- {
- // ... add a serialized result
- $rows[] = $result->serialize();
- }
+ // ... add a serialized result
+ $rows[] = $result->serialize();
}
}
@@ -281,61 +215,5 @@
break;
}
}
-
- public function download_export()
- {
- if(!$this->isExecutiveOfficer())
- {
- $this->render('permission_denied.php');
- return;
- }
- //$browser = CreateObject('phpgwapi.browser');
- //$browser->content_header('export.txt','text/plain');
-
- $stop = phpgw::get_var('date');
-
- $cs15 = phpgw::get_var('generate_cs15');
- if($cs15 == null){
- $export_format =
explode('_',phpgw::get_var('export_format'));
- $file_ending = $export_format[1];
- if($file_ending == 'gl07')
- {
- $type = 'intern';
- }
- else if($file_ending == 'lg04')
- {
- $type = 'faktura';
- }
- $date = date('Ymd', $stop);
- header('Content-type: text/plain');
- header("Content-Disposition: attachment;
filename=PE_{$type}_{$date}.{$file_ending}");
-
- $id = phpgw::get_var('id');
- $path = "/rental/billings/{$id}";
-
- $vfs = CreateObject('phpgwapi.vfs');
- $vfs->override_acl = 1;
-
- print $vfs->read
- (
- array
- (
- 'string' => $path,
- RELATIVE_NONE
- )
- );
-
- //print
rental_sobilling::get_instance()->get_export_data((int)phpgw::get_var('id'));
- }
- else{
- $file_ending = 'cs15';
- $type = 'kundefil';
- $date = date('Ymd', $stop);
- header('Content-type: text/plain');
- header("Content-Disposition: attachment;
filename=PE_{$type}_{$date}.{$file_ending}");
- print
rental_sobilling::get_instance()->generate_customer_export((int)phpgw::get_var('id'));
- }
- }
-
}
?>
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,8 +1,9 @@
<?php
phpgw::import_class('activitycalendar.uicommon');
phpgw::import_class('activitycalendar.soorganization');
+phpgw::import_class('activitycalendar.sogroup');
-//include_class('activitycalendar', 'organization', 'inc/model/');
+include_class('activitycalendar', 'organization', 'inc/model/');
class activitycalendar_uiorganization extends activitycalendar_uicommon
{
@@ -64,30 +65,15 @@
//Retrieve the type of query and perform type specific logic
$type = phpgw::get_var('type');
- /*$config =
CreateObject('phpgwapi.config','activitycalendar');
- $config->read();
switch($type)
{
- case 'included_parties': // ... get all parties
incolved in the contract
- $filters = array('contract_id' => $contract_id);
- break;
- case 'not_included_parties': // ... get all parties not
included in the contract
- $filters = array('not_contract_id' =>
$contract_id, 'party_type' => phpgw::get_var('party_type'));
- break;
- case 'sync_parties':
- case 'sync_parties_res_unit':
- case 'sync_parties_identifier':
case 'sync_parties_org_unit':
- $filters = array('sync' => $type, 'party_type'
=> phpgw::get_var('party_type'), 'active' => phpgw::get_var('active'));
- if($use_fellesdata)
- {
- $bofelles =
rental_bofellesdata::get_instance();
- }
+ //$filters = array('sync' => $type,
'party_type' => phpgw::get_var('party_type'), 'active' =>
phpgw::get_var('active'));
break;
default: // ... get all parties of a given type
//$filters = array('party_type' =>
phpgw::get_var('party_type'), 'active' => phpgw::get_var('active'));
break;
- }*/
+ }
$result_objects =
activitycalendar_soorganization::get_instance()->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
$result_count =
activitycalendar_soorganization::get_instance()->get_count($search_for,
$search_type, $filters);
@@ -98,7 +84,19 @@
foreach ($result_objects as $result) {
if(isset($result))
{
- $rows[] = $result->serialize();
+ $res = $result->serialize();
+ $org_id = $result->get_id();
+ //$rows[] = $result->serialize();
+ $rows[] = $res;
+ $filter_group = array('org_id' => $org_id);
+ $result_groups =
activitycalendar_sogroup::get_instance()->get(null, null, $sort_field,
$sort_ascending, $search_for, $search_type, $filter_group);
+ foreach ($result_groups as $result_group) {
+ if(isset($result_group))
+ {
+ $res_g =
$result_group->serialize();
+ $rows[] = $res_g;
+ }
+ }
}
}
// ... add result data
@@ -182,7 +180,13 @@
{
case 'all_organizations':
$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'booking.uiorganization.show', 'id' => $value['id'])));
+ if($value['organization_id'] != '' &&
$value['organization_id'] != null){
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'booking.uigroup.show',
'id' => $value['id'])));
+ }
+ else
+ {
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'booking.uiorganization.show', 'id' => $value['id'])));
+ }
$value['labels'][] = lang('show');
break;
}
Modified:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,5 +1,8 @@
<?php
-
+ phpgw::import_class('activitycalendar.soorganization');
+ phpgw::import_class('activitycalendar.sogroup');
+ phpgw::import_class('activitycalendar.soarena');
+ phpgw::import_class('activitycalendar.socontactperson');
include_class('activitycalendar', 'model', 'inc/model/');
class activitycalendar_activity extends activitycalendar_model
@@ -15,6 +18,8 @@
protected $arena;
protected $date_start;
protected $date_end;
+ protected $create_date;
+ protected $last_change_date;
protected $contact_person_1;
protected $contact_person_2;
@@ -71,6 +76,13 @@
public function get_description() { return $this->description; }
+ public function set_state($state)
+ {
+ $this->state = $state;
+ }
+
+ public function get_state() { return $this->state; }
+
public function set_arena($arena)
{
$this->arena = $arena;
@@ -92,6 +104,20 @@
public function get_date_end() { return $this->date_end; }
+ public function set_create_date($create_date)
+ {
+ $this->create_date = $create_date;
+ }
+
+ public function get_create_date() { return $this->create_date; }
+
+ public function get_last_change_date() { return
$this->last_change_date; }
+
+ public function set_last_change_date($last_change_date)
+ {
+ $this->last_change_date = $last_change_date;
+ }
+
public function set_contact_person_1($contact_person_1)
{
$this->contact_person_1 = $contact_person_1;
@@ -114,7 +140,7 @@
public static function get_so()
{
if (self::$so == null) {
- self::$so = CreateObject('rental.socontract');
+ self::$so =
CreateObject('activitycalendar.soactivity');
}
return self::$so;
@@ -122,18 +148,34 @@
public function serialize()
{
+ /*if(isset($this->organization_id) &&
$this->get_organization_id() > 0)
+ {
+ $contact_1 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_1());
+ $contact_2 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_2());
+ }
+ else if(isset($this->group_id) && $this->get_group_id()
> 0)
+ {
+ $contact_1 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
+ $contact_2 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
+ }
+ else
+ {*/
+ $contact_1 = "";
+ $contact_2 = "";
+ //}
return array(
'id' => $this->get_id(),
- 'organization_id' =>
$this->get_organization_id(),
- 'group_id' => $this->get_group_id(),
+ 'organization_id' =>
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id()),
+ 'group_id' =>
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id()),
'district' => $this->get_district(),
'category' => $this->get_category(),
'description' => $this->get_description(),
- 'arena' => $this->get_arena(),
+ 'state' => $this->get_state(),
+ 'arena' =>
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena()),
'date_start' => $this->get_date_start(),
'date_end' => $this->get_date_end(),
- 'contact_person_1' =>
$this->get_contact_person_1(),
- 'contact_person_2' =>
$this->get_contact_person_2()
+ 'contact_person_1' => $contact_1,
+ 'contact_person_2' => $contact_2
);
}
}
Copied:
branches/Version-1_0-branch/activitycalendar/inc/model/class.contact_person.inc.php
(from rev 7238, trunk/activitycalendar/inc/model/class.contact_person.inc.php)
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.contact_person.inc.php
(rev 0)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.contact_person.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -0,0 +1,121 @@
+<?php
+
+ include_class('activitycalendar', 'model', 'inc/model/');
+
+ class activitycalendar_contact_person extends activitycalendar_model
+ {
+ public static $so;
+
+ protected $id;
+ protected $name;
+ protected $ssn;
+ protected $phone;
+ protected $email;
+ protected $organization_id;
+ protected $group_id;
+
+ /**
+ * Constructor. Takes an optional ID. If a contract is
created from outside
+ * the database the ID should be empty so the database can add
one according to its logic.
+ *
+ * @param int $id the id of this composite
+ */
+ public function __construct(int $id = null)
+ {
+ $this->id = (int)$id;
+ }
+
+ public function set_id($id)
+ {
+ $this->id = $id;
+ }
+
+ public function get_id() { return $this->id; }
+
+ public function set_name($name){
+ $this->name = $name;
+ }
+
+ public function get_name(){
+ return $this->name;
+ }
+
+ public function set_ssn($ssn)
+ {
+ $this->ssn = $ssn;
+ }
+
+ public function get_ssn()
+ {
+ return $this->ssn;
+ }
+
+ public function set_phone($phone)
+ {
+ $this->phone = $phone;
+ }
+
+ public function get_phone()
+ {
+ return $this->phone;
+ }
+
+ public function set_email($email)
+ {
+ $this->email = $email;
+ }
+
+ public function get_email()
+ {
+ return $this->email;
+ }
+
+ public function set_organization_id($organization_id)
+ {
+ $this->organization_id = $organization_id;
+ }
+
+ public function get_organization_id()
+ {
+ return $this->organization_id;
+ }
+
+ public function set_group_id($group_id)
+ {
+ $this->group_id = $group_id;
+ }
+
+ public function get_group_id()
+ {
+ return $this->group_id;
+ }
+
+ /**
+ * Get a static reference to the storage object associated with
this model object
+ *
+ * @return the storage object
+ */
+ public static function get_so()
+ {
+ if (self::$so == null) {
+ self::$so = CreateObject('rental.socontract');
+ }
+
+ return self::$so;
+ }
+
+ public function serialize()
+ {
+ return array(
+ 'id' => $this->get_id(),
+ 'name' => $this->get_name(),
+ 'ssn' => $this->get_ssn(),
+ 'phone' => $this->get_phone(),
+ 'email' => $this->get_email(),
+ 'organization_id' =>
$this->get_organization_id(),
+ 'group_id' => $this->get_group_id()
+ );
+ }
+ }
+
+?>
\ No newline at end of file
Copied:
branches/Version-1_0-branch/activitycalendar/inc/model/class.group.inc.php
(from rev 7238, trunk/activitycalendar/inc/model/class.group.inc.php)
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/model/class.group.inc.php
(rev 0)
+++ branches/Version-1_0-branch/activitycalendar/inc/model/class.group.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -0,0 +1,81 @@
+<?php
+ include_class('activitycalendar', 'model', 'inc/model/');
+
+ class activitycalendar_group extends activitycalendar_model
+ {
+ public static $so;
+
+ protected $id;
+ protected $name;
+ protected $description;
+ protected $organization_id;
+ protected $show_in_portal;
+ protected $shortname;
+
+ /**
+ * Constructor. Takes an optional ID. If a organization is
created from outside
+ * the database the ID should be empty so the database can add
one according to its logic.
+ *
+ * @param int $id the id of this organization
+ */
+ public function __construct(int $id = null)
+ {
+ $this->id = (int)$id;
+ }
+
+ public function set_id($id)
+ {
+ $this->id = $id;
+ }
+
+ public function get_id() { return $this->id; }
+
+ public function set_name($name)
+ {
+ $this->name = $name;
+ }
+
+ public function get_name() { return $this->name; }
+
+ public function set_description($description)
+ {
+ $this->description = $description;
+ }
+
+ public function get_description() { return $this->description; }
+
+ public function set_organization_id($organization_id)
+ {
+ $this->organization_id = $organization_id;
+ }
+
+ public function get_organization_id() { return
$this->organization_id; }
+
+ public function set_show_in_portal($show_in_portal)
+ {
+ $this->show_in_portal = $show_in_portal;
+ }
+
+ public function get_show_in_portal() { return
$this->show_in_portal; }
+
+ public function set_shortname($shortname)
+ {
+ $this->shortname = $shortname;
+ }
+
+ public function get_shortname() { return $this->shortname; }
+
+ public function serialize()
+ {
+ return array(
+ 'id' => $this->get_id(),
+ 'name' => $this->get_name(),
+ 'organization_id' =>
$this->get_organization_id(),
+ 'shortname' => $this->get_shortname(),
+ 'description' => $this->get_description(),
+ 'show_in_portal' => $this->get_show_in_portal()
+ );
+ }
+
+ }
+?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-04-30 18:13:44 UTC (rev 7239)
@@ -324,3 +324,33 @@
Agegroups kan not be larger than 9999 peoples activitycalendar no
Estimert antall deltakere kan ikke være større en 9999 personer
Contact information name is to long. max 50 characters activitycalendar
no Navn i kontakt informasjon er for langt. Maks 50 tegn
Unable to fill report activitycalendar no Greide ikke å fylle ut
rapport
+arena activitycalendar no Arena
+description activitycalendar no Beskrivelse
+date_start activitycalendar no Startdato
+date_end activitycalendar no Sluttdato
+contact_person_1 activitycalendar no Kontaktperson 1
+contact_person_2 activitycalendar no Kontaktperson 2
+Activities activitycalendar no Aktiviteter
+activities activitycalendar no Aktiviteter
+Arena activitycalendar no Arena
+arenas activitycalendar no Arena
+OrganizationList activitycalendar no Organisasjoner/Grupper
+f_new_activity activitycalendar no Ny aktivitet
+f_new_arena activitycalendar no Ny arena
+search_for activitycalendar no Søk etter
+activity_type activitycalendar no Aktivitetstype
+all activitycalendar no Alle
+not_internal activitycalendar no Ikke intern
+organization_id activitycalendar no Organisasjon ID
+arena_type activitycalendar no Arenatype
+internal_arena_id activitycalendar no Intern arena ID
+reset activitycalendar no Nullstill
+organization_number activitycalendar no Organisasjonsnummer
+elements_pr_page activitycalendar no elementer per side
+shows_from activitycalendar no Viser fra
+of_total activitycalendar no av totalt
+DATATABLE_MSG_EMPTY activitycalendar no Ingen elementer
+export_to activitycalendar no Eksporter til
+activity_state activitycalendar no Status
+processed activitycalendar no Behandlet
+show activitycalendar no Vis
\ No newline at end of file
Modified: branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -22,12 +22,12 @@
/* Dependencies for this app to work */
$setup_info['activitycalendar']['depends'][] = array(
'appname' => 'phpgwapi',
- 'versions' => array('0.9.17', '0.9.18')
+ 'versions' => array('0.9.17', '0.9.18','0.9.19')
);
$setup_info['activitycalendar']['depends'][] = array(
'appname' => 'booking',
- 'versions' => array('0.2.05')
+ 'versions' => array('0.2.05','0.2.06','0.2.07')
);
$setup_info['activitycalendar']['depends'][] = array(
Modified:
branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/setup/tables_current.inc.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -8,10 +8,13 @@
'district' => array('type' =>
'varchar','precision' => '255'),
'category' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'target' => array('type' => 'int', 'precision'
=> 4, 'nullable' => True),
+ 'state' => array('type' => 'int', 'precision'
=> 4, 'nullable' => True),
'description' => array('type' =>
'varchar','precision' => '255'),
'arena' => array('type' => 'int', 'precision'
=> 4, 'nullable' => True),
'date_start' => array('type' => 'int',
'precision' => 4, 'precision' => '8', 'nullable' => true),
'date_end' => array('type' => 'int',
'precision' => 4, 'precision' => '8', 'nullable' => true),
+ 'create_date' => array('type' => 'int',
'precision' => 4, 'precision' => '8', 'nullable' => false),
+ 'last_change_date' => array('type' => 'int',
'precision' => 4, 'precision' => '8', 'nullable' => true),
'contact_person_1' => array('type' =>
'varchar','precision' => '255'),
'contact_person_2' => array('type' =>
'varchar','precision' => '255')
),
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -21,7 +21,7 @@
{
?>
<select name="organization_id">
- <option>Ingen
organisasjon valgt</option>
+ <option value="">Ingen
organisasjon valgt</option>
<?php
foreach($organizations
as $organization)
{
@@ -51,7 +51,7 @@
{
?>
<select name="group_id">
- <option>Ingen gruppe
valgt</option>
+ <option value="0">Ingen
gruppe valgt</option>
<?php
foreach($groups as
$group)
{
@@ -81,7 +81,7 @@
{
?>
<select name="arena_id">
- <option>Ingen arena
valgt</option>
+ <option value="0">Ingen
arena valgt</option>
<?php
foreach($arenas as
$arena)
{
@@ -116,6 +116,117 @@
}
?>
</dd>
+ <dt>
+ <?php if($activity->get_category() ||
$editable) { ?>
+ <label for="category"><?php echo
lang('category') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <input type="text"
name="category" id="category" value="<?php echo $activity->get_category() ?>" />
+ <?php
+ }
+ else
+ {
+ echo $activity->get_category();
+ }
+ ?>
+ </dd>
+ <dt>
+ <?php if($activity->get_description()
|| $editable) { ?>
+ <label for="description"><?php echo
lang('description') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <input type="text"
name="description" id="description" value="<?php echo
$activity->get_description() ?>" />
+ <?php
+ }
+ else
+ {
+ echo
$activity->get_description();
+ }
+ ?>
+ </dd>
+ <dt>
+ <?php if($activity->get_date_start() ||
$editable) { ?>
+ <label for="start_date"><?php echo
lang('date_start') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ $start_date =
$activity->get_date_start() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$activity->get_date_start()) : '-';
+ $start_date_yui =
$activity->get_date_start() ? date('Y-m-d', $activity->get_date_start()) : '';
+ $start_date_cal =
$GLOBALS['phpgw']->yuical->add_listener('start_date', $start_date);?>
+ <?php if ($editable) {
+ echo
$GLOBALS['phpgw']->yuical->add_listener('start_date', $start_date);
+ } else {
+ echo $start_date;
+ }
+ ?>
+ </dd>
+ <dt>
+ <?php if($activity->get_date_end() ||
$editable) { ?>
+ <label for="end_date"><?php echo
lang('date_end') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ $end_date =
$activity->get_date_end() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$activity->get_date_end()) : '-';
+ $end_date_yui =
$activity->get_date_end() ? date('Y-m-d', $activity->get_date_end()) : '';
+ $end_date_cal =
$GLOBALS['phpgw']->yuical->add_listener('end_date', $end_date);
+ ?>
+ <?php if ($editable) {
+ echo
$GLOBALS['phpgw']->yuical->add_listener('end_date', $end_date);
+ } else {
+ echo $end_date;
+ }?>
+ <br/>
+ </dd>
+ <dt>
+ <?php
if($activity->get_contact_person_1() || $editable) { ?>
+ <label for="contact_person_1"><?php
echo lang('contact_person_1') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <input type="text"
name="contact_person_1" id="contact_person_1" value="<?php echo
$activity->get_contact_person_1() ?>" />
+ <?php
+ }
+ else
+ {
+ echo
$activity->get_contact_person_1();
+ }
+ ?>
+ </dd>
+ <dt>
+ <?php
if($activity->get_contact_person_2() || $editable) { ?>
+ <label for="contact_person_2"><?php
echo lang('contact_person_2') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <input type="text"
name="contact_person_2" id="contact_person_2" value="<?php echo
$activity->get_contact_person_2() ?>" />
+ <?php
+ }
+ else
+ {
+ echo
$activity->get_contact_person_2();
+ }
+ ?>
+ </dd>
</dl>
<div class="form-buttons">
<?php
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -23,126 +23,19 @@
<?php
- $list_form = true;
+ $list_form = true;
$list_id = 'all_activities';
$url_add_on = '&type=all_activities';
include('activity_list_partial.php');
?>
-
+<!--
<hr/>
-<hr/>
-<table>
- <tr>
-
<th>Navn</th><th>bydel</th><th>kategori</th><th>målgruppe</th><th>arena</th><th>kontor</th><th>epost</th><th>dato
oppdatert</th>
- </tr>
- <tr>
- <td>test</td><td>Fana</td><td>idrett</td><td>alle</td><td>Fana
bydelshus</td><td>Fana</td><td>address@hidden</td><td>2011-03-24</td>
- </tr>
-</table>
-<hr/>
-
-<div class="toolbar-container"><div class="toolbar"><form method="POST"
action="/pe/index.php?menuaction=property.uilocation.index&type_id=1&district_id=&part_of_town_id=&cat_id=&click_history=ed9d0b13fdf51556bfabd136e6d73aee">
<div style="float:left" class="field"><input id="btn_cat_id" type="button"
name="cat_id" value="Kategori" class="button" tabindex="1"></div>
<div style="float:left" class="field"><input id="btn_district_id"
type="button" name="district_id" value="Område" class="button"
tabindex="2"></div>
<div style="float:left" class="field"><input id="btn_part_of_town_id"
type="button" name="part_of_town_id" value="Bydel" class="button"
tabindex="3"></div>
<div style="float:left" class="field"><input id="btn_owner_id" type="button"
name="owner_id" value="Filter" class="button" tabindex="4"></div>
-<div style="float:right" class="field"><a id="btn_columns" href="#"
onclick="Javascript:window.open('/pe/index.php?menuaction=property.uilocation.columns&type_id=1&click_history=ed9d0b13fdf51556bfabd136e6d73aee','','width=300,height=600,scrollbars=1')"
tabindex="9">kolonner</a></div>
-<div style="float:right" class="field"><input id="btn_export" type="button"
name="" value="Last ned" class="button" tabindex="8"></div>
-<div style="float:right" class="field"><input id="type_id" type="hidden"
name="" value="1" class="hidden"></div>
-<div style="float:right" class="field"><input id="btn_search" type="button"
name="search" value="Søk" class="button" tabindex="6"></div>
-<div style="float:right" class="field"><input id="txt_query" type="text"
name="query" value="" class="text" size="28" tabindex="5" onkeypress="return
pulsar(event)"></div>
-<div style="float:right" class="field"><input id="btn_new" type="button"
name="" value="Legg til" class="button" tabindex="7"></div>
-</form></div></div><script type="text/javascript">
- function Exchange_values(data)
- {
-
- }
- </script><br><div id="message"></div><div
id="paging"></div><div class="datatable-container"></div><div
id="datatable-detail"
style="background-color:#000000;color:#FFFFFF;display:none">
-<div class="hd" style="background-color:#000000;color:#000000; border:0;
text-align:center"> Record Detail </div>
-<div class="bd" style="text-align:center;"></div>
-</div><div id="footer"></div>
<script type="text/javascript">
- var allow_allrows = "1";
-
- var property_js = "/pe/property/js/yahoo/property.js";
-
- var base_java_url =
"{menuaction:'property.uilocation.index',type_id:'1',query:'',district_id:
'',part_of_town_id:'',lookup:'',second_display:1,lookup_tenant:'',lookup_name:'',cat_id:'',status:'',location_code:'',block_query:''}";
-
-
- var json_data =
{"recordsReturned":"10","totalRecords":626,"startIndex":0,"sort":"loc1","dir":"asc","records":[],"integrationurl":"","hidden":{"dependent":[{"id":"","value":"#!no
part of address@hidden address@hidden address@hidden address@hidden
address@hidden address@hidden address@hidden address@hidden@6#YTREBYGDA
BYDEL@"}]},"rights":[{"my_name":"view","text":"Kontrakter","action":"\/pe\/index.php?menuaction=rental.uicontract.index&search_type=location_id&contract_status=all&populate_form=yes&click_history=ed9d0b13fdf51556bfabd136e6d73aee","parameters":{"parameter":[{"name":"search_for","source":"location_code"}]}},{"my_name":"view","text":"Vis","action":"\/pe\/index.php?menuaction=property.uilocation.view&click_history=ed9d0b13fdf51556bfabd136e6d73aee","parameters":{"parameter":[{"name":"location_code","source":"location_code"}]}},{"my_name":"view","text":"\u00c5pne
visning i nytt
vindu","action":"\/pe\/index.php?menuaction=property.uilocation.view&target=_blank&click_history=ed9d0b13fdf51556bfabd136e6d73aee","parameters":{"parameter":[{"name":"location_code","source":"location_code"}]}}]};
-
-
- var myColumnDefs = [
-
- {
- key: "location_code",
- label: "dummy",
- resizeable:true,
- sortable: false,
- visible: false,
- format: "hidden",
- formatter: "",
- source: "",
- className: ""
- },
- {
- key: "loc1",
- label: "Eiendom",
- resizeable:true,
- sortable: true,
- visible: true,
- format: "number",
- formatter: "",
- source: "fm_location1.loc1",
- className: ""
- },
- {
- key: "loc1_name",
- label: "Eiendom Navn",
- resizeable:true,
- sortable: false,
- visible: true,
- format: "varchar",
- formatter: "",
- source: "",
- className: ""
- },
- {
- key: "adresse1",
- label: "Adresse1",
- resizeable:true,
- sortable: true,
- visible: true,
- format: "varchar",
- formatter: "",
- source: "adresse1",
- className: ""
- },
- {
- key: "postnummer",
- label: "Postnummer",
- resizeable:true,
- sortable: true,
- visible: true,
- format: "number",
- formatter: "",
- source: "postnummer",
- className: ""
- },
- {
- key: "poststed",
- label: "Poststed",
- resizeable:true,
- sortable: true,
- visible: true,
- format: "varchar",
- formatter: "",
- source: "poststed",
- className: ""
- }
- ];
-
var values_combo_box = [
{
@@ -164,4 +57,5 @@
];
- </script>
\ No newline at end of file
+ </script>
+-->
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2011-04-30 18:13:44 UTC (rev 7239)
@@ -17,21 +17,56 @@
sortable: true
},
{
- key: "arena_name",
- label: "<?php echo lang('name') ?>",
+ key: "organization_id",
+ label: "<?php echo lang('organization') ?>",
sortable: true
},
{
- key: "internal_arena_id",
- label: "<?php echo lang('internal_arena_id') ?>",
+ key: "group_id",
+ label: "<?php echo lang('group') ?>",
sortable: true
},
{
- key: "address",
- label: "<?php echo lang('address') ?>",
+ key: "district",
+ label: "<?php echo lang('district') ?>",
sortable: true
},
{
+ key: "category",
+ label: "<?php echo lang('category') ?>",
+ sortable: true
+ },
+ {
+ key: "description",
+ label: "<?php echo lang('description') ?>",
+ sortable: true
+ },
+ {
+ key: "arena",
+ label: "<?php echo lang('arena') ?>",
+ sortable: true
+ },
+ {
+ key: "date_start",
+ label: "<?php echo lang('date_start') ?>",
+ sortable: true
+ },
+ {
+ key: "date_end",
+ label: "<?php echo lang('date_end') ?>",
+ sortable: true
+ },
+ {
+ key: "contact_person_1",
+ label: "<?php echo lang('contact_person_1') ?>",
+ sortable: true
+ },
+ {
+ key: "contact_person_2",
+ label: "<?php echo lang('contact_person_2') ?>",
+ sortable: true
+ },
+ {
key: "actions",
hidden: true
},
@@ -117,6 +152,15 @@
<option value="1"><?php echo lang('internal')
?></option>
<option value="2" ><?php echo lang('not_internal')
?></option>
</select>
+ <label class="toolbar_element_label"
for="ctrl_toggle_activity_state"><?php echo lang('activity_state') ?></label>
+ <select name="activity_state" id="<?php echo $list_id
?>_ctrl_toggle_activity_state">
+ <option value="all"><?php echo lang('all') ?></option>
+ <option value="1"><?php echo lang('new') ?></option>
+ <option value="2" ><?php echo lang('change') ?></option>
+ <option value="3" ><?php echo lang('accepted')
?></option>
+ <option value="4" ><?php echo lang('processed')
?></option>
+ <option value="5" ><?php echo lang('rejected')
?></option>
+ </select>
</fieldset>
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-debug.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-debug.js
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-debug.js
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
(function() {
@@ -365,13 +365,15 @@
Y.AnimMgr.stop(this);
};
- var onStart = function() {
+ this._handleStart = function() {
this.onStart.fire();
this.runtimeAttributes = {};
for (var attr in this.attributes) {
+ if (this.attributes.hasOwnProperty(attr)) {
this.setRuntimeAttribute(attr);
}
+ }
isAnimated = true;
actualFrames = 0;
@@ -383,7 +385,7 @@
* @private
*/
- var onTween = function() {
+ this._handleTween = function() {
var data = {
duration: new Date() - this.getStartTime(),
currentFrame: this.currentFrame
@@ -401,13 +403,17 @@
var runtimeAttributes = this.runtimeAttributes;
for (var attr in runtimeAttributes) {
+ if (runtimeAttributes.hasOwnProperty(attr)) {
this.setAttribute(attr, this.doMethod(attr,
runtimeAttributes[attr].start, runtimeAttributes[attr].end),
runtimeAttributes[attr].unit);
}
+ }
+ this.afterTween.fire(data);
+
actualFrames += 1;
};
- var onComplete = function() {
+ this._handleComplete = function() {
var actual_duration = (new Date() - startTime) / 1000 ;
var data = {
@@ -450,6 +456,13 @@
this.onTween = new Y.CustomEvent('tween', this);
/**
+ * Custom event that fires between each frame
+ * Listen via subscribe method (e.g.
myAnim.afterTween.subscribe(someFunction)
+ * @event afterTween
+ */
+ this.afterTween = new Y.CustomEvent('afterTween', this);
+
+ /**
* Custom event that fires after onTween
* @private
*/
@@ -467,9 +480,9 @@
*/
this._onComplete = new Y.CustomEvent('_complete', this, true);
- this._onStart.subscribe(onStart);
- this._onTween.subscribe(onTween);
- this._onComplete.subscribe(onComplete);
+ this._onStart.subscribe(this._handleStart);
+ this._onTween.subscribe(this._handleTween);
+ this._onComplete.subscribe(this._handleComplete);
}
};
@@ -521,7 +534,7 @@
* @type Int
*
*/
- this.delay = 1;
+ this.delay = 20;
/**
* Adds an animation instance to the animation queue.
@@ -536,15 +549,18 @@
this.start();
};
- /**
- * removes an animation instance from the animation queue.
- * All animation instances must be registered in order to animate.
- * @method unRegister
- * @param {object} tween The Anim instance to be be registered
- * @param {Int} index The index of the Anim instance
- * @private
- */
- this.unRegister = function(tween, index) {
+ var _unregisterQueue = [];
+ var _unregistering = false;
+
+ var doUnregister = function() {
+ var next_args = _unregisterQueue.shift();
+ unRegister.apply(YAHOO.util.AnimMgr,next_args);
+ if (_unregisterQueue.length) {
+ arguments.callee();
+ }
+ };
+
+ var unRegister = function(tween, index) {
index = index || getIndex(tween);
if (!tween.isAnimated() || index === -1) {
return false;
@@ -562,6 +578,23 @@
};
/**
+ * removes an animation instance from the animation queue.
+ * All animation instances must be registered in order to animate.
+ * @method unRegister
+ * @param {object} tween The Anim instance to be be registered
+ * @param {Int} index The index of the Anim instance
+ * @private
+ */
+ this.unRegister = function() {
+ _unregisterQueue.push(arguments);
+ if (!_unregistering) {
+ _unregistering = true;
+ doUnregister();
+ _unregistering = false;
+ }
+ }
+
+ /**
* Starts the animation thread.
* Only one thread can run at a time.
* @method start
@@ -1393,4 +1426,4 @@
Y.Scroll = Scroll;
})();
-YAHOO.register("animation", YAHOO.util.Anim, {version: "2.8.2r1", build: "7"});
+YAHOO.register("animation", YAHOO.util.Anim, {version: "2.9.0", build:
"2800"});
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-min.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-min.js
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation-min.js
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,12 +1,12 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
-(function(){var B=YAHOO.util;var
A=function(D,C,E,F){if(!D){}this.init(D,C,E,F);};A.NAME="Anim";A.prototype={toString:function(){var
C=this.getEl()||{};var D=C.id||C.tagName;return(this.constructor.NAME+":
"+D);},patterns:{noNegatives:/width|height|opacity|padding/i,offsetAttribute:/^((width|height)|(top|left))$/,defaultUnit:/width|height|top$|bottom$|left$|right$/i,offsetUnit:/\d+(em|%|en|ex|pt|in|cm|mm|pc)$/i},doMethod:function(C,E,D){return
this.method(this.currentFrame,E,D-E,this.totalFrames);},setAttribute:function(C,F,E){var
D=this.getEl();if(this.patterns.noNegatives.test(C)){F=(F>0)?F:0;}if(C in
D&&!("style" in D&&C in
D.style)){D[C]=F;}else{B.Dom.setStyle(D,C,F+E);}},getAttribute:function(C){var
E=this.getEl();var
G=B.Dom.getStyle(E,C);if(G!=="auto"&&!this.patterns.offsetUnit.test(G)){return
parseFloat(G);}var D=this.patterns.offsetAttribute.exec(C)||[];var
H=!!(D[3]);var F=!!(D[2]);if("style" in
E){if(F||(B.Dom.getStyle(E,"position")=="absolute"&&H)){G=E["offset"+D[0].charAt(0).toUpperCase()+D[0].substr(1)];}else{G=0;}}else{if(C
in E){G=E[C];}}return
G;},getDefaultUnit:function(C){if(this.patterns.defaultUnit.test(C)){return"px";}return"";},setRuntimeAttribute:function(D){var
I;var E;var F=this.attributes;this.runtimeAttributes[D]={};var
H=function(J){return(typeof
J!=="undefined");};if(!H(F[D]["to"])&&!H(F[D]["by"])){return
false;}I=(H(F[D]["from"]))?F[D]["from"]:this.getAttribute(D);if(H(F[D]["to"])){E=F[D]["to"];}else{if(H(F[D]["by"])){if(I.constructor==Array){E=[];for(var
G=0,C=I.length;G<C;++G){E[G]=I[G]+F[D]["by"][G]*1;}}else{E=I+F[D]["by"]*1;}}}this.runtimeAttributes[D].start=I;this.runtimeAttributes[D].end=E;this.runtimeAttributes[D].unit=(H(F[D].unit))?F[D]["unit"]:this.getDefaultUnit(D);return
true;},init:function(E,J,I,C){var D=false;var F=null;var
H=0;E=B.Dom.get(E);this.attributes=J||{};this.duration=!YAHOO.lang.isUndefined(I)?I:1;this.method=C||B.Easing.easeNone;this.useSeconds=true;this.currentFrame=0;this.totalFrames=B.AnimMgr.fps;this.setEl=function(M){E=B.Dom.get(M);};this.getEl=function(){return
E;};this.isAnimated=function(){return D;};this.getStartTime=function(){return
F;};this.runtimeAttributes={};this.animate=function(){if(this.isAnimated()){return
false;}this.currentFrame=0;this.totalFrames=(this.useSeconds)?Math.ceil(B.AnimMgr.fps*this.duration):this.duration;if(this.duration===0&&this.useSeconds){this.totalFrames=1;}B.AnimMgr.registerElement(this);return
true;};this.stop=function(M){if(!this.isAnimated()){return
false;}if(M){this.currentFrame=this.totalFrames;this._onTween.fire();}B.AnimMgr.stop(this);};var
L=function(){this.onStart.fire();this.runtimeAttributes={};for(var M in
this.attributes){this.setRuntimeAttribute(M);}D=true;H=0;F=new Date();};var
K=function(){var O={duration:new
Date()-this.getStartTime(),currentFrame:this.currentFrame};O.toString=function(){return("duration:
"+O.duration+", currentFrame: "+O.currentFrame);};this.onTween.fire(O);var
N=this.runtimeAttributes;for(var M in
N){this.setAttribute(M,this.doMethod(M,N[M].start,N[M].end),N[M].unit);}H+=1;};var
G=function(){var M=(new Date()-F)/1000;var
N={duration:M,frames:H,fps:H/M};N.toString=function(){return("duration:
"+N.duration+", frames: "+N.frames+", fps:
"+N.fps);};D=false;H=0;this.onComplete.fire(N);};this._onStart=new
B.CustomEvent("_start",this,true);this.onStart=new
B.CustomEvent("start",this);this.onTween=new
B.CustomEvent("tween",this);this._onTween=new
B.CustomEvent("_tween",this,true);this.onComplete=new
B.CustomEvent("complete",this);this._onComplete=new
B.CustomEvent("_complete",this,true);this._onStart.subscribe(L);this._onTween.subscribe(K);this._onComplete.subscribe(G);}};B.Anim=A;})();YAHOO.util.AnimMgr=new
function(){var C=null;var B=[];var
A=0;this.fps=1000;this.delay=1;this.registerElement=function(F){B[B.length]=F;A+=1;F._onStart.fire();this.start();};this.unRegister=function(G,F){F=F||E(G);if(!G.isAnimated()||F===-1){return
false;}G._onComplete.fire();B.splice(F,1);A-=1;if(A<=0){this.stop();}return
true;};this.start=function(){if(C===null){C=setInterval(this.run,this.delay);}};this.stop=function(H){if(!H){clearInterval(C);for(var
G=0,F=B.length;G<F;++G){this.unRegister(B[0],0);}B=[];C=null;A=0;}else{this.unRegister(H);}};this.run=function(){for(var
H=0,F=B.length;H<F;++H){var
G=B[H];if(!G||!G.isAnimated()){continue;}if(G.currentFrame<G.totalFrames||G.totalFrames===null){G.currentFrame+=1;if(G.useSeconds){D(G);}G._onTween.fire();}else{YAHOO.util.AnimMgr.stop(G,H);}}};var
E=function(H){for(var G=0,F=B.length;G<F;++G){if(B[G]===H){return G;}}return
-1;};var D=function(G){var J=G.totalFrames;var I=G.currentFrame;var
H=(G.currentFrame*G.duration*1000/G.totalFrames);var F=(new
Date()-G.getStartTime());var
K=0;if(F<G.duration*1000){K=Math.round((F/H-1)*G.currentFrame);}else{K=J-(I+1);}if(K>0&&isFinite(K)){if(G.currentFrame+K>=J){K=J-(I+1);}G.currentFrame+=K;}};this._queue=B;this._getIndex=E;};YAHOO.util.Bezier=new
function(){this.getPosition=function(E,D){var F=E.length;var C=[];for(var
B=0;B<F;++B){C[B]=[E[B][0],E[B][1]];}for(var
A=1;A<F;++A){for(B=0;B<F-A;++B){C[B][0]=(1-D)*C[B][0]+D*C[parseInt(B+1,10)][0];C[B][1]=(1-D)*C[B][1]+D*C[parseInt(B+1,10)][1];}}return[C[0][0],C[0][1]];};};(function(){var
A=function(F,E,G,H){A.superclass.constructor.call(this,F,E,G,H);};A.NAME="ColorAnim";A.DEFAULT_BGCOLOR="#fff";var
C=YAHOO.util;YAHOO.extend(A,C.Anim);var D=A.superclass;var
B=A.prototype;B.patterns.color=/color$/i;B.patterns.rgb=/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i;B.patterns.hex=/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i;B.patterns.hex3=/^#?([0-9A-F]{1})([0-9A-F]{1})([0-9A-F]{1})$/i;B.patterns.transparent=/^transparent|rgba\(0,
0, 0, 0\)$/;B.parseColor=function(E){if(E.length==3){return E;}var
F=this.patterns.hex.exec(E);if(F&&F.length==4){return[parseInt(F[1],16),parseInt(F[2],16),parseInt(F[3],16)];}F=this.patterns.rgb.exec(E);if(F&&F.length==4){return[parseInt(F[1],10),parseInt(F[2],10),parseInt(F[3],10)];}F=this.patterns.hex3.exec(E);if(F&&F.length==4){return[parseInt(F[1]+F[1],16),parseInt(F[2]+F[2],16),parseInt(F[3]+F[3],16)];
-}return null;};B.getAttribute=function(E){var
G=this.getEl();if(this.patterns.color.test(E)){var
I=YAHOO.util.Dom.getStyle(G,E);var
H=this;if(this.patterns.transparent.test(I)){var
F=YAHOO.util.Dom.getAncestorBy(G,function(J){return
!H.patterns.transparent.test(I);});if(F){I=C.Dom.getStyle(F,E);}else{I=A.DEFAULT_BGCOLOR;}}}else{I=D.getAttribute.call(this,E);}return
I;};B.doMethod=function(F,J,G){var
I;if(this.patterns.color.test(F)){I=[];for(var
H=0,E=J.length;H<E;++H){I[H]=D.doMethod.call(this,F,J[H],G[H]);}I="rgb("+Math.floor(I[0])+","+Math.floor(I[1])+","+Math.floor(I[2])+")";}else{I=D.doMethod.call(this,F,J,G);}return
I;};B.setRuntimeAttribute=function(F){D.setRuntimeAttribute.call(this,F);if(this.patterns.color.test(F)){var
H=this.attributes;var J=this.parseColor(this.runtimeAttributes[F].start);var
G=this.parseColor(this.runtimeAttributes[F].end);if(typeof
H[F]["to"]==="undefined"&&typeof
H[F]["by"]!=="undefined"){G=this.parseColor(H[F].by);for(var
I=0,E=J.length;I<E;++I){G[I]=J[I]+G[I];}}this.runtimeAttributes[F].start=J;this.runtimeAttributes[F].end=G;}};C.ColorAnim=A;})();
-/*
+(function(){var b=YAHOO.util;var
a=function(d,c,e,f){if(!d){}this.init(d,c,e,f);};a.NAME="Anim";a.prototype={toString:function(){var
c=this.getEl()||{};var d=c.id||c.tagName;return(this.constructor.NAME+":
"+d);},patterns:{noNegatives:/width|height|opacity|padding/i,offsetAttribute:/^((width|height)|(top|left))$/,defaultUnit:/width|height|top$|bottom$|left$|right$/i,offsetUnit:/\d+(em|%|en|ex|pt|in|cm|mm|pc)$/i},doMethod:function(c,e,d){return
this.method(this.currentFrame,e,d-e,this.totalFrames);},setAttribute:function(c,f,e){var
d=this.getEl();if(this.patterns.noNegatives.test(c)){f=(f>0)?f:0;}if(c in
d&&!("style" in d&&c in
d.style)){d[c]=f;}else{b.Dom.setStyle(d,c,f+e);}},getAttribute:function(c){var
e=this.getEl();var
g=b.Dom.getStyle(e,c);if(g!=="auto"&&!this.patterns.offsetUnit.test(g)){return
parseFloat(g);}var d=this.patterns.offsetAttribute.exec(c)||[];var
h=!!(d[3]);var f=!!(d[2]);if("style" in
e){if(f||(b.Dom.getStyle(e,"position")=="absolute"&&h)){g=e["offset"+d[0].charAt(0).toUpperCase()+d[0].substr(1)];}else{g=0;}}else{if(c
in e){g=e[c];}}return
g;},getDefaultUnit:function(c){if(this.patterns.defaultUnit.test(c)){return"px";}return"";},setRuntimeAttribute:function(d){var
j;var e;var f=this.attributes;this.runtimeAttributes[d]={};var
h=function(i){return(typeof
i!=="undefined");};if(!h(f[d]["to"])&&!h(f[d]["by"])){return
false;}j=(h(f[d]["from"]))?f[d]["from"]:this.getAttribute(d);if(h(f[d]["to"])){e=f[d]["to"];}else{if(h(f[d]["by"])){if(j.constructor==Array){e=[];for(var
g=0,c=j.length;g<c;++g){e[g]=j[g]+f[d]["by"][g]*1;}}else{e=j+f[d]["by"]*1;}}}this.runtimeAttributes[d].start=j;this.runtimeAttributes[d].end=e;this.runtimeAttributes[d].unit=(h(f[d].unit))?f[d]["unit"]:this.getDefaultUnit(d);return
true;},init:function(f,c,h,i){var d=false;var e=null;var
g=0;f=b.Dom.get(f);this.attributes=c||{};this.duration=!YAHOO.lang.isUndefined(h)?h:1;this.method=i||b.Easing.easeNone;this.useSeconds=true;this.currentFrame=0;this.totalFrames=b.AnimMgr.fps;this.setEl=function(j){f=b.Dom.get(j);};this.getEl=function(){return
f;};this.isAnimated=function(){return d;};this.getStartTime=function(){return
e;};this.runtimeAttributes={};this.animate=function(){if(this.isAnimated()){return
false;}this.currentFrame=0;this.totalFrames=(this.useSeconds)?Math.ceil(b.AnimMgr.fps*this.duration):this.duration;if(this.duration===0&&this.useSeconds){this.totalFrames=1;}b.AnimMgr.registerElement(this);return
true;};this.stop=function(j){if(!this.isAnimated()){return
false;}if(j){this.currentFrame=this.totalFrames;this._onTween.fire();}b.AnimMgr.stop(this);};this._handleStart=function(){this.onStart.fire();this.runtimeAttributes={};for(var
j in
this.attributes){if(this.attributes.hasOwnProperty(j)){this.setRuntimeAttribute(j);}}d=true;g=0;e=new
Date();};this._handleTween=function(){var l={duration:new
Date()-this.getStartTime(),currentFrame:this.currentFrame};l.toString=function(){return("duration:
"+l.duration+", currentFrame: "+l.currentFrame);};this.onTween.fire(l);var
k=this.runtimeAttributes;for(var j in
k){if(k.hasOwnProperty(j)){this.setAttribute(j,this.doMethod(j,k[j].start,k[j].end),k[j].unit);}}this.afterTween.fire(l);g+=1;};this._handleComplete=function(){var
j=(new Date()-e)/1000;var
k={duration:j,frames:g,fps:g/j};k.toString=function(){return("duration:
"+k.duration+", frames: "+k.frames+", fps:
"+k.fps);};d=false;g=0;this.onComplete.fire(k);};this._onStart=new
b.CustomEvent("_start",this,true);this.onStart=new
b.CustomEvent("start",this);this.onTween=new
b.CustomEvent("tween",this);this.afterTween=new
b.CustomEvent("afterTween",this);this._onTween=new
b.CustomEvent("_tween",this,true);this.onComplete=new
b.CustomEvent("complete",this);this._onComplete=new
b.CustomEvent("_complete",this,true);this._onStart.subscribe(this._handleStart);this._onTween.subscribe(this._handleTween);this._onComplete.subscribe(this._handleComplete);}};b.Anim=a;})();YAHOO.util.AnimMgr=new
function(){var e=null;var c=[];var
g=0;this.fps=1000;this.delay=20;this.registerElement=function(j){c[c.length]=j;g+=1;j._onStart.fire();this.start();};var
f=[];var d=false;var h=function(){var
j=f.shift();b.apply(YAHOO.util.AnimMgr,j);if(f.length){arguments.callee();}};var
b=function(k,j){j=j||a(k);if(!k.isAnimated()||j===-1){return
false;}k._onComplete.fire();c.splice(j,1);g-=1;if(g<=0){this.stop();}return
true;};this.unRegister=function(){f.push(arguments);if(!d){d=true;h();d=false;}};this.start=function(){if(e===null){e=setInterval(this.run,this.delay);}};this.stop=function(l){if(!l){clearInterval(e);for(var
k=0,j=c.length;k<j;++k){this.unRegister(c[0],0);}c=[];e=null;g=0;}else{this.unRegister(l);}};this.run=function(){for(var
l=0,j=c.length;l<j;++l){var
k=c[l];if(!k||!k.isAnimated()){continue;}if(k.currentFrame<k.totalFrames||k.totalFrames===null){k.currentFrame+=1;if(k.useSeconds){i(k);}k._onTween.fire();}else{YAHOO.util.AnimMgr.stop(k,l);}}};var
a=function(l){for(var k=0,j=c.length;k<j;++k){if(c[k]===l){return k;}}return
-1;};var i=function(k){var n=k.totalFrames;var m=k.currentFrame;var
l=(k.currentFrame*k.duration*1000/k.totalFrames);var j=(new
Date()-k.getStartTime());var
o=0;if(j<k.duration*1000){o=Math.round((j/l-1)*k.currentFrame);}else{o=n-(m+1);}if(o>0&&isFinite(o)){if(k.currentFrame+o>=n){o=n-(m+1);}k.currentFrame+=o;}};this._queue=c;this._getIndex=a;};YAHOO.util.Bezier=new
function(){this.getPosition=function(e,d){var f=e.length;var c=[];for(var
b=0;b<f;++b){c[b]=[e[b][0],e[b][1]];}for(var
a=1;a<f;++a){for(b=0;b<f-a;++b){c[b][0]=(1-d)*c[b][0]+d*c[parseInt(b+1,10)][0];c[b][1]=(1-d)*c[b][1]+d*c[parseInt(b+1,10)][1];}}return[c[0][0],c[0][1]];};};(function(){var
a=function(f,e,g,h){a.superclass.constructor.call(this,f,e,g,h);};a.NAME="ColorAnim";a.DEFAULT_BGCOLOR="#fff";var
c=YAHOO.util;YAHOO.extend(a,c.Anim);var d=a.superclass;var
b=a.prototype;b.patterns.color=/color$/i;b.patterns.rgb=/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i;b.patterns.hex=/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i;b.patterns.hex3=/^#?([0-9A-F]{1})([0-9A-F]{1})([0-9A-F]{1})$/i;
+b.patterns.transparent=/^transparent|rgba\(0, 0, 0,
0\)$/;b.parseColor=function(e){if(e.length==3){return e;}var
f=this.patterns.hex.exec(e);if(f&&f.length==4){return[parseInt(f[1],16),parseInt(f[2],16),parseInt(f[3],16)];}f=this.patterns.rgb.exec(e);if(f&&f.length==4){return[parseInt(f[1],10),parseInt(f[2],10),parseInt(f[3],10)];}f=this.patterns.hex3.exec(e);if(f&&f.length==4){return[parseInt(f[1]+f[1],16),parseInt(f[2]+f[2],16),parseInt(f[3]+f[3],16)];}return
null;};b.getAttribute=function(e){var
g=this.getEl();if(this.patterns.color.test(e)){var
i=YAHOO.util.Dom.getStyle(g,e);var
h=this;if(this.patterns.transparent.test(i)){var
f=YAHOO.util.Dom.getAncestorBy(g,function(j){return
!h.patterns.transparent.test(i);});if(f){i=c.Dom.getStyle(f,e);}else{i=a.DEFAULT_BGCOLOR;}}}else{i=d.getAttribute.call(this,e);}return
i;};b.doMethod=function(f,k,g){var
j;if(this.patterns.color.test(f)){j=[];for(var
h=0,e=k.length;h<e;++h){j[h]=d.doMethod.call(this,f,k[h],g[h]);}j="rgb("+Math.floor(j[0])+","+Math.floor(j[1])+","+Math.floor(j[2])+")";}else{j=d.doMethod.call(this,f,k,g);}return
j;};b.setRuntimeAttribute=function(f){d.setRuntimeAttribute.call(this,f);if(this.patterns.color.test(f)){var
h=this.attributes;var k=this.parseColor(this.runtimeAttributes[f].start);var
g=this.parseColor(this.runtimeAttributes[f].end);if(typeof
h[f]["to"]==="undefined"&&typeof
h[f]["by"]!=="undefined"){g=this.parseColor(h[f].by);for(var
j=0,e=k.length;j<e;++j){g[j]=k[j]+g[j];}}this.runtimeAttributes[f].start=k;this.runtimeAttributes[f].end=g;}};c.ColorAnim=a;})();
+/*!
TERMS OF USE - EASING EQUATIONS
Open source under the BSD License.
Copyright 2001 Robert Penner All rights reserved.
@@ -19,5 +19,5 @@
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-YAHOO.util.Easing={easeNone:function(B,A,D,C){return
D*B/C+A;},easeIn:function(B,A,D,C){return
D*(B/=C)*B+A;},easeOut:function(B,A,D,C){return
-D*(B/=C)*(B-2)+A;},easeBoth:function(B,A,D,C){if((B/=C/2)<1){return
D/2*B*B+A;}return
-D/2*((--B)*(B-2)-1)+A;},easeInStrong:function(B,A,D,C){return
D*(B/=C)*B*B*B+A;},easeOutStrong:function(B,A,D,C){return
-D*((B=B/C-1)*B*B*B-1)+A;},easeBothStrong:function(B,A,D,C){if((B/=C/2)<1){return
D/2*B*B*B*B+A;}return
-D/2*((B-=2)*B*B*B-2)+A;},elasticIn:function(C,A,G,F,B,E){if(C==0){return
A;}if((C/=F)==1){return A+G;}if(!E){E=F*0.3;}if(!B||B<Math.abs(G)){B=G;var
D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}return
-(B*Math.pow(2,10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E))+A;},elasticOut:function(C,A,G,F,B,E){if(C==0){return
A;}if((C/=F)==1){return A+G;}if(!E){E=F*0.3;}if(!B||B<Math.abs(G)){B=G;var
D=E/4;}else{var D=E/(2*Math.PI)*Math.asin(G/B);}return
B*Math.pow(2,-10*C)*Math.sin((C*F-D)*(2*Math.PI)/E)+G+A;},elasticBoth:function(C,A,G,F,B,E){if(C==0){return
A;}if((C/=F/2)==2){return
A+G;}if(!E){E=F*(0.3*1.5);}if(!B||B<Math.abs(G)){B=G;var D=E/4;}else{var
D=E/(2*Math.PI)*Math.asin(G/B);}if(C<1){return
-0.5*(B*Math.pow(2,10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E))+A;}return
B*Math.pow(2,-10*(C-=1))*Math.sin((C*F-D)*(2*Math.PI)/E)*0.5+G+A;},backIn:function(B,A,E,D,C){if(typeof
C=="undefined"){C=1.70158;}return
E*(B/=D)*B*((C+1)*B-C)+A;},backOut:function(B,A,E,D,C){if(typeof
C=="undefined"){C=1.70158;}return
E*((B=B/D-1)*B*((C+1)*B+C)+1)+A;},backBoth:function(B,A,E,D,C){if(typeof
C=="undefined"){C=1.70158;}if((B/=D/2)<1){return
E/2*(B*B*(((C*=(1.525))+1)*B-C))+A;}return
E/2*((B-=2)*B*(((C*=(1.525))+1)*B+C)+2)+A;},bounceIn:function(B,A,D,C){return
D-YAHOO.util.Easing.bounceOut(C-B,0,D,C)+A;},bounceOut:function(B,A,D,C){if((B/=C)<(1/2.75)){return
D*(7.5625*B*B)+A;}else{if(B<(2/2.75)){return
D*(7.5625*(B-=(1.5/2.75))*B+0.75)+A;}else{if(B<(2.5/2.75)){return
D*(7.5625*(B-=(2.25/2.75))*B+0.9375)+A;}}}return
D*(7.5625*(B-=(2.625/2.75))*B+0.984375)+A;},bounceBoth:function(B,A,D,C){if(B<C/2){return
YAHOO.util.Easing.bounceIn(B*2,0,D,C)*0.5+A;}return
YAHOO.util.Easing.bounceOut(B*2-C,0,D,C)*0.5+D*0.5+A;}};(function(){var
A=function(H,G,I,J){if(H){A.superclass.constructor.call(this,H,G,I,J);}};A.NAME="Motion";var
E=YAHOO.util;YAHOO.extend(A,E.ColorAnim);var F=A.superclass;var
C=A.prototype;C.patterns.points=/^points$/i;C.setAttribute=function(G,I,H){if(this.patterns.points.test(G)){H=H||"px";F.setAttribute.call(this,"left",I[0],H);F.setAttribute.call(this,"top",I[1],H);}else{F.setAttribute.call(this,G,I,H);}};C.getAttribute=function(G){if(this.patterns.points.test(G)){var
H=[F.getAttribute.call(this,"left"),F.getAttribute.call(this,"top")];}else{H=F.getAttribute.call(this,G);}return
H;};C.doMethod=function(G,K,H){var J=null;if(this.patterns.points.test(G)){var
I=this.method(this.currentFrame,0,100,this.totalFrames)/100;J=E.Bezier.getPosition(this.runtimeAttributes[G],I);}else{J=F.doMethod.call(this,G,K,H);}return
J;};C.setRuntimeAttribute=function(P){if(this.patterns.points.test(P)){var
H=this.getEl();var J=this.attributes;var G;var L=J["points"]["control"]||[];var
I;var M,O;if(L.length>0&&!(L[0] instanceof Array)){L=[L];}else{var
K=[];for(M=0,O=L.length;M<O;++M){K[M]=L[M];}L=K;}if(E.Dom.getStyle(H,"position")=="static"){E.Dom.setStyle(H,"position","relative");}if(D(J["points"]["from"])){E.Dom.setXY(H,J["points"]["from"]);
-}else{E.Dom.setXY(H,E.Dom.getXY(H));}G=this.getAttribute("points");if(D(J["points"]["to"])){I=B.call(this,J["points"]["to"],G);var
N=E.Dom.getXY(this.getEl());for(M=0,O=L.length;M<O;++M){L[M]=B.call(this,L[M],G);}}else{if(D(J["points"]["by"])){I=[G[0]+J["points"]["by"][0],G[1]+J["points"]["by"][1]];for(M=0,O=L.length;M<O;++M){L[M]=[G[0]+L[M][0],G[1]+L[M][1]];}}}this.runtimeAttributes[P]=[G];if(L.length>0){this.runtimeAttributes[P]=this.runtimeAttributes[P].concat(L);}this.runtimeAttributes[P][this.runtimeAttributes[P].length]=I;}else{F.setRuntimeAttribute.call(this,P);}};var
B=function(G,I){var
H=E.Dom.getXY(this.getEl());G=[G[0]-H[0]+I[0],G[1]-H[1]+I[1]];return G;};var
D=function(G){return(typeof G!=="undefined");};E.Motion=A;})();(function(){var
D=function(F,E,G,H){if(F){D.superclass.constructor.call(this,F,E,G,H);}};D.NAME="Scroll";var
B=YAHOO.util;YAHOO.extend(D,B.ColorAnim);var C=D.superclass;var
A=D.prototype;A.doMethod=function(E,H,F){var
G=null;if(E=="scroll"){G=[this.method(this.currentFrame,H[0],F[0]-H[0],this.totalFrames),this.method(this.currentFrame,H[1],F[1]-H[1],this.totalFrames)];}else{G=C.doMethod.call(this,E,H,F);}return
G;};A.getAttribute=function(E){var G=null;var
F=this.getEl();if(E=="scroll"){G=[F.scrollLeft,F.scrollTop];}else{G=C.getAttribute.call(this,E);}return
G;};A.setAttribute=function(E,H,G){var
F=this.getEl();if(E=="scroll"){F.scrollLeft=H[0];F.scrollTop=H[1];}else{C.setAttribute.call(this,E,H,G);}};B.Scroll=D;})();YAHOO.register("animation",YAHOO.util.Anim,{version:"2.8.2r1",build:"7"});
\ No newline at end of file
+YAHOO.util.Easing={easeNone:function(e,a,g,f){return
g*e/f+a;},easeIn:function(e,a,g,f){return
g*(e/=f)*e+a;},easeOut:function(e,a,g,f){return
-g*(e/=f)*(e-2)+a;},easeBoth:function(e,a,g,f){if((e/=f/2)<1){return
g/2*e*e+a;}return
-g/2*((--e)*(e-2)-1)+a;},easeInStrong:function(e,a,g,f){return
g*(e/=f)*e*e*e+a;},easeOutStrong:function(e,a,g,f){return
-g*((e=e/f-1)*e*e*e-1)+a;},easeBothStrong:function(e,a,g,f){if((e/=f/2)<1){return
g/2*e*e*e*e+a;}return
-g/2*((e-=2)*e*e*e-2)+a;},elasticIn:function(g,e,k,j,f,i){if(g==0){return
e;}if((g/=j)==1){return e+k;}if(!i){i=j*0.3;}if(!f||f<Math.abs(k)){f=k;var
h=i/4;}else{var h=i/(2*Math.PI)*Math.asin(k/f);}return
-(f*Math.pow(2,10*(g-=1))*Math.sin((g*j-h)*(2*Math.PI)/i))+e;},elasticOut:function(g,e,k,j,f,i){if(g==0){return
e;}if((g/=j)==1){return e+k;}if(!i){i=j*0.3;}if(!f||f<Math.abs(k)){f=k;var
h=i/4;}else{var h=i/(2*Math.PI)*Math.asin(k/f);}return
f*Math.pow(2,-10*g)*Math.sin((g*j-h)*(2*Math.PI)/i)+k+e;},elasticBoth:function(g,e,k,j,f,i){if(g==0){return
e;}if((g/=j/2)==2){return
e+k;}if(!i){i=j*(0.3*1.5);}if(!f||f<Math.abs(k)){f=k;var h=i/4;}else{var
h=i/(2*Math.PI)*Math.asin(k/f);}if(g<1){return
-0.5*(f*Math.pow(2,10*(g-=1))*Math.sin((g*j-h)*(2*Math.PI)/i))+e;}return
f*Math.pow(2,-10*(g-=1))*Math.sin((g*j-h)*(2*Math.PI)/i)*0.5+k+e;},backIn:function(e,a,h,g,f){if(typeof
f=="undefined"){f=1.70158;}return
h*(e/=g)*e*((f+1)*e-f)+a;},backOut:function(e,a,h,g,f){if(typeof
f=="undefined"){f=1.70158;}return
h*((e=e/g-1)*e*((f+1)*e+f)+1)+a;},backBoth:function(e,a,h,g,f){if(typeof
f=="undefined"){f=1.70158;}if((e/=g/2)<1){return
h/2*(e*e*(((f*=(1.525))+1)*e-f))+a;}return
h/2*((e-=2)*e*(((f*=(1.525))+1)*e+f)+2)+a;},bounceIn:function(e,a,g,f){return
g-YAHOO.util.Easing.bounceOut(f-e,0,g,f)+a;},bounceOut:function(e,a,g,f){if((e/=f)<(1/2.75)){return
g*(7.5625*e*e)+a;}else{if(e<(2/2.75)){return
g*(7.5625*(e-=(1.5/2.75))*e+0.75)+a;}else{if(e<(2.5/2.75)){return
g*(7.5625*(e-=(2.25/2.75))*e+0.9375)+a;}}}return
g*(7.5625*(e-=(2.625/2.75))*e+0.984375)+a;},bounceBoth:function(e,a,g,f){if(e<f/2){return
YAHOO.util.Easing.bounceIn(e*2,0,g,f)*0.5+a;}return
YAHOO.util.Easing.bounceOut(e*2-f,0,g,f)*0.5+g*0.5+a;}};(function(){var
a=function(h,g,i,j){if(h){a.superclass.constructor.call(this,h,g,i,j);}};a.NAME="Motion";var
e=YAHOO.util;YAHOO.extend(a,e.ColorAnim);var f=a.superclass;var
c=a.prototype;c.patterns.points=/^points$/i;c.setAttribute=function(g,i,h){if(this.patterns.points.test(g)){h=h||"px";f.setAttribute.call(this,"left",i[0],h);f.setAttribute.call(this,"top",i[1],h);}else{f.setAttribute.call(this,g,i,h);}};c.getAttribute=function(g){if(this.patterns.points.test(g)){var
h=[f.getAttribute.call(this,"left"),f.getAttribute.call(this,"top")];}else{h=f.getAttribute.call(this,g);}return
h;};c.doMethod=function(g,k,h){var j=null;if(this.patterns.points.test(g)){var
i=this.method(this.currentFrame,0,100,this.totalFrames)/100;j=e.Bezier.getPosition(this.runtimeAttributes[g],i);
+}else{j=f.doMethod.call(this,g,k,h);}return
j;};c.setRuntimeAttribute=function(q){if(this.patterns.points.test(q)){var
h=this.getEl();var k=this.attributes;var g;var m=k["points"]["control"]||[];var
j;var n,p;if(m.length>0&&!(m[0] instanceof Array)){m=[m];}else{var
l=[];for(n=0,p=m.length;n<p;++n){l[n]=m[n];}m=l;}if(e.Dom.getStyle(h,"position")=="static"){e.Dom.setStyle(h,"position","relative");}if(d(k["points"]["from"])){e.Dom.setXY(h,k["points"]["from"]);}else{e.Dom.setXY(h,e.Dom.getXY(h));}g=this.getAttribute("points");if(d(k["points"]["to"])){j=b.call(this,k["points"]["to"],g);var
o=e.Dom.getXY(this.getEl());for(n=0,p=m.length;n<p;++n){m[n]=b.call(this,m[n],g);}}else{if(d(k["points"]["by"])){j=[g[0]+k["points"]["by"][0],g[1]+k["points"]["by"][1]];for(n=0,p=m.length;n<p;++n){m[n]=[g[0]+m[n][0],g[1]+m[n][1]];}}}this.runtimeAttributes[q]=[g];if(m.length>0){this.runtimeAttributes[q]=this.runtimeAttributes[q].concat(m);}this.runtimeAttributes[q][this.runtimeAttributes[q].length]=j;}else{f.setRuntimeAttribute.call(this,q);}};var
b=function(g,i){var
h=e.Dom.getXY(this.getEl());g=[g[0]-h[0]+i[0],g[1]-h[1]+i[1]];return g;};var
d=function(g){return(typeof g!=="undefined");};e.Motion=a;})();(function(){var
d=function(f,e,g,h){if(f){d.superclass.constructor.call(this,f,e,g,h);}};d.NAME="Scroll";var
b=YAHOO.util;YAHOO.extend(d,b.ColorAnim);var c=d.superclass;var
a=d.prototype;a.doMethod=function(e,h,f){var
g=null;if(e=="scroll"){g=[this.method(this.currentFrame,h[0],f[0]-h[0],this.totalFrames),this.method(this.currentFrame,h[1],f[1]-h[1],this.totalFrames)];}else{g=c.doMethod.call(this,e,h,f);}return
g;};a.getAttribute=function(e){var g=null;var
f=this.getEl();if(e=="scroll"){g=[f.scrollLeft,f.scrollTop];}else{g=c.getAttribute.call(this,e);}return
g;};a.setAttribute=function(e,h,g){var
f=this.getEl();if(e=="scroll"){f.scrollLeft=h[0];f.scrollTop=h[1];}else{c.setAttribute.call(this,e,h,g);}};b.Scroll=d;})();YAHOO.register("animation",YAHOO.util.Anim,{version:"2.9.0",build:"2800"});
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation.js
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/animation/animation.js
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
(function() {
@@ -361,13 +361,15 @@
Y.AnimMgr.stop(this);
};
- var onStart = function() {
+ this._handleStart = function() {
this.onStart.fire();
this.runtimeAttributes = {};
for (var attr in this.attributes) {
+ if (this.attributes.hasOwnProperty(attr)) {
this.setRuntimeAttribute(attr);
}
+ }
isAnimated = true;
actualFrames = 0;
@@ -379,7 +381,7 @@
* @private
*/
- var onTween = function() {
+ this._handleTween = function() {
var data = {
duration: new Date() - this.getStartTime(),
currentFrame: this.currentFrame
@@ -397,13 +399,17 @@
var runtimeAttributes = this.runtimeAttributes;
for (var attr in runtimeAttributes) {
+ if (runtimeAttributes.hasOwnProperty(attr)) {
this.setAttribute(attr, this.doMethod(attr,
runtimeAttributes[attr].start, runtimeAttributes[attr].end),
runtimeAttributes[attr].unit);
}
+ }
+ this.afterTween.fire(data);
+
actualFrames += 1;
};
- var onComplete = function() {
+ this._handleComplete = function() {
var actual_duration = (new Date() - startTime) / 1000 ;
var data = {
@@ -446,6 +452,13 @@
this.onTween = new Y.CustomEvent('tween', this);
/**
+ * Custom event that fires between each frame
+ * Listen via subscribe method (e.g.
myAnim.afterTween.subscribe(someFunction)
+ * @event afterTween
+ */
+ this.afterTween = new Y.CustomEvent('afterTween', this);
+
+ /**
* Custom event that fires after onTween
* @private
*/
@@ -463,9 +476,9 @@
*/
this._onComplete = new Y.CustomEvent('_complete', this, true);
- this._onStart.subscribe(onStart);
- this._onTween.subscribe(onTween);
- this._onComplete.subscribe(onComplete);
+ this._onStart.subscribe(this._handleStart);
+ this._onTween.subscribe(this._handleTween);
+ this._onComplete.subscribe(this._handleComplete);
}
};
@@ -517,7 +530,7 @@
* @type Int
*
*/
- this.delay = 1;
+ this.delay = 20;
/**
* Adds an animation instance to the animation queue.
@@ -532,15 +545,18 @@
this.start();
};
- /**
- * removes an animation instance from the animation queue.
- * All animation instances must be registered in order to animate.
- * @method unRegister
- * @param {object} tween The Anim instance to be be registered
- * @param {Int} index The index of the Anim instance
- * @private
- */
- this.unRegister = function(tween, index) {
+ var _unregisterQueue = [];
+ var _unregistering = false;
+
+ var doUnregister = function() {
+ var next_args = _unregisterQueue.shift();
+ unRegister.apply(YAHOO.util.AnimMgr,next_args);
+ if (_unregisterQueue.length) {
+ arguments.callee();
+ }
+ };
+
+ var unRegister = function(tween, index) {
index = index || getIndex(tween);
if (!tween.isAnimated() || index === -1) {
return false;
@@ -558,6 +574,23 @@
};
/**
+ * removes an animation instance from the animation queue.
+ * All animation instances must be registered in order to animate.
+ * @method unRegister
+ * @param {object} tween The Anim instance to be be registered
+ * @param {Int} index The index of the Anim instance
+ * @private
+ */
+ this.unRegister = function() {
+ _unregisterQueue.push(arguments);
+ if (!_unregistering) {
+ _unregistering = true;
+ doUnregister();
+ _unregistering = false;
+ }
+ }
+
+ /**
* Starts the animation thread.
* Only one thread can run at a time.
* @method start
@@ -1389,4 +1422,4 @@
Y.Scroll = Scroll;
})();
-YAHOO.register("animation", YAHOO.util.Anim, {version: "2.8.2r1", build: "7"});
+YAHOO.register("animation", YAHOO.util.Anim, {version: "2.9.0", build:
"2800"});
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/autocomplete.css
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/autocomplete.css
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/autocomplete.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
-.yui-skin-sam
.yui-ac{position:relative;font-family:arial;font-size:100%;}.yui-skin-sam
.yui-ac-input{position:absolute;width:100%;}.yui-skin-sam
.yui-ac-container{position:absolute;top:1.6em;width:100%;}.yui-skin-sam
.yui-ac-content{position:absolute;width:100%;border:1px solid
#808080;background:#fff;overflow:hidden;z-index:9050;}.yui-skin-sam
.yui-ac-shadow{position:absolute;margin:.3em;width:100%;background:#000;-moz-opacity:.10;opacity:.10;filter:alpha(opacity=10);z-index:9049;}.yui-skin-sam
.yui-ac
iframe{opacity:0;filter:alpha(opacity=0);padding-right:.3em;padding-bottom:.3em;}.yui-skin-sam
.yui-ac-content ul{margin:0;padding:0;width:100%;}.yui-skin-sam
.yui-ac-content li{margin:0;padding:2px
5px;cursor:default;white-space:nowrap;list-style:none;zoom:1;}.yui-skin-sam
.yui-ac-content li.yui-ac-prehighlight{background:#B3D4FF;}.yui-skin-sam
.yui-ac-content li.yui-ac-highlight{background:#426FD9;color:#FFF;}
+.yui-skin-sam
.yui-ac{position:relative;font-family:arial;font-size:100%}.yui-skin-sam
.yui-ac-input{position:absolute;width:100%}.yui-skin-sam
.yui-ac-container{position:absolute;top:1.6em;width:100%}.yui-skin-sam
.yui-ac-content{position:absolute;width:100%;border:1px solid
#808080;background:#fff;overflow:hidden;z-index:9050}.yui-skin-sam
.yui-ac-shadow{position:absolute;margin:.3em;width:100%;background:#000;-moz-opacity:.10;opacity:.10;filter:alpha(opacity=10);z-index:9049}.yui-skin-sam
.yui-ac
iframe{opacity:0;filter:alpha(opacity=0);padding-right:.3em;padding-bottom:.3em}.yui-skin-sam
.yui-ac-content ul{margin:0;padding:0;width:100%}.yui-skin-sam .yui-ac-content
li{margin:0;padding:2px
5px;cursor:default;white-space:nowrap;list-style:none;zoom:1}.yui-skin-sam
.yui-ac-content li.yui-ac-prehighlight{background:#b3d4ff}.yui-skin-sam
.yui-ac-content li.yui-ac-highlight{background:#426fd9;color:#FFF}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/button.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/button.css
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/button.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
.yui-button{display:-moz-inline-box;display:inline-block;vertical-align:text-bottom;}.yui-button
.first-child{display:block;*display:inline-block;}.yui-button
button,.yui-button
a{display:block;*display:inline-block;border:none;margin:0;}.yui-button
button{background-color:transparent;*overflow:visible;cursor:pointer;}.yui-button
a{text-decoration:none;}.yui-skin-sam .yui-button{border-width:1px
0;border-style:solid;border-color:#808080;background:url(sprite.png) repeat-x 0
0;margin:auto .25em;}.yui-skin-sam .yui-button .first-child{border-width:0
1px;border-style:solid;border-color:#808080;margin:0
-1px;_margin:0;}.yui-skin-sam .yui-button button,.yui-skin-sam .yui-button
a,.yui-skin-sam .yui-button a:visited{padding:0
10px;font-size:93%;line-height:2;*line-height:1.7;min-height:2em;*min-height:auto;color:#000;}.yui-skin-sam
.yui-button a{*line-height:1.875;*padding-bottom:1px;}.yui-skin-sam
.yui-split-button button,.yui-skin-sam .yui-menu-button
button{padding-right:20px;background-position:right
center;background-repeat:no-repeat;}.yui-skin-sam .yui-menu-button
button{background-image:url(menu-button-arrow.png);}.yui-skin-sam
.yui-split-button
button{background-image:url(split-button-arrow.png);}.yui-skin-sam
.yui-button-focus{border-color:#7D98B8;background-position:0
-1300px;}.yui-skin-sam .yui-button-focus
.first-child{border-color:#7D98B8;}.yui-skin-sam .yui-split-button-focus
button{background-image:url(split-button-arrow-focus.png);}.yui-skin-sam
.yui-button-hover{border-color:#7D98B8;background-position:0
-1300px;}.yui-skin-sam .yui-button-hover
.first-child{border-color:#7D98B8;}.yui-skin-sam .yui-split-button-hover
button{background-image:url(split-button-arrow-hover.png);}.yui-skin-sam
.yui-button-active{border-color:#7D98B8;background-position:0
-1700px;}.yui-skin-sam .yui-button-active
.first-child{border-color:#7D98B8;}.yui-skin-sam
.yui-split-button-activeoption{border-color:#808080;background-position:0
0;}.yui-skin-sam .yui-split-button-activeoption
.first-child{border-color:#808080;}.yui-skin-sam .yui-split-button-activeoption
button{background-image:url(split-button-arrow-active.png);}.yui-skin-sam
.yui-radio-button-checked,.yui-skin-sam
.yui-checkbox-button-checked{border-color:#304369;background-position:0
-1400px;}.yui-skin-sam .yui-radio-button-checked .first-child,.yui-skin-sam
.yui-checkbox-button-checked .first-child{border-color:#304369;}.yui-skin-sam
.yui-radio-button-checked button,.yui-skin-sam .yui-checkbox-button-checked
button{color:#fff;}.yui-skin-sam
.yui-button-disabled{border-color:#ccc;background-position:0
-1500px;}.yui-skin-sam .yui-button-disabled
.first-child{border-color:#ccc;}.yui-skin-sam .yui-button-disabled
button,.yui-skin-sam .yui-button-disabled a,.yui-skin-sam .yui-button-disabled
a:visited{color:#A6A6A6;cursor:default;}.yui-skin-sam .yui-menu-button-disabled
button{background-image:url(menu-button-arrow-disabled.png);}.yui-skin-sam
.yui-split-button-disabled
button{background-image:url(split-button-arrow-disabled.png);}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/calendar.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/calendar.css
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/calendar.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
-.yui-calcontainer{position:relative;float:left;_overflow:hidden;}.yui-calcontainer
iframe{position:absolute;border:none;margin:0;padding:0;z-index:0;width:100%;height:100%;left:0;top:0;}.yui-calcontainer
iframe.fixedsize{width:50em;height:50em;top:-1px;left:-1px;}.yui-calcontainer.multi
.groupcal{z-index:1;float:left;position:relative;}.yui-calcontainer
.title{position:relative;z-index:1;}.yui-calcontainer
.close-icon{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden;}.yui-calendar{position:relative;}.yui-calendar
.calnavleft{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden;}.yui-calendar
.calnavright{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden;}.yui-calendar
.calheader{position:relative;width:100%;text-align:center;}.yui-calcontainer
.yui-cal-nav-mask{position:absolute;z-index:2;margin:0;padding:0;width:100%;height:100%;_width:0;_height:0;left:0;top:0;display:none;}.yui-calcontainer
.yui-cal-nav{position:absolute;z-index:3;top:0;display:none;}.yui-calcontainer
.yui-cal-nav
.yui-cal-nav-btn{display:-moz-inline-box;display:inline-block;}.yui-calcontainer
.yui-cal-nav .yui-cal-nav-btn
button{display:block;*display:inline-block;*overflow:visible;border:none;background-color:transparent;cursor:pointer;}.yui-calendar
.calbody
a:hover{background:inherit;}p#clear{clear:left;padding-top:10px;}.yui-skin-sam
.yui-calcontainer{background-color:#f2f2f2;border:1px solid
#808080;padding:10px;}.yui-skin-sam .yui-calcontainer.multi{padding:0 5px 0
5px;}.yui-skin-sam .yui-calcontainer.multi
.groupcal{background-color:transparent;border:none;padding:10px 5px 10px
5px;margin:0;}.yui-skin-sam .yui-calcontainer .title{background:url(sprite.png)
repeat-x 0 0;border-bottom:1px solid #ccc;font:100%
sans-serif;color:#000;font-weight:bold;height:auto;padding:.4em;margin:0 -10px
10px -10px;top:0;left:0;text-align:left;}.yui-skin-sam .yui-calcontainer.multi
.title{margin:0 -5px 0 -5px;}.yui-skin-sam
.yui-calcontainer.withtitle{padding-top:0;}.yui-skin-sam .yui-calcontainer
.calclose{background:url(sprite.png) no-repeat 0
-300px;width:25px;height:15px;top:.4em;right:.4em;cursor:pointer;}.yui-skin-sam
.yui-calendar{border-spacing:0;border-collapse:collapse;font:100%
sans-serif;text-align:center;margin:0;}.yui-skin-sam .yui-calendar
.calhead{background:transparent;border:none;vertical-align:middle;padding:0;}.yui-skin-sam
.yui-calendar .calheader{background:transparent;font-weight:bold;padding:0 0
.6em 0;text-align:center;}.yui-skin-sam .yui-calendar .calheader
img{border:none;}.yui-skin-sam .yui-calendar
.calnavleft{background:url(sprite.png) no-repeat 0
-450px;width:25px;height:15px;top:0;bottom:0;left:-10px;margin-left:.4em;cursor:pointer;}.yui-skin-sam
.yui-calendar .calnavright{background:url(sprite.png) no-repeat 0
-500px;width:25px;height:15px;top:0;bottom:0;right:-10px;margin-right:.4em;cursor:pointer;}.yui-skin-sam
.yui-calendar .calweekdayrow{height:2em;}.yui-skin-sam .yui-calendar
.calweekdayrow th{padding:0;border:none;}.yui-skin-sam .yui-calendar
.calweekdaycell{color:#000;font-weight:bold;text-align:center;width:2em;}.yui-skin-sam
.yui-calendar .calfoot{background-color:#f2f2f2;}.yui-skin-sam .yui-calendar
.calrowhead,.yui-skin-sam .yui-calendar
.calrowfoot{color:#a6a6a6;font-size:85%;font-style:normal;font-weight:normal;border:none;}.yui-skin-sam
.yui-calendar .calrowhead{text-align:right;padding:0 2px 0 0;}.yui-skin-sam
.yui-calendar .calrowfoot{text-align:left;padding:0 0 0 2px;}.yui-skin-sam
.yui-calendar td.calcell{border:1px solid
#ccc;background:#fff;padding:1px;height:1.6em;line-height:1.6em;text-align:center;white-space:nowrap;}.yui-skin-sam
.yui-calendar td.calcell
a{color:#06c;display:block;height:100%;text-decoration:none;}.yui-skin-sam
.yui-calendar td.calcell.today{background-color:#000;}.yui-skin-sam
.yui-calendar td.calcell.today a{background-color:#fff;}.yui-skin-sam
.yui-calendar
td.calcell.oom{background-color:#ccc;color:#a6a6a6;cursor:default;}.yui-skin-sam
.yui-calendar
td.calcell.selected{background-color:#fff;color:#000;}.yui-skin-sam
.yui-calendar td.calcell.selected
a{background-color:#b3d4ff;color:#000;}.yui-skin-sam .yui-calendar
td.calcell.calcellhover{background-color:#426fd9;color:#fff;cursor:pointer;}.yui-skin-sam
.yui-calendar td.calcell.calcellhover
a{background-color:#426fd9;color:#fff;}.yui-skin-sam .yui-calendar
td.calcell.previous{color:#e0e0e0;}.yui-skin-sam .yui-calendar
td.calcell.restricted{text-decoration:line-through;}.yui-skin-sam .yui-calendar
td.calcell.highlight1{background-color:#cf9;}.yui-skin-sam .yui-calendar
td.calcell.highlight2{background-color:#9cf;}.yui-skin-sam .yui-calendar
td.calcell.highlight3{background-color:#fcc;}.yui-skin-sam .yui-calendar
td.calcell.highlight4{background-color:#cf9;}.yui-skin-sam .yui-calendar
a.calnav{border:1px solid #f2f2f2;padding:0
4px;text-decoration:none;color:#000;zoom:1;}.yui-skin-sam .yui-calendar
a.calnav:hover{background:url(sprite.png) repeat-x 0
0;border-color:#A0A0A0;cursor:pointer;}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-mask{background-color:#000;opacity:.25;filter:alpha(opacity=25);}.yui-skin-sam
.yui-calcontainer
.yui-cal-nav{font-family:arial,helvetica,clean,sans-serif;font-size:93%;border:1px
solid
#808080;left:50%;margin-left:-7em;width:14em;padding:0;top:2.5em;background-color:#f2f2f2;}.yui-skin-sam
.yui-calcontainer.withtitle .yui-cal-nav{top:4.5em;}.yui-skin-sam
.yui-calcontainer.multi .yui-cal-nav{width:16em;margin-left:-8em;}.yui-skin-sam
.yui-calcontainer .yui-cal-nav-y,.yui-skin-sam .yui-calcontainer
.yui-cal-nav-m,.yui-skin-sam .yui-calcontainer .yui-cal-nav-b{padding:5px 10px
5px 10px;}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-b{text-align:center;}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-e{margin-top:5px;padding:5px;background-color:#EDF5FF;border-top:1px
solid black;display:none;}.yui-skin-sam .yui-calcontainer .yui-cal-nav
label{display:block;font-weight:bold;}
-.yui-skin-sam .yui-calcontainer
.yui-cal-nav-mc{width:100%;_width:auto;}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-y input.yui-invalid{background-color:#FFEE69;border:1px solid
#000;}.yui-skin-sam .yui-calcontainer .yui-cal-nav-yc{width:4em;}.yui-skin-sam
.yui-calcontainer .yui-cal-nav .yui-cal-nav-btn{border:1px solid
#808080;background:url(sprite.png) repeat-x 0
0;background-color:#ccc;margin:auto .15em;}.yui-skin-sam .yui-calcontainer
.yui-cal-nav .yui-cal-nav-btn button{padding:0
8px;font-size:93%;line-height:2;*line-height:1.7;min-height:2em;*min-height:auto;color:#000;}.yui-skin-sam
.yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default{border:1px solid
#304369;background-color:#426fd9;background:url(sprite.png) repeat-x 0
-1400px;}.yui-skin-sam .yui-calcontainer .yui-cal-nav
.yui-cal-nav-btn.yui-default button{color:#fff;}
+.yui-calcontainer{position:relative;float:left;_overflow:hidden}.yui-calcontainer
iframe{position:absolute;border:0;margin:0;padding:0;z-index:0;width:100%;height:100%;left:0;top:0}.yui-calcontainer
iframe.fixedsize{width:50em;height:50em;top:-1px;left:-1px}.yui-calcontainer.multi
.groupcal{z-index:1;float:left;position:relative}.yui-calcontainer
.title{position:relative;z-index:1}.yui-calcontainer
.close-icon{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden}.yui-calendar{position:relative}.yui-calendar
.calnavleft{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden}.yui-calendar
.calnavright{position:absolute;z-index:1;text-indent:-10000em;overflow:hidden}.yui-calendar
.calheader{position:relative;width:100%;text-align:center}.yui-calcontainer
.yui-cal-nav-mask{position:absolute;z-index:2;margin:0;padding:0;width:100%;height:100%;_width:0;_height:0;left:0;top:0;display:none}.yui-calcontainer
.yui-cal-nav{position:absolute;z-index:3;top:0;display:none}.yui-calcontainer
.yui-cal-nav
.yui-cal-nav-btn{display:-moz-inline-box;display:inline-block}.yui-calcontainer
.yui-cal-nav .yui-cal-nav-btn
button{display:block;*display:inline-block;*overflow:visible;border:0;background-color:transparent;cursor:pointer}.yui-calendar
.calbody
a:hover{background:inherit}p#clear{clear:left;padding-top:10px}.yui-skin-sam
.yui-calcontainer{background-color:#f2f2f2;border:1px solid
#808080;padding:10px}.yui-skin-sam .yui-calcontainer.multi{padding:0 5px 0
5px}.yui-skin-sam .yui-calcontainer.multi
.groupcal{background-color:transparent;border:0;padding:10px 5px 10px
5px;margin:0}.yui-skin-sam .yui-calcontainer .title{background:url(sprite.png)
repeat-x 0 0;border-bottom:1px solid #ccc;font:100%
sans-serif;color:#000;font-weight:bold;height:auto;padding:.4em;margin:0 -10px
10px -10px;top:0;left:0;text-align:left}.yui-skin-sam .yui-calcontainer.multi
.title{margin:0 -5px 0 -5px}.yui-skin-sam
.yui-calcontainer.withtitle{padding-top:0}.yui-skin-sam .yui-calcontainer
.calclose{background:url(sprite.png) no-repeat 0
-300px;width:25px;height:15px;top:.4em;right:.4em;cursor:pointer}.yui-skin-sam
.yui-calendar{border-spacing:0;border-collapse:collapse;font:100%
sans-serif;text-align:center;margin:0}.yui-skin-sam .yui-calendar
.calhead{background:transparent;border:0;vertical-align:middle;padding:0}.yui-skin-sam
.yui-calendar .calheader{background:transparent;font-weight:bold;padding:0 0
.6em 0;text-align:center}.yui-skin-sam .yui-calendar .calheader
img{border:0}.yui-skin-sam .yui-calendar .calnavleft{background:url(sprite.png)
no-repeat 0
-450px;width:25px;height:15px;top:0;bottom:0;left:-10px;margin-left:.4em;cursor:pointer}.yui-skin-sam
.yui-calendar .calnavright{background:url(sprite.png) no-repeat 0
-500px;width:25px;height:15px;top:0;bottom:0;right:-10px;margin-right:.4em;cursor:pointer}.yui-skin-sam
.yui-calendar .calweekdayrow{height:2em}.yui-skin-sam .yui-calendar
.calweekdayrow th{padding:0;border:0}.yui-skin-sam .yui-calendar
.calweekdaycell{color:#000;font-weight:bold;text-align:center;width:2em}.yui-skin-sam
.yui-calendar .calfoot{background-color:#f2f2f2}.yui-skin-sam .yui-calendar
.calrowhead,.yui-skin-sam .yui-calendar
.calrowfoot{color:#a6a6a6;font-size:85%;font-style:normal;font-weight:normal;border:0}.yui-skin-sam
.yui-calendar .calrowhead{text-align:right;padding:0 2px 0 0}.yui-skin-sam
.yui-calendar .calrowfoot{text-align:left;padding:0 0 0 2px}.yui-skin-sam
.yui-calendar td.calcell{border:1px solid
#ccc;background:#fff;padding:1px;height:1.6em;line-height:1.6em;text-align:center;white-space:nowrap}.yui-skin-sam
.yui-calendar td.calcell
a{color:#06c;display:block;height:100%;text-decoration:none}.yui-skin-sam
.yui-calendar td.calcell.today{background-color:#000}.yui-skin-sam
.yui-calendar td.calcell.today a{background-color:#fff}.yui-skin-sam
.yui-calendar
td.calcell.oom{background-color:#ccc;color:#a6a6a6;cursor:default}.yui-skin-sam
.yui-calendar td.calcell.oom a{color:#a6a6a6}.yui-skin-sam .yui-calendar
td.calcell.selected{background-color:#fff;color:#000}.yui-skin-sam
.yui-calendar td.calcell.selected
a{background-color:#b3d4ff;color:#000}.yui-skin-sam .yui-calendar
td.calcell.calcellhover{background-color:#426fd9;color:#fff;cursor:pointer}.yui-skin-sam
.yui-calendar td.calcell.calcellhover
a{background-color:#426fd9;color:#fff}.yui-skin-sam .yui-calendar
td.calcell.previous{color:#e0e0e0}.yui-skin-sam .yui-calendar
td.calcell.restricted{text-decoration:line-through}.yui-skin-sam .yui-calendar
td.calcell.highlight1{background-color:#cf9}.yui-skin-sam .yui-calendar
td.calcell.highlight2{background-color:#9cf}.yui-skin-sam .yui-calendar
td.calcell.highlight3{background-color:#fcc}.yui-skin-sam .yui-calendar
td.calcell.highlight4{background-color:#cf9}.yui-skin-sam .yui-calendar
a.calnav{border:1px solid #f2f2f2;padding:0
4px;text-decoration:none;color:#000;zoom:1}.yui-skin-sam .yui-calendar
a.calnav:hover{background:url(sprite.png) repeat-x 0
0;border-color:#a0a0a0;cursor:pointer}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-mask{background-color:#000;opacity:.25;filter:alpha(opacity=25)}.yui-skin-sam
.yui-calcontainer
.yui-cal-nav{font-family:arial,helvetica,clean,sans-serif;font-size:93%;border:1px
solid
#808080;left:50%;margin-left:-7em;width:14em;padding:0;top:2.5em;background-color:#f2f2f2}.yui-skin-sam
.yui-calcontainer.withtitle .yui-cal-nav{top:4.5em}.yui-skin-sam
.yui-calcontainer.multi .yui-cal-nav{width:16em;margin-left:-8em}.yui-skin-sam
.yui-calcontainer .yui-cal-nav-y,.yui-skin-sam .yui-calcontainer
.yui-cal-nav-m,.yui-skin-sam .yui-calcontainer .yui-cal-nav-b{padding:5px 10px
5px 10px}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-b{text-align:center}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-e{margin-top:5px;padding:5px;background-color:#edf5ff;border-top:1px
solid black;display:none}.yui-skin-sam .yui-calcontainer .yui-cal-nav
label{display:block;font-weight:bold}
+.yui-skin-sam .yui-calcontainer
.yui-cal-nav-mc{width:100%;_width:auto}.yui-skin-sam .yui-calcontainer
.yui-cal-nav-y input.yui-invalid{background-color:#ffee69;border:1px solid
#000}.yui-skin-sam .yui-calcontainer .yui-cal-nav-yc{width:4em}.yui-skin-sam
.yui-calcontainer .yui-cal-nav .yui-cal-nav-btn{border:1px solid
#808080;background:url(sprite.png) repeat-x 0
0;background-color:#ccc;margin:auto .15em}.yui-skin-sam .yui-calcontainer
.yui-cal-nav .yui-cal-nav-btn button{padding:0
8px;font-size:93%;line-height:2;*line-height:1.7;min-height:2em;*min-height:auto;color:#000}.yui-skin-sam
.yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default{border:1px solid
#304369;background-color:#426fd9;background:url(sprite.png) repeat-x 0
-1400px}.yui-skin-sam .yui-calcontainer .yui-cal-nav
.yui-cal-nav-btn.yui-default button{color:#fff}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/carousel.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/carousel.css
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/carousel.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
.yui-carousel{visibility:hidden;overflow:hidden;position:relative;text-align:left;zoom:1;}.yui-carousel.yui-carousel-visible{visibility:visible;}.yui-carousel-content{overflow:hidden;position:relative;text-align:center;}.yui-carousel-element
li{border:1px solid
#ccc;list-style:none;margin:1px;overflow:hidden;padding:0;position:absolute;text-align:center;}.yui-carousel-vertical
.yui-carousel-element li{display:block;float:none;}.yui-log
.carousel{background:#f2e886;}.yui-carousel-nav{zoom:1;}.yui-carousel-nav:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.yui-carousel-button-focus{outline:1px
dotted
#000;}.yui-carousel-min-width{min-width:115px;}.yui-carousel-element{overflow:hidden;position:relative;margin:0
auto;padding:0;text-align:left;*margin:0;}.yui-carousel-horizontal
.yui-carousel-element{width:320000px;}.yui-carousel-vertical
.yui-carousel-element{height:320000px;}.yui-skin-sam .yui-carousel-nav
select{position:static;}.yui-carousel .yui-carousel-item-selected{border:1px
dashed #000;margin:1px;}.yui-skin-sam .yui-carousel,.yui-skin-sam
.yui-carousel-vertical{border:1px solid #808080;}.yui-skin-sam
.yui-carousel-nav{background:url(sprite.png) repeat-x 0
0;padding:3px;text-align:right;}.yui-skin-sam
.yui-carousel-button{background:url(sprite.png) no-repeat 0
-600px;float:right;height:19px;margin:5px;overflow:hidden;width:40px;}.yui-skin-sam
.yui-carousel-vertical .yui-carousel-button{background-position:0
-800px;}.yui-skin-sam .yui-carousel-button-disabled{background-position:0
-2000px;}.yui-skin-sam .yui-carousel-vertical
.yui-carousel-button-disabled{background-position:0 -2100px;}.yui-skin-sam
.yui-carousel-button input,.yui-skin-sam .yui-carousel-button
button{background-color:transparent;border:0;cursor:pointer;display:block;height:44px;margin:-2px
0 0 -2px;padding:0 0 0 50px;}.yui-skin-sam
span.yui-carousel-first-button{background-position:0
-550px;margin-left:-100px;margin-right:50px;*margin:5px 5px 5px
-90px;}.yui-skin-sam .yui-carousel-vertical
span.yui-carousel-first-button{background-position:0 -750px;}.yui-skin-sam
span.yui-carousel-first-button-disabled{background-position:0
-1950px;}.yui-skin-sam .yui-carousel-vertical
span.yui-carousel-first-button-disabled{background-position:0
-2050px;}.yui-skin-sam .yui-carousel-nav
ul{float:right;height:19px;margin:0;margin-left:-220px;margin-right:100px;*margin-left:-160px;*margin-right:0;padding:0;}.yui-skin-sam
.yui-carousel-min-width .yui-carousel-nav
ul{*margin-left:-170px;}.yui-skin-sam .yui-carousel-nav
select{position:relative;*right:50px;top:4px;}.yui-skin-sam
.yui-carousel-vertical .yui-carousel-nav select{position:static;}.yui-skin-sam
.yui-carousel-vertical .yui-carousel-nav ul,.yui-skin-sam
.yui-carousel-vertical .yui-carousel-nav
select{float:none;margin:0;*zoom:1;}.yui-skin-sam .yui-carousel-nav ul
li{background:url(sprite.png) no-repeat 0
-650px;cursor:pointer;float:left;height:9px;list-style:none;margin:10px 0 0
5px;overflow:hidden;padding:0;width:9px;}.yui-skin-sam .yui-carousel-nav
ul:after{content:".";display:block;height:0;clear:both;visibility:hidden;}.yui-skin-sam
.yui-carousel-nav ul li
a{display:block;width:100%;height:100%;text-indent:-10000px;text-align:left;overflow:hidden;}.yui-skin-sam
.yui-carousel-nav ul li.yui-carousel-nav-page-focus{outline:1px dotted
#000;}.yui-skin-sam .yui-carousel-nav ul
li.yui-carousel-nav-page-selected{background-position:0 -700px;}.yui-skin-sam
.yui-carousel-item-loading{background:url(ajax-loader.gif) no-repeat 50%
50%;position:absolute;text-indent:-150px;}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/colorpicker.css
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/colorpicker.css
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/colorpicker.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
-.yui-picker-panel{background:#e3e3e3;border-color:#888;}.yui-picker-panel
.hd{background-color:#ccc;font-size:100%;line-height:100%;border:1px solid
#e3e3e3;font-weight:bold;overflow:hidden;padding:6px;color:#000;}.yui-picker-panel
.bd{background:#e8e8e8;margin:1px;height:200px;}.yui-picker-panel
.ft{background:#e8e8e8;margin:1px;padding:1px;}.yui-picker{position:relative;}.yui-picker-hue-thumb{cursor:default;width:18px;height:18px;top:-8px;left:-2px;z-index:9;position:absolute;}.yui-picker-hue-bg{-moz-outline:none;outline:0
none;position:absolute;left:200px;height:183px;width:14px;background:url(hue_bg.png)
no-repeat;top:4px;}.yui-picker-bg{-moz-outline:none;outline:0
none;position:absolute;top:4px;left:4px;height:182px;width:182px;background-color:#F00;background-image:url(picker_mask.png);}*html
.yui-picker-bg{background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../build/colorpicker/assets/picker_mask.png',sizingMethod='scale');}.yui-picker-mask{position:absolute;z-index:1;top:0;left:0;}.yui-picker-thumb{cursor:default;width:11px;height:11px;z-index:9;position:absolute;top:-4px;left:-4px;}.yui-picker-swatch{position:absolute;left:240px;top:4px;height:60px;width:55px;border:1px
solid
#888;}.yui-picker-websafe-swatch{position:absolute;left:304px;top:4px;height:24px;width:24px;border:1px
solid
#888;}.yui-picker-controls{position:absolute;top:72px;left:226px;font:1em
monospace;}.yui-picker-controls
.hd{background:transparent;border-width:0!important;}.yui-picker-controls
.bd{height:100px;border-width:0!important;}.yui-picker-controls
ul{float:left;padding:0 2px 0 0;margin:0;}.yui-picker-controls
li{padding:2px;list-style:none;margin:0;}.yui-picker-controls
input{font-size:.85em;width:2.4em;}.yui-picker-hex-controls{clear:both;padding:2px;}.yui-picker-hex-controls
input{width:4.6em;}.yui-picker-controls a{font:1em
arial,helvetica,clean,sans-serif;display:block;*display:inline-block;padding:0;color:#000;}
+.yui-picker-panel{background:#e3e3e3;border-color:#888}.yui-picker-panel
.hd{background-color:#ccc;font-size:100%;line-height:100%;border:1px solid
#e3e3e3;font-weight:bold;overflow:hidden;padding:6px;color:#000}.yui-picker-panel
.bd{background:#e8e8e8;margin:1px;height:200px}.yui-picker-panel
.ft{background:#e8e8e8;margin:1px;padding:1px}.yui-picker{position:relative}.yui-picker-hue-thumb{cursor:default;width:18px;height:18px;top:-8px;left:-2px;z-index:9;position:absolute}.yui-picker-hue-bg{-moz-outline:0;outline:0
none;position:absolute;left:200px;height:183px;width:14px;background:url(hue_bg.png)
no-repeat;top:4px}.yui-picker-bg{-moz-outline:0;outline:0
none;position:absolute;top:4px;left:4px;height:182px;width:182px;background-color:#F00;background-image:url(picker_mask.png)}*html
.yui-picker-bg{background-image:none;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='picker_mask.png',sizingMethod='scale')}.yui-picker-mask{position:absolute;z-index:1;top:0;left:0}.yui-picker-thumb{cursor:default;width:11px;height:11px;z-index:9;position:absolute;top:-4px;left:-4px}.yui-picker-swatch{position:absolute;left:240px;top:4px;height:60px;width:55px;border:1px
solid
#888}.yui-picker-websafe-swatch{position:absolute;left:304px;top:4px;height:24px;width:24px;border:1px
solid #888}.yui-picker-controls{position:absolute;top:72px;left:226px;font:1em
monospace}.yui-picker-controls
.hd{background:transparent;border-width:0!important}.yui-picker-controls
.bd{height:100px;border-width:0!important}.yui-picker-controls
ul{float:left;padding:0 2px 0 0;margin:0}.yui-picker-controls
li{padding:2px;list-style:none;margin:0}.yui-picker-controls
input{font-size:.85em;width:2.4em}.yui-picker-hex-controls{clear:both;padding:2px}.yui-picker-hex-controls
input{width:4.6em}.yui-picker-controls a{font:1em
arial,helvetica,clean,sans-serif;display:block;*display:inline-block;padding:0;color:#000}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/container.css
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/container.css
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/container.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,7 +1,7 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
-.yui-overlay,.yui-panel-container{visibility:hidden;position:absolute;z-index:2;}.yui-panel{position:relative;}.yui-panel-container
form{margin:0;}.mask{z-index:1;display:none;position:absolute;top:0;left:0;right:0;bottom:0;}.mask.block-scrollbars{overflow:auto;}.masked
select,.drag select,.hide-select
select{_visibility:hidden;}.yui-panel-container
select{_visibility:inherit;}.hide-scrollbars,.hide-scrollbars
*{overflow:hidden;}.hide-scrollbars
select{display:none;}.show-scrollbars{overflow:auto;}.yui-panel-container.show-scrollbars,.yui-tt.show-scrollbars{overflow:visible;}.yui-panel-container.show-scrollbars
.underlay,.yui-tt.show-scrollbars
.yui-tt-shadow{overflow:auto;}.yui-panel-container.shadow
.underlay.yui-force-redraw{padding-bottom:1px;}.yui-effect-fade
.underlay,.yui-effect-fade
.yui-tt-shadow{display:none;}.yui-tt-shadow{position:absolute;}.yui-override-padding{padding:0!important;}.yui-panel-container
.container-close{overflow:hidden;text-indent:-10000em;text-decoration:none;}.yui-overlay.yui-force-redraw,.yui-panel-container.yui-force-redraw{margin-bottom:1px;}.yui-skin-sam
.mask{background-color:#000;opacity:.25;filter:alpha(opacity=25);}.yui-skin-sam
.yui-panel-container{padding:0 1px;*padding:2px;}.yui-skin-sam
.yui-panel{position:relative;left:0;top:0;border-style:solid;border-width:1px
0;border-color:#808080;z-index:1;*border-width:1px;*zoom:1;_zoom:normal;}.yui-skin-sam
.yui-panel .hd,.yui-skin-sam .yui-panel .bd,.yui-skin-sam .yui-panel
.ft{border-style:solid;border-width:0 1px;border-color:#808080;margin:0
-1px;*margin:0;*border:0;}.yui-skin-sam .yui-panel .hd{border-bottom:solid 1px
#ccc;}.yui-skin-sam .yui-panel .bd,.yui-skin-sam .yui-panel
.ft{background-color:#F2F2F2;}.yui-skin-sam .yui-panel .hd{padding:0
10px;font-size:93%;line-height:2;*line-height:1.9;font-weight:bold;color:#000;background:url(sprite.png)
repeat-x 0 -200px;}.yui-skin-sam .yui-panel .bd{padding:10px;}.yui-skin-sam
.yui-panel .ft{border-top:solid 1px #808080;padding:5px
10px;font-size:77%;}.yui-skin-sam
.container-close{position:absolute;top:5px;right:6px;width:25px;height:15px;background:url(sprite.png)
no-repeat 0 -300px;cursor:pointer;}.yui-skin-sam .yui-panel-container
.underlay{right:-1px;left:-1px;}.yui-skin-sam
.yui-panel-container.matte{padding:9px
10px;background-color:#fff;}.yui-skin-sam
.yui-panel-container.shadow{_padding:2px 4px 0 2px;}.yui-skin-sam
.yui-panel-container.shadow
.underlay{position:absolute;top:2px;left:-3px;right:-3px;bottom:-3px;*top:4px;*left:-1px;*right:-1px;*bottom:-1px;_top:0;_left:0;_right:0;_bottom:0;_margin-top:3px;_margin-left:-1px;background-color:#000;opacity:.12;filter:alpha(opacity=12);}.yui-skin-sam
.yui-dialog .ft{border-top:none;padding:0 10px 10px
10px;font-size:100%;}.yui-skin-sam .yui-dialog .ft
.button-group{display:block;text-align:right;}.yui-skin-sam .yui-dialog .ft
button.default{font-weight:bold;}.yui-skin-sam .yui-dialog .ft
span.default{border-color:#304369;background-position:0 -1400px;}.yui-skin-sam
.yui-dialog .ft span.default .first-child{border-color:#304369;}.yui-skin-sam
.yui-dialog .ft span.default button{color:#fff;}.yui-skin-sam .yui-dialog .ft
span.yui-button-disabled{background-position:0
-1500px;border-color:#ccc;}.yui-skin-sam .yui-dialog .ft
span.yui-button-disabled .first-child{border-color:#ccc;}.yui-skin-sam
.yui-dialog .ft span.yui-button-disabled button{color:#a6a6a6;}.yui-skin-sam
.yui-simple-dialog .bd .yui-icon{background:url(sprite.png) no-repeat 0
0;width:16px;height:16px;margin-right:10px;float:left;}.yui-skin-sam
.yui-simple-dialog .bd span.blckicon{background-position:0
-1100px;}.yui-skin-sam .yui-simple-dialog .bd
span.alrticon{background-position:0 -1050px;}.yui-skin-sam .yui-simple-dialog
.bd span.hlpicon{background-position:0 -1150px;}.yui-skin-sam
.yui-simple-dialog .bd span.infoicon{background-position:0
-1200px;}.yui-skin-sam .yui-simple-dialog .bd
span.warnicon{background-position:0 -1900px;}.yui-skin-sam .yui-simple-dialog
.bd span.tipicon{background-position:0 -1250px;}.yui-skin-sam .yui-tt
.bd{position:relative;top:0;left:0;z-index:1;color:#000;padding:2px
5px;border-color:#D4C237 #A6982B #A6982B
#A6982B;border-width:1px;border-style:solid;background-color:#FFEE69;}.yui-skin-sam
.yui-tt.show-scrollbars .bd{overflow:auto;}.yui-skin-sam
.yui-tt-shadow{top:2px;right:-3px;left:-3px;bottom:-3px;background-color:#000;}.yui-skin-sam
.yui-tt-shadow-visible{opacity:.12;filter:alpha(opacity=12);}
+.yui-overlay,.yui-panel-container{visibility:hidden;position:absolute;z-index:2}.yui-panel{position:relative}.yui-panel-container
form{margin:0}.mask{z-index:1;display:none;position:absolute;top:0;left:0;right:0;bottom:0}.mask.block-scrollbars{overflow:auto}.masked
select,.drag select,.hide-select
select{_visibility:hidden}.yui-panel-container
select{_visibility:inherit}.hide-scrollbars,.hide-scrollbars
*{overflow:hidden}.hide-scrollbars
select{display:none}.show-scrollbars{overflow:auto}.yui-panel-container.show-scrollbars,.yui-tt.show-scrollbars{overflow:visible}.yui-panel-container.show-scrollbars
.underlay,.yui-tt.show-scrollbars
.yui-tt-shadow{overflow:auto}.yui-panel-container.shadow
.underlay.yui-force-redraw{padding-bottom:1px}.yui-effect-fade
.underlay,.yui-effect-fade
.yui-tt-shadow{display:none}.yui-tt-shadow{position:absolute}.yui-override-padding{padding:0!important}.yui-panel-container
.container-close{overflow:hidden;text-indent:-10000em;text-decoration:none}.yui-overlay.yui-force-redraw,.yui-panel-container.yui-force-redraw{margin-bottom:1px}.yui-skin-sam
.mask{background-color:#000;opacity:.25;filter:alpha(opacity=25)}.yui-skin-sam
.yui-panel-container{padding:0 1px;*padding:2px}.yui-skin-sam
.yui-panel{position:relative;left:0;top:0;border-style:solid;border-width:1px
0;border-color:#808080;z-index:1;*border-width:1px;*zoom:1;_zoom:normal}.yui-skin-sam
.yui-panel .hd,.yui-skin-sam .yui-panel .bd,.yui-skin-sam .yui-panel
.ft{border-style:solid;border-width:0 1px;border-color:#808080;margin:0
-1px;*margin:0;*border:0}.yui-skin-sam .yui-panel .hd{border-bottom:solid 1px
#ccc}.yui-skin-sam .yui-panel .bd,.yui-skin-sam .yui-panel
.ft{background-color:#f2f2f2}.yui-skin-sam .yui-panel .hd{padding:0
10px;font-size:93%;line-height:2;*line-height:1.9;font-weight:bold;color:#000;background:url(sprite.png)
repeat-x 0 -200px}.yui-skin-sam .yui-panel .bd{padding:10px}.yui-skin-sam
.yui-panel .ft{border-top:solid 1px #808080;padding:5px
10px;font-size:77%}.yui-skin-sam
.container-close{position:absolute;top:5px;right:6px;width:25px;height:15px;background:url(sprite.png)
no-repeat 0 -300px;cursor:pointer}.yui-skin-sam .yui-panel-container
.underlay{right:-1px;left:-1px}.yui-skin-sam
.yui-panel-container.matte{padding:9px 10px;background-color:#fff}.yui-skin-sam
.yui-panel-container.shadow{_padding:2px 4px 0 2px}.yui-skin-sam
.yui-panel-container.shadow
.underlay{position:absolute;top:2px;left:-3px;right:-3px;bottom:-3px;*top:4px;*left:-1px;*right:-1px;*bottom:-1px;_top:0;_left:0;_right:0;_bottom:0;_margin-top:3px;_margin-left:-1px;background-color:#000;opacity:.12;filter:alpha(opacity=12)}.yui-skin-sam
.yui-dialog .ft{border-top:0;padding:0 10px 10px
10px;font-size:100%}.yui-skin-sam .yui-dialog .ft
.button-group{display:block;text-align:right}.yui-skin-sam .yui-dialog .ft
button.default{font-weight:bold}.yui-skin-sam .yui-dialog .ft
span.default{border-color:#304369;background-position:0 -1400px}.yui-skin-sam
.yui-dialog .ft span.default .first-child{border-color:#304369}.yui-skin-sam
.yui-dialog .ft span.default button{color:#fff}.yui-skin-sam .yui-dialog .ft
span.yui-button-disabled{background-position:0
-1500px;border-color:#ccc}.yui-skin-sam .yui-dialog .ft
span.yui-button-disabled .first-child{border-color:#ccc}.yui-skin-sam
.yui-dialog .ft span.yui-button-disabled button{color:#a6a6a6}.yui-skin-sam
.yui-simple-dialog .bd .yui-icon{background:url(sprite.png) no-repeat 0
0;width:16px;height:16px;margin-right:10px;float:left}.yui-skin-sam
.yui-simple-dialog .bd span.blckicon{background-position:0
-1100px}.yui-skin-sam .yui-simple-dialog .bd
span.alrticon{background-position:0 -1050px}.yui-skin-sam .yui-simple-dialog
.bd span.hlpicon{background-position:0 -1150px}.yui-skin-sam .yui-simple-dialog
.bd span.infoicon{background-position:0 -1200px}.yui-skin-sam
.yui-simple-dialog .bd span.warnicon{background-position:0
-1900px}.yui-skin-sam .yui-simple-dialog .bd span.tipicon{background-position:0
-1250px}.yui-skin-sam .yui-tt
.bd{position:relative;top:0;left:0;z-index:1;color:#000;padding:2px
5px;border-color:#d4c237 #A6982b #a6982b
#A6982B;border-width:1px;border-style:solid;background-color:#ffee69}.yui-skin-sam
.yui-tt.show-scrollbars .bd{overflow:auto}.yui-skin-sam
.yui-tt-shadow{top:2px;right:-3px;left:-3px;bottom:-3px;background-color:#000}.yui-skin-sam
.yui-tt-shadow-visible{opacity:.12;filter:alpha(opacity=12)}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/datatable.css
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/datatable.css
2011-04-30 13:02:59 UTC (rev 7238)
+++
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/datatable.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
-.yui-skin-sam
.yui-dt-mask{position:absolute;z-index:9500;}.yui-dt-tmp{position:absolute;left:-9000px;}.yui-dt-scrollable
.yui-dt-bd{overflow:auto;}.yui-dt-scrollable
.yui-dt-hd{overflow:hidden;position:relative;}.yui-dt-scrollable .yui-dt-bd
thead tr,.yui-dt-scrollable .yui-dt-bd thead
th{position:absolute;left:-1500px;}.yui-dt-scrollable
tbody{-moz-outline:none;}.yui-skin-sam thead
.yui-dt-sortable{cursor:pointer;}.yui-skin-sam thead
.yui-dt-draggable{cursor:move;}.yui-dt-coltarget{position:absolute;z-index:999;}.yui-dt-hd{zoom:1;}th.yui-dt-resizeable
.yui-dt-resizerliner{position:relative;}.yui-dt-resizer{position:absolute;right:0;bottom:0;height:100%;cursor:e-resize;cursor:col-resize;background-color:#CCC;opacity:0;filter:alpha(opacity=0);}.yui-dt-resizerproxy{visibility:hidden;position:absolute;z-index:9000;background-color:#CCC;opacity:0;filter:alpha(opacity=0);}th.yui-dt-hidden
.yui-dt-liner,td.yui-dt-hidden .yui-dt-liner,th.yui-dt-hidden
.yui-dt-resizer{display:none;}.yui-dt-editor{position:absolute;z-index:9000;}.yui-skin-sam
.yui-dt
table{margin:0;padding:0;font-family:arial;font-size:inherit;border-collapse:separate;*border-collapse:collapse;border-spacing:0;border:1px
solid #7F7F7F;}.yui-skin-sam .yui-dt thead{border-spacing:0;}.yui-skin-sam
.yui-dt
caption{color:#000;font-size:85%;font-weight:normal;font-style:italic;line-height:1;padding:1em
0;text-align:center;}.yui-skin-sam .yui-dt th{background:#D8D8DA
url(sprite.png) repeat-x 0 0;}.yui-skin-sam .yui-dt th,.yui-skin-sam .yui-dt th
a{font-weight:normal;text-decoration:none;color:#000;vertical-align:bottom;}.yui-skin-sam
.yui-dt th{margin:0;padding:0;border:none;border-right:1px solid
#CBCBCB;}.yui-skin-sam .yui-dt tr.yui-dt-first td{border-top:1px solid
#7F7F7F;}.yui-skin-sam .yui-dt th
.yui-dt-liner{white-space:nowrap;}.yui-skin-sam
.yui-dt-liner{margin:0;padding:0;padding:4px 10px 4px 10px;}.yui-skin-sam
.yui-dt-coltarget{width:5px;background-color:red;}.yui-skin-sam .yui-dt
td{margin:0;padding:0;border:none;border-right:1px solid
#CBCBCB;text-align:left;}.yui-skin-sam .yui-dt-list
td{border-right:none;}.yui-skin-sam .yui-dt-resizer{width:6px;}.yui-skin-sam
.yui-dt-mask{background-color:#000;opacity:.25;filter:alpha(opacity=25);}.yui-skin-sam
.yui-dt-message{background-color:#FFF;}.yui-skin-sam .yui-dt-scrollable
table{border:none;}.yui-skin-sam .yui-dt-scrollable .yui-dt-hd{border-left:1px
solid #7F7F7F;border-top:1px solid #7F7F7F;border-right:1px solid
#7F7F7F;}.yui-skin-sam .yui-dt-scrollable .yui-dt-bd{border-left:1px solid
#7F7F7F;border-bottom:1px solid #7F7F7F;border-right:1px solid
#7F7F7F;background-color:#FFF;}.yui-skin-sam .yui-dt-scrollable .yui-dt-data
tr.yui-dt-last td{border-bottom:1px solid #7F7F7F;}.yui-skin-sam
th.yui-dt-asc,.yui-skin-sam th.yui-dt-desc{background:url(sprite.png) repeat-x
0 -100px;}.yui-skin-sam th.yui-dt-sortable
.yui-dt-label{margin-right:10px;}.yui-skin-sam th.yui-dt-asc
.yui-dt-liner{background:url(dt-arrow-up.png) no-repeat right;}.yui-skin-sam
th.yui-dt-desc .yui-dt-liner{background:url(dt-arrow-dn.png) no-repeat
right;}tbody
.yui-dt-editable{cursor:pointer;}.yui-dt-editor{text-align:left;background-color:#F2F2F2;border:1px
solid #808080;padding:6px;}.yui-dt-editor
label{padding-left:4px;padding-right:6px;}.yui-dt-editor
.yui-dt-button{padding-top:6px;text-align:right;}.yui-dt-editor .yui-dt-button
button{background:url(sprite.png) repeat-x 0 0;border:1px solid
#999;width:4em;height:1.8em;margin-left:6px;}.yui-dt-editor .yui-dt-button
button.yui-dt-default{background:url(sprite.png) repeat-x 0
-1400px;background-color:#5584E0;border:1px solid
#304369;color:#FFF;}.yui-dt-editor .yui-dt-button
button:hover{background:url(sprite.png) repeat-x 0
-1300px;color:#000;}.yui-dt-editor .yui-dt-button
button:active{background:url(sprite.png) repeat-x 0
-1700px;color:#000;}.yui-skin-sam
tr.yui-dt-even{background-color:#FFF;}.yui-skin-sam
tr.yui-dt-odd{background-color:#EDF5FF;}.yui-skin-sam tr.yui-dt-even
td.yui-dt-asc,.yui-skin-sam tr.yui-dt-even
td.yui-dt-desc{background-color:#EDF5FF;}.yui-skin-sam tr.yui-dt-odd
td.yui-dt-asc,.yui-skin-sam tr.yui-dt-odd
td.yui-dt-desc{background-color:#DBEAFF;}.yui-skin-sam .yui-dt-list
tr.yui-dt-even{background-color:#FFF;}.yui-skin-sam .yui-dt-list
tr.yui-dt-odd{background-color:#FFF;}.yui-skin-sam .yui-dt-list tr.yui-dt-even
td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-even
td.yui-dt-desc{background-color:#EDF5FF;}.yui-skin-sam .yui-dt-list
tr.yui-dt-odd td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-odd
td.yui-dt-desc{background-color:#EDF5FF;}.yui-skin-sam
th.yui-dt-highlighted,.yui-skin-sam th.yui-dt-highlighted
a{background-color:#B2D2FF;}.yui-skin-sam tr.yui-dt-highlighted,.yui-skin-sam
tr.yui-dt-highlighted td.yui-dt-asc,.yui-skin-sam tr.yui-dt-highlighted
td.yui-dt-desc,.yui-skin-sam tr.yui-dt-even td.yui-dt-highlighted,.yui-skin-sam
tr.yui-dt-odd
td.yui-dt-highlighted{cursor:pointer;background-color:#B2D2FF;}.yui-skin-sam
.yui-dt-list th.yui-dt-highlighted,.yui-skin-sam .yui-dt-list
th.yui-dt-highlighted a{background-color:#B2D2FF;}.yui-skin-sam .yui-dt-list
tr.yui-dt-highlighted,.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted
td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted
td.yui-dt-desc,.yui-skin-sam .yui-dt-list tr.yui-dt-even
td.yui-dt-highlighted,.yui-skin-sam .yui-dt-list tr.yui-dt-odd
td.yui-dt-highlighted{cursor:pointer;background-color:#B2D2FF;}.yui-skin-sam
th.yui-dt-selected,.yui-skin-sam th.yui-dt-selected
a{background-color:#446CD7;}.yui-skin-sam tr.yui-dt-selected td,.yui-skin-sam
tr.yui-dt-selected td.yui-dt-asc,.yui-skin-sam tr.yui-dt-selected
td.yui-dt-desc{background-color:#426FD9;color:#FFF;}.yui-skin-sam
tr.yui-dt-even td.yui-dt-selected,.yui-skin-sam tr.yui-dt-odd
td.yui-dt-selected{background-color:#446CD7;color:#FFF;}.yui-skin-sam
.yui-dt-list th.yui-dt-selected,.yui-skin-sam .yui-dt-list th.yui-dt-selected
a{background-color:#446CD7;}
-.yui-skin-sam .yui-dt-list tr.yui-dt-selected td,.yui-skin-sam .yui-dt-list
tr.yui-dt-selected td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-selected
td.yui-dt-desc{background-color:#426FD9;color:#FFF;}.yui-skin-sam .yui-dt-list
tr.yui-dt-even td.yui-dt-selected,.yui-skin-sam .yui-dt-list tr.yui-dt-odd
td.yui-dt-selected{background-color:#446CD7;color:#FFF;}.yui-skin-sam
.yui-dt-paginator{display:block;margin:6px 0;white-space:nowrap;}.yui-skin-sam
.yui-dt-paginator .yui-dt-first,.yui-skin-sam .yui-dt-paginator
.yui-dt-last,.yui-skin-sam .yui-dt-paginator .yui-dt-selected{padding:2px
6px;}.yui-skin-sam .yui-dt-paginator a.yui-dt-first,.yui-skin-sam
.yui-dt-paginator a.yui-dt-last{text-decoration:none;}.yui-skin-sam
.yui-dt-paginator .yui-dt-previous,.yui-skin-sam .yui-dt-paginator
.yui-dt-next{display:none;}.yui-skin-sam a.yui-dt-page{border:1px solid
#CBCBCB;padding:2px
6px;text-decoration:none;background-color:#fff;}.yui-skin-sam
.yui-dt-selected{border:1px solid #fff;background-color:#fff;}
+.yui-skin-sam
.yui-dt-mask{position:absolute;z-index:9500}.yui-dt-tmp{position:absolute;left:-9000px}.yui-dt-scrollable
.yui-dt-bd{overflow:auto}.yui-dt-scrollable
.yui-dt-hd{overflow:hidden;position:relative}.yui-dt-scrollable .yui-dt-bd
thead tr,.yui-dt-scrollable .yui-dt-bd thead
th{position:absolute;left:-1500px}.yui-dt-scrollable
tbody{-moz-outline:0}.yui-skin-sam thead
.yui-dt-sortable{cursor:pointer}.yui-skin-sam thead
.yui-dt-draggable{cursor:move}.yui-dt-coltarget{position:absolute;z-index:999}.yui-dt-hd{zoom:1}th.yui-dt-resizeable
.yui-dt-resizerliner{position:relative}.yui-dt-resizer{position:absolute;right:0;bottom:0;height:100%;cursor:e-resize;cursor:col-resize;background-color:#CCC;opacity:0;filter:alpha(opacity=0)}.yui-dt-resizerproxy{visibility:hidden;position:absolute;z-index:9000;background-color:#CCC;opacity:0;filter:alpha(opacity=0)}th.yui-dt-hidden
.yui-dt-liner,td.yui-dt-hidden .yui-dt-liner,th.yui-dt-hidden
.yui-dt-resizer{display:none}.yui-dt-editor,.yui-dt-editor-shim{position:absolute;z-index:9000}.yui-skin-sam
.yui-dt
table{margin:0;padding:0;font-family:arial;font-size:inherit;border-collapse:separate;*border-collapse:collapse;border-spacing:0;border:1px
solid #7f7f7f}.yui-skin-sam .yui-dt thead{border-spacing:0}.yui-skin-sam
.yui-dt
caption{color:#000;font-size:85%;font-weight:normal;font-style:italic;line-height:1;padding:1em
0;text-align:center}.yui-skin-sam .yui-dt th{background:#d8d8da
url(sprite.png) repeat-x 0 0}.yui-skin-sam .yui-dt th,.yui-skin-sam .yui-dt th
a{font-weight:normal;text-decoration:none;color:#000;vertical-align:bottom}.yui-skin-sam
.yui-dt th{margin:0;padding:0;border:0;border-right:1px solid
#cbcbcb}.yui-skin-sam .yui-dt tr.yui-dt-first td{border-top:1px solid
#7f7f7f}.yui-skin-sam .yui-dt th .yui-dt-liner{white-space:nowrap}.yui-skin-sam
.yui-dt-liner{margin:0;padding:0;padding:4px 10px 4px 10px}.yui-skin-sam
.yui-dt-coltarget{width:5px;background-color:red}.yui-skin-sam .yui-dt
td{margin:0;padding:0;border:0;border-right:1px solid
#cbcbcb;text-align:left}.yui-skin-sam .yui-dt-list
td{border-right:0}.yui-skin-sam .yui-dt-resizer{width:6px}.yui-skin-sam
.yui-dt-mask{background-color:#000;opacity:.25;filter:alpha(opacity=25)}.yui-skin-sam
.yui-dt-message{background-color:#FFF}.yui-skin-sam .yui-dt-scrollable
table{border:0}.yui-skin-sam .yui-dt-scrollable .yui-dt-hd{border-left:1px
solid #7f7f7f;border-top:1px solid #7f7f7f;border-right:1px solid
#7f7f7f}.yui-skin-sam .yui-dt-scrollable .yui-dt-bd{border-left:1px solid
#7f7f7f;border-bottom:1px solid #7f7f7f;border-right:1px solid
#7f7f7f;background-color:#FFF}.yui-skin-sam .yui-dt-scrollable .yui-dt-data
tr.yui-dt-last td{border-bottom:1px solid #7f7f7f}.yui-skin-sam
th.yui-dt-asc,.yui-skin-sam th.yui-dt-desc{background:url(sprite.png) repeat-x
0 -100px}.yui-skin-sam th.yui-dt-sortable
.yui-dt-label{margin-right:10px}.yui-skin-sam th.yui-dt-asc
.yui-dt-liner{background:url(dt-arrow-up.png) no-repeat right}.yui-skin-sam
th.yui-dt-desc .yui-dt-liner{background:url(dt-arrow-dn.png) no-repeat
right}tbody
.yui-dt-editable{cursor:pointer}.yui-dt-editor{text-align:left;background-color:#f2f2f2;border:1px
solid #808080;padding:6px}.yui-dt-editor
label{padding-left:4px;padding-right:6px}.yui-dt-editor
.yui-dt-button{padding-top:6px;text-align:right}.yui-dt-editor .yui-dt-button
button{background:url(sprite.png) repeat-x 0 0;border:1px solid
#999;width:4em;height:1.8em;margin-left:6px}.yui-dt-editor .yui-dt-button
button.yui-dt-default{background:url(sprite.png) repeat-x 0
-1400px;background-color:#5584e0;border:1px solid
#304369;color:#FFF}.yui-dt-editor .yui-dt-button
button:hover{background:url(sprite.png) repeat-x 0
-1300px;color:#000}.yui-dt-editor .yui-dt-button
button:active{background:url(sprite.png) repeat-x 0
-1700px;color:#000}.yui-skin-sam
tr.yui-dt-even{background-color:#FFF}.yui-skin-sam
tr.yui-dt-odd{background-color:#edf5ff}.yui-skin-sam tr.yui-dt-even
td.yui-dt-asc,.yui-skin-sam tr.yui-dt-even
td.yui-dt-desc{background-color:#edf5ff}.yui-skin-sam tr.yui-dt-odd
td.yui-dt-asc,.yui-skin-sam tr.yui-dt-odd
td.yui-dt-desc{background-color:#dbeaff}.yui-skin-sam .yui-dt-list
tr.yui-dt-even{background-color:#FFF}.yui-skin-sam .yui-dt-list
tr.yui-dt-odd{background-color:#FFF}.yui-skin-sam .yui-dt-list tr.yui-dt-even
td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-even
td.yui-dt-desc{background-color:#edf5ff}.yui-skin-sam .yui-dt-list
tr.yui-dt-odd td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-odd
td.yui-dt-desc{background-color:#edf5ff}.yui-skin-sam
th.yui-dt-highlighted,.yui-skin-sam th.yui-dt-highlighted
a{background-color:#b2d2ff}.yui-skin-sam tr.yui-dt-highlighted,.yui-skin-sam
tr.yui-dt-highlighted td.yui-dt-asc,.yui-skin-sam tr.yui-dt-highlighted
td.yui-dt-desc,.yui-skin-sam tr.yui-dt-even td.yui-dt-highlighted,.yui-skin-sam
tr.yui-dt-odd
td.yui-dt-highlighted{cursor:pointer;background-color:#b2d2ff}.yui-skin-sam
.yui-dt-list th.yui-dt-highlighted,.yui-skin-sam .yui-dt-list
th.yui-dt-highlighted a{background-color:#b2d2ff}.yui-skin-sam .yui-dt-list
tr.yui-dt-highlighted,.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted
td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted
td.yui-dt-desc,.yui-skin-sam .yui-dt-list tr.yui-dt-even
td.yui-dt-highlighted,.yui-skin-sam .yui-dt-list tr.yui-dt-odd
td.yui-dt-highlighted{cursor:pointer;background-color:#b2d2ff}.yui-skin-sam
th.yui-dt-selected,.yui-skin-sam th.yui-dt-selected
a{background-color:#446cd7}.yui-skin-sam tr.yui-dt-selected td,.yui-skin-sam
tr.yui-dt-selected td.yui-dt-asc,.yui-skin-sam tr.yui-dt-selected
td.yui-dt-desc{background-color:#426fd9;color:#FFF}.yui-skin-sam tr.yui-dt-even
td.yui-dt-selected,.yui-skin-sam tr.yui-dt-odd
td.yui-dt-selected{background-color:#446cd7;color:#FFF}.yui-skin-sam
.yui-dt-list th.yui-dt-selected,.yui-skin-sam .yui-dt-list th.yui-dt-selected
a{background-color:#446cd7}
+.yui-skin-sam .yui-dt-list tr.yui-dt-selected td,.yui-skin-sam .yui-dt-list
tr.yui-dt-selected td.yui-dt-asc,.yui-skin-sam .yui-dt-list tr.yui-dt-selected
td.yui-dt-desc{background-color:#426fd9;color:#FFF}.yui-skin-sam .yui-dt-list
tr.yui-dt-even td.yui-dt-selected,.yui-skin-sam .yui-dt-list tr.yui-dt-odd
td.yui-dt-selected{background-color:#446cd7;color:#FFF}.yui-skin-sam
.yui-dt-paginator{display:block;margin:6px 0;white-space:nowrap}.yui-skin-sam
.yui-dt-paginator .yui-dt-first,.yui-skin-sam .yui-dt-paginator
.yui-dt-last,.yui-skin-sam .yui-dt-paginator .yui-dt-selected{padding:2px
6px}.yui-skin-sam .yui-dt-paginator a.yui-dt-first,.yui-skin-sam
.yui-dt-paginator a.yui-dt-last{text-decoration:none}.yui-skin-sam
.yui-dt-paginator .yui-dt-previous,.yui-skin-sam .yui-dt-paginator
.yui-dt-next{display:none}.yui-skin-sam a.yui-dt-page{border:1px solid
#cbcbcb;padding:2px
6px;text-decoration:none;background-color:#fff}.yui-skin-sam
.yui-dt-selected{border:1px solid #fff;background-color:#fff}
Modified:
branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/editor.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/editor.css
2011-04-30 13:02:59 UTC (rev 7238)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/assets/skins/sam/editor.css
2011-04-30 18:13:44 UTC (rev 7239)
@@ -1,8 +1,8 @@
/*
-Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Copyright (c) 2011, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.com/yui/license.html
-version: 2.8.2r1
+version: 2.9.0
*/
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7239] Merge 7235:7238 from trunk,
Sigurd Nes <=