fmsystem-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [10479] Merge 10394:10478 from trunk

From: Sigurd Nes
Subject: [Fmsystem-commits] [10479] Merge 10394:10478 from trunk
Date: Tue, 06 Nov 2012 10:47:28 +0000 
Revision: 10479
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10479
Author:   sigurdne
Date:     2012-11-06 10:47:26 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Merge 10394:10478 from trunk

Modified Paths:
--------------
    
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
    
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
    branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
    branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
    
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list_partial.php
    branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
    
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
    branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
    branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php
    
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
    branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
    branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php
    branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
    
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
    
branches/Version-1_0-branch/logistic/inc/class.uiresource_type_requirement.inc.php
    branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
    branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php
    
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
    branches/Version-1_0-branch/logistic/js/logistic/activity.js
    branches/Version-1_0-branch/logistic/js/logistic/project.js
    branches/Version-1_0-branch/logistic/js/logistic/resource_allocation.js
    branches/Version-1_0-branch/logistic/setup/phpgw_no.lang
    branches/Version-1_0-branch/logistic/setup/setup.inc.php
    branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
    branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
    branches/Version-1_0-branch/logistic/templates/base/css/base.css
    branches/Version-1_0-branch/logistic/templates/base/project/project_item.xsl
    
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
    
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
    
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
    
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
    branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.datetime.inc.php
    branches/Version-1_0-branch/phpgwapi/inc/class.uicommon.inc.php
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraysort/arraysort-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraysort/arraysort-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraysort/arraysort.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/autocomplete-list.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/bg.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/horizontal-menu-submenu-toggle.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/scrollview-scrollbars.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/widget-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/async-queue/async-queue-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/async-queue/async-queue-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/async-queue/async-queue.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/charts/charts-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/charts/charts-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/charts/charts.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/classnamemanager/classnamemanager-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/classnamemanager/classnamemanager-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/classnamemanager/classnamemanager.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/cookie/cookie-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/cookie/cookie-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/cookie/cookie.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase/base-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase/base.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts/fonts-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts/fonts.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids/grids-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids/grids.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-simulate/event-simulate-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-simulate/event-simulate-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-simulate/event-simulate.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-valuechange/event-valuechange-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-valuechange/event-valuechange-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-valuechange/event-valuechange.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/imageloader/imageloader-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/imageloader/imageloader-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/imageloader/imageloader.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/intl/intl-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/intl/intl-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/intl/intl.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/assets/node-flick-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/assets/skins/sam/node-flick-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/assets/skins/sam/node-flick.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/node-flick-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/node-flick-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/node-flick.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-focusmanager/node-focusmanager-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-focusmanager/node-focusmanager-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-focusmanager/node-focusmanager.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/node-menunav-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/skins/sam/horizontal-menu-submenu-indicator.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/skins/sam/horizontal-menu-submenu-toggle.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/skins/sam/node-menunav-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/skins/sam/node-menunav.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/skins/sam/vertical-menu-submenu-indicator.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/node-menunav-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/node-menunav-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/node-menunav.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/oop/oop-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/oop/oop-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/oop/oop.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/assets/overlay-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/assets/skins/sam/overlay-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/assets/skins/sam/overlay.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/overlay-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/overlay-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/overlay.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/plugin/plugin-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/plugin/plugin-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/plugin/plugin.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/profiler/profiler-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/profiler/profiler-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/profiler/profiler.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/queue-promote/queue-promote-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/queue-promote/queue-promote-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/queue-promote/queue-promote.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/simpleyui/simpleyui-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/simpleyui/simpleyui-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/simpleyui/simpleyui.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/stylesheet/stylesheet-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/stylesheet/stylesheet-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/stylesheet/stylesheet.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/swfdetect/swfdetect-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/swfdetect/swfdetect-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/swfdetect/swfdetect.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/test/test-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/test/test-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/test/test.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/uploader-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/uploader-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/uploader.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yql/yql-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yql/yql-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yql/yql.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui.js
    branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
    branches/Version-1_0-branch/property/inc/class.bocondition_survey.inc.php
    branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
    branches/Version-1_0-branch/property/inc/class.menu.inc.php
    branches/Version-1_0-branch/property/inc/class.soadmin_location.inc.php
    branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
    branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
    branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
    branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
    branches/Version-1_0-branch/property/setup/default_records.inc.php
    branches/Version-1_0-branch/property/setup/setup.inc.php
    branches/Version-1_0-branch/property/setup/tables_current.inc.php
    branches/Version-1_0-branch/property/setup/tables_update.inc.php

Added Paths:
-----------
    branches/Version-1_0-branch/logistic/images/
    
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
    
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
    
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
    
branches/Version-1_0-branch/logistic/templates/base/allocation/book_resources.xsl
    branches/Version-1_0-branch/phpgwapi/inc/yui-combo-master/
    branches/Version-1_0-branch/phpgwapi/js/yui3/align-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-color/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-curve/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-easing/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-node-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-scroll/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-shape/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-shape-transform/
    branches/Version-1_0-branch/phpgwapi/js/yui3/anim-xy/
    branches/Version-1_0-branch/phpgwapi/js/yui3/app-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/app-content/
    branches/Version-1_0-branch/phpgwapi/js/yui3/app-transitions/
    branches/Version-1_0-branch/phpgwapi/js/yui3/app-transitions-css/
    branches/Version-1_0-branch/phpgwapi/js/yui3/app-transitions-native/
    branches/Version-1_0-branch/phpgwapi/js/yui3/array-extras/
    branches/Version-1_0-branch/phpgwapi/js/yui3/array-invoke/
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraylist/
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraylist-add/
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraylist-filter/
    branches/Version-1_0-branch/phpgwapi/js/yui3/arraysort/arraysort-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/arrows.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/calendar-base.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/calendar.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/calendarnavigator.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/console-filters.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/console.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/datatable-base-deprecated.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/datatable-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/datatable-message.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/datatable-scroll.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/datatable-sort.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/dial.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/dt-arrow-dn.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/dt-arrow-up.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/horizontal-menu-submenu-indicator.png
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/node-flick.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/node-menunav.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/overlay.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/panel.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/rail-x-lines.png
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/rail-x.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/rail-y-lines.png
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/rail-y.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/resize-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/scrollview-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/scrollview-list.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/slider-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/sort-arrow-sprite-ie.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/sort-arrow-sprite.png
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/sprite.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/sprite_icons.gif
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/sprite_icons.png
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/tabview.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/test-console.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/thumb-y.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/vertical-menu-submenu-indicator.png
    branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/warn_error.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/widget-buttons.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/widget-modality.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/widget-stack.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/async-queue/async-queue-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/attribute-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/attribute-complex/
    branches/Version-1_0-branch/phpgwapi/js/yui3/attribute-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/attribute-events/
    branches/Version-1_0-branch/phpgwapi/js/yui3/attribute-extras/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-filters/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-filters-accentfold/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-highlighters/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-highlighters-accentfold/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-list/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-list-keys/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete-sources/
    branches/Version-1_0-branch/phpgwapi/js/yui3/base-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/base-build/
    branches/Version-1_0-branch/phpgwapi/js/yui3/base-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/base-pluginhost/
    branches/Version-1_0-branch/phpgwapi/js/yui3/button/
    branches/Version-1_0-branch/phpgwapi/js/yui3/button-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/button-group/
    branches/Version-1_0-branch/phpgwapi/js/yui3/button-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cache-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cache-offline/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cache-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/calendar/
    branches/Version-1_0-branch/phpgwapi/js/yui3/calendar-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/calendarnavigator/
    branches/Version-1_0-branch/phpgwapi/js/yui3/charts/charts-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/charts-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/charts-legend/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/classnamemanager/classnamemanager-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/clickable-rail/
    branches/Version-1_0-branch/phpgwapi/js/yui3/console/
    branches/Version-1_0-branch/phpgwapi/js/yui3/console-filters/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cookie/cookie-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/createlink-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase/cssbase-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase/cssbase.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase-context/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbutton/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts/cssfonts-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts/cssfonts.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts-context/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids/cssgrids-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids/cssgrids.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids-context-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssgrids-units/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssreset/
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssreset-context/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema-array/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema-json/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema-text/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema-xml/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-arrayschema/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-cache/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-function/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-get/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-io/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-jsonschema/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-local/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-polling/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-textschema/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datasource-xmlschema/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-base-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-body/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-column-widths/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-datasource/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-datasource-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-head/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-message/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-mutable/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-scroll/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-scroll-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-sort/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-sort-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatable-table/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-date-format/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-date-math/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-date-parse/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-number-format/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-number-parse/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-xml-format/
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype-xml-parse/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-constrain/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-ddm/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-ddm-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-ddm-drop/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-delegate/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-drag/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-drop/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-drop-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-gestures/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-proxy/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd-scroll/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dial/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-attrs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-class/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-create/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-screen/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-size/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-style/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom-style-ie/
    branches/Version-1_0-branch/phpgwapi/js/yui3/dump/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-bidi/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-br/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-lists/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-para/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-para-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-para-ie/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-selection/
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor-tab/
    branches/Version-1_0-branch/phpgwapi/js/yui3/escape/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-base-ie/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-contextmenu/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom-complex/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-delegate/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-flick/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-focus/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-hover/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-key/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-mouseenter/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-mousewheel/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-move/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-outside/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-resize/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-simulate/event-simulate-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-synthetic/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-tap/
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-touch/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-valuechange/event-valuechange-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/exec-command/
    branches/Version-1_0-branch/phpgwapi/js/yui3/features/
    branches/Version-1_0-branch/phpgwapi/js/yui3/file/
    branches/Version-1_0-branch/phpgwapi/js/yui3/file-flash/
    branches/Version-1_0-branch/phpgwapi/js/yui3/file-html5/
    branches/Version-1_0-branch/phpgwapi/js/yui3/frame/
    branches/Version-1_0-branch/phpgwapi/js/yui3/gallery-formvalidator/
    branches/Version-1_0-branch/phpgwapi/js/yui3/gesture-simulate/
    branches/Version-1_0-branch/phpgwapi/js/yui3/get/
    branches/Version-1_0-branch/phpgwapi/js/yui3/get-nodejs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics-canvas/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics-canvas-default/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics-svg/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics-svg-default/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics-vml/
    branches/Version-1_0-branch/phpgwapi/js/yui3/graphics-vml-default/
    branches/Version-1_0-branch/phpgwapi/js/yui3/handlebars-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/handlebars-compiler/
    branches/Version-1_0-branch/phpgwapi/js/yui3/highlight-accentfold/
    branches/Version-1_0-branch/phpgwapi/js/yui3/highlight-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/history-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/history-hash/
    branches/Version-1_0-branch/phpgwapi/js/yui3/history-hash-ie/
    branches/Version-1_0-branch/phpgwapi/js/yui3/history-html5/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/imageloader/imageloader-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/intl/intl-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/intl-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/io-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/io-form/
    branches/Version-1_0-branch/phpgwapi/js/yui3/io-nodejs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/io-queue/
    branches/Version-1_0-branch/phpgwapi/js/yui3/io-upload-iframe/
    branches/Version-1_0-branch/phpgwapi/js/yui3/io-xdr/
    branches/Version-1_0-branch/phpgwapi/js/yui3/json-parse/
    branches/Version-1_0-branch/phpgwapi/js/yui3/json-stringify/
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp-url/
    branches/Version-1_0-branch/phpgwapi/js/yui3/lazy-model-list/
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader-rollup/
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader-yui3/
    branches/Version-1_0-branch/phpgwapi/js/yui3/matrix/
    branches/Version-1_0-branch/phpgwapi/js/yui3/model/
    branches/Version-1_0-branch/phpgwapi/js/yui3/model-list/
    branches/Version-1_0-branch/phpgwapi/js/yui3/model-sync-rest/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-event-delegate/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-event-html5/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-event-simulate/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-flick/node-flick-coverage.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-focusmanager/node-focusmanager-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-load/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/assets/skins/night/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node-menunav/node-menunav-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-pluginhost/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-screen/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-scroll-info/
    branches/Version-1_0-branch/phpgwapi/js/yui3/node-style/
    branches/Version-1_0-branch/phpgwapi/js/yui3/oop/oop-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/assets/skins/night/
    branches/Version-1_0-branch/phpgwapi/js/yui3/overlay/overlay-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/panel/
    branches/Version-1_0-branch/phpgwapi/js/yui3/parallel/
    branches/Version-1_0-branch/phpgwapi/js/yui3/pjax/
    branches/Version-1_0-branch/phpgwapi/js/yui3/pjax-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/pjax-content/
    branches/Version-1_0-branch/phpgwapi/js/yui3/pjax-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/plugin/plugin-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost-config/
    branches/Version-1_0-branch/phpgwapi/js/yui3/profiler/profiler-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/querystring-parse/
    branches/Version-1_0-branch/phpgwapi/js/yui3/querystring-parse-simple/
    branches/Version-1_0-branch/phpgwapi/js/yui3/querystring-stringify/
    branches/Version-1_0-branch/phpgwapi/js/yui3/querystring-stringify-simple/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/queue-promote/queue-promote-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/range-slider/
    branches/Version-1_0-branch/phpgwapi/js/yui3/recordset-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/recordset-filter/
    branches/Version-1_0-branch/phpgwapi/js/yui3/recordset-indexer/
    branches/Version-1_0-branch/phpgwapi/js/yui3/recordset-sort/
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize-constrain/
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize-proxy/
    branches/Version-1_0-branch/phpgwapi/js/yui3/router/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview-base-ie/
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview-list/
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview-paginator/
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview-scrollbars/
    branches/Version-1_0-branch/phpgwapi/js/yui3/selector/
    branches/Version-1_0-branch/phpgwapi/js/yui3/selector-css2/
    branches/Version-1_0-branch/phpgwapi/js/yui3/selector-css3/
    branches/Version-1_0-branch/phpgwapi/js/yui3/selector-native/
    branches/Version-1_0-branch/phpgwapi/js/yui3/shim-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/slider-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/slider-value-range/
    branches/Version-1_0-branch/phpgwapi/js/yui3/sortable/
    branches/Version-1_0-branch/phpgwapi/js/yui3/sortable-scroll/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/stylesheet/stylesheet-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/substitute/
    branches/Version-1_0-branch/phpgwapi/js/yui3/swf/
    branches/Version-1_0-branch/phpgwapi/js/yui3/swfdetect/swfdetect-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/tabview/
    branches/Version-1_0-branch/phpgwapi/js/yui3/tabview-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/tabview-plugin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/test/test-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/test-console/
    branches/Version-1_0-branch/phpgwapi/js/yui3/text-accentfold/
    branches/Version-1_0-branch/phpgwapi/js/yui3/text-data-accentfold/
    branches/Version-1_0-branch/phpgwapi/js/yui3/text-data-wordbreak/
    branches/Version-1_0-branch/phpgwapi/js/yui3/text-wordbreak/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/transition-timer/
    
branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/assets/flashuploader.swf
    
branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/assets/uploader-flash-core.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/uploader-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader-deprecated/
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader-flash/
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader-html5/
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader-queue/
    branches/Version-1_0-branch/phpgwapi/js/yui3/view/
    branches/Version-1_0-branch/phpgwapi/js/yui3/view-node-map/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-anim/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-autohide/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-base-ie/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-buttons/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-child/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-htmlparser/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-locale/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-modality/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-parent/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-position/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-position-align/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-position-constrain/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-skin/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-stack/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-stdmod/
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget-uievents/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yql/yql-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yql-nodejs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yql-winjs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-coverage.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-base/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-core/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-later/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-log/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-log-nodejs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-nodejs/
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui-throttle/
    branches/Version-1_0-branch/property/inc/import/import_update_generic.php
    branches/Version-1_0-branch/property/js/portico/condition_survey_edit.js
    branches/Version-1_0-branch/property/templates/base/condition_survey.xsl

Removed Paths:
-------------
    branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php
    
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item.xsl
    
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
    
branches/Version-1_0-branch/logistic/templates/base/allocation/allocation_suggestions.xsl
    
branches/Version-1_0-branch/phpgwapi/js/yui3/assets/skins/sam/thumb-classic-x.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/assets/autocomplete-list-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/assets/skins/sam/autocomplete-list-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/assets/skins/sam/autocomplete-list.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/assets/skins/sam/autocomplete.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-base-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-base-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-base.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-filters-accentfold-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-filters-accentfold-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-filters-accentfold.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-filters-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-filters-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-filters.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-highlighters-accentfold-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-highlighters-accentfold-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-highlighters-accentfold.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-highlighters-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-highlighters-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-highlighters.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-list-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-list-keys-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-list-keys-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-list-keys.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-list-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-list.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-plugin-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-plugin-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-plugin.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-sources-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-sources-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete-sources.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/autocomplete.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/lang/autocomplete-list.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/lang/autocomplete-list_en.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/lang/autocomplete.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/autocomplete/lang/autocomplete_en.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/collection/array-extras-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/array-extras-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/array-extras.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/collection/array-invoke-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/array-invoke-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/array-invoke.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-add-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-add-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-add.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-filter-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-filter-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-filter.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/arraylist.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/collection-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/collection-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/collection/collection.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/compat/compat-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/compat/compat-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/compat/compat.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase/base-context-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssbase/base-context.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts/fonts-context-min.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/cssfonts/fonts-context.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-array-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-array-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-array.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-base-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-json-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-json-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-json.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-text-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-text-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-text.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-xml-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-xml-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema-xml.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dataschema/dataschema.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-format-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-format-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-format.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-parse-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-parse-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date-parse.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-date.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-format-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-format-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-format.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-parse-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-parse-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number-parse.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-number.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-format-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-format-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-format.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-parse-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-parse-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml-parse.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype-xml.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/datatype.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ar-JO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ar.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ca-ES.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ca.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_da-DK.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_da.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_de-AT.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_de-DE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_de.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_el-GR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_el.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-AU.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-CA.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-GB.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-IE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-IN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-JO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-MY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-NZ.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-PH.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-SG.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en-US.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_en.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-AR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-BO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-CL.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-CO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-EC.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-ES.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-MX.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-PE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-PY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-US.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-UY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es-VE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_es.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_fi-FI.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_fi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_fr-BE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_fr-CA.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_fr-FR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_fr.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_hi-IN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_hi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_id-ID.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_id.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_it-IT.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_it.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ja-JP.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ja.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ko-KR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ko.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ms-MY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ms.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_nb-NO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_nb.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_nl-BE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_nl-NL.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_nl.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_pl-PL.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_pl.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_pt-BR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_pt.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ro-RO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ro.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ru-RU.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_ru.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_sv-SE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_sv.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_th-TH.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_th.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_tr-TR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_tr.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_vi-VN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_vi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_zh-Hans-CN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_zh-Hans.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_zh-Hant-HK.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_zh-Hant-TW.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date-format_zh-Hant.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ar-JO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ar.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ca-ES.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ca.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_da-DK.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_da.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_de-AT.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_de-DE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_de.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_el-GR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_el.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-AU.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-CA.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-GB.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-IE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-IN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-JO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-MY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-NZ.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-PH.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-SG.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en-US.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_en.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-AR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-BO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-CL.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-CO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-EC.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-ES.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-MX.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-PE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-PY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-US.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-UY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es-VE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_es.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_fi-FI.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_fi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_fr-BE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_fr-CA.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_fr-FR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_fr.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_hi-IN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_hi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_id-ID.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_id.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_it-IT.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_it.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ja-JP.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ja.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ko-KR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ko.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ms-MY.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ms.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_nb-NO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_nb.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_nl-BE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_nl-NL.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_nl.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_pl-PL.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_pl.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_pt-BR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_pt.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ro-RO.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ro.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ru-RU.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_ru.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_sv-SE.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_sv.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_th-TH.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_th.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_tr-TR.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_tr.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_vi-VN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_vi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_zh-Hans-CN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_zh-Hans.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_zh-Hant-HK.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_zh-Hant-TW.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype-date_zh-Hant.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ar-JO.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ar.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ca-ES.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ca.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_da-DK.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_da.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_de-AT.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_de-DE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_de.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_el-GR.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_el.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-AU.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-CA.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-GB.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-IE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-IN.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-JO.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-MY.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-NZ.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-PH.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-SG.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en-US.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_en.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-AR.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-BO.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-CL.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-CO.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-EC.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-ES.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-MX.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-PE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-PY.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-US.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-UY.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es-VE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_es.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_fi-FI.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_fi.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_fr-BE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_fr-CA.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_fr-FR.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_fr.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_hi-IN.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_hi.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_id-ID.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_id.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_it-IT.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_it.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ja-JP.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ja.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ko-KR.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ko.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ms-MY.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ms.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_nb-NO.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_nb.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_nl-BE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_nl-NL.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_nl.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_pl-PL.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_pl.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_pt-BR.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_pt.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ro-RO.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ro.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ru-RU.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_ru.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_sv-SE.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_sv.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_th-TH.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_th.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_tr-TR.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_tr.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_vi-VN.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_vi.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_zh-Hans-CN.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_zh-Hans.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_zh-Hant-HK.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_zh-Hant-TW.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/datatype/lang/datatype_zh-Hant.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-constrain-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-constrain-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-constrain.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-drop-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-drop-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-drop.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-ddm.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-delegate-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-delegate-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-delegate.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drag-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drag-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drag.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drop-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drop-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drop-plugin-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drop-plugin-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drop-plugin.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-drop.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-gestures-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-gestures-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-gestures.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-plugin-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-plugin-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-plugin.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-proxy-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-proxy-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-proxy.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-scroll-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-scroll-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd-scroll.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dd/dd.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-deprecated-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-deprecated-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-deprecated.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-screen-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-screen-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-screen.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-style-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-style-ie-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-style-ie-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-style-ie.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-style-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom-style.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/dom.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-css2-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-css2-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-css2.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-css3-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-css3-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-css3.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-native-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-native-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector-native.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/dom/selector.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/createlink-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/createlink-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/createlink-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-bidi-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-bidi-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-bidi.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-br-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-br-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-br.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-lists-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-lists-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-lists.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-para-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-para-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-para.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-tab-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-tab-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor-tab.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/editor.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/exec-command-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/exec-command-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/exec-command.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/frame-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/frame-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/frame.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/selection-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/selection-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/editor/selection.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-base-ie-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-base-ie-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-base-ie.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-delegate-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-delegate-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-delegate.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-focus-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-focus-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-focus.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-hover-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-hover-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-hover.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-key-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-key-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-key.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-mouseenter-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-mouseenter-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-mouseenter.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-mousewheel-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-mousewheel-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-mousewheel.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-resize-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-resize-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-resize.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-synthetic-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-synthetic-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-synthetic.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-touch-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-touch-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event-touch.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event/event.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-base-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-base-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-base.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-complex-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-complex-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-complex.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-custom/event-custom.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-flick-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-flick-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-flick.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-gestures-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-gestures-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-gestures.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-move-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-move-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/event-gestures/event-move.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-form-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-form-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-form.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-queue-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-queue-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-queue.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-upload-iframe-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-upload-iframe-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-upload-iframe.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-xdr-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-xdr-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io-xdr.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/io/io.swf
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-parse-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-parse-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-parse.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-stringify-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-stringify-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json-stringify.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/json/json.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp-url-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp-url-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/jsonp/jsonp-url.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-rollup-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-rollup-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-rollup.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-yui3-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-yui3-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/loader/loader-yui3.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/align-plugin-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/align-plugin-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/align-plugin.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-deprecated-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-deprecated-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-deprecated.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-delegate-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-delegate-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-delegate.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-html5-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-html5-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-html5.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-simulate-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-simulate-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-event-simulate.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-load-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-load-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-load.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-pluginhost-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-pluginhost-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-pluginhost.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-screen-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-screen-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-screen.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-style-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-style-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node-style.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/node.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/shim-plugin-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/shim-plugin-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/node/shim-plugin.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-base-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-base.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-config-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-config-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-config.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/pluginhost/pluginhost.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-parse-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-parse-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-parse-simple-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-parse-simple-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-parse-simple.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-parse.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-stringify-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-stringify-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-stringify-simple-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-stringify-simple-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-stringify-simple.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring-stringify.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/querystring/querystring.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/resize/assets/resize-base-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/resize/assets/skins/sam/arrows.png
    
branches/Version-1_0-branch/phpgwapi/js/yui3/resize/assets/skins/sam/resize-base-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/resize/assets/skins/sam/resize-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/resize/assets/skins/sam/resize.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-base.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-constrain-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-constrain-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-constrain.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-proxy-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-proxy-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize-proxy.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/resize/resize.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/scrollview-base-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/scrollview-paginator-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/scrollview-scrollbars-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/skins/sam/scrollview-base-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/skins/sam/scrollview-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/skins/sam/scrollview-paginator-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/skins/sam/scrollview-paginator.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/skins/sam/scrollview-scrollbars-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/assets/skins/sam/scrollview-scrollbars.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-base-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-base-ie-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-base-ie-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-base-ie.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-base.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-paginator-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-paginator-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-paginator.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-scrollbars-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-scrollbars-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/scrollview/scrollview-scrollbars.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/test/assets/skins/sam/test-skin.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/test/assets/skins/sam/test.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/test/assets/test-console.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-native-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-native-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-native.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-timer-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-timer-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/transition/transition-timer.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/uploader/assets/uploader.swf
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/skins/sam/widget-base-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/skins/sam/widget-base.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/skins/sam/widget-stack-skin.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/skins/sam/widget-stack.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/skins/sam/widget.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/widget-base-core.css
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/assets/widget-stack-core.css
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-base-ie-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-base-ie-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-base-ie.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-child-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-child-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-child.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-htmlparser-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-htmlparser-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-htmlparser.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-locale-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-locale-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-locale.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-parent-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-parent-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-parent.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-align-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-align-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-align.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-constrain-debug.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-constrain-min.js
    
branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-constrain.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-position.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-skin-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-skin-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-skin.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-stack-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-stack-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-stack.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-stdmod-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-stdmod-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-stdmod.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-uievents-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-uievents-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget-uievents.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/widget/widget.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/features-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/features-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/features.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/get-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/get-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/get.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/intl-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/intl-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/intl-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/rls-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/rls-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/rls.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-base-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-base-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-base.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-later-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-later-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-later.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-log-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-log-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-log.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-throttle-debug.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-throttle-min.js
    branches/Version-1_0-branch/phpgwapi/js/yui3/yui/yui-throttle.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,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393
   + 
/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,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478

Modified: 
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- 
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php   
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php   
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -633,6 +633,7 @@
                $city = $org_info['postaddress'];
                $activity_id = 1;
                $show_in_portal = 1;
+               $customer_internal = 0;
 
                $columns[] = 'name';
                $columns[] = 'homepage';
@@ -645,6 +646,7 @@
                $columns[] = 'district';
                $columns[] = 'organization_number';
                $columns[] = 'activity_id';
+               $columns[] = 'customer_internal';
                $columns[] = 'show_in_portal';
                $cols = implode(',',$columns);
 
@@ -659,6 +661,7 @@
                $values[] = "'{$district}'";
                $values[] = "'{$orgnr}'";
                $values[] = $this->marshal($activity_id, 'int');
+               $values[] = $customer_internal;
                $values[] = $show_in_portal;
                $vals = implode(',',$values);
 
@@ -896,5 +899,24 @@
 
                return $result;
        }
+
+       //$org->set_change_type("rejected");
+       function reject_organization($org_id)
+       {
+               if(isset($org_id))
+               {
+                       $query = "UPDATE activity_organization set 
change_type='rejected' where id={$org_id}";
+                       $result = $this->db->query($query, __LINE__, __FILE__);
+                       if(isset($result))
+                       {
+                               return true;
+                       }
+                       else
+                       {
+                               return false;
+                       }
+               }
+               return false;
+       }
 }
 ?>

Modified: 
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- 
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php   
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php   
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -13,7 +13,7 @@
        protected $so_group;
        protected $so_contact;
        protected $so_activity;
-       
+
        public $public_functions = array
        (
                'index'                         => true,
@@ -23,7 +23,7 @@
                'show'  =>      true,
                'edit'  =>      true
        );
-       
+
        public function __construct()
        {
                parent::__construct();
@@ -35,22 +35,22 @@
                $config = CreateObject('phpgwapi.config','activitycalendar');
                $config->read();
        }
-       
+
        public function index()
        {
                if(phpgw::get_var('phpgw_return_as') == 'json') {
                        return $this->index_json();
                }
-               
+
                $this->render('organization_list.php');
        }
-       
+
        public function changed_organizations()
        {
                
self::set_active_menu('activitycalendar::organizationList::changed_organizations');
                $this->render('organization_list_changed.php');
        }
-       
+
        public function index_json()
        {
                $organizations = 
activitycalendar_soorganization::get_instance()->get(); //get organizations
@@ -71,7 +71,7 @@
 
                return $this->yui_results($organizations);
        }
-       
+
        public function edit()
        {
                $GLOBALS['phpgw_info']['flags']['app_header'] .= 
'::'.lang('edit');
@@ -91,7 +91,7 @@
                        }
                        //var_dump($org);
                        $districts = $so_activity->get_districts();
-                       
+
                        if(isset($_POST['store_organization'])) // The user has 
pressed the store button
                        {
                                $orgno = phpgw::get_var('orgno');
@@ -114,7 +114,7 @@
                                //phpgw::get_var('address') . ' ' . 
phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
                                //$address_array = explode(",",$address_tmp);
                                $desc = phpgw::get_var('org_description');
-                               
+
                                $org_info = array();
                                $org_info['name'] = $org->get_name(); //new
                                $orgno_tmp = $orgno;
@@ -122,8 +122,8 @@
                                {
                                        $orgno_tmp = NULL;
                                }
-                               $org_info['orgnr'] = $orgno_tmp; 
-                               
+                               $org_info['orgnr'] = $orgno_tmp;
+
                                $org_info['homepage'] = $homepage;
                                $org_info['phone'] = $phone;
                                $org_info['email'] = $email;
@@ -133,19 +133,19 @@
                                 $org_info['postaddress'] = $city;
                                $org_info['activity_id'] = '';
                                $org_info['district'] = $district_name;
-                               
+
                                $contact1_id = phpgw::get_var('contact1_id');
                                $contact2_id = phpgw::get_var('contact2_id');
-                               
+
                                $contact1_name = 
phpgw::get_var('contact1_name');
                                $contact1_phone = 
phpgw::get_var('contact1_phone');
                                $contact1_email = 
phpgw::get_var('contact1_email');
-                               
+
                                $contact2_name = 
phpgw::get_var('contact2_name');
                                $contact2_phone = 
phpgw::get_var('contact2_phone');
                                $contact2_email = 
phpgw::get_var('contact2_email');
 
-                               
+
                                $new_org_id = 
$so_org->transfer_organization($org_info);
                                if($new_org_id)
                                {
@@ -157,9 +157,9 @@
                                        $contact1['mail'] = $contact1_email;
                                        $contact1['org_id'] = $new_org_id;
                                        
$so_activity->add_contact_person_org($contact1);
-                                       
-                                       $message = lang('messages_saved_form'); 
-                                       
+
+                                       $message = lang('messages_saved_form');
+
                                        //get affected activities and update 
with new org id
                                        $update_activities = 
$so_activity->get_activities_for_update($id);
                                        //var_dump($update_activities);
@@ -170,7 +170,7 @@
                                                $act->set_new_org(false);
                                                $so_activity->store($act);
                                        }
-                                       
+
                                        //set local organization as stored
                                        $org->set_change_type("added");
                                        $org->set_transferred(true);
@@ -182,6 +182,32 @@
                                }
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uidashboard.index'));
                        }
+                       if(isset($_POST['reject_organization'])) // The user 
has pressed the reject button
+                       {
+                               $reject_org_id = $id;
+                               if($so_org->reject_organization($reject_org_id))
+                               {
+                                       $update_activities = 
$so_activity->get_activities_for_update($reject_org_id);
+                                       //var_dump($update_activities);
+                                       foreach($update_activities as $act_id)
+                                       {
+                                               $act = 
$so_activity->get_single($act_id);
+                                               $act->set_state(5);
+                                               $so_activity->store($act);
+                                       }
+                               }
+                               else
+                               {
+                                       $error = lang('messages_form_error');
+                               }
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uidashboard.index'));
+                       }
+                       if(isset($_POST['reject_organization_update'])) // The 
user has pressed the reject button
+                       {
+                               $reject_org_id = $id;
+                               $so_org->reject_organization($reject_org_id);
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uidashboard.index'));
+                       }
                        else if(isset($_POST['update_organization'])) // The 
user has pressed the store button
                        {
                                $original_org_id = 
phpgw::get_var('original_org_id');
@@ -203,7 +229,7 @@
                                 $zip = phpgw::get_var('zip_code');
                                 $city = phpgw::get_var('city');
                                $desc = phpgw::get_var('org_description');
-                               
+
                                $org_info = array();
                                $org_info['name'] = $org->get_name(); //new
                                $orgno_tmp = $orgno;
@@ -211,8 +237,8 @@
                                {
                                        $orgno_tmp = NULL;
                                }
-                               $org_info['orgnr'] = $orgno_tmp; 
-                               
+                               $org_info['orgnr'] = $orgno_tmp;
+
                                $org_info['homepage'] = $homepage;
                                $org_info['phone'] = $phone;
                                $org_info['email'] = $email;
@@ -223,19 +249,19 @@
                                $org_info['activity_id'] = '';
                                $org_info['district'] = $district_name;
                                 $org_info['orgid'] = $original_org_id;
-                               
+
                                $contact1_id = phpgw::get_var('contact1_id');
                                $contact2_id = phpgw::get_var('contact2_id');
-                               
+
                                $contact1_name = 
phpgw::get_var('contact1_name');
                                $contact1_phone = 
phpgw::get_var('contact1_phone');
                                $contact1_email = 
phpgw::get_var('contact1_email');
-                               
+
                                $contact2_name = 
phpgw::get_var('contact2_name');
                                $contact2_phone = 
phpgw::get_var('contact2_phone');
                                $contact2_email = 
phpgw::get_var('contact2_email');
 
-                               
+
                                $so_org->update_organization($org_info);
                                
$so_activity->delete_contact_persons($original_org_id);
 
@@ -246,28 +272,28 @@
                                $contact1['mail'] = $contact1_email;
                                $contact1['org_id'] = $original_org_id;
                                $so_activity->add_contact_person_org($contact1);
-                               
+
                                $contact2 = array();
                                $contact2['name'] = $contact2_name;
                                $contact2['phone'] = $contact2_phone;
                                $contact2['mail'] = $contact_mail_2;
                                $contact2['org_id'] = $original_org_id;
                                $so_activity->add_contact_person_org($contact2);
-                                       
-                               $message = lang('messages_saved_form'); 
-                               
+
+                               $message = lang('messages_saved_form');
+
                                //set local organization as stored
                                $org->set_change_type("added");
                                $org->set_transferred(true);
                                $so_org->update_local($org);
-                               
+
                                $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'activitycalendar.uidashboard.index'));
                        }
-                       
+
                        $contact_persons = 
$so_contact->get_local_contact_persons($org->get_id());
                        $cp1 = $contact_persons[0];
                        $cp2 = $contact_persons[1];
-                       
+
                        $data = array
                        (
                                'organization'  => $org,
@@ -279,10 +305,10 @@
                                'errorMsgs' => $errorMsgs,
                                'infoMsgs' => $infoMsgs
                        );
-                       
+
                        return $this->render('organization.php', $data);
        }
-       
+
        public function show()
        {
                $GLOBALS['phpgw_info']['flags']['app_header'] .= 
'::'.lang('view');
@@ -313,7 +339,7 @@
                        $contact_persons = 
$socontact->get_local_contact_persons($group->get_id(), true);
                        $cp1 = $contact_persons[0];
                        $cp2 = $contact_persons[1];
-                       
+
                        $data = array
                        (
                                'group'         => $group,
@@ -345,11 +371,11 @@
                                $keys = array_keys($org_array);
                                $org = $org_array[$keys[0]];
                        }
-                       
+
                        $contact_persons = 
$socontact->get_local_contact_persons($org->get_id());
                        $cp1 = $contact_persons[0];
                        $cp2 = $contact_persons[1];
-                       
+
                        $data = array
                        (
                                'organization'  => $org,
@@ -360,13 +386,13 @@
                                'errorMsgs' => $errorMsgs,
                                'infoMsgs' => $infoMsgs
                        );
-                       
+
                        return $this->render('organization.php', $data);
                //}
        }
-       
-       
 
+
+
        /**
         * (non-PHPdoc)
         * @see rental/inc/rental_uicommon#query()
@@ -391,17 +417,17 @@
                // Create an empty result set
                $result_objects = array();
                $result_count = 0;
-               
+
                //Create an empty result set
                $parties = array();
-               
+
                $exp_param      = phpgw::get_var('export');
                $export = false;
                if(isset($exp_param)){
                        $export=true;
                        $num_of_objects = null;
                }
-               
+
                //Retrieve the type of query and perform type specific logic
                $type = phpgw::get_var('type');
                $changed_org = false;
@@ -415,6 +441,7 @@
                        case 'new_organizations':
                                $filters = array('new_orgs' => 'true');
                                $changed_org = true;
+                               $sort_field = 'identifier';
                                break;
                        case 'changed_groups':
                                $filters = array('changed_groups' => 'true');
@@ -438,7 +465,7 @@
                        $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);
                }
-                               
+
                //var_dump($result_objects);
                // Create an empty row set
                $rows = array();
@@ -470,24 +497,24 @@
 
                if(!$export){
                        array_walk(
-                               $organization_data['results'], 
-                               array($this, 'add_actions'), 
+                               $organization_data['results'],
+                               array($this, 'add_actions'),
                                array(                                          
                                                        // Parameters 
(non-object pointers)
-                                       $type                                   
                                                        // [2] The type of 
query                
+                                       $type                                   
                                                        // [2] The type of query
                                )
                        );
                }
-               
-               
+
+
                return $this->yui_results($organization_data, 'total_records', 
'results');
        }
-       
+
        public function get_organization_groups()
        {
-               $GLOBALS['phpgw_info']['flags']['noheader'] = true; 
-               $GLOBALS['phpgw_info']['flags']['nofooter'] = true; 
+               $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+               $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
                $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
-               
+
                $org_id = phpgw::get_var('orgid');
                $group_id = phpgw::get_var('groupid');
                $returnHTML = "<option value='0'>Ingen gruppe valgt</option>";
@@ -501,7 +528,7 @@
                                        $selected = "";
                                        if($group_id && $group_id > 0)
                                        {
-                                               $gr_id = (int)$group_id; 
+                                               $gr_id = (int)$group_id;
                                                if($gr_id == 
(int)$group->get_id())
                                                {
                                                        $selected_group = " 
selected";
@@ -513,8 +540,8 @@
                    $html = implode(' ' , $group_html);
                    $returnHTML = $returnHTML . ' ' . $html;
                }
-               
-               
+
+
                return $returnHTML;
                //return "<option>Ingen gruppe valgt</option>";
        }
@@ -530,18 +557,18 @@
                $party_id = (int)phpgw::get_var('id');
                if(isset($party_id) && $party_id > 0)
                {
-                       $party = 
rental_soparty::get_instance()->get_single($party_id); 
+                       $party = 
rental_soparty::get_instance()->get_single($party_id);
                }
                else
                {
                        $this->render('permission_denied.php',array('error' => 
lang('invalid_request')));
                        return;
                }
-               
+
                if(isset($party) && $party->has_permission(PHPGW_ACL_READ))
                {
                        return $this->render(
-                               'party.php', 
+                               'party.php',
                                array (
                                        'party'         => $party,
                                        'editable' => false,
@@ -560,7 +587,7 @@
                $browser->content_header('export.txt','text/plain');
                print rental_soparty::get_instance()->get_export_data();
        }
-       
+
        /**
         * Add action links and labels for the context menu of the list items
         *
@@ -576,7 +603,7 @@
                $value['labels'] = array();
 
                $query_type = $params[0];
-               
+
                switch($query_type)
                {
                        case 'all_organizations':
@@ -590,7 +617,7 @@
                                }
                                $value['labels'][] = lang('show');
                                break;
-                               
+
                        case 'changed_organizations':
                                $value['ajax'][] = false;
                                if($value['organization_id'] != '' && 
$value['organization_id'] != null){

Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang    
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang    
2012-11-06 10:47:26 UTC (rev 10479)
@@ -63,7 +63,7 @@
 contact 1      activitycalendar        no      Kontakt 1
 contact 2      activitycalendar        no      Kontakt 2
 contact person activitycalendar        no      Kontaktperson
-contact information    activitycalendar        no      Kontaktinformasjon 
+contact information    activitycalendar        no      Kontaktinformasjon
 cost   activitycalendar        no      Pris
 create activitycalendar        no      Lagre
 created        activitycalendar        no      Opprettet
@@ -104,7 +104,7 @@
 id     activitycalendar        no      ID
 inactivate     activitycalendar        no      Inaktivert
 inactive       activitycalendar        no      Inaktiv
-invoice information    activitycalendar        no      Fakturainformasjon 
+invoice information    activitycalendar        no      Fakturainformasjon
 responsible applicant  activitycalendar        no      Ansvarlig søker
 jan    activitycalendar        no      januar
 jul    activitycalendar        no      juli
@@ -415,7 +415,7 @@
 organization_helptext  activitycalendar        no      Velg organisasjon eller 
registrer inn ny.<br/>Stå i feltet og skriv inn første bokstav for å få opp 
oversikt.
 group_helptext activitycalendar        no      Velg gruppe/lag, eller 
ingen.<br/>Feltet vis i portal må være satt til JA om lag/gruppe skal komme opp 
i listen.
 criteria_label activitycalendar        no      Valgkriterier/søkeord i portalen
-criteria_helptext      activitycalendar        no      Feltene må fylles ut 
for at aktiviteten skal komme frem i søk i portalen, koder for kategori og 
målgruppe hentes fra booking. 
+criteria_helptext      activitycalendar        no      Feltene må fylles ut 
for at aktiviteten skal komme frem i søk i portalen, koder for kategori og 
målgruppe hentes fra booking.
 what   activitycalendar        no      HVA
 where_when     activitycalendar        no      HVOR/NÅR
 who    activitycalendar        no      HVEM
@@ -440,4 +440,5 @@
 contact_person_1_mail  activitycalendar        no      Kontaktperson 1 epost
 contact_person_2_name  activitycalendar        no      Kontaktperson 2
 contact_person_2_phone activitycalendar        no      Kontaktperson 2 tlf
-contact_person_2_mail  activitycalendar        no      Kontaktperson 2 epost
\ No newline at end of file
+contact_person_2_mail  activitycalendar        no      Kontaktperson 2 epost
+reject activitycalendar        no      Avvis organisasjon
\ No newline at end of file

Modified: 
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
===================================================================
--- 
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php    
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php    
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -17,10 +17,10 @@
                                <dd><?php echo $organization->get_name();?></dd>
                                <dt><label 
for="orgno">Organisasjonsnummer</label></dt>
                                <dd>
-                                       <?php 
+                                       <?php
                                        if($editable){?>
                                                <input type="text" name="orgno" 
value="<?php echo $organization->get_organization_number();?>"/><br/>
-                                       <?php 
+                                       <?php
                                        }else{?>
                                                <?php echo 
$organization->get_organization_number();?>
                                        <?php }?>
@@ -31,12 +31,12 @@
                                <?php $curr_district = 
$organization->get_district();
                                        if(!is_numeric($curr_district))
                                        {
-                                               $curr_district = 
activitycalendar_soactivity::get_instance()->get_district_from_name($organization->get_district());
 
+                                               $curr_district = 
activitycalendar_soactivity::get_instance()->get_district_from_name($organization->get_district());
                                        }
                                ?>
                                        <select name="org_district">
                                                <option value="0">Ingen bydel 
valgt</option>
-                                       <?php 
+                                       <?php
                                                foreach($districts as $d){?>
                                                        <option value="<?php 
echo $d['part_of_town_id']?>" <?php echo ($curr_district == 
$d['part_of_town_id'])? 'selected' : '' ?>><?php echo $d['name']?></option>
                                                <?php }?>
@@ -46,7 +46,7 @@
                                                     
if($organization->get_district()){?>
                                                        <?php echo 
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
                                        <?php       }
-                                        
+
                                                 }else{
                                                        
if($organization->get_district() && 
is_numeric($organization->get_district())){?>
                                                                <?php echo 
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
@@ -167,10 +167,12 @@
                                                
if($organization->get_original_org_id() && $organization->get_original_org_id() 
> 0)
                                                {
                                                        echo '<input 
type="submit" name="update_organization" value="' . lang('update_org') . '"/>';
+                                                       echo '<input 
type="submit" name="reject_organization_update" value="' . lang('reject') . 
'"/>';
                                                }
                                                else
                                                {
                                                        echo '<input 
type="submit" name="store_organization" value="' . lang('store') . '"/>';
+                                                       echo '<input 
type="submit" name="reject_organization" value="' . lang('reject') . '"/>';
                                                }
                                                echo '<a href="' . $cancel_link 
. '">' . lang('back_to_list') . '</a>';
                                        }
@@ -187,4 +189,3 @@
                </form>
        </div>
 </div>
-                               
\ No newline at end of file

Modified: 
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list_partial.php
===================================================================
--- 
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list_partial.php
   2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list_partial.php
   2012-11-06 10:47:26 UTC (rev 10479)
@@ -9,11 +9,56 @@
        window.location = 
'index.php?menuaction=activitycalendar.uiorganization.index';
                }
        );
-
+<?php
+       if($list_id == 'new_organizations')
+       {
+               ?>
        // Defining columns for datatable
        var columnDefs = [{
                key: "organization_number",
                label: "<?php echo lang('organization_number') ?>",
+           sortable: false
+       },
+       {
+               key: "name",
+               label: "<?php echo lang('name') ?>",
+           sortable: false
+       },
+       {
+               key: "district",
+               label: "<?php echo lang('district') ?>",
+           sortable: false
+       },
+       {
+               key: "office",
+               label: "<?php echo lang('office') ?>",
+           sortable: false
+       },
+       {
+               key: "description",
+               label: "<?php echo lang('description') ?>",
+           sortable: false
+       },
+       {
+               key: "actions",
+               hidden: true
+       },
+       {
+               key: "labels",
+               hidden: true
+       },
+       {
+               key: "ajax",
+               hidden: true
+       }
+       ];
+<?php }
+       else
+       {?>
+       // Defining columns for datatable
+       var columnDefs = [{
+               key: "organization_number",
+               label: "<?php echo lang('organization_number') ?>",
            sortable: true
        },
        {
@@ -49,6 +94,8 @@
                hidden: true
        }
        ];
+<?php  }
+       ?>
 
        <?php
                if(isset($extra_cols)){

Modified: branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php        
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/controller/inc/class.uiprocedure.inc.php        
2012-11-06 10:47:26 UTC (rev 10479)
@@ -378,14 +378,22 @@
                                        'label' => 
lang('View_documents_for_procedure')
                                ));
 
+                               
$GLOBALS['phpgw']->jqcal->add_listener('start_date');
+                               
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
+                               
$GLOBALS['phpgw']->jqcal->add_listener('revision_date');
+
+                               $end_date       = 
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'], 
$procedure->get_end_date() ? $procedure->get_end_date():'');
+                               $revision_date =  
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'], 
$procedure->get_revision_date() ? $procedure->get_revision_date():'');
+
+
                                $data = array
                                (
                                        'tabs'                                  
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
                                        'view'                                  
=> "view_procedure",
                                        'value_id'                              
=> !empty($procedure) ? $procedure->get_id() : 0,
-                                       'start_date'                    => 
$GLOBALS['phpgw']->yuical->add_listener('start_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 ($procedure->get_start_date())?$procedure->get_start_date():time())),
-                                       'end_date'                              
=> 
$GLOBALS['phpgw']->yuical->add_listener('end_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 ($procedure->get_end_date())?$procedure->get_end_date():'')),
-                                       'revision_date'                 => 
$GLOBALS['phpgw']->yuical->add_listener('revision_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 ($procedure->get_revision_date())?$procedure->get_revision_date():'')),
+                                       'start_date'                    => 
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'], 
$procedure->get_start_date() ? $procedure->get_start_date():time()),
+                                       'end_date'                              
=> $end_date ? $end_date : '',
+                                       'revision_date'                 => 
$revision_date ? $revision_date : '',
                                        'editable'                              
=> true,
                                        'procedure'                             
=> $procedure_array,
                                        //'control_area'                        
        => array('options' => $control_area_options),
@@ -397,7 +405,7 @@
 
                                
$this->use_yui_editor(array('responsibility','description', 'reference'));
 
-                               
self::render_template_xsl(array('procedure/procedure_tabs', 'common', 
'procedure/procedure_item'), $data);
+                               
self::render_template_xsl(array('procedure/procedure_tabs', 
'procedure/procedure_item'), $data);
                        }
                }
 
@@ -521,7 +529,7 @@
                                }
 
                                $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('controller') . '::' . lang('Procedure');
-                               
self::render_template_xsl(array('procedure/procedure_tabs', 'common', 
'procedure/procedure_item'), $data);
+                               
self::render_template_xsl(array('procedure/procedure_tabs', 
'procedure/procedure_item'), $data);
                        }
                }
 

Modified: 
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- 
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
  2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/controller/templates/base/procedure/procedure_item.xsl
  2012-11-06 10:47:26 UTC (rev 10479)
@@ -52,11 +52,11 @@
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <xsl:value-of 
disable-output-escaping="yes" select="start_date"/>
+                                                       <input type="text" 
id="start_date" name="start_date" size="10" value="{start_date}" 
readonly="readonly">
+                                                       </input>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:variable 
name="startdate"><xsl:value-of select="procedure/start_date" /></xsl:variable>
-                                                       <xsl:value-of 
select="php:function('date', $date_format, $startdate)" />
+                                                       <xsl:value-of 
select="start_date" />
                                                </xsl:otherwise>
                                        </xsl:choose>
                                        </dd>
@@ -66,32 +66,28 @@
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <xsl:value-of 
disable-output-escaping="yes" select="revision_date"/>
+                                                       <input type="text" 
id="revision_date" name="revision_date" size="10" value="{revision_date}" 
readonly="readonly">
+                                                       </input>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:if 
test="procedure/revision_date != 0">
-                                                               <xsl:variable 
name="revisiondate"><xsl:value-of select="procedure/revision_date" 
/></xsl:variable>
-                                                               <xsl:value-of 
select="php:function('date', $date_format, $revisiondate)" />
-                                                       </xsl:if>
+                                                       <xsl:value-of 
select="revision_date" />
                                                </xsl:otherwise>
                                        </xsl:choose>
                                        </dd>
-                                       <xsl:if test="procedure/end_date != 0">
                                        <dt>
                                                <label 
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')" 
/></label>
                                        </dt>
                                        <dd>
                                        <xsl:choose>
                                                <xsl:when test="editable">
-                                                       <xsl:value-of 
disable-output-escaping="yes" select="end_date"/>
+                                                       <input type="text" 
id="end_date" name="end_date" size="10" value="{end_date}" readonly="readonly">
+                                                       </input>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <xsl:variable 
name="enddate"><xsl:value-of select="procedure/end_date" /></xsl:variable>
-                                                       <xsl:value-of 
select="php:function('date', $date_format, $enddate)" />
+                                                       <xsl:value-of 
select="end_date" />
                                                </xsl:otherwise>
                                        </xsl:choose>
                                        </dd>
-                                       </xsl:if>
                                        <dt>
                                                <label 
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')" 
/></label>
                                        </dt>

Modified: branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php   
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php   
2012-11-06 10:47:26 UTC (rev 10479)
@@ -32,6 +32,7 @@
 
        class logistic_soactivity extends logistic_socommon
        {
+               public $total_records = 0;
                protected static $so;
                protected $activity_tree = array();
 
@@ -214,7 +215,7 @@
                 * @return array of objects. May return an empty
                 * array, never null. The array keys are the respective index 
numbers.
                 */
-               public function get(int $start_index, int $num_of_objects, 
string $sort_field, boolean $ascending, string $search_for, string 
$search_type, array $filters)
+               public function get(int $start_index, int $num_of_objects, 
string $sort_field, boolean $ascending, string $search_for, string 
$search_type, array $filters, boolean $allrows)
                {
                        $results = array();                     // Array to 
store result objects
                        $map = array();                         // Array to 
hold number of records per target object
@@ -257,7 +258,7 @@
                        }
 
                        $sql = $this->get_query($sort_field, $ascending, 
$search_for, $search_type, $filters, false);
-                       $ret = $this->read_tree($sql, $filters);
+                       $ret = $this->read_tree($sql, $filters, 
$num_of_objects, $allrows);
 
                        return $ret;
                }
@@ -280,7 +281,13 @@
 
                        $parent_id = $this->db->f('parent_activity_id');
                        $name = $this->db->f('name', true);
-                       $path = array($name);
+                       $path = array();
+                       $path[] = array
+                       (
+                               'id'    => $node,
+                               'name'  => $name
+                       );
+
                        if ($parent_id)
                        {
                                $path = 
array_merge($this->get_path($parent_id), $path);
@@ -298,7 +305,7 @@
                 * array, never null. The array keys are the respective index 
numbers.
                 */
 
-               public function read_tree($sql, $filters)
+               public function read_tree($sql, $filters, $num_of_objects = 0, 
$allrows = false)
                {
                        if($filters['activity'])
                        {
@@ -340,16 +347,47 @@
                                $this->get_children($activity['id'], 1);
                        }
 
+
                        $result = array();
-                       foreach($this->activity_tree as $_activity)
+
+//------ Start pagination
+                       $this->total_records = count($this->activity_tree);
+
+                       if($this->total_records == 0)
                        {
+                               return $result;
+                       }
+
+                       if($num_of_objects)
+                       {
+                               $num_rows = $num_of_objects;
+                       }
+                       else
+                       {
+                               $num_rows = 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] ? (int) 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] : 15;      
                
+                       }
+
+                       if($allrows)
+                       {
+                               $out = $this->activity_tree;
+                       }
+                       else
+                       {
+                               $page = ceil( ( $start / $this->total_records ) 
* ($this->total_records/ $num_rows) );
+                               $activity_tree = 
array_chunk($this->activity_tree, $num_rows);
+                               $out = $activity_tree[$page];
+                       }
+
+//------ End pagination
+
+                       foreach($out as $_activity)
+                       {
                                $this->db->query("SELECT * FROM lg_activity 
WHERE id ={$_activity['id']}",__LINE__,__FILE__);
                                $this->db->next_record();
                                $activity_obj = 
$this->populate($_activity['id']);
                                $activity_obj->set_name($_activity['name']);
                                $result[] = $activity_obj;
                        }
-
                        return $result;
                }
 

Modified: branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php    
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/class.soproject.inc.php    
2012-11-06 10:47:26 UTC (rev 10479)
@@ -58,14 +58,32 @@
                }
 
                protected function add(&$project)
-               {
+               {               
+                       $cols = array(
+                               'name',
+                               'project_type_id',
+                               'description',
+                               'create_user',
+                               'create_date',
+                               'start_date',
+                               'end_date'
+                       );
+
                        $user_id = $GLOBALS['phpgw_info']['user']['id'];
                        $now = time();
-                       $name = $project->get_name();
-                       $description = $project->get_description();
-                       $type_id = $project->get_project_type_id();
+                       
+                       $values = array(
+                               $this->marshal($project->get_name(), 'string'),
+                               $this->marshal($project->get_project_type_id(), 
'int'),
+                               $this->marshal($project->get_description(), 
'string'),
+                               $user_id,
+                               $now,
+                               $this->marshal($project->get_start_date(), 
'int'),
+                               $this->marshal($project->get_end_date(), 'int')
+                       );
 
-                       $sql = "INSERT INTO lg_project (name, description, 
project_type_id, create_user, create_date) VALUES 
('$name','$description',$type_id, $user_id, $now)";
+                       $sql = 'INSERT INTO lg_project (' . join(',', $cols) . 
') VALUES (' . join(',', $values) . ')';
+
                        $result = $this->db->query($sql, __LINE__,__FILE__);
 
                        if($result)
@@ -87,7 +105,9 @@
                        $values = array(
                                'name = ' . 
$this->marshal($project->get_name(), 'string'),
                                'description = ' . 
$this->marshal($project->get_description(), 'string'),
-                               'project_type_id = ' . 
$this->marshal($project->get_project_type_id(), 'int')
+                               'project_type_id = ' . 
$this->marshal($project->get_project_type_id(), 'int'),
+                               'start_date = ' . 
$this->marshal($project->get_start_date(), 'int'),
+                               'end_date = ' . 
$this->marshal($project->get_end_date(), 'int'),
                        );
 
                        $result = $this->db->query('UPDATE lg_project SET ' . 
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
@@ -206,6 +226,8 @@
                                {
                                        
$project->set_project_type_label($this->get_project_type_label($this->unmarshal($this->db->f('project_type_id'),
 'int')));
                                }
+                               
$project->set_start_date($this->unmarshal($this->db->f('start_date'), 'int'));
+                               
$project->set_end_date($this->unmarshal($this->db->f('end_date'), 'int'));
                        }
 
                        return $project;

Modified: 
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
===================================================================
--- 
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -142,8 +142,9 @@
 
 
                        $tables = "lg_requirement_resource_allocation 
allocation";
-                       $joins = "      {$this->left_join} phpgw_locations ON 
(phpgw_locations.location_id = allocation.location_id)";
-                       
+                       $joins .= "     {$this->left_join} phpgw_locations ON 
(phpgw_locations.location_id = allocation.location_id)";
+                       $joins .= "     {$this->left_join} fm_bim_item ON 
(fm_bim_item.location_id = allocation.location_id and fm_bim_item.id = 
allocation.resource_id )";
+                        
                        if($return_count)
                        {
                                $cols = 'COUNT(DISTINCT(allocation.id)) AS 
count';
@@ -151,10 +152,10 @@
                        else
                        {
                                $cols .= "allocation.*, ";
-                               $cols .= "phpgw_locations.descr AS 
resource_type_descr";
-                       
+                               $cols .= "phpgw_locations.descr AS 
resource_type_descr, ";
+                               $cols .= "fm_bim_item.location_code AS 
location_code, (xpath('//address/node()', 
fm_bim_item.xml_representation))[1]::text AS fm_bim_item_address, 
(xpath('//navn[1]/text()', fm_bim_item.xml_representation))[1]::text AS 
fm_bim_item_name ";
                        }
-                       
+                                               
                        $dir = $ascending ? 'ASC' : 'DESC';
                        $order = $sort_field ? "ORDER BY 
{$this->marshal($sort_field, 'field')} $dir ": '';
                        
@@ -171,10 +172,46 @@
                                
$allocation->set_requirement_id($this->unmarshal($this->db->f('requirement_id'),
 'string'));
                                
$allocation->set_resource_id($this->unmarshal($this->db->f('resource_id'), 
'int'));
                                
$allocation->set_resource_type_descr($this->unmarshal($this->db->f('resource_type_descr'),
 'string'));
+                               
$allocation->set_location_code($this->unmarshal($this->db->f('location_code'), 
'string'));
+                               
$allocation->set_fm_bim_item_address($this->unmarshal($this->db->f('fm_bim_item_address'),
 'string'));
+                               
+                               $fm_bim_name = $this->unmarshal( 
$this->db->f('fm_bim_item_name'), 'string');
+                               
+                               $allocation->set_fm_bim_item_name($fm_bim_name);
                        }
 
                        return $allocation;
                }
+               
+               function delete($resource_allocation_id)
+               {
+                       $resource_allocation_id = (int) $resource_allocation_id;
+                       $status = $this->db->query("DELETE FROM 
lg_requirement_resource_allocation WHERE id = $resource_allocation_id");
+                                       
+                       if( $status )
+                       {
+                               return true;
+                       }
+                       else
+                       {
+                               return false;
+                       }
+               }
+               
+               public function delete_resources($requirement_id)
+               {
+                       $requirement_id = (int) $requirement_id;
+                       $status = $this->db->query("DELETE FROM 
lg_requirement_resource_allocation WHERE requirement_id = $requirement_id");
+                                       
+                       if( $status )
+                       {
+                               return true;
+                       }
+                       else
+                       {
+                               return false;
+                       }
+               }
 
                public static function get_instance()
                {

Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php   
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php   
2012-11-06 10:47:26 UTC (rev 10479)
@@ -28,8 +28,11 @@
         * @version $Id$
         */
 
+       phpgw::import_class('logistic.sorequirement');
+       phpgw::import_class('logistic.sorequirement_resource_allocation');
        phpgw::import_class('phpgwapi.uicommon');
        phpgw::import_class('logistic.soactivity');
+       phpgw::import_class('phpgwapi.jquery');
 
        include_class('logistic', 'actvity');
 
@@ -37,6 +40,9 @@
        {
                private $so;
                private $so_project;
+               private $so_requirement;
+               private $so_resource_allocation;
+               
                public $public_functions = array(
                        'query'                 => true,
                        'add'                   => true,
@@ -44,7 +50,8 @@
                        'view'                  => true,
                        'index'                 => true,
                        'save'                  => true,
-                       'edit_favorite' => true
+                       'edit_favorite' => true,
+                       'view_resource_allocation'      => true
                );
 
                public function __construct()
@@ -53,6 +60,9 @@
 
                        $this->so = createObject('logistic.soactivity');
                        $this->so_project = createObject('logistic.soproject');
+                       $this->so_requirement = 
CreateObject('logistic.sorequirement');
+                       $this->so_resource_allocation = 
CreateObject('logistic.sorequirement_resource_allocation');
+                       
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"logistic::project::activity";
                }
                
@@ -71,7 +81,7 @@
                        $user_array = $this->get_user_array();
 
                        $data = array(
-                               'datatable_name'        => lang('activity'),
+                               'datatable_name'        => lang('Overview 
activities'),
                                'form' => array(
                                        'toolbar' => array(
                                                'item' => array(
@@ -94,6 +104,12 @@
                                                                'name' => 
'search',
                                                                'value' => 
lang('Search')
                                                        ),
+                                                       array(
+                                                               'type' => 
'link',
+                                                               'value' => 
lang('Add activity'),
+                                                               'href' => 
self::link(array('menuaction' => 'logistic.uiactivity.add')),
+                                                               'class' => 
'new_item'
+                                                       ),
                                                ),
                                        ),
                                ),
@@ -101,17 +117,17 @@
                                        'source' => 
self::link(array('menuaction' => 'logistic.uiactivity.index', 'phpgw_return_as' 
=> 'json', 'filter' => phpgw::get_var('filter', 'int'))),
                                        'field' => array(
                                                array(
+                                                       'key' => 'id',
+                                                       'label' => lang('Id'),
+                                                       'sortable' => true,
+                                                       'formatter' => 
'YAHOO.portico.formatLink'
+                                               ),              
+                                               array(
                                                        'key' => 'name',
                                                        'label' => 
lang('Activity name'),
                                                        'sortable' => true
                                                ),
                                                array(
-                                                       'key' => 'id',
-                                                       'label' => lang('ID'),
-                                                       'sortable' => true,
-                                                       'formatter' => 
'YAHOO.portico.formatLink'
-                                               ),
-                                               array(
                                                        'key' => 'project_name',
                                                        'label' => 
lang('Project'),
                                                        'sortable' => false
@@ -127,11 +143,16 @@
                                                        'sortable' => false
                                                ),
                                                array(
-                                                       'key' => 
'responsible_user_id',
+                                                       'key' => 
'responsible_user_name',
                                                        'label' => 
lang('Responsible user'),
                                                        'sortable' => false
                                                ),
                                                array(
+                                                       'key' => 'status',
+                                                       'label' => 
lang('Status'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -139,7 +160,6 @@
                                ),
                        );
 
-
                        $parameters = array
                                (
                                        'parameter' => array
@@ -180,7 +200,7 @@
                                                'text'                  => 
lang('t_view_requirements'),
                                                'action'                => 
$GLOBALS['phpgw']->link('/index.php',array
                                                (
-                                                       'menuaction'    => 
'logistic.uirequirement.index'
+                                                       'menuaction'    => 
'logistic.uiactivity.view_resource_allocation'
                                                )),
                                                'parameters'    => 
json_encode($parameters)
                                        );
@@ -248,24 +268,82 @@
 
                        switch ($query_type)
                        {
+                               case 'children':
+                                       $activity_id = 
phpgw::get_var('activity_id');
+                                       $filters = array('id' => $activity_id);
+                                       $result_objects = 
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending, 
$search_for, $search_type, $filters);
+                                       $object_count = 
$this->so->get_count($search_for, $search_type, $filters);
+                                       
+                                       array_shift($result_objects);
+                                       break;
+                               case 'activity_id':
+                                       $activity_id = 
phpgw::get_var('activity_id');
+                                       $filters = array('id' => $activity_id);
+                                       $result_objects = 
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending, 
$search_for, $search_type, $filters);
+                                       $object_count = 
$this->so->get_count($search_for, $search_type, $filters);
+                                       break;
                                default: // ... all activities, filters (active 
and vacant)
                                        phpgwapi_cache::session_set('logistic', 
'activity_query', $search_for);
                                        $filters = array('project' => 
phpgw::get_var('project'), 'user' => phpgw::get_var('user'), 'activity' => 
phpgw::get_var('filter', 'int'));
                                        $result_objects = 
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending, 
$search_for, $search_type, $filters);
-                                       $object_count = 
$this->so->get_count($search_for, $search_type, $filters);
+                                       $object_count = 
$this->so->total_records;
                                        break;
                        }
 
                        //Create an empty row set
                        $rows = array();
-                       foreach ($result_objects as $result)
+                       foreach ($result_objects as $activity)
                        {
-                               if (isset($result))
+                               if (isset($activity))
                                {
-                                       $rows[] = $result->serialize();
+                                       $filters = array('activity' => 
$activity->get_id());
+                                       $requirements_for_activity = 
$this->so_requirement->get($start_index, $num_of_objects, $sort_field, 
$sort_ascending, $search_for, $search_type, $filters);
+                                       
+                                       if( count( $requirements_for_activity ) 
> 0 )
+                                       {
+                                               $total_num_alloc = 0;
+                                               $total_num_required = 0;
+                                               
+                                               
foreach($requirements_for_activity as $requirement)
+                                               {
+                                                       $filters = 
array('requirement_id' => $requirement->get_id());
+                                                       $num_allocated = 
$this->so_resource_allocation->get_count($search_for, $search_type, $filters); 
+                                                        
+                                                       $num_required = 
$requirement->get_no_of_items();
+                                                       
+                                                       $total_num_alloc += 
$num_allocated;
+                                                       $total_num_required += 
$num_required;
+                                               }
+                                               
+                                               if($total_num_alloc == 
$total_num_required)
+                                               {
+                                                       $status = "Behov 
dekket";
+                                               }
+                                               else
+                                               {
+                                                       $status = "Udekket 
behov (" . ($total_num_required - $total_num_alloc) . ")" ;
+                                               }
+                                       }
+                                       else
+                                       {
+                                               $status = "Ingen registerte 
behov";
+                                       }
+                                       
+                                       $activity_arr = $activity->serialize(); 
+                                       
+                                       $activity_arr['status'] = $status;
+                                       
+                                       
+                                       $href = self::link(array('menuaction' 
=> 'logistic.uiactivity.view', 'id' => $activity_arr['id']));
+                                       $activity_arr['id'] = "<a 
href=\"{$href}\">" . $activity_arr['id'] . "</a>";
+                                       $activity_arr['name'] = "<a 
href=\"{$href}\">" . $activity_arr['name'] . "</a>";
+                                       
+                                       
+                                       $rows[] = $activity_arr;
                                }
                        }
                        
+                       
                        // ... add result data
                        $result_data = array('results' => $rows);
 
@@ -302,6 +380,11 @@
                        
                        if($activity == null)
                        {
+                               if( $project_id && is_numeric($project_id) )
+                               {
+                                       $project = 
$this->so_project->get_single($project_id);
+                               }
+                               
                                if( $activity_id && is_numeric($activity_id) )
                                {
                                        $activity = 
$this->so->get_single($activity_id);
@@ -321,7 +404,14 @@
                                        $activity->set_parent_id( 
$parent_activity_id );
                                        $parent_activity = 
$this->so->get_single( $parent_activity_id );
                                        $activity->set_project_id( 
$parent_activity->get_project_id() );
+                                       
+                                       
$activity->set_start_date($parent_activity->get_start_date());
+                                       
$activity->set_end_date($parent_activity->get_end_date());
                                }
+                               else
+                               {
+                                       $projects = $this->so_project->get();
+                               }
                        }
 
                        if($activity->get_parent_id() > 0)
@@ -338,9 +428,20 @@
                                'responsible_users' => $accounts,
                                'activities' => $activities,
                                'activity' => $activity,
-                               'editable' => true
+                               'editable' => true,
+                               'breadcrumb' => $this->_get_breadcrumb( 
$activity_id, 'logistic.uiactivity.edit', 'id')
                        );
                        
+                       if($project)
+                       {
+                               $data['project'] = $project;
+                       }
+                       
+                       if($projects)
+                       {
+                               $data['projects'] = $projects;
+                       }
+                       
                        if($parent_activity)
                        {
                                $data['parent_activity'] = $parent_activity;
@@ -351,13 +452,14 @@
 
                        $GLOBALS['phpgw']->jqcal->add_listener('start_date');
                        $GLOBALS['phpgw']->jqcal->add_listener('end_date');
-
-                       
self::render_template_xsl(array('activity/activity_item'), $data);
+                       
+                       self::add_javascript('logistic', 'logistic', 
'activity.js');
+                       self::render_template_xsl('activity/add_activity_item', 
$data);
                }
                
                public function view()
                {
-                       $activity_id = phpgw::get_var('id');
+                       $activity_id = phpgw::get_var('id', 'int');
 
                        if ($activity_id && is_numeric($activity_id))
                        {
@@ -366,11 +468,17 @@
                                $responsible_user = 
$this->so->get_responsible_user( $activity->get_responsible_user_id() );
 
                                $activity->set_responsible_user_name( 
$responsible_user );
+                               $breadcrumb = $this->_get_breadcrumb( 
$activity_id, 'logistic.uiactivity.view', 'id');
                        }
 
+                       $tabs = $this->make_tab_menu($activity_id);
+                       
                        $data = array
                        (
-                               'activity' => $activity
+                               'tabs'                  => 
$GLOBALS['phpgw']->common->create_tabs($tabs, 0),
+                               'view'                  => 'activity_details',
+                               'activity'              => $activity,
+                               'breadcrumb'    => $breadcrumb
                        );
 
                        if($activity->get_parent_id() > 0)
@@ -379,7 +487,7 @@
                                $data['parent_activity'] = $parent_activity;
                        }
                        
-                       
self::render_template_xsl(array('activity/activity_item'), $data);
+                       
self::render_template_xsl(array('activity/view_activity_item', 
'activity/activity_tabs'), $data);
                }
                
                public function save()
@@ -440,7 +548,111 @@
                        }
                        $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.index'));     
                }
+               
+               public function view_resource_allocation()
+               {
+                       $activity_id = phpgw::get_var('activity_id');
+                       $activity = $this->so->get_single($activity_id);
+                       
+                       $data = array(
+                               'form' => array(
+                                       'toolbar' => array(
+                                               'item' => array(
+                                                       array('type' => 'text',
+                                                               'text' => 
lang('search'),
+                                                               'name' => 
'query'
+                                                       ),
+                                                       array(
+                                                               'type' => 
'submit',
+                                                               'name' => 
'search',
+                                                               'value' => 
lang('Search')
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                               'datatable' => array(
+                                       'source' => 
self::link(array('menuaction' => 'logistic.uirequirement.index', 'activity_id' 
=> $activity_id, 'phpgw_return_as' => 'json')),
+                                       'field' => array(
+                                               /*array(
+                                                       'key' => 'select',
+                                                       'label' => 
lang('select'),
+                                                       'sortable' => false,
+                                               ),*/
+                                               array(
+                                                       'key' => 'id',
+                                                       'label' => lang('Id'),
+                                                       'sortable' => true,
+                                               ),
+                                               array(
+                                                       'key' => 'start_date',
+                                                       'label' => lang('Start 
date'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 'end_date',
+                                                       'label' => lang('End 
date'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 'no_of_items',
+                                                       'label' => lang('Num 
required'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 'allocated',
+                                                       'label' => lang('Num 
allocated'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 'location_id',
+                                                       'label' => 
lang('Resource type'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 'link',
+                                                       'hidden' => true
+                                               ),
+                                               array(
+                                                       'key' => 'id',
+                                                       'className' => 
'requirement_id',
+                                                       'hidden' => true
+                                               ),
+                                               array(
+                                                       'key' => 'status',
+                                                       'label' => lang('Status 
requirement'),
+                                                       'sortable' => false,
+                                               ),
+                                               array(
+                                                       'key' => 'alloc_link',
+                                                       'label' => 
lang('Allocate resources'),
+                                                       'sortable' => false,
+                                               ),
+                                               array(
+                                                       'key' => 
'edit_requirement_link',
+                                                       'label' => lang('Edit 
requirement'),
+                                                       'sortable' => false,
+                                               )
+                                       )
+                               ),
+                       );
+                       
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('paginator');
+                       phpgwapi_jquery::load_widget('core');
 
+                       $tabs = $this->make_tab_menu($activity_id);
+                       
+                       $data['tabs']                   = 
$GLOBALS['phpgw']->common->create_tabs($tabs, 1);
+                       $data['view']           = 'requirement_overview';
+                       $data['activity'] = $activity;
+                       $data['breadcrumb'] = $this->_get_breadcrumb( 
$activity_id, 'logistic.uiactivity.view_resource_allocation', 'activity_id');
+                       
+                       self::add_javascript('logistic', 'logistic', 
'activity.js');
+                       self::add_javascript('logistic', 'logistic', 
'resource_allocation.js');
+                       self::add_javascript('logistic', 'logistic', 
'requirement.js');
+                       
self::render_template_xsl(array('activity/view_activity_item', 
'requirement/requirement_overview', 'activity/activity_tabs'), $data);
+               }
+
                private function get_user_array()
                {
                        $user_array = array();
@@ -456,4 +668,53 @@
 
                        return $user_array;
                }
+               
+               function make_tab_menu($activity_id)
+               {
+                       $tabs = array();
+
+                       if($activity_id > 0){
+
+                               $activity = $this->so->get_single($activity_id);
+
+                               $tabs = array(
+                                                  array(
+                                                       'label' => "1: " . 
lang('Activity details'),
+                                                  'link'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'logistic.uiactivity.view',
+                                                                               
                                                                                
                                                                                
                         'id' => $activity->get_id()))
+                                               ), array(
+                                                       'label' => "2: " . 
lang('Requirement allocation'),
+                                                       'link'  => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'logistic.uiactivity.view_resource_allocation',
+                                                                               
                                                                                
                                                                                
                         'activity_id' => $activity->get_id()))
+                                               ));
+                       }else{
+                               $tabs = array(
+                                                  array(
+                                                       'label' => "1: " . 
lang('Activity details')
+                                               ), array(
+                                                       'label' => "2: " . 
lang('Requirement allocation')
+                               ));
+                       }
+
+                       return $tabs;
+               }
+
+               private function _get_breadcrumb($activity_id, $menuaction, 
$id_name = 'id')
+               {
+                       if(!$activity_id)
+                       {
+                               return;
+                       }
+                       $path = $this->so->get_path($activity_id);
+                       $level = count($path) - 1;
+                       $breadcrumb_array = array();
+
+                       for ($i=0;$i<$level;$i++)
+                       {
+                               $_link = self::link(array('menuaction' => 
$menuaction, $id_name => $path[$i]['id']));
+                               $breadcrumb_array[] = "<a 
href=\"{$_link}\">{$path[$i]['name']}</a>";
+                       }
+                       $breadcrumb_array[] = $path[$level]['name'];
+                       return implode(' > ', $breadcrumb_array);
+               }
        }

Deleted: branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php 
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/class.uiallocation.inc.php 
2012-11-06 10:47:26 UTC (rev 10479)
@@ -1,315 +0,0 @@
-<?php
-
-       /**
-        * phpGroupWare - logistic: a part of a Facilities Management System.
-        *
-        * @author Erik Holm-Larsen <address@hidden>
-        * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc. 
http://www.fsf.org/
-        * This file is part of phpGroupWare.
-        *
-        * phpGroupWare is free software; you can redistribute it and/or modify
-        * it under the terms of the GNU General Public License as published by
-        * the Free Software Foundation; either version 2 of the License, or
-        * (at your option) any later version.
-        *
-        * phpGroupWare is distributed in the hope that it will be useful,
-        * but WITHOUT ANY WARRANTY; without even the implied warranty of
-        * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        * GNU General Public License for more details.
-        *
-        * You should have received a copy of the GNU General Public License
-        * along with phpGroupWare; if not, write to the Free Software
-        * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
02110-1301  USA
-        *
-        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
-        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/
-        * @package property
-        * @subpackage logistic
-        * @version $Id: class.uiactivity.inc.php 10101 2012-10-03 09:46:51Z 
vator $
-        */
-       phpgw::import_class('phpgwapi.uicommon');
-       phpgw::import_class('logistic.soactivity');
-       include_class('logistic', 'activity');
-       
-       
-       class logistic_uiallocation extends phpgwapi_uicommon
-       {
-               
-               var $cat_id;
-               var $start;
-               var $query;
-               var $sort;
-               var $order;
-               var $filter;
-               var $type_id;
-               var $location_code;
-               
-               private $bo;
-               private $bocommon;
-               private $so_activity;
-               
-               public $public_functions = array(
-                       'query' => true,
-                       'add'   => true,
-                       'edit' => true,
-                       'view' => true,
-                       'index' => true
-               );
-
-               public function __construct()
-               {
-                       parent::__construct();
-                       
-                 $this->bo                                     = 
CreateObject('property.bolocation',true);
-                       $this->bocommon                         = & 
$this->bo->bocommon;
-                       
-                       $this->so_activity = 
createObject('logistic.soactivity');
-                       
-                       $this->type_id                          = 
$this->bo->type_id;
-                       
-                       $this->start                            = 
$this->bo->start;
-                       $this->query                            = 
$this->bo->query;
-                       $this->sort                                     = 
$this->bo->sort;
-                       $this->order                            = 
$this->bo->order;
-                       $this->filter                           = 
$this->bo->filter;
-                       $this->cat_id                           = 
$this->bo->cat_id;
-                       $this->part_of_town_id          = 
$this->bo->part_of_town_id;
-                       $this->district_id                      = 
$this->bo->district_id;
-                       $this->status                           = 
$this->bo->status;
-                       $this->allrows                          = 
$this->bo->allrows;
-                       $this->lookup                           = 
$this->bo->lookup;
-                       $this->location_code            = 
$this->bo->location_code;
-
-                       $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"logistic::project::allocation";
-               }
-               
-               public function index()
-               {
-                       if (phpgw::get_var('phpgw_return_as') == 'json')
-                       {
-                               return $this->query();
-                       }
-                       self::add_javascript('phpgwapi', 'yahoo', 
'datatable.js');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('paginator');
-
-                       $user_array = $this->get_user_array();
-
-                       $data = array(
-                               'datatable_name'        => lang('allocation'),
-                               'form' => array(
-                                       'toolbar' => array(
-                                               'item' => array(
-                                                       array('type' => 
'filter',
-                                                               'name' => 
'project',
-                                                               'text' => 
lang('Project') . ':',
-                                                               'list' => 
$project_array,
-                                                       ),
-                                                       array('type' => 
'filter',
-                                                               'name' => 
'user',
-                                                               'text' => 
lang('Responsible user') . ':',
-                                                               'list' => 
$user_array,
-                                                       ),
-                                                       array('type' => 'text',
-                                                               'text' => 
lang('search'),
-                                                               'name' => 
'query'
-                                                       ),
-                                                       array(
-                                                               'type' => 
'submit',
-                                                               'name' => 
'search',
-                                                               'value' => 
lang('Search')
-                                                       ),
-                                               ),
-                                       ),
-                               ),
-                               'datatable' => array(
-                                       'source' => 
self::link(array('menuaction' => 'logistic.uiallocation.index', 
'phpgw_return_as' => 'json')),
-                                       'field' => array(
-                                       array(
-                                                       'key' => 'id',
-                                                       'label' => lang('ID'),
-                                                       'sortable' => true,
-                                               ),              
-                                               array(
-                                                       'key' => 
'location_code',
-                                                       'label' => 
lang('Location code'),
-                                                       'sortable' => true
-                                               ),
-                                               array(
-                                                       'key' => 'address',
-                                                       'label' => 
lang('Address'),
-                                                       'sortable' => false
-                                               )
-                                       )
-                               ),
-                       );
-
-                       self::render_template_xsl(array('datatable_common'), 
$data);
-               }
-
-               public function query()
-               {
-                       $params = array(
-                               'start' => phpgw::get_var('startIndex', 'int', 
'REQUEST', 0),
-                               'query' => phpgw::get_var('query'),
-                               'sort' => phpgw::get_var('sort'),
-                               'dir' => phpgw::get_var('dir'),
-                               'filters' => $filters
-                       );
-                       
-                 $entity_id                    = phpgw::get_var('entity_id', 
'int');
-                       $cat_id                         = 
phpgw::get_var('cat_id', 'int');
-                       $district_id            = phpgw::get_var('district_id', 
'int');
-                       $part_of_town_id        = 
phpgw::get_var('part_of_town_id', 'int');
-                       $control_id                     = 
phpgw::get_var('control_id', 'int');
-                       $results                        = 
phpgw::get_var('results', 'int');
-                       
-/*
-                       if(!$entity_id && !$cat_id)
-                       {
-                               $values = array();
-                       }
-                       else
-                       {
-                       */
-                       $entity_id = 3;
-                       $cat_id = 1;
-                               $location_id = 
2295;//$GLOBALS['phpgw']->locations->get_id('property', 
".entity.{$entity_id}.{$cat_id}");
-                               //$boentity     = 
CreateObject('property.boentity',false, 'entity');
-                               $boentity       = 
CreateObject('property.boentity',false, 'entity', $entity_id, $cat_id);
-                               $boentity->results = $results;
-                               //$values = 
$boentity->read(array('control_registered' => $control_registered, 'control_id' 
=> $control_id));
-                               $values = $boentity->read();
-                       //}     
-
-                       $results = $results ? $results : 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
-
-                       $result_data = array('results' => $values);
-
-                       $result_data['total_records'] = 
$boentity->total_records;
-                       $result_data['start'] = $params['start'];
-                       $result_data['sort'] = $params['sort'];
-                       $result_data['dir'] = $params['dir'];
-                       
-                       return $this->yui_results($result_data);
-               }
-
-               public function add()
-               {
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiallocation.edit'));
-               }
-
-               public function edit()
-               {
-                       $activity_id = phpgw::get_var('activity_id');
-                       $allocation_id = phpgw::get_var('id');
-                       
-                       if ($activity_id && is_numeric($activity_id))
-                       {
-                               $activity = 
$this->so_activity->get_single($activity_id);
-                       }
-                       
-                       if (isset($_POST['save_allocation']))
-                       {
-                               $allocation = new 
logistic_requirement_resource_allocation();
-                               $allocation->set_id(phpgw::get_var('id'));
-                               
$allocation->set_requirement_id(phpgw::get_var('requirement_id'));
-                               
$allocation->set_article_id(phpgw::get_var('article_id'));
-                               $allocation->set_type(phpgw::get_var('type'));
-                               
-       //                      $allocation_id = $this->so->store($allocation);
-
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiallocation.view', 'id' => $allocation_id));
-                       }
-                       else if (isset($_POST['cancel_allocation']))
-                       {
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiallocation.view', 'id' => $allocation_id));
-                       }
-                       else
-                       {
-                               $accounts = 
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
-
-               
-                               $data = array
-                               (
-                                       'editable' => true,
-                               );
-                               
-                               if($activity_id > 0)
-                               {
-                                       $data['activity'] = $activity;
-                               }
-                               
-                               
self::render_template_xsl(array('allocation/allocation_item'), $data);
-                       }
-               }
-               
-               function convert_to_array($object_list)
-               {
-                       $converted_array = array();
-                       
-                       foreach($object_list as $object)
-                       {
-                               $converted_array[] = $object->toArray();
-                       }
-                       
-                       return $converted_array; 
-               }
-
-               public function view()
-               {
-                       $activity_id = phpgw::get_var('id');
-                       $project_id = phpgw::get_var('project_id');
-                       if (isset($_POST['edit_activity']))
-                       {
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.edit', 'id' => $activity_id, 
'project_id' => $project_id));
-                       }
-                       else if (isset($_POST['new_activity']))
-                       {
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.edit', 'project_id' => $project_id));
-                       }
-                       else
-                       {
-                               if ($activity_id && is_numeric($activity_id))
-                               {
-                                       $activity = 
$this->so->get_single($activity_id);
-                               }
-
-                               $activity_array = $activity->toArray();
-
-                               if ($this->flash_msgs)
-                               {
-                                       $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($this->flash_msgs);
-                                       $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
-                               }
-
-                               $activity->set_project_id($project_id);
-
-                               $data = array
-                                       (
-                                               'activity' => 
$activity->toArray(),
-                                               'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
-                                               'dateformat'                    
        => $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
-                               );
-
-                               $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Project');
-                               
self::render_template_xsl(array('activity_item'), $data);
-                       }
-               }
-
-               private function get_user_array()
-               {
-                       $user_array = array();
-                       $user_array[] = array(
-                               'id' => '',
-                               'name' => lang('all_types')
-                       );
-                       $user_array[] = array(
-                               'id' => 
$GLOBALS['phpgw_info']['user']['account_id'],
-                               'name' => lang('my_activities'),
-                               'selected' => 1
-                       );
-
-                       return $user_array;
-               }
-       }

Modified: branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php    
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/class.uiproject.inc.php    
2012-11-06 10:47:26 UTC (rev 10479)
@@ -38,16 +38,16 @@
 
                private $so;
                public $public_functions = array(
-                       'query' => true,
-                       'index' => true,
-                       'project_types' => true,
-                       'view' => true,
-                       'view_project_type' => true,
-                       'edit_project_type' => true,
-                       'edit_project_type_name' => true,
-                       'add' => true,
-                       'edit' => true,
-                       'save' => true
+                       'query'                                                 
                        => true,
+                       'index'                                                 
                        => true,
+                       'project_types'                                         
=> true,
+                       'view'                                                  
                        => true,
+                       'view_project_type'                     => true,
+                       'edit_project_type'                     => true,
+                       'edit_project_type_name'        => true,
+                       'add'                                                   
                        => true,
+                       'edit'                                                  
                        => true,
+                       'save'                                                  
                        => true
                );
 
                public function __construct()
@@ -133,7 +133,12 @@
                        {
                                if (isset($result))
                                {
-                                       $rows[] = $result->serialize();
+                                       $project = $result->serialize();
+
+                                       $href = self::link(array('menuaction' 
=> 'logistic.uiactivity.edit', 'project_id' => $project['id']));
+                                       $project['add_activity_link'] = "<a 
class=\"btn-sm delete\" href=\"{$href}\">Legg til aktivitet</a>";
+                                       
+                                       $rows[] = $project; 
                                }
                        }
 
@@ -178,7 +183,7 @@
                        $project_type_array = $this->so->get_project_types();
 
                        $data = array(
-                               'datatable_name'        => lang('project'),
+                               'datatable_name'        => lang('Overview 
projects'),
                                'form' => array(
                                        'toolbar' => array(
                                                'item' => array(
@@ -209,17 +214,17 @@
                                        'source' => 
self::link(array('menuaction' => 'logistic.uiproject.index', 'phpgw_return_as' 
=> 'json')),
                                        'field' => array(
                                                array(
+                                                       'key' => 'id',
+                                                       'label' => lang('Id'),
+                                                       'sortable' => true,
+                                                       'formatter' => 
'YAHOO.portico.formatLink'
+                                               ),              
+                                               array(
                                                        'key' => 'name',
                                                        'label' => 
lang('Project name'),
                                                        'sortable' => true
                                                ),
                                                array(
-                                                       'key' => 'id',
-                                                       'label' => lang('ID'),
-                                                       'sortable' => true,
-                                                       'formatter' => 
'YAHOO.portico.formatLink'
-                                               ),
-                                               array(
                                                        'key' => 'description',
                                                        'label' => 
lang('Project description'),
                                                        'sortable' => false,
@@ -231,6 +236,21 @@
                                                        'sortable' => false
                                                ),
                                                array(
+                                                       'key' => 'start_date',
+                                                       'label' => lang('Start 
date'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 'end_date',
+                                                       'label' => lang('End 
date'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
+                                                       'key' => 
'add_activity_link',
+                                                       'label' => lang('Add 
activity'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -288,7 +308,7 @@
                        {
                                //list project types
                                $data = array(
-                                       'datatable_name'        => 
lang('project types'),
+                                       'datatable_name'        => 
lang('Overview project types'),
                                        'form' => array(
                                                'toolbar' => array(
                                                        'item' => array(
@@ -316,7 +336,7 @@
                                                'field' => array(
                                                        array(
                                                                'key' => 'id',
-                                                               'label' => 
lang('ID'),
+                                                               'label' => 
lang('Id'),
                                                                'sortable' => 
true,
                                                                'formatter' => 
'YAHOO.portico.formatLink'
                                                        ),
@@ -356,11 +376,8 @@
                                        $project = 
$this->so->get_single($project_id);
                                }
 
-                               $project_array = $project->toArray();
-
                                $data = array
                                        (
-                                       'value_id' => !empty($project) ? 
$project->get_id() : 0,
                                        'project' => $project,
                                        'view' => 'view_project'
                                );
@@ -389,12 +406,8 @@
                                                $project = $objects[$keys[0]];
                                        }
                                }
-
-                               $project_array = $project->toArray();
-
                                $data = array
                                        (
-                                       'value_id' => !empty($project) ? 
$project->get_id() : 0,
                                        'project' => $project
                                );
 
@@ -439,12 +452,9 @@
                        }
                        else
                        {
-                               $project_array = $project->toArray();
-
                                $data = array
                                        (
-                                       'value_id' => !empty($project) ? 
$project->get_id() : 0,
-                                       'project' => $project_array,
+                                       'project' => $project,
                                        'editable' => true
                                );
 
@@ -514,8 +524,11 @@
 
                        $this->use_yui_editor('description');
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Project type');
+                       $GLOBALS['phpgw']->jqcal->add_listener('start_date');
+                       $GLOBALS['phpgw']->jqcal->add_listener('end_date');
                        
                        phpgwapi_jquery::load_widget('core');
+                       
                        self::add_javascript('logistic', 'logistic', 
'project.js');
                        
self::render_template_xsl(array('project/project_item'), $data);
                }
@@ -534,7 +547,7 @@
                        }
                        
                        $project->populate();
-                       
+
                        if( $project->validate() )
                        {
                                $project_id = $this->so->store($project);

Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php        
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php        
2012-11-06 10:47:26 UTC (rev 10479)
@@ -34,6 +34,7 @@
        phpgw::import_class('logistic.soproject');
        phpgw::import_class('property.soadmin_entity');
        phpgw::import_class('logistic.soresource_type_requirement');
+       phpgw::import_class('logistic.sorequirement_resource_allocation');
 
        include_class('logistic', 'requirement');
        phpgw::import_class('phpgwapi.datetime');
@@ -47,6 +48,7 @@
                private $so_activity;
                private $so_project;
                private $so_resource_type_requirement;
+               private $so_resource_allocation;
 
                public $public_functions = array(
                        'query'                                                 
                        => true,
@@ -71,8 +73,8 @@
                        $this->so_activity = 
CreateObject('logistic.soactivity');
                        $this->so_project = CreateObject('logistic.soproject');
                        $this->so_resource_type_requirement = 
CreateObject('logistic.soresource_type_requirement');
+                       $this->so_resource_allocation = 
CreateObject('logistic.sorequirement_resource_allocation');
 
-
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"logistic::project::requirement";
                }
 
@@ -153,13 +155,32 @@
                                {
                                        $_checked = 'checked="checked"';
                                }
-
-                               $href = self::link(array('menuaction' => 
'logistic.uirequirement.delete', 'id' => $entry['id']));
-                               $entry['delete_link'] = "<a class=\"btn-sm 
delete\" href=\"{$href}\">Slett</a>";
                                
+                         $num_required = $entry['no_of_items'];
+         
+                               $filters = array('requirement_id' => 
$entry['id']);
+                               $num_allocated = 
$this->so_resource_allocation->get_count($search_for, $search_type, $filters);
+                               
+                               $entry['allocated'] = $num_allocated;
                                $entry['select'] = "<input 
class=\"select_line\" type =\"radio\" {$_checked} name=\"values[select_line]\" 
value=\"{$entry['id']}\">";
-                               $href = self::link(array('menuaction' => 
'logistic.uirequirement_resource_allocation.edit', 'requirement_id' => 
$entry['id']));
-                               $entry['alloc_link'] = "<a class=\"btn-sm 
alloc\" href=\"{$href}\">Alloker</a>";
+                                       
+                               if($num_allocated == $num_required)
+                               {
+                                       $entry['status'] = "OK";
+                                       
+                                       $entry['alloc_link'] = "<span 
class='btn-sm cancel'>Tildel ressurser</span>";
+                               }
+                               else
+                               {
+                                       $num_remaining = $num_required - 
$num_allocated;
+                                       $entry['status'] = "MANGLER (" . 
$num_remaining . ")";
+                                       
+                                       $href = self::link(array('menuaction' 
=> 'logistic.uirequirement_resource_allocation.edit', 'requirement_id' => 
$entry['id']));
+                                       $entry['alloc_link'] = "<a 
class=\"btn-sm alloc\" href=\"{$href}\">Tildel ressurser</a>";
+                               }
+                               
+                               $href = self::link(array('menuaction' => 
'logistic.uirequirement.edit', 'id' => $entry['id']));
+                               $entry['edit_requirement_link'] = "<a 
class=\"btn-sm alloc\" href=\"{$href}\">Endre behov</a>";
                        }
 
                        // ... add result data
@@ -222,7 +243,7 @@
                                                ),
                                                array(
                                                        'key' => 'id',
-                                                       'label' => lang('ID'),
+                                                       'label' => lang('Id'),
                                                        'sortable' => true,
                                                ),
                                                array(
@@ -237,10 +258,15 @@
                                                ),
                                                array(
                                                        'key' => 'no_of_items',
-                                                       'label' => lang('No of 
items'),
+                                                       'label' => lang('Num 
required'),
                                                        'sortable' => false
                                                ),
                                                array(
+                                                       'key' => 'allocated',
+                                                       'label' => lang('Num 
allocated'),
+                                                       'sortable' => false
+                                               ),
+                                               array(
                                                        'key' => 'location_id',
                                                        'label' => 
lang('Resource type'),
                                                        'sortable' => false
@@ -255,15 +281,20 @@
                                                        'hidden' => true
                                                ),
                                                array(
-                                                       'key' => 'delete_link',
-                                                       'label' => lang('Delete 
requirement'),
+                                                       'key' => 'alloc_link',
+                                                       'label' => 
lang('Allocate resources'),
                                                        'sortable' => false,
                                                ),
                                                array(
-                                                       'key' => 'alloc_link',
-                                                       'label' => 
lang('Allocate resources'),
+                                                       'key' => 'status',
+                                                       'label' => 
lang('Status'),
                                                        'sortable' => false,
                                                ),
+                                               array(
+                                                       'key' => 
'edit_requirement_link',
+                                                       'label' => 
lang('Status'),
+                                                       'sortable' => false,
+                                               ),
                                        )
                                ),
                        );
@@ -289,6 +320,8 @@
                                        $requirement = 
$this->so->get_single($requirement_id);
                                }
 
+                               $activity = 
$this->so_activity->get_single($requirement->get_activity_id());
+                               
                                $location_info = 
$GLOBALS['phpgw']->locations->get_name($requirement->get_location_id());
                                
                                $tabs = $this->make_tab_menu($requirement_id);
@@ -298,6 +331,7 @@
                                        'tabs'                          => 
$GLOBALS['phpgw']->common->create_tabs($tabs, 0),
                                        'view'                          => 
"requirement_details",
                                        'requirement' => $requirement,
+                                       'activity'      => $activity,
                                        'location'              => 
$location_info,
                                );
 
@@ -316,7 +350,7 @@
                        $requirement_id = phpgw::get_var('id');
                        $activity_id = phpgw::get_var('activity_id');
 
-                       if ($requirement_id && is_numeric($requirement_id))
+                       if ( ($requirement == null) && ($requirement_id) && 
(is_numeric($requirement_id)) )
                        {
                                $requirement = 
$this->so->get_single($requirement_id);
 
@@ -391,6 +425,11 @@
                        {
                                $data['activity'] = $activity;
                        }
+                       else
+                       {
+                               $activity = $this->so_activity->get_single( 
$requirement->get_activity_id() );
+                               $data['activity'] = $activity;
+                       }
 
                        $GLOBALS['phpgw']->jqcal->add_listener('start_date', 
'datetime');
                        $GLOBALS['phpgw']->jqcal->add_listener('end_date', 
'datetime');
@@ -415,8 +454,35 @@
                        
                        if( $requirement->validate() )
                        {
+                               $GLOBALS['phpgw']->db->transaction_begin();
+//                             $db_requirement = $this->so->get_db();
+//                             $db_requirement->transaction_begin();
                                $requirement_id = 
$this->so->store($requirement);
-                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id)); 
 
+                               
+//                             $db_requirement_values = 
$this->so_requirement_value->get_db();
+//                             $db_requirement_values->transaction_begin();
+                               $status_delete_values = 
$this->so_requirement_value->delete_resources($requirement_id);
+                               
+//                             $db_resource_allocation = 
$this->so_resource_allocation->get_db();
+//                             $db_resource_allocation->transaction_begin();
+                               $status_delete_resources = 
$this->so->delete_resource_allocations($requirement_id);
+                               
+                               if( ($requirement_id > 0) && 
($status_delete_values) && ($status_delete_resources) )
+                               {
+                                       
$GLOBALS['phpgw']->db->transaction_commit();
+//                                     $db_requirement->transaction_commit();
+//                                     
$db_requirement_values->transaction_commit();
+//                                     
$db_resource_allocation->transaction_commit();
+                               }
+                               else
+                               {
+                                       
$GLOBALS['phpgw']->db->transaction_abort();
+//                                     $db_requirement->transaction_abort();
+//                                     
$db_requirement_values->transaction_abort();
+//                                     
$db_resource_allocation->transaction_abort();
+                               }                       
+                               
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement.view', 'id' => $requirement_id));
                        }
                        else
                        {
@@ -571,7 +637,7 @@
 
                                
$temp_requirement_attributes_array[$cust_attribute_id][] = array(
                                        "id"                                    
                => $requirement_value->get_id(),
-                                       "attrib_value"                          
        => $requirement_value->get_value(),
+                                       "attrib_value"          => 
$requirement_value->get_value(),
                                        "operator"                              
=> $requirement_value->get_operator(),
                                        "cust_attribute"        => $attrib_data
                                );

Modified: 
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- 
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -60,7 +60,8 @@
                        'edit' => true,
                        'view' => true,
                        'index' => true,
-                       'save' => true
+                       'save' => true,
+                       'delete' => true
                );
 
                public function __construct()
@@ -130,7 +131,7 @@
                                        'field' => array(
                                        array(
                                                        'key' => 'id',
-                                                       'label' => lang('ID'),
+                                                       'label' => lang('Id'),
                                                        'sortable' => true,
                                                ),
                                                array(
@@ -153,10 +154,15 @@
                                                        'label' => 
lang('Resource id'),
                                                        'sortable' => true
                                                ),
+                                               array(
+                                                       'key' => 'delete_link',
+                                                       'label' => 
lang('Delete'),
+                                                       'sortable' => true
+                                               ),
                                        )
                                ),
-                       );
-
+                       );                      
+                       
                        self::render_template_xsl(array('datatable_common'), 
$data);
                }
 
@@ -224,10 +230,18 @@
                        {
                                if (isset($result))
                                {
-                                       $rows[] = $result->serialize();
+                                       $requirement = $result->serialize();    
                
+                                       
+                                       $delete_href = self::link(
+                                                                               
                                                array('menuaction' => 
'logistic.uirequirement_resource_allocation.delete', 
+                                                                               
                                                                        'id' => 
$requirement['id'], 
+                                                                               
                                                                        
'phpgw_return_as' => 'json')
+                                                                               
                                                );
+                                       $requirement['delete_link'] = "<a 
class=\"btn-sm delete\" href=\"{$delete_href}\">Slett</a>";
+                                       $rows[] = $requirement;
                                }
                        }
-
+                       
                        // ... add result data
                        $result_data = array('results' => $rows);
 
@@ -342,6 +356,7 @@
                        $so_entity      = 
CreateObject('property.soentity',$entity_id,$cat_id);
                        $allocation_suggestions = 
$so_entity->get_eav_list($criterias_array);
                        
+                       $activity = $this->so_activity->get_single( 
$requirement->get_activity_id() );
                        
                        $data = array
                        (
@@ -351,37 +366,66 @@
                                'allocation_suggestions'        => 
$allocation_suggestions,
                                'editable'                                      
                        => true
                        );
-               
-                       
self::render_template_xsl(array('allocation/allocation_suggestions'), $data);
+                       
+                       
self::render_template_xsl(array('allocation/book_resources'), $data);
                }
 
                public function save()
                {
                        $requirement_id = phpgw::get_var('requirement_id');
-                       
+               
                        if($requirement_id && is_numeric($requirement_id))
                        {
                                $requirement = 
$this->so_requirement->get_single($requirement_id);
                        }
                        
+                       $user_id = $GLOBALS['phpgw_info']['user']['id'];
                        $chosen_resources = phpgw::get_var('chosen_resources');
                        
-                       $user_id = $GLOBALS['phpgw_info']['user']['id'];
-                       
-                       foreach($chosen_resources as $resource_id)
+                       $filters = array('requirement_id' => 
$requirement->get_id());
+                       $num_allocated = $this->so->get_count($search_for, 
$search_type, $filters);     
+                                                               
+                       $num_required = $requirement->get_no_of_items();
+                                                       
+                       $num_allowed_bookings = $num_required - $num_allocated;
+                                       
+                       if( count($chosen_resources) <=  $num_allowed_bookings)
                        {
-                               $resource_alloc = new 
logistic_requirement_resource_allocation();
-                               $resource_alloc->set_requirement_id( 
$requirement->get_id() );
-                               $resource_alloc->set_resource_id( $resource_id 
);
-                               $resource_alloc->set_location_id( 
$requirement->get_location_id() );
-                               $resource_alloc->set_create_user( $user_id );
+                               foreach($chosen_resources as $resource_id)
+                               {
+                                       $resource_alloc = new 
logistic_requirement_resource_allocation();
+                                       $resource_alloc->set_requirement_id( 
$requirement->get_id() );
+                                       $resource_alloc->set_resource_id( 
$resource_id );
+                                       $resource_alloc->set_location_id( 
$requirement->get_location_id() );
+                                       $resource_alloc->set_create_user( 
$user_id );
+                                       
+                                       $resource_alloc_id = $this->so->store( 
$resource_alloc );
+                               }
                                
-                               $resource_alloc_id = $this->so->store( 
$resource_alloc );
+                               $activity = 
$this->so_activity->get_single($requirement->get_activity_id()); 
+
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'activity_id' => $requirement->get_activity_id()));
                        }
-
-                       $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uirequirement_resource_allocation.index', 'id' 
=> $allocation_id));
+                       else
+                       {
+                               $GLOBALS['phpgw']->redirect_link('/index.php', 
array('menuaction' => 'logistic.uiactivity.view_resource_allocation', 
'activity_id' => $requirement->get_activity_id()));
+                       }
                }
                
+               public function delete()
+               {
+                       $resource_allocation_id = phpgw::get_var('id');
+                               
+                       $status = $this->so->delete($resource_allocation_id);
+               
+                       if($status){
+                               return json_encode( array( "status" => 
"deleted" ) );
+                       }
+                       else{
+                               return json_encode( array( "status" => 
"not_deleted" ) );
+                       }
+               } 
+               
                function convert_to_array($object_list)
                {
                        $converted_array = array();
@@ -433,7 +477,6 @@
                                                'activity' => $activity,
                                                'allocation' => $allocation,
                                                'requirement' => $requirement,
-                                               'img_go_home' => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                                'dateformat' => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
                                );
 

Modified: 
branches/Version-1_0-branch/logistic/inc/class.uiresource_type_requirement.inc.php
===================================================================
--- 
branches/Version-1_0-branch/logistic/inc/class.uiresource_type_requirement.inc.php
  2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/inc/class.uiresource_type_requirement.inc.php
  2012-11-06 10:47:26 UTC (rev 10479)
@@ -198,14 +198,14 @@
                                        'field' => array(
                                                array(
                                                        'key' => 'id',
-                                                       'label' => lang('ID'),
+                                                       'label' => lang('Id'),
                                                        'sortable' => false,
                                                        'hidden' => true,
                                                        'formatter' => 
'YAHOO.portico.formatLink'
                                                ),
                                                array(
                                                        'key' => 'location_id',
-                                                       'label' => lang('ID'),
+                                                       'label' => lang('Id'),
                                                        'sortable' => true,
                                                        'formatter' => 
'YAHOO.portico.formatLink'
                                                ),

Modified: branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php       
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php       
2012-11-06 10:47:26 UTC (rev 10479)
@@ -239,7 +239,8 @@
                                'project_name' => $project_name,
                                'start_date' => $this->get_start_date() ? 
date($date_format, $this->get_start_date()): '',
                                'end_date' => $this->get_end_date() ? 
date($date_format, $this->get_end_date()): '',
-                               'responsible_user_id' => $responsible_user
+                               'responsible_user_id' => 
$this->get_responsible_user_id(),
+                               'responsible_user_name' => $responsible_user
                        );
                }
                

Modified: branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php        
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/inc/model/class.project.inc.php        
2012-11-06 10:47:26 UTC (rev 10479)
@@ -38,6 +38,8 @@
                protected $project_type_id;
                protected $project_type_label;
                protected $description;
+               protected $start_date;
+               protected $end_date;
                
                protected $error_msg_array = array();
 
@@ -102,6 +104,26 @@
                        return $this->description;
                }
                
+               public function set_start_date($start_date)
+               {
+                       $this->start_date = $start_date;
+               }
+
+               public function get_start_date()
+               {
+                       return $this->start_date;
+               }
+
+               public function set_end_date($end_date)
+               {
+                       $this->end_date = $end_date;
+               }
+
+               public function get_end_date()
+               {
+                       return $this->end_date;
+               }
+               
                public function get_error_msg_array() { return 
$this->error_msg_array; }
                
                public function set_error_msg_array( $error_msg_array )
@@ -125,12 +147,16 @@
 
                public function serialize()
                {
+                       $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       
                        return array(
                                'id' => $this->get_id(),
                                'name' => $this->get_name(),
                                'project_type_id' => 
$this->get_project_type_id(),
                                'project_type_label' => 
$this->get_project_type_label(),
-                               'description' => $this->get_description()
+                               'description' => $this->get_description(),
+                               'start_date' => $this->get_start_date() ? 
date($date_format, $this->get_start_date()): '',
+                               'end_date' => $this->get_end_date() ? 
date($date_format, $this->get_end_date()): '',
                        );
                }
                                
@@ -139,7 +165,19 @@
                        $this->set_id( phpgw::get_var('id') );
                        $this->set_name( phpgw::get_var('name') );
                        $this->set_project_type_id( 
phpgw::get_var('project_type_id') );
-                       $this->set_description( phpgw::get_var('description') 
);                        
+                       $this->set_description( phpgw::get_var('description') );
+                       
+                       if(phpgw::get_var('start_date','string') != '')
+                       {
+                               $start_date_ts = 
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('start_date','string') );
+                               $this->set_start_date($start_date_ts);
+                       }
+                                                                               
+                       if( phpgw::get_var('end_date','string') != '')
+                       {
+                               $end_date_ts = 
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('end_date','string') );
+                               $this->set_end_date($end_date_ts);
+                       }
                }
                
                public function validate()
@@ -166,6 +204,20 @@
                        $status = false;
                        $this->error_msg_array['project_type_id'] = 
"error_msg_1";
                  }
+                 
+                  // Validate START DATE
+                       if( empty($this->start_date) )
+                 {
+                       $status = false;
+                       $this->error_msg_array['start_date'] = "error_msg_1";
+                 }
+
+                 // Validate END DATE
+                       if( !empty($this->end_date) && ($this->end_date < 
$this->start_date) )
+                 {
+                       $status = false;
+                       $this->error_msg_array['end_date'] = "error_msg_3";
+                 }  
        
                  return $status;
                }

Modified: 
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
===================================================================
--- 
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
        2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
        2012-11-06 10:47:26 UTC (rev 10479)
@@ -40,7 +40,10 @@
                protected $create_user;
                
                protected $resource_type_descr;
-
+               protected $location_code;
+               protected $fm_bim_item_address;
+               protected $fm_bim_item_name;
+               
                /**
                 * 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.
@@ -112,6 +115,36 @@
                        return $this->resource_type_descr;
                }
 
+               public function set_location_code($location_code)
+               {
+                       $this->location_code = $location_code;
+               }
+
+               public function get_location_code()
+               {
+                       return $this->location_code;
+               }
+               
+               public function set_fm_bim_item_address($fm_bim_item_address)
+               {
+                       $this->fm_bim_item_address = $fm_bim_item_address;
+               }
+
+               public function get_fm_bim_item_address()
+               {
+                       return $this->fm_bim_item_address;
+               }
+               
+               public function set_fm_bim_item_name($fm_bim_item_name)
+               {
+                       $this->fm_bim_item_name = $fm_bim_item_name;
+               }
+
+               public function get_fm_bim_item_name()
+               {
+                       return $this->fm_bim_item_name;
+               }
+
                /**
                * Get a static reference to the storage object associated with 
this model object
                *
@@ -129,11 +162,14 @@
                public function serialize()
                {
                        return array(
-                               'id' => $this->get_id(),
+                               'id'                                            
                        => $this->get_id(),
                                'resource_type_descr' => 
$this->get_resource_type_descr(),
-                               'requirement_id' => $this->get_requirement_id(),
-                               'resource_id' => $this->get_resource_id(),
-                               'location_id' => $this->get_location_id()
+                               'requirement_id'                        => 
$this->get_requirement_id(),
+                               'resource_id'                           => 
$this->get_resource_id(),
+                               'location_id'                                   
=> $this->get_location_id(),
+                               'location_code'                         => 
$this->get_location_code(),
+                               'fm_bim_item_address'   => 
$this->get_fm_bim_item_address(),
+                               'fm_bim_item_name'              => 
$this->get_fm_bim_item_name()
                        );
                }
        }
\ No newline at end of file

Modified: branches/Version-1_0-branch/logistic/js/logistic/activity.js
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/activity.js        
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/js/logistic/activity.js        
2012-11-06 10:47:26 UTC (rev 10479)
@@ -1,15 +1,49 @@
 $(document).ready(function(){
-       $("#select_activity").change(function () {
+       $("#select_parent_activity").change(function () {
                 var parent_id = $(this).val();
                 var thisForm = $(this).closest("form");
-                var project_id = 
$(thisForm).find("input[name=project_id]").val();
-                var activity_id = 
$(thisForm).find("input[name=activity_id]").val();
+                
$(thisForm).find("input[name=parent_activity_id]").val(parent_id);
+
+                alert(activity_id);
                 
-                var oArgs = {menuaction:'logistic.uiactivity.edit'};
-                var baseUrl = phpGWLink('index.php', oArgs, false);
-                var requestUrl = baseUrl + "&parent_id=" + parent_id + 
"&activity_id=" + activity_id;
-                        
-                window.location.href = requestUrl;
-  });  
+       });
        
+       $("#select_project").change(function () {
+                var project_id = $(this).val();
+                var thisForm = $(this).closest("form");
+                $(thisForm).find("input[name=project_id]").val(project_id);
+
+                alert(project_id);
+                
+       });
+       
+       $("#activity_details input").focus(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeIn(200);
+       });
+       
+       $("#activity_details textarea").focus(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeIn(200);
+       });
+
+       $("#activity_details select").focus(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeIn(200);
+       });
+       
+       $("#activity_details textarea").focusout(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeOut();
+       });
+       
+       $("#activity_details input").focusout(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeOut();
+       });
+               
+       $("#activity_details select").focusout(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeOut();
+       });
 });
\ No newline at end of file

Modified: branches/Version-1_0-branch/logistic/js/logistic/project.js
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/project.js 2012-11-06 
10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/js/logistic/project.js 2012-11-06 
10:47:26 UTC (rev 10479)
@@ -29,5 +29,4 @@
                var wrpElem = $(this).parents("dd");
                $(wrpElem).find(".help_text").fadeOut();
        });
-       
 });
\ No newline at end of file

Modified: 
branches/Version-1_0-branch/logistic/js/logistic/resource_allocation.js
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/resource_allocation.js     
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/js/logistic/resource_allocation.js     
2012-11-06 10:47:26 UTC (rev 10479)
@@ -7,6 +7,31 @@
                
                updateAllocationTable( requirement_id );
     });
+       
+       $("#allocation-container table .btn-sm.delete").live("click", 
function(e){
+               var thisRow = $(this).parents("tr");
+               
+               var requestUrl = $(this).attr("href");
+               
+               $.ajax({
+                         type: 'POST',
+                         url: requestUrl,
+                         success: function(data) {
+                                 var obj = jQuery.parseJSON(data);
+                         
+                         if(obj.status == "deleted"){
+                                 $(thisRow).remove();
+                                 }
+                         },
+                         error: function(XMLHttpRequest, textStatus, 
errorThrown) {
+                   if (XMLHttpRequest.status === 401) {
+                     location.href = '/';
+                   }
+                         }
+               });
+               
+               return false;
+    });
 });
 
 

Modified: branches/Version-1_0-branch/logistic/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/logistic/setup/phpgw_no.lang    2012-11-06 
10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/setup/phpgw_no.lang    2012-11-06 
10:47:26 UTC (rev 10479)
@@ -4,18 +4,19 @@
 activity       logistic        no      Aktivitet
 allocation     logistic        no      Beholdning
 requirement    logistic        no      Behov
+Resource requirement   logistic        no      Ressursbehov
 Project name   logistic        no      Navn
 Project type   logistic        no      Type
 Project description    logistic        no      Beskrivelse
-ID     logistic        no      ID
+ID     logistic        no      Id
 t_new_project  logistic        no      Nytt prosjekt
 t_new_project_type     logistic        no      Ny prosjekttype
 t_new_activity logistic        no      Opprett ny aktivitet på dette prosjektet
 t_new_requirement      logistic        no      Registrer nytt behov på denne 
aktiviteten
 t_view_requirements    logistic        no      Vis registrerte behov på denne 
aktiviteten
-t_new_allocation       logistic        no      Registrer ny booking på denne 
aktiviteten
-t_view_allocations     logistic        no      Vis registrerte bookinger på 
denne aktiviteten
-t_new_type_requirement logistic        no      Nytt type-krav
+t_new_allocation       logistic        no      Tildel ressurser til denne 
aktiviteten
+t_view_allocations     logistic        no      Vis tildelte ressurser til 
denne aktiviteten
+t_new_type_requirement logistic        no      Ny behovstype
 Project_type   logistic        no      Prosjekttype
 settings       logistic        no      innstillinger
 Project types  logistic        no      Prosjekttyper
@@ -30,13 +31,13 @@
 my_activities  logistic        no      Mine aktiviteter
 Project type name updated              logistic        no      
Prosjekttypenavn oppdatert
 Add activity   logistic        no      Legg til aktivitet
-Add sub activity       logistic        no      Legg til subaktivitet
+Add sub activity       logistic        no      Legg til underaktivitet
 Entity logistic        no      Entitet
 Category       logistic        no      Kategori
 Attributes     logistic        no      Attributter
 Chosen attributes      logistic        no      Valgte attributter
-Administrate requirements      logistic        no      Administrer type-krav
-resource_type_requirement      logistic        no      Ressurstype-krav
+Administrate requirements      logistic        no      Administrer behovstype
+resource_type_requirement      logistic        no      Ressurstypebehov
 Varchar        logistic        no      Text
 Contact        logistic        no      Kontakt
 Entity types   logistic        no      Entitetstyper
@@ -50,20 +51,65 @@
 event  logistic        no      Hendelse
 Link   logistic        no      Lenke
 Add requirement to activity    logistic        no      Registrer behov for 
aktiviteten
-Add requirement        logistic        no      Legg til krav
+Add requirement        logistic        no      Legg til behov
 Requirement details    logistic        no      Detaljer for behov
 Add constraints        logistic        no      Legg til kriterier på behovet
 No of items    logistic        no      Antall
+Num required   logistic        no      Trenger antall 
 Resource type  logistic        no      Ressurstype
-t_new_booking_allocation       logistic        no      Registrer ny booking på 
dette behovet
-t_view_booking_allocations     logistic        no      Vis registrerte 
bookinger på dette behovet
+t_new_booking_allocation       logistic        no      Tildel dette behovet 
ressurser
+t_view_booking_allocations     logistic        no      Vis tildelte ressurser 
på dette behovet
 error_msg_1    logistic        no      Vennligst fyll inn dette feltet
 error_msg_2    logistic        no      Vennligst velg en verdi i listen
 error_msg_3    logistic        no      Vennligst angi sluttdato etter startdato
 Criterias      logistic        no      Kriterier
-Add criterias  logistic        no      Legg til kriterier
+Add criterias  logistic        no      Legg til kriterier på behovet
 favorites      logistic        no      Favoritter
 toggle as favorite     logistic        no      Legg til / fjern som favoritt
-Add allocation to requirement  logistic        no      Alloker ressurser til 
krav
-Delete requirement     logistic        no Slett krav
-Allocate resources     logistic        no      Alloker ressurser
\ No newline at end of file
+Add allocation to requirement  logistic        no      Tildel dette behovet 
ressurser
+Delete requirement     logistic        no      Slett behov
+Allocate resources     logistic        no      Tildel ressurser
+Num allocated  logistic        no      Antall tildelte ressurser
+Status logistic        no      Status
+Requirement allocation logistic        no      Tildeling av ressurser
+Activity details       logistic        no      Detaljer for aktivitet
+Status requirement     logistic        no      Status behov
+select logistic        no      Velg
+Add project    logistic        no      Nytt prosjekt
+Booking of resources   logistic        no      Tildeling av ressurser
+Requirement to activity        logistic        no      Behov for aktiviteten
+edit   logistic        no      Rediger
+Overview projects      logistic        no      Oversikt over prosjekter
+Overview for activity  logistic        no      Oversikt for aktiviteten
+Add project    logistic        no      Legg til prosjekt 
+Edit project   logistic        no      Endre prosjekt
+Overview project types logistic        no      Oversikt over prosjekttyper
+Overview activities    logistic        no      Oversikt over aktiviteter
+Overview for activity  logistic        no      Oversikt for aktiviten
+Edit activity  logistic        no      Endre aktivitet
+Add activity   logistic        no      Legg til aktivitet
+Overview of resources for activity     logistic        no      Oversikt over 
ressurser for aktivteten
+Allocated resouces     logistic        no      Tildelte ressurser
+Click on table above to get allocations        logistic        no      Klikk 
på en rad i tabellen over for å få frem visning
+Add activity to project        logistic        no      Legg aktivitet til 
prosjektet
+View resources overview        logistic        no      Vis ressursoversikt
+Edit requirement       logistic        no      Endre behov
+Choose another project for the activity        logistic        no      Velg et 
annet prosjekt for aktiviteten
+Choose another project logistic        no      Velg et annet prosjekt
+Choose the project in which the activity is part of    logistic        no      
Velg prosjektet som aktiviteten er en del av
+Choose project logistic        no      Velg prosjekt
+Choose another main activity for this sub activity     logistic        no      
Velg en annen hovedaktivitet for denne underaktiviteten
+Give name to this activity     logistic        no      Gi name til denne 
aktiviteten
+Give start date to activity    logistic        no      Angi startdato for 
aktiviteten
+Give end date to activity      logistic        no      Angi sluttdato for 
aktiviteten
+Give description to activity   logistic        no      Gi beskrivelse for 
aktiviteten
+Give start date to project     logistic        no      Angi startdato for 
prosjektet
+Give end date to project       logistic        no      Angi sluttdato for 
prosjektet
+Give description to the project        logistic        no      Gi en 
beskrivelse av prosjektet
+Give project type      logistic        no      Angi prosjekttype
+Give project name      logistic        no      Angi prosjektnavn
+Show project overview  logistic        no      Vis prosjektoversikt
+Start date     logistic        no      Startdato
+End date       logistic        no      Sluttdato
+Responsible person     logistic        no      Ansvarlig bruker
+Responsible person for activity        logistic        no      Angi hvilken 
person som skal være ansvarlig for aktiviteten
\ No newline at end of file

Modified: branches/Version-1_0-branch/logistic/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/setup.inc.php    2012-11-06 
10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/setup/setup.inc.php    2012-11-06 
10:47:26 UTC (rev 10479)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['logistic']['name'] = 'logistic';
-       $setup_info['logistic']['version'] = '0.0.3';
+       $setup_info['logistic']['version'] = '0.0.4';
        $setup_info['logistic']['app_order'] = 70;
        $setup_info['logistic']['enable'] = 1;
        $setup_info['logistic']['app_group']    = 'office';

Modified: branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/tables_current.inc.php   
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/setup/tables_current.inc.php   
2012-11-06 10:47:26 UTC (rev 10479)
@@ -21,6 +21,8 @@
                                                'description' => array('type' 
=> 'text', 'nullable' => false),
                                                'create_user' => array('type' 
=> 'int', 'precision' => 4, 'nullable' => false),
                                                'create_date' => array('type' 
=> 'int', 'precision' => 4, 'nullable' => false),
+                                               'start_date' => array('type' => 
'int', 'precision' => 4, 'nullable' => true),
+                                               'end_date' => array('type' => 
'int', 'precision' => 4, 'nullable' => true),
                                ),
                                'pk' => array('id'),
                                'fk' => array('lg_project_type' => 
array('project_type_id' => 'id')),

Modified: branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/tables_update.inc.php    
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/setup/tables_update.inc.php    
2012-11-06 10:47:26 UTC (rev 10479)
@@ -34,4 +34,28 @@
                        return $GLOBALS['setup_info']['logistic']['currentver'];
                }
        }
-       
\ No newline at end of file
+       
+       $test[] = '0.0.3';
+       function logistic_upgrade0_0_3()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+       
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_project','start_date',array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true
+               ));
+               
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_project','end_date',array(
+                       'type' => 'int',
+                       'precision' => 4,
+                       'nullable' => true
+               ));
+       
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['logistic']['currentver'] = 
'0.0.4';
+                       return $GLOBALS['setup_info']['logistic']['currentver'];
+               }
+       }
+       

Deleted: 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item.xsl
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item.xsl  
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item.xsl  
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -1,209 +0,0 @@
-<!-- $Id$ -->
-<!-- item  -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
-
-<xsl:call-template name="yui_phpgw_i18n"/>
-<div class="yui-navset yui-navset-top">
-               
-       <xsl:choose>
-               <xsl:when test="parent_activity/id &gt; 0">
-                       <h1> 
-                               <xsl:value-of select="parent_activity/name" 
disable-output-escaping="yes"/>::<xsl:value-of select="php:function('lang', 
'Add sub activity')" />
-                       </h1>
-               </xsl:when>
-               <xsl:otherwise>
-                       <h1> 
-                               <xsl:value-of select="php:function('lang', 'Add 
activity')" />
-                       </h1>
-               </xsl:otherwise>
-       </xsl:choose>
-       
-       <div class="content-wrp">
-               <div id="details">
-                       <xsl:variable name="action_url">
-                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uiactivity.save')" />
-                       </xsl:variable>
-                       <form action="{$action_url}" method="post">
-                               <input type="hidden" name="id" value = 
"{activity/id}" />
-                               <input type="hidden" name="project_id" 
value="{activity/project_id}" />
-                               <input type="hidden" name="parent_id" 
value="{parent_activity/id}" />
-                               
-                               <dl class="proplist-col">
-                                       <xsl:if test="parent_activity/id &gt; 
0">
-                                       <dt>            
-                                               <xsl:if test="editable">
-                                                       <div 
style="margin-bottom: 1em;width: 88%;" class="select-box">
-                                                               <label>Velg en 
annen hovedaktivitet</label>
-                                                               <select 
id="select_activity" name="parent_activity_id" class="selectLocation">
-                                                                       
<option>Velg aktivitet</option>
-                                                                       
<xsl:for-each select="activities">
-                                                       <option value="{id}">
-                                                               <xsl:if 
test="activity/parent_id = id">
-                                                                       
<xsl:attribute name="selected">
-                                                                               
        selected
-                                                                               
        </xsl:attribute>
-                                                               </xsl:if>
-                                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                                                       </option>
-                                                                 
</xsl:for-each>
-                                                               </select>       
                                
-                                                       </div>
-                                                       </xsl:if>
-                                               </dt>
-                                       </xsl:if>       
-                                       <dt>
-                                               <label for="name"><xsl:value-of 
select="php:function('lang','Activity name')" /></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:if 
test="activity/error_msg_array/name != ''">
-                                                               <xsl:variable 
name="error_msg"><xsl:value-of select="activity/error_msg_array/name" 
/></xsl:variable>
-                                                               <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                       </xsl:if>
-                                                       <input type="text" 
name="name" id="name" value="{activity/name}" size="100"/>
-                                                       <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="activity/name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="description"><xsl:value-of select="php:function('lang', 'Description')" 
/></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:if 
test="activity/error_msg_array/description != ''">
-                                                               <xsl:variable 
name="error_msg"><xsl:value-of select="activity/error_msg_array/description" 
/></xsl:variable>
-                                                               <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                       </xsl:if>
-                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="activity/description" disable-output-escaping="yes"/></textarea>
-                                                       <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="activity/description" disable-output-escaping="yes"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="start_date">Startdato</label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <xsl:if 
test="activity/error_msg_array/start_date != ''">
-                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/start_date" /></xsl:variable>
-                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                               </xsl:if>
-                                                               <input 
class="date" id="start_date" name="start_date" type="text">
-                                                       <xsl:if 
test="activity/start_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/start_date))"/></xsl:attribute>
-                                                       </xsl:if>
-                                               </input>
-                                               <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="php:function('date', $date_format, 
number(activity/start_date))"/></span>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="end_date">Sluttdato</label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <xsl:if 
test="activity/error_msg_array/end_date != ''">
-                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/end_date" /></xsl:variable>
-                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                               </xsl:if>
-                                                               <input 
class="date" id="end_date" name="end_date" type="text">
-                                                       <xsl:if 
test="activity/end_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/end_date))"/></xsl:attribute>
-                                                       </xsl:if>
-                                               </input>
-                                               <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="php:function('date', $date_format, number(activity/end_date))"/></span>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="end_date">Ansvarlig</label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <xsl:if 
test="activity/error_msg_array/responsible_user_id != ''">
-                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
-                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                               </xsl:if>
-                                                               <select 
name="responsible_user_id">
-                                                                       <option 
value="">Velg ansvarlig bruker</option>
-                                               <xsl:for-each 
select="responsible_users">
-                                                       <xsl:variable 
name="full_name">
-                                                               <xsl:value-of 
disable-output-escaping="yes" select="account_firstname"/><xsl:text> </xsl:text>
-                                                               <xsl:value-of 
disable-output-escaping="yes" select="account_lastname"/>
-                                                       </xsl:variable>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//activity/responsible_user_id = account_id">
-                                                                               
                <option selected="selected" value="{account_id}">
-                                                                               
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-                                                                       
</option>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <option 
value="{account_id}">
-                                                                               
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-                                                                       
</option>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:for-each>
-                                             </select>
-                                             <span class="help_text line">Angi 
startdato for aktiviteten</span>
-                                             </xsl:when>
-                                                       <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="activity/responsible_user_name"/></span>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                               </dl>
-                               
-                               <div class="form-buttons">
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="save_activity" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel_activity" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="params">
-                                                               
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
-                                                               <xsl:value-of 
select="activity/id" />
-                                                       </xsl:variable>
-                                                       <xsl:variable 
name="edit_url">
-                                                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $params )" />
-                                                       </xsl:variable>
-                                                       <a class="btn" 
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </div>
-                       </form>
-               </div>
-       </div>
-</div>
-</xsl:template>
-
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>

Deleted: 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_item_2.xsl
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -1,209 +0,0 @@
-<!-- $Id: activity_item.xsl 10305 2012-10-23 09:08:34Z vator $ -->
-<!-- item  -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
-
-<xsl:call-template name="yui_phpgw_i18n"/>
-<div class="yui-navset yui-navset-top">
-               
-       <xsl:choose>
-               <xsl:when test="parent_activity/id &gt; 0">
-                       <h1> 
-                               <xsl:value-of select="parent_activity/name" 
disable-output-escaping="yes"/>::<xsl:value-of select="php:function('lang', 
'Add sub activity')" />
-                       </h1>
-               </xsl:when>
-               <xsl:otherwise>
-                       <h1> 
-                               <xsl:value-of select="php:function('lang', 'Add 
activity')" />
-                       </h1>
-               </xsl:otherwise>
-       </xsl:choose>
-       
-       <div class="content-wrp">
-               <div id="details">
-                       <xsl:variable name="action_url">
-                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uiactivity.save')" />
-                       </xsl:variable>
-                       <form action="{$action_url}" method="post">
-                               <input type="hidden" name="id" value = 
"{activity/id}" />
-                               <input type="hidden" name="project_id" 
value="{activity/project_id}" />
-                               <input type="hidden" name="parent_id" 
value="{parent_activity/id}" />
-                               
-                               <dl class="proplist-col">
-                                       <xsl:if test="parent_activity/id &gt; 
0">
-                                       <dt>            
-                                               <xsl:if test="editable">
-                                                       <div 
style="margin-bottom: 1em;width: 88%;" class="select-box">
-                                                               <label>Velg en 
annen hovedaktivitet</label>
-                                                               <select 
id="select_activity" name="parent_activity_id" class="selectLocation">
-                                                                       
<option>Velg aktivitet</option>
-                                                                       
<xsl:for-each select="activities">
-                                                       <option value="{id}">
-                                                               <xsl:if 
test="activity/parent_id = id">
-                                                                       
<xsl:attribute name="selected">
-                                                                               
        selected
-                                                                               
        </xsl:attribute>
-                                                               </xsl:if>
-                                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                                                       </option>
-                                                                 
</xsl:for-each>
-                                                               </select>       
                                
-                                                       </div>
-                                                       </xsl:if>
-                                               </dt>
-                                       </xsl:if>       
-                                       <dt>
-                                               <label for="name"><xsl:value-of 
select="php:function('lang','Activity name')" /></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:if 
test="activity/error_msg_array/name != ''">
-                                                               <xsl:variable 
name="error_msg"><xsl:value-of select="activity/error_msg_array/name" 
/></xsl:variable>
-                                                               <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                       </xsl:if>
-                                                       <input type="text" 
name="name" id="name" value="{activity/name}" size="100"/>
-                                                       <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="activity/name" />
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="description"><xsl:value-of select="php:function('lang', 'Description')" 
/></label>
-                                       </dt>
-                                       <dd>
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:if 
test="activity/error_msg_array/description != ''">
-                                                               <xsl:variable 
name="error_msg"><xsl:value-of select="activity/error_msg_array/description" 
/></xsl:variable>
-                                                               <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                       </xsl:if>
-                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="activity/description" disable-output-escaping="yes"/></textarea>
-                                                       <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:value-of 
select="activity/description" disable-output-escaping="yes"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="start_date">Startdato</label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <xsl:if 
test="activity/error_msg_array/start_date != ''">
-                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/start_date" /></xsl:variable>
-                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                               </xsl:if>
-                                                               <input 
class="date" id="start_date" name="start_date" type="text">
-                                                       <xsl:if 
test="activity/start_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/start_date))"/></xsl:attribute>
-                                                       </xsl:if>
-                                               </input>
-                                               <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="php:function('date', $date_format, 
number(activity/start_date))"/></span>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="end_date">Sluttdato</label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <xsl:if 
test="activity/error_msg_array/end_date != ''">
-                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/end_date" /></xsl:variable>
-                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                               </xsl:if>
-                                                               <input 
class="date" id="end_date" name="end_date" type="text">
-                                                       <xsl:if 
test="activity/end_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/end_date))"/></xsl:attribute>
-                                                       </xsl:if>
-                                               </input>
-                                               <span class="help_text 
line">Angi startdato for aktiviteten</span>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="php:function('date', $date_format, number(activity/end_date))"/></span>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                                       <dt>
-                                               <label 
for="end_date">Ansvarlig</label>
-                                       </dt>
-                                       <dd>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="editable">
-                                                               <xsl:if 
test="activity/error_msg_array/responsible_user_id != ''">
-                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
-                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
-                                                               </xsl:if>
-                                                               <select 
name="responsible_user_id">
-                                                                       <option 
value="">Velg ansvarlig bruker</option>
-                                               <xsl:for-each 
select="responsible_users">
-                                                       <xsl:variable 
name="full_name">
-                                                               <xsl:value-of 
disable-output-escaping="yes" select="account_firstname"/><xsl:text> </xsl:text>
-                                                               <xsl:value-of 
disable-output-escaping="yes" select="account_lastname"/>
-                                                       </xsl:variable>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="//activity/responsible_user_id = account_id">
-                                                                               
                <option selected="selected" value="{account_id}">
-                                                                               
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-                                                                       
</option>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <option 
value="{account_id}">
-                                                                               
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
-                                                                       
</option>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:for-each>
-                                             </select>
-                                             <span class="help_text line">Angi 
startdato for aktiviteten</span>
-                                             </xsl:when>
-                                                       <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="activity/responsible_user_name"/></span>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </dd>
-                               </dl>
-                               
-                               <div class="form-buttons">
-                                       <xsl:choose>
-                                               <xsl:when test="editable">
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
-                                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')" 
/></xsl:variable>
-                                                       <input type="submit" 
name="save_activity" value="{$lang_save}" title = "{$lang_save}" />
-                                                       <input type="submit" 
name="cancel_activity" value="{$lang_cancel}" title = "{$lang_cancel}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:variable 
name="params">
-                                                               
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
-                                                               <xsl:value-of 
select="activity/id" />
-                                                       </xsl:variable>
-                                                       <xsl:variable 
name="edit_url">
-                                                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $params )" />
-                                                       </xsl:variable>
-                                                       <a class="btn" 
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </div>
-                       </form>
-               </div>
-       </div>
-</div>
-</xsl:template>
-
-<xsl:template match="options">
-       <option value="{id}">
-               <xsl:if test="selected">
-                       <xsl:attribute name="selected" value="selected" />
-               </xsl:if>
-               <xsl:value-of disable-output-escaping="yes" select="name"/>
-       </option>
-</xsl:template>

Copied: 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl 
(from rev 10478, trunk/logistic/templates/base/activity/activity_tabs.xsl)
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl  
                            (rev 0)
+++ 
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl  
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -0,0 +1,90 @@
+<!-- $Id: control_tabs.xsl 9951 2012-08-31 10:14:12Z vator $ -->
+<!-- separate tabs and  inline tables-->
+
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<div class="yui-navset yui-navset-top" id="activity-tabview">
+
+       <xsl:choose>
+               <xsl:when test="view = 'activity_details'">
+                       <xsl:call-template name="yui_phpgw_i18n"/>
+
+                       <xsl:choose>
+                               <xsl:when test="activity/id != '' or 
activity/id != 0">
+                                       
+                                       <!-- =========== HEADING ============== 
-->
+                                       <h1 style="float:left;"> 
+                                               <span>
+                                                       <xsl:value-of 
select="php:function('lang', 'Overview for activity')" />
+                                               </span>
+                                               <span style="margin-left:5px;">
+                                                       <xsl:value-of 
select="activity/name" />
+                                               </span>
+                                       </h1>
+                                       
+                                       <!-- =========== BREADCRUMB 
============== -->
+                                       <div id="breadcrumb">
+                                               <span>Du er her:</span>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />
+                                       </div>
+                                               
+                               </xsl:when>
+                               <xsl:otherwise>
+                               
+                                       <!-- =========== HEADING ============== 
-->
+                                       <h1 style="float:left;"> 
+                                               <xsl:value-of 
select="php:function('lang', 'Requirement allocation')" />
+                                       </h1>
+                                       
+                                       <!-- =========== BREADCRUMB 
============== -->
+                                       <div id="breadcrumb">
+                                               <span>Du er her:</span>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />
+                                       </div>
+                               </xsl:otherwise>
+                       </xsl:choose>
+               
+                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
+                       <xsl:call-template name="activity_details" />
+               </xsl:when>
+               <xsl:when test="view = 'requirement_overview'">
+                       <xsl:choose>
+                               <xsl:when test="activity/id != '' or 
activity/id != 0">
+                                       
+                                       <!-- =========== HEADING ============== 
-->
+                                       <h1 style="float:left;"> 
+                                               <span>
+                                                       <xsl:value-of 
select="php:function('lang', 'Overview of resources for activity')" />
+                                               </span>
+                                               <span style="margin-left:5px;">
+                                                       <xsl:value-of 
select="activity/name" />
+                                               </span>
+                                       </h1>
+                                       
+                                       <!-- =========== BREADCRUMB 
============== -->
+                                       <div id="breadcrumb">
+                                               <span>Du er her:</span>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />
+                                       </div>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       
+                                       <!-- =========== HEADING ============== 
-->
+                                       <h1 style="float:left;"> 
+                                               <xsl:value-of 
select="php:function('lang', 'Add criterias')" />
+                                       </h1>
+                                       
+                                       <!-- =========== BREADCRUMB 
============== -->
+                                       <div id="breadcrumb">
+                                               <span>Du er her:</span>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="breadcrumb" />
+                                       </div>
+                               </xsl:otherwise>
+                       </xsl:choose>
+               
+                       <xsl:value-of disable-output-escaping="yes" 
select="tabs" />
+                       <xsl:call-template name="requirement_overview" />
+               </xsl:when>
+       </xsl:choose>
+</div>
+       
+</xsl:template>

Copied: 
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
 (from rev 10478, trunk/logistic/templates/base/activity/add_activity_item.xsl)
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
                          (rev 0)
+++ 
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
  2012-11-06 10:47:26 UTC (rev 10479)
@@ -0,0 +1,252 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
+
+<xsl:call-template name="yui_phpgw_i18n"/>
+<div class="yui-navset yui-navset-top">
+
+       <xsl:choose>
+               <xsl:when test="project/id != '' or project/id != 0">
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 'Add 
activity to project')" />
+                               <span style="margin-left:5px;"><xsl:value-of 
select="project/name" /></span>
+                       </h1>
+               </xsl:when>
+               <xsl:when test="activity/id != '' and activity/id != 0">
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 
'Edit activity')" />
+                       </h1>
+               </xsl:when>
+               <xsl:otherwise>
+                       <h1>
+                               <xsl:value-of select="php:function('lang', 'Add 
activity')" />
+                       </h1>
+               </xsl:otherwise>
+       </xsl:choose>
+       
+       <div id="activity_details" class="content-wrp">
+               <div id="details">
+                       <xsl:variable name="action_url">
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uiactivity.save')" />
+                       </xsl:variable>
+                       <form action="{$action_url}" method="post">
+                               <input type="hidden" name="id" value = 
"{activity/id}" />
+                               <input type="hidden" name="project_id" 
value="{activity/project_id}" />
+                               <input type="hidden" name="parent_id" 
value="{parent_activity/id}" />
+                               
+                               <dl class="proplist-col">
+                                 <xsl:choose>
+                                               <xsl:when test="(editable) and 
(parent_activity/id &gt; 0)">
+                                                       <dt>            
+                                                                       <div 
style="margin-bottom: 1em;">
+                                                                               
<label style="display:block;"><xsl:value-of select="php:function('lang', 
'Choose another main activity for this sub activity')" /></label>
+                                                                               
<select id="select_parent_activity" name="parent_activity_id">
+                                                                               
        <option>Velg annen hovedaktivitet</option>
+                                                                               
        <xsl:for-each select="activities">
+                                                                       <option 
value="{id}">
+                                                                               
<xsl:if test="activity/parent_id = id">
+                                                                               
        <xsl:attribute name="selected">
+                                                                               
                        selected
+                                                                               
                        </xsl:attribute>
+                                                                               
</xsl:if>
+                                                                       
<xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                       
</option>
+                                                                               
  </xsl:for-each>
+                                                                               
</select>                                       
+                                                                       </div>
+                                                               </dt>
+                                                 </xsl:when>
+                                                 <xsl:when test="(editable) 
and not(parent_activity) and not(project)">
+                                                       <dt>            
+                                                                       <div 
style="margin-bottom: 1em;">
+                                                                               
<label style="display:block;"><xsl:value-of select="php:function('lang', 
'Choose the project in which the activity is part of')" /></label>
+                                                                               
<select id="select_project" name="select_project">
+                                                                               
        <option><xsl:value-of select="php:function('lang', 'Choose project')" 
/></option>
+                                                                               
        <xsl:for-each select="projects">
+                                                                       <option 
value="{id}">
+                                                                               
<xsl:if test="project/id = project_id">
+                                                                               
        <xsl:attribute name="selected">
+                                                                               
                        selected
+                                                                               
                        </xsl:attribute>
+                                                                               
</xsl:if>
+                                                                       
<xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                       
</option>
+                                                                               
  </xsl:for-each>
+                                                                               
</select>                                       
+                                                                       </div>
+                                                               </dt>
+                                                 </xsl:when>
+                                                 <xsl:otherwise>
+                                                       <dt>            
+                                                                       <div 
style="margin-bottom: 1em;">
+                                                                               
<label style="display:block;"><xsl:value-of select="php:function('lang', 
'Choose another project for the activity')" /></label>
+                                                                               
<select id="select_project" name="select_project">
+                                                                               
        <option><xsl:value-of select="php:function('lang', 'Choose another 
project')" /></option>
+                                                                               
        <xsl:for-each select="projects">
+                                                                       <option 
value="{id}">
+                                                                               
<xsl:if test="project/id = project_id">
+                                                                               
        <xsl:attribute name="selected">
+                                                                               
                        selected
+                                                                               
                        </xsl:attribute>
+                                                                               
</xsl:if>
+                                                                       
<xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                       
</option>
+                                                                               
  </xsl:for-each>
+                                                                               
</select>                                       
+                                                                       </div>
+                                                               </dt>
+                                                 </xsl:otherwise>
+                                         </xsl:choose>
+                                       <dt>
+                                               <label for="name"><xsl:value-of 
select="php:function('lang','Activity name')" /></label>
+                                       </dt>
+                                       <dd>
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <xsl:if 
test="activity/error_msg_array/name != ''">
+                                                               <xsl:variable 
name="error_msg"><xsl:value-of select="activity/error_msg_array/name" 
/></xsl:variable>
+                                                               <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
+                                                       </xsl:if>
+                                                       <div 
class="help_text"><xsl:value-of select="php:function('lang','Give name to this 
activity')" /></div>
+                                                       <input type="text" 
name="name" id="name" value="{activity/name}" size="100"/>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="activity/name" />
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="description"><xsl:value-of select="php:function('lang', 'Description')" 
/></label>
+                                       </dt>
+                                       <dd>
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <xsl:if 
test="activity/error_msg_array/description != ''">
+                                                               <xsl:variable 
name="error_msg"><xsl:value-of select="activity/error_msg_array/description" 
/></xsl:variable>
+                                                               <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
+                                                       </xsl:if>
+                                                       <div 
class="help_text"><xsl:value-of select="php:function('lang','Give description 
to activity')" /></div>
+                                                       <textarea 
id="description" name="description" rows="5" cols="60"><xsl:value-of 
select="activity/description" disable-output-escaping="yes"/></textarea>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="activity/description" disable-output-escaping="yes"/>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="start_date"><xsl:value-of select="php:function('lang','Start date')" 
/></label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable">
+                                                               <xsl:if 
test="activity/error_msg_array/start_date != ''">
+                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/start_date" /></xsl:variable>
+                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
+                                                               </xsl:if>
+                                                               <div 
class="help_text"><xsl:value-of select="php:function('lang','Give start date to 
activity')" /></div>
+                                                               <input 
class="date" id="start_date" name="start_date" type="text">
+                                                       <xsl:if 
test="activity/start_date != ''">
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/start_date))"/></xsl:attribute>
+                                                       </xsl:if>
+                                               </input>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                       <span><xsl:value-of 
select="php:function('date', $date_format, 
number(activity/start_date))"/></span>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable">
+                                                               <xsl:if 
test="activity/error_msg_array/end_date != ''">
+                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/end_date" /></xsl:variable>
+                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
+                                                               </xsl:if>
+                                                               <div 
class="help_text"><xsl:value-of select="php:function('lang','Give end date to 
activity')" /></div>
+                                                               <input 
class="date" id="end_date" name="end_date" type="text">
+                                                       <xsl:if 
test="activity/end_date != ''">
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/end_date))"/></xsl:attribute>
+                                                       </xsl:if>
+                                               </input>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                       <span><xsl:value-of 
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="end_date"><xsl:value-of select="php:function('lang', 'Responsible 
person')" /></label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable">
+                                                               <xsl:if 
test="activity/error_msg_array/responsible_user_id != ''">
+                                                                       
<xsl:variable name="error_msg"><xsl:value-of 
select="activity/error_msg_array/responsible_user_id" /></xsl:variable>
+                                                                       <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
+                                                               </xsl:if>
+                                                               <div 
class="help_text"><xsl:value-of select="php:function('lang', 'Responsible 
person for activity')" /></div>
+                                                               <select 
name="responsible_user_id">
+                                                                       <option 
value="">Velg ansvarlig bruker</option>
+                                               <xsl:for-each 
select="responsible_users">
+                                                       <xsl:variable 
name="full_name">
+                                                               <xsl:value-of 
disable-output-escaping="yes" select="account_firstname"/><xsl:text> </xsl:text>
+                                                               <xsl:value-of 
disable-output-escaping="yes" select="account_lastname"/>
+                                                       </xsl:variable>
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="//activity/responsible_user_id = account_id">
+                                                                               
                <option selected="selected" value="{account_id}">
+                                                                               
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
+                                                                       
</option>
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
+                                                                       <option 
value="{account_id}">
+                                                                               
<xsl:value-of disable-output-escaping="yes" select="$full_name"/>
+                                                                       
</option>
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
+                                               </xsl:for-each>
+                                             </select>
+                                             </xsl:when>
+                                                       <xsl:otherwise>
+                                                       <span><xsl:value-of 
select="activity/responsible_user_name"/></span>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </dd>
+                               </dl>
+                               
+                               <div class="form-buttons">
+                                       <xsl:choose>
+                                               <xsl:when test="editable">
+                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 'save')" 
/></xsl:variable>
+                                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')" 
/></xsl:variable>
+                                                       <input type="submit" 
name="save_activity" value="{$lang_save}" title = "{$lang_save}" />
+                                                       <input type="submit" 
name="cancel_activity" value="{$lang_cancel}" title = "{$lang_cancel}" />
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:variable 
name="params">
+                                                               
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
+                                                               <xsl:value-of 
select="activity/id" />
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="edit_url">
+                                                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $params )" />
+                                                       </xsl:variable>
+                                                       <a class="btn" 
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </div>
+                       </form>
+               </div>
+       </div>
+</div>
+</xsl:template>
+
+<xsl:template match="options">
+       <option value="{id}">
+               <xsl:if test="selected">
+                       <xsl:attribute name="selected" value="selected" />
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
+</xsl:template>

Copied: 
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
 (from rev 10478, trunk/logistic/templates/base/activity/view_activity_item.xsl)
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
                         (rev 0)
+++ 
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
 2012-11-06 10:47:26 UTC (rev 10479)
@@ -0,0 +1,107 @@
+<xsl:template name="activity_details" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
+
+       <div class="content-wrp">
+               <div id="details">
+               
+                       <h3 style="margin: 0 0 5px 0;">Detaljer</h3>
+                       <xsl:variable name="action_url">
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uiactivity.save')" />
+                       </xsl:variable>
+                       <form action="{$action_url}" method="post">
+                               <input type="hidden" name="id" value = 
"{activity/id}" />
+                               <input type="hidden" name="project_id" 
value="{activity/project_id}" />
+                               <input type="hidden" name="parent_id" 
value="{parent_activity/id}" />
+                               
+                               <dl class="proplist-col">
+                                       <dt>
+                                               <label for="name"><xsl:value-of 
select="php:function('lang','Activity name')" /></label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:value-of 
select="activity/name" />
+                                       </dd>
+                                       <dt>
+                                               <label 
for="description"><xsl:value-of select="php:function('lang', 'Description')" 
/></label>
+                                       </dt>
+                                       <dd>
+                                               <xsl:value-of 
select="activity/description" disable-output-escaping="yes"/>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="start_date"><xsl:value-of select="php:function('lang','Start date')" 
/></label>
+                                       </dt>
+                                       <dd>
+                                               <span><xsl:value-of 
select="php:function('date', $date_format, 
number(activity/start_date))"/></span>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
+                                       </dt>
+                                       <dd>
+                                               <span><xsl:value-of 
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+                                       </dd>
+                                       <dt>
+                                               <label 
for="end_date">Ansvarlig</label>
+                                       </dt>
+                                       <dd>
+                                               <span><xsl:value-of 
select="activity/responsible_user_name"/></span>
+                                       </dd>
+                               </dl>
+                                       <div class="form-buttons">
+                                               <xsl:variable name="params">
+                                                       
<xsl:text>menuaction:logistic.uiactivity.edit, id:</xsl:text>
+                                                       <xsl:value-of 
select="activity/id" />
+                                               </xsl:variable>
+                                               <xsl:variable name="edit_url">
+                                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $params )" />
+                                               </xsl:variable>
+                                               <a class="btn" 
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
+                               </div>
+                       </form>
+                       
+                       <!-- =========  SUBACTIVITIES  =========  -->
+                       <div style="">
+                               <xsl:variable name="add_sub_activity_params">
+                                       
<xsl:text>menuaction:logistic.uiactivity.edit, parent_id:</xsl:text>
+                                       <xsl:value-of select="activity/id" />
+                               </xsl:variable>
+                               <xsl:variable name="add_sub_activity_url">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $add_sub_activity_params 
)" />
+                               </xsl:variable>
+                               
+                               <h3 style="clear:left; float:left;margin: 0; 
padding: 10px 0 5px;">Underaktiviteter</h3>
+                               <a id="add-sub-activity-btn" class="btn focus" 
href="{$add_sub_activity_url}"><xsl:value-of select="php:function('lang', 'Add 
sub activity')" /></a>
+                               
+                               <div style="clear:both;" 
id="sub-activities-container"></div>           
+                               <xsl:call-template name="datasource-definition" 
/>
+                       </div>
+               </div>
+       </div>
+</xsl:template>
+
+<xsl:template name="datasource-definition">
+
+       <script>
+       YAHOO.util.Event.onDOMReady(function(){
+        
+   var oArgs = {
+                                       menuaction:'logistic.uiactivity.index',
+                                       activity_id: '<xsl:value-of 
select='activity/id'/>',
+                                       type: 'children',
+                                       phpgw_return_as: 'json'
+                               };
+                       
+               var requestUrl = phpGWLink('index.php', oArgs, true);
+                       
+               var myColumnDefs = [ 
+               {key:"id", label:'Id', sortable:true},
+               {key:"name", label:'Aktivitetsnavn', sortable:true},
+               {key:"start_date", label:'Startdato', sortable:true}, 
+               {key:"end_date", label:'Sluttdato', sortable:true},
+                       {key:"responsible_user_name", label:'Ansvarlig', 
sortable:true},
+                       {key:"status", label:'Status', sortable:true}
+           ]; 
+
+               YAHOO.portico.inlineTableHelper("sub-activities-container", 
requestUrl, myColumnDefs);
+               
+       });
+  </script>
+</xsl:template>

Deleted: 
branches/Version-1_0-branch/logistic/templates/base/allocation/allocation_suggestions.xsl
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/allocation/allocation_suggestions.xsl
   2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/templates/base/allocation/allocation_suggestions.xsl
   2012-11-06 10:47:26 UTC (rev 10479)
@@ -1,91 +0,0 @@
-<!-- $Id: activity_item.xsl 10096 2012-10-03 07:10:49Z vator $ -->
-<!-- item  -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
-
-<xsl:call-template name="yui_phpgw_i18n"/>
-<div id="resource-allocation" class="yui-navset yui-navset-top">
-       <h1>
-               <xsl:value-of select="php:function('lang', 'Allocation of 
requirement for')"/> <xsl:value-of select="activity/name"/>
-       </h1>
-       
-       <div class="content-wrp">
-               
-               <div id="requirement-wrp">
-                       <ul>
-                               <li>
-                                       <label 
for="start_date">Startdato</label><span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/start_date))"/></span>
-                               </li>
-                               <li>
-                                       <label for="end_date">Sluttdato</label>
-                                       <span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/end_date))"/></span>
-                               </li>
-                               <li>
-                                       <label for="no_of_items">Antall</label>
-                                       <span><xsl:value-of 
select="requirement/no_of_items" /></span>
-                               </li>
-                       </ul>
-                       
-                       <h3>Kriterier</h3>
-                               <xsl:for-each select="view_criterias_array">
-                                       <ul>
-                                               <li>
-                                                       <label><xsl:value-of 
select="cust_attribute_data/input_text"/></label>
-                                                       <span 
style="margin-right:5px;"><xsl:value-of select="operator"/></span>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="cust_attribute_data/column_info/type = 'LB'">
-                                                                       
<xsl:for-each select="cust_attribute_data/choice">
-                                                                               
<xsl:if test="//value = id">
-                                                                               
        <span><xsl:value-of select="value"/></span>
-                                                                               
</xsl:if>
-                                                                       
</xsl:for-each>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<span><xsl:value-of select="value"/></span>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </li>
-                                       </ul>
-                               </xsl:for-each>
-               </div>
-                       
-                       <xsl:variable name="action_url">
-                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uirequirement_resource_allocation.save')" />
-                       </xsl:variable>
-                       <form action="{$action_url}" method="post">
-                               <input type="hidden" name="requirement_id" 
value="{requirement/id}" />
-
-                               <div id="resource-list">
-                                       <div class="resource heading">
-                                                       <span class="desc">Kort 
beskrivelse</span>
-                                                       <span 
class="loc_id">Lokasjons id</span>
-                                                       <span 
class="type">Type</span>
-                                                       <span 
class="loc_code">Lokasjons kode</span>
-                                       </div>
-                                       <xsl:for-each 
select="allocation_suggestions">
-                                               
-                                               <div>                           
-                                                       <xsl:choose>
-                                                       <xsl:when 
test="(position() mod 2) != 1">
-                                                       <xsl:attribute 
name="class">resource odd</xsl:attribute>
-                                                   </xsl:when>
-                                                   <xsl:otherwise>
-                                                       <xsl:attribute 
name="class">resource even</xsl:attribute>
-                                                   </xsl:otherwise>
-                                                 </xsl:choose>
-                                               
-                                                       <input type="checkbox" 
value="{id}" name="chosen_resources[]" />
-                                                       <span 
class="desc"><xsl:value-of select="short_description" /></span>
-                                                       <span 
class="loc_id"><xsl:value-of select="location_id" /></span>
-                                                       <span 
class="type"><xsl:value-of select="type_lokale" /></span>
-                                                       <span 
class="loc_code"><xsl:value-of select="location_code" /></span>
-                                               </div>
-                                       </xsl:for-each>
-                               </div>                  
-                               
-                               <input type="submit" value="Lagre" />
-                       </form>
-       </div>
-</div>
-</xsl:template>
\ No newline at end of file

Copied: 
branches/Version-1_0-branch/logistic/templates/base/allocation/book_resources.xsl
 (from rev 10478, trunk/logistic/templates/base/allocation/book_resources.xsl)
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/allocation/book_resources.xsl
                           (rev 0)
+++ 
branches/Version-1_0-branch/logistic/templates/base/allocation/book_resources.xsl
   2012-11-06 10:47:26 UTC (rev 10479)
@@ -0,0 +1,107 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
+
+<xsl:call-template name="yui_phpgw_i18n"/>
+<div id="resource-allocation" class="yui-navset yui-navset-top">
+       <h1 style="margin-bottom:10px;">
+               <xsl:value-of select="php:function('lang', 'Booking of 
resources')"/> for <xsl:value-of select="activity/name"/>
+       </h1>
+       
+       <xsl:variable name="view_resources_params">
+               
<xsl:text>menuaction:logistic.uiactivity.view_resource_allocation, 
activity_id:</xsl:text>
+                       <xsl:value-of select="activity/id" />
+               </xsl:variable>
+               <xsl:variable name="view_resources_url">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $view_resources_params )" />
+       </xsl:variable>
+       <a style="margin-left:0;margin-bottom:5px;" id="view-resources-btn" 
class="btn non-focus" href="{$view_resources_url}">
+               <xsl:value-of select="php:function('lang', 'View resources 
overview')" />
+       </a>
+       
+       <div class="content-wrp">
+               
+               <div id="requirement-wrp">
+                       <h3 style="margin: 0 0 10px 0;">Detaljer for behov</h3>
+                       <ul>
+                               <li>
+                                       <label 
for="start_date">Startdato</label><span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/start_date))"/></span>
+                               </li>
+                               <li>
+                                       <label for="end_date">Sluttdato</label>
+                                       <span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/end_date))"/></span>
+                               </li>
+                               <li>
+                                       <label for="no_of_items">Antall</label>
+                                       <span><xsl:value-of 
select="requirement/no_of_items" /></span>
+                               </li>
+                       </ul>
+                       
+                       <h3 style="margin-bottom: 10px;">Kriterier</h3>
+                               <xsl:choose>
+                                       <xsl:when 
test="view_criterias_array/child::node()">
+                                               <xsl:for-each 
select="view_criterias_array">
+                                                       <ul>
+                                                               <li>
+                                                                       
<label><xsl:value-of select="cust_attribute_data/input_text"/></label>
+                                                                       <span 
style="margin-right:5px;"><xsl:value-of select="operator"/></span>
+                                                                       
<xsl:choose>
+                                                                               
<xsl:when test="cust_attribute_data/column_info/type = 'LB'">
+                                                                               
        <xsl:for-each select="cust_attribute_data/choice">
+                                                                               
                <xsl:if test="//value = id">
+                                                                               
                        <span><xsl:value-of select="value"/></span>
+                                                                               
                </xsl:if>
+                                                                               
        </xsl:for-each>
+                                                                               
</xsl:when>
+                                                                               
<xsl:otherwise>
+                                                                               
        <span><xsl:value-of select="value"/></span>
+                                                                               
</xsl:otherwise>
+                                                                       
</xsl:choose>
+                                                               </li>
+                                                       </ul>
+                                               </xsl:for-each>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <p 
style="margin-top:0;">Ingen kriterier lagt til</p>
+                                               </xsl:otherwise>
+                               </xsl:choose>
+               </div>
+                       
+                       <xsl:variable name="action_url">
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:logistic.uirequirement_resource_allocation.save')" />
+                       </xsl:variable>
+                       <form action="{$action_url}" method="post">
+                               <input type="hidden" name="requirement_id" 
value="{requirement/id}" />
+
+                               <div id="resource-list">
+                                       <div class="resource heading">
+                                                       <span class="desc">Kort 
beskrivelse</span>
+                                                       <span 
class="loc_id">Lokasjons id</span>
+                                                       <span 
class="type">Type</span>
+                                                       <span 
class="loc_code">Lokasjons kode</span>
+                                       </div>
+                                       <xsl:for-each 
select="allocation_suggestions">
+                                               
+                                               <div>                           
+                                                       <xsl:choose>
+                                                       <xsl:when 
test="(position() mod 2) != 1">
+                                                       <xsl:attribute 
name="class">resource odd</xsl:attribute>
+                                                   </xsl:when>
+                                                   <xsl:otherwise>
+                                                       <xsl:attribute 
name="class">resource even</xsl:attribute>
+                                                   </xsl:otherwise>
+                                                 </xsl:choose>
+                                               
+                                                       <input type="checkbox" 
value="{id}" name="chosen_resources[]" />
+                                                       <span 
class="desc"><xsl:value-of select="short_description" /></span>
+                                                       <span 
class="loc_id"><xsl:value-of select="location_id" /></span>
+                                                       <span 
class="type"><xsl:value-of select="type_lokale" /></span>
+                                                       <span 
class="loc_code"><xsl:value-of select="location_code" /></span>
+                                               </div>
+                                       </xsl:for-each>
+                               </div>                  
+                               
+                               <input type="submit" value="Lagre bestilling" />
+                       </form>
+       </div>
+</div>
+</xsl:template>
\ No newline at end of file

Modified: branches/Version-1_0-branch/logistic/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/logistic/templates/base/css/base.css    
2012-11-06 10:38:04 UTC (rev 10478)
+++ branches/Version-1_0-branch/logistic/templates/base/css/base.css    
2012-11-06 10:47:26 UTC (rev 10479)
@@ -383,7 +383,7 @@
   text-decoration: none;
 }
 
-#innertoolbar-button, input[type="submit"] {
+#innertoolbar-button, input[type="submit"], input[type="button"]{
     background: none repeat scroll 0 0 #4F9AEA;
     border: 1px solid #4685C8;
     border-radius: 4px 4px 4px 4px;
@@ -392,6 +392,11 @@
     padding: 3px 15px;
 }
 
+input[type="submit"][disabled]
+{
+    background: none repeat scroll 0 0 #A3D1FF;
+}
+
 #innertoolbar-button {
   font-size: 1em;
   line-height: 1.2em;
@@ -855,23 +860,30 @@
 }
 
 .btn-sm {
-  font-size: 12px;
-  padding: 1px 4px;
+    font-size: 12px;
+    padding: 1px 4px;
+    text-align: center;
 }
 
-.btn.cancel, .btn_m.cancel {
+.btn.cancel, .btn_m.cancel, .btn-sm.cancel {
   background: none repeat scroll 0 0 #EEEEEE;
   border: 1px solid #CCCCCC;
   color: #333333;
 }
 
+.btn.non-focus {
+    background: none repeat scroll 0 0 #A0C8F2;
+    border: 1px solid #74B0EF;
+    color: #0A3E74;
+}
+
 .btn.focus, .btn_m.focus {
-  background: none repeat scroll 0 0 #F57056;
-  border-color: #EE836F -moz-use-text-color #CB563F;
-  border-style: solid none;
-  border-width: 1px 0;
-  color: #FFFFFF;
-  margin-top: 1px;
+    background: none repeat scroll 0 0 #F57056;
+    border-color: #EE836F #CB563F #CB563F;
+    border-style: solid none;
+    border-width: 1px 0;
+    color: #FFFFFF;
+    margin-top: 1px;
 }
 
 /* =======================================  MAIN CONTENT  
========================================= */
@@ -916,7 +928,7 @@
 
 input.datetime {
   text-align: right;
-  width: 100px;
+  width: 110px;
 }
 
 /* =======================================  CHECK LIST  
========================================= */
@@ -2287,11 +2299,18 @@
        margin:0 0 10px;
 }
 
-#resource-allocation form{
-       margin: 20px;
+#resource-list {
        border: 1px solid #B0D9FF;
 }
 
+#resource-allocation form {
+       padding: 20px;  
+}
+
+#resource-allocation form input[type=submit]{
+       margin-top: 10px;       
+}
+
 #resource-list .resource {
   padding: 10px;
 }
@@ -2319,22 +2338,16 @@
 }
 
 #resource-list .resource.heading {
-    background: none repeat scroll 0 0 #B0D9FF;
-    color: #092845;
+    background: none repeat scroll 0 0 #6292C5;
+    color: #FFFFFF;
     font-weight: bold;
     padding: 5px 20px;
 }
 
 #resource_alloc_wrp {
-       margin: 20px;
        padding: 20px;  
 }
 
-#resource_alloc_wrp #btn_menu {
-       float:left;
-       margin-left: 20px;
-}
-
 #resource_alloc_wrp input[type="submit"] {
     font-size: 13px;
     margin-bottom: 1px;
@@ -2344,4 +2357,91 @@
 
 #resource_alloc_wrp h2{
        margin-top: 0;  
-}
\ No newline at end of file
+}
+
+#requirement-container .btn-sm {
+    border-color: #4378B1 #2663A3 #366CA4;
+    font-size: 12px;
+    padding: 1px 8px;
+}
+
+#details table {
+    margin: 0;
+    padding: 0;
+}
+
+#requirement-container table td{
+       padding: 5px 0; 
+}
+
+#activity-tabview .yui-navset {
+    margin-left: 0;
+    margin-right: 0;
+}
+
+.yui-dt19-col-delete_link .yui-dt-liner, .yui-dt19-col-alloc_link 
.yui-dt-liner {
+       text-align: center;     
+}
+
+.yui-dt19-col-no_of_items .yui-dt-liner, .yui-dt19-col-allocated .yui-dt-liner 
{
+       text-align: center;
+}
+
+
+#allocation-container .yui-dt-col-delete_link .yui-dt-liner {
+       text-align: center;
+}
+       
+#add-requirement-btn {
+    float: left;
+    margin-left: 725px;
+    text-align: center;
+    width: 120px;
+}
+
+#add-sub-activity-btn {
+    float: left;
+    margin-left: 525px;
+    margin-top: 0;
+    text-align: center;
+    width: 136px;
+}
+
+#sub-activities-container th div, #requirement-container th div {
+    /*background: #6292C5;*/
+}
+
+#sub-activities-container .yui-dt table, #requirement-container .yui-dt table {
+    /*border: 1px solid #98BFE8;*/
+}
+
+#sub-activities-container .yui-dt table {
+    width: 800px;
+}
+
+#requirement-container .yui-dt table, #allocation-container .yui-dt table {
+    width: 1000px;
+}
+       
+#sub-activities-container th a, #sub-activities-container th span, 
+#requirement-container th a, #requirement-container th span,
+#allocation-container th a, #allocation-container th span,
+#datatable-container th a, #datatable-container th span
+{
+    /*color: #F9FCFE;*/
+    font-weight: bold;
+}
+
+#breadcrumb {
+       clear: both;
+  font-size: 16px;
+  margin-bottom: 1em;
+}
+
+#breadcrumb img{
+       height: 14px;
+}
+
+#requirement-container .btn-sm.cancel {
+  border: 1px solid #CCCCCC;
+}

Modified: 
branches/Version-1_0-branch/logistic/templates/base/project/project_item.xsl
===================================================================
--- 
branches/Version-1_0-branch/logistic/templates/base/project/project_item.xsl    
    2012-11-06 10:38:04 UTC (rev 10478)
+++ 
branches/Version-1_0-branch/logistic/templates/base/project/project_item.xsl    
    2012-11-06 10:47:26 UTC (rev 10479)
@@ -2,21 +2,30 @@
 <!-- item  -->
 
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
 
 <xsl:call-template name="yui_phpgw_i18n"/>
 <div class="yui-navset yui-navset-top">
+       <xsl:choose>

@@ Diff output truncated at 153600 characters. @@
reply via email to
[Prev in Thread] Current Thread [Next in Thread]