[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16047] Stable: Merge 15901:16046 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16047] Stable: Merge 15901:16046 from trunk |
|
Date: |
Mon, 5 Dec 2016 08:57:35 +0000 (UTC) |
Revision: 16047
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16047
Author: sigurdne
Date: 2016-12-05 08:57:35 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
Stable: Merge 15901:16046 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-2_0-branch/admin/templates/base/config.tpl
branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation.inc.php
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
branches/Version-2_0-branch/booking/inc/class.uireports.inc.php
branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
branches/Version-2_0-branch/booking/js/booking/allocation.js
branches/Version-2_0-branch/booking/js/booking/application.js
branches/Version-2_0-branch/booking/js/booking/booking.js
branches/Version-2_0-branch/booking/js/booking/email_send.js
branches/Version-2_0-branch/booking/js/booking/event.js
branches/Version-2_0-branch/booking/js/booking/report.js
branches/Version-2_0-branch/booking/js/booking/season.js
branches/Version-2_0-branch/booking/setup/phpgw_no.lang
branches/Version-2_0-branch/booking/templates/base/building_schedule.xsl
branches/Version-2_0-branch/booking/templates/base/massbooking_schedule.xsl
branches/Version-2_0-branch/booking/templates/base/resource_schedule.xsl
branches/Version-2_0-branch/booking/templates/base/season_wtemplate.xsl
branches/Version-2_0-branch/bookingfrontend/css/bookingfrontend.css
branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
branches/Version-2_0-branch/bookingfrontend/inc/class.uievent.inc.php
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking.js
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking_massupdate.js
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/event.js
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/search.js
branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
branches/Version-2_0-branch/bookingfrontend/templates/base/access_denied.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete_preview.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_cancel.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete_preview.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit_preview.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_massupdate.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new_preview.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
branches/Version-2_0-branch/bookingfrontend/templates/base/event_delete.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/event_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/organization_edit.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/report_numbers.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
branches/Version-2_0-branch/bookingfrontend/templates/base/system_message.xsl
branches/Version-2_0-branch/calendar/templates/base/contacts_popup.tpl
branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-2_0-branch/controller/inc/class.uicase.inc.php
branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-2_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_group.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_group_component.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
branches/Version-2_0-branch/controller/inc/class.uidocument.inc.php
branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
branches/Version-2_0-branch/controller/js/controller/ajax.js
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_component.js
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_location.js
branches/Version-2_0-branch/controller/js/controller/case.js
branches/Version-2_0-branch/controller/js/controller/check_list_update_status.js
branches/Version-2_0-branch/controller/templates/base/component.xsl
branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicommon.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.booking.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.vendor.inc.php
branches/Version-2_0-branch/eventplanner/js/portico/application.edit.js
branches/Version-2_0-branch/eventplanner/setup/default_records.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
branches/Version-2_0-branch/eventplanner/templates/base/booking.xsl
branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
branches/Version-2_0-branch/eventplanner/templates/base/vendor.xsl
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/inc/hook_settings.inc.php
branches/Version-2_0-branch/helpdesk/setup/default_records.inc.php
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/setup/setup.inc.php
branches/Version-2_0-branch/helpdesk/setup/tables_current.inc.php
branches/Version-2_0-branch/helpdesk/setup/tables_update.inc.php
branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
branches/Version-2_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-2_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-2_0-branch/mobilefrontend/home.php
branches/Version-2_0-branch/phpgwapi/inc/class.common.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.jqcal.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.jquery.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.phpgw.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/phpgwapi/inc/model/class.model.inc.php
branches/Version-2_0-branch/phpgwapi/js/SlickNav/demo/index.html
branches/Version-2_0-branch/phpgwapi/js/jquery/common.js
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_glass_100_f5f0e5_1x400.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_glass_25_cb842e_1x400.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_glass_70_ede4d4_1x400.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-icons_c47a23_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-icons_cb672b_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-icons_f08000_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-icons_f35f07_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-icons_ff7519_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/images/ui-icons_ffffff_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-icons_222222_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-icons_228ef1_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/images/ui-icons_ffffff_256x240.png
branches/Version-2_0-branch/phpgwapi/js/jquery/index.html
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/drag_and_drop_handler.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/node.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/save_state_handler.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/select_node_handler.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/lib/version.js
branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/tree.jquery.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-timepicker-addon.js
branches/Version-2_0-branch/phpgwapi/js/jquery/tabs/css/style.css
branches/Version-2_0-branch/phpgwapi/js/jquery/tabs/jquery.responsiveTabs.js
branches/Version-2_0-branch/phpgwapi/js/jquery/tabs/jquery.responsiveTabs.min.js
branches/Version-2_0-branch/phpgwapi/js/layout/jquery.layout.js
branches/Version-2_0-branch/phpgwapi/js/layout/jquery.layout.min.js
branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/phpgwapi/templates/bkbooking/css/frontend.css
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/footer.tpl
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
branches/Version-2_0-branch/phpgwapi/templates/mobilefrontend/navbar.tpl
branches/Version-2_0-branch/phpgwapi/templates/portico/css/base.css
branches/Version-2_0-branch/phpgwapi/templates/portico/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/portico/js/base.js
branches/Version-2_0-branch/phpgwapi/templates/pure/css/HISTORY.md
branches/Version-2_0-branch/phpgwapi/templates/pure/css/README.md
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-context.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/base.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/bower.json
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-core.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/buttons.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/demo_mmenu.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms-nr.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/forms.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-core.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive-old-ie.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-responsive.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids-units.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/grids.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-core.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-extension.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure-nr.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/pure.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/tables.css
branches/Version-2_0-branch/phpgwapi/templates/pure/footer.tpl
branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/pure/js/mmenu.js
branches/Version-2_0-branch/phpgwapi/templates/pure/navbar.inc.php
branches/Version-2_0-branch/phpgwapi/templates/simple/head.inc.php
branches/Version-2_0-branch/preferences/inc/hook_settings.inc.php
branches/Version-2_0-branch/preferences/preferences.php
branches/Version-2_0-branch/property/inc/class.bocommon.inc.php
branches/Version-2_0-branch/property/inc/class.bolookup.inc.php
branches/Version-2_0-branch/property/inc/class.boproject.inc.php
branches/Version-2_0-branch/property/inc/class.botts.inc.php
branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
branches/Version-2_0-branch/property/inc/class.custom_fields.inc.php
branches/Version-2_0-branch/property/inc/class.notify.inc.php
branches/Version-2_0-branch/property/inc/class.socommon.inc.php
branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-2_0-branch/property/inc/class.sogeneric_.inc.php
branches/Version-2_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-2_0-branch/property/inc/class.solocation.inc.php
branches/Version-2_0-branch/property/inc/class.soproject.inc.php
branches/Version-2_0-branch/property/inc/class.sotts.inc.php
branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-2_0-branch/property/inc/class.uicustom.inc.php
branches/Version-2_0-branch/property/inc/class.uientity.inc.php
branches/Version-2_0-branch/property/inc/class.uigeneric_document.inc.php
branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
branches/Version-2_0-branch/property/inc/class.uilookup.inc.php
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/inc/class.uiresponsible.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_exporter_varemottak_til_Agresso.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_melding.php
branches/Version-2_0-branch/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
branches/Version-2_0-branch/property/js/portico/notify.js
branches/Version-2_0-branch/property/js/portico/project.edit.js
branches/Version-2_0-branch/property/js/portico/tts.view.js
branches/Version-2_0-branch/property/js/portico/workorder.edit.js
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/templates/base/condition_survey.xsl
branches/Version-2_0-branch/property/templates/base/entity.xsl
branches/Version-2_0-branch/property/templates/base/invoice2.xsl
branches/Version-2_0-branch/property/templates/base/project.xsl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/property/templates/base/workorder.xsl
branches/Version-2_0-branch/redirect.php
branches/Version-2_0-branch/rental/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/rental/js/rental/application.edit.js
branches/Version-2_0-branch/rental/js/rental/schedule.js
branches/Version-2_0-branch/rental/setup/phpgw_no.lang
branches/Version-2_0-branch/rental/templates/base/application.xsl
branches/Version-2_0-branch/rental/templates/base/schedule.xsl
Added Paths:
-----------
branches/Version-2_0-branch/controller/templates/mobilefrontend/
branches/Version-2_0-branch/helpdesk/inc/class.uicustom.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uilookup.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.jqcal2.inc.php
branches/Version-2_0-branch/phpgwapi/js/datetimepicker/
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery-ui.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery-ui.min.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/theme.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/redmond/
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/jquery-ui.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/jquery-ui.min.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/theme.css
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-3.1.1.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-migrate-1.4.1.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-migrate-3.0.0.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.12.1.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.12.1.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-timepicker-addon.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/ui/
branches/Version-2_0-branch/phpgwapi/templates/bookingfrontend/
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-dropdown.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-horizontal.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-scrollable.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin-min.css
branches/Version-2_0-branch/phpgwapi/templates/pure/css/menus-skin.css
branches/Version-2_0-branch/phpgwapi/templates/pure/images/arrow34.png
branches/Version-2_0-branch/property/inc/cron/default/Import_fra_agresso_X205_BK.php
Removed Paths:
-------------
branches/Version-2_0-branch/controller/templates/base/css/jquery-ui.custom.css
branches/Version-2_0-branch/eventplanner/js/portico/demo.edit.js
branches/Version-2_0-branch/eventplanner/js/portico/demo.index.js
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom
xx.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom
xx.min.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery-ui-1.10.4.custom.min.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/humanity/jquery.ui.theme.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.10.4.custom.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.10.4.custom.min.css
branches/Version-2_0-branch/phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.8.19.custom.css
branches/Version-2_0-branch/phpgwapi/js/jquery/development-bundle/
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-1.11.1.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-1.11.1.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-1.11.1.min.map
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-1.7.2.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-2.1.1.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.10.4.custom.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.10.4.custom.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.11.1.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.11.1.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.11.4.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.11.4.min.js
branches/Version-2_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.8.19.custom.min.js
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15891
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900
+ /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15891
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046
Modified: branches/Version-2_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/activitycalendar/setup/phpgw_no.lang
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/activitycalendar/setup/phpgw_no.lang
2016-12-05 08:57:35 UTC (rev 16047)
@@ -140,8 +140,6 @@
new root permission activitycalendar no Nye systemrettigheter
new season activitycalendar no Ny sesong
new season permission activitycalendar no Nye rettigheter sesong
-next activitycalendar no Neste
-next week activitycalendar no Neste uke
no Data. activitycalendar no Ingen treff.
no description yet activitycalendar no Beskrivelse mangler
no parents activitycalendar no Ingen overordnet
@@ -166,7 +164,6 @@
planning activitycalendar no Planlegging
prev activitycalendar no Forrige
preview activitycalendar no Forhåndsvisning
-previous week activitycalendar no Forrige uke
price list activitycalendar no Prisliste
primary admin activitycalendar no Kontaktperson 1
primary contact activitycalendar no Kontaktperson 1
@@ -212,8 +209,6 @@
upload document activitycalendar no Last opp dokument
user activitycalendar no Bruker
we activitycalendar no on.
-week activitycalendar no Uke
-week day activitycalendar no Ukedag
week template activitycalendar no Ukeplan
when activitycalendar no Når
when? activitycalendar no Når?
Modified: branches/Version-2_0-branch/admin/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/admin/templates/base/config.tpl 2016-12-05
08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/admin/templates/base/config.tpl 2016-12-05
08:57:35 UTC (rev 16047)
@@ -3,293 +3,296 @@
{error}
</div>
<form method="post" action="{action_url}">
-<table class="pure-table pure-table-bordered">
- <thead>
- <tr>
- <th colspan="2">{title}</th>
- </tr>
- </thead>
- <tbody>
-<!-- END header -->
-<!-- BEGIN body -->
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version_when_admins_login_?}:</td>
- <td>
- <select name="newsettings[checkfornewversion]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_checkfornewversion_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
- <td><input size="8" name="newsettings[sessions_timeout]"
value="{value_sessions_timeout}"></td>
- </tr>
+ <table class="pure-table pure-table-bordered">
+ <thead>
+ <tr>
+ <th colspan="2">{title}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <!-- END header -->
+ <!-- BEGIN body -->
+ <tr class="pure-table-odd">
+
<td>{lang_Would_you_like_phpGroupWare_to_check_for_a_new_version_when_admins_login_?}:</td>
+ <td>
+ <select
name="newsettings[checkfornewversion]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_checkfornewversion_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
- <tr class="pure-table-odd">
-
<td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
- <td><input size="8" name="newsettings[sessions_app_timeout]"
value="{value_sessions_app_timeout}"></td>
- </tr>
+ <tr>
+
<td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
+ <td><input size="8"
name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
+ </tr>
- <tr>
-
<td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
- <select name="newsettings[checkappversions]">
- <option value="">{lang_No}</option>
- <option
value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
- <option
value="All"{selected_checkappversions_All}>{lang_All_Users}</option>
- </select>
- </td>
- </tr>
+ <tr class="pure-table-odd">
+
<td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
+ <td><input size="8"
name="newsettings[sessions_app_timeout]"
value="{value_sessions_app_timeout}"></td>
+ </tr>
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array_?}:</td>
- <td>
- <select name="newsettings[cache_phpgw_info]">
- <option value="">{lang_No}</option>
- <option value="True"{selected_cache_phpgw_info_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
+ <tr>
+
<td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
+ <select
name="newsettings[checkappversions]">
+ <option
value="">{lang_No}</option>
+ <option
value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
+ <option
value="All"{selected_checkappversions_All}>{lang_All_Users}</option>
+ </select>
+ </td>
+ </tr>
- <tr>
- <td>{lang_Maximum_entries_in_click_path_history}:</td>
- <td><input size="8" name="newsettings[max_history]"
value="{value_max_history}"></td>
- </tr>
+ <tr class="pure-table-odd">
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_the_phpgw_info_array_?}:</td>
+ <td>
+ <select
name="newsettings[cache_phpgw_info]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_cache_phpgw_info_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
- <td>
- <select name="newsettings[disable_autoload_langfiles]">
- <option value="">{lang_Yes}</option>
- <option
value="True"{selected_disable_autoload_langfiles_True}>{lang_No}</option>
- </select>
- </td>
- </tr>
+ <tr>
+
<td>{lang_Maximum_entries_in_click_path_history}:</td>
+ <td><input size="8"
name="newsettings[max_history]" value="{value_max_history}"></td>
+ </tr>
- <tr class="pure-table-odd">
-
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory_?}:</td>
- <td>
- <select name="newsettings[shm_enable]">
- <option value="">{lang_No}</option>
- <option value="True"{selected_shm_enable_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
+ <tr class="pure-table-odd">
+
<td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
+ <td>
+ <select
name="newsettings[disable_autoload_langfiles]">
+ <option
value="">{lang_Yes}</option>
+ <option
value="True"{selected_disable_autoload_langfiles_True}>{lang_No}</option>
+ </select>
+ </td>
+ </tr>
- <tr class="th">
- <td colspan="2"> <b>{lang_SMTP_settings}</b></td>
- </tr>
+ <tr class="pure-table-odd">
+
<td>{lang_Would_you_like_phpGroupWare_to_cache_data_in_shared_memory_?}:</td>
+ <td>
+ <select name="newsettings[shm_enable]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_shm_enable_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
- <tr class="pure-table-odd">
- <td>{lang_SMTP_server_hostname_(or_IP_address)}:</td>
- <td><input name="newsettings[smtp_server]" value="{value_smtp_server}"
/></td>
- </tr>
-
- <tr>
- <td>{lang_SMTP_server_port_number}:</td>
- <td><input name="newsettings[smtp_port]"
value="{value_smtp_port}" /></td>
- </tr>
+ <tr class="th">
+ <td
colspan="2"> <b>{lang_SMTP_settings}</b></td>
+ </tr>
- <tr>
- <td>{lang_SMTP_server_timeout}:</td>
- <td><input name="newsettings[smtp_timeout]"
value="{value_smtp_timeout}" /></td>
- </tr>
+ <tr class="pure-table-odd">
+
<td>{lang_SMTP_server_hostname_(or_IP_address)}:</td>
+ <td><input name="newsettings[smtp_server]"
value="{value_smtp_server}" /></td>
+ </tr>
- <tr class="pure-table-odd">
- <td>{lang_Use_SMTP_auth}:</td>
- <td>
- <select name="newsettings[smtpAuth]">
- <option value="">{lang_no}</option>
- <option value="yes" {selected_smtpAuth_yes}>{lang_yes}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td>{lang_Enter_your_SMTP_server_user}:</td>
- <td><input name="newsettings[smtpUser]" value="{value_smtpUser}"></td>
- </tr>
- <tr class="pure-table-odd">
- <td>{lang_Enter_your_SMTP_server_password}:</td>
- <td><input type= "password" name="newsettings[smtpPassword]"
value="{value_smtpPassword}"></td>
- </tr>
- <tr>
- <td>{lang_SMTPSecure}:</td>
- <td>
- <select name="newsettings[smtpSecure]">
- <option value="">{lang_No}</option>
- <option
value="ssl"{selected_smtpSecure_ssl}>ssl</option>
- <option
value="tls"{selected_smtpSecure_tls}>tls</option>
- </select>
- </td>
- </tr>
+ <tr>
+ <td>{lang_SMTP_server_port_number}:</td>
+ <td><input name="newsettings[smtp_port]"
value="{value_smtp_port}" /></td>
+ </tr>
- <tr class="pure-table-odd">
- <td>{lang_SMTPDebug}:</td>
- <td>
- <select name="newsettings[SMTPDebug]">
- <option value="0">{lang_No}</option>
- <option
value="1"{selected_SMTPDebug_1}>commands</option>
- <option
value="2"{selected_SMTPDebug_2}>commands and data</option>
- </select>
- </td>
- </tr>
+ <tr>
+ <td>{lang_SMTP_server_timeout}:</td>
+ <td><input name="newsettings[smtp_timeout]"
value="{value_smtp_timeout}" /></td>
+ </tr>
- <tr>
- <td>{lang_Debugoutput}:</td>
- <td>
- <select name="newsettings[Debugoutput]">
- <option value="echo">echo</option>
- <option
value="html"{selected_Debugoutput_html}>html</option>
- <option
value="errorlog"{selected_Debugoutput_errorlog}>error log</option>
- </select>
- </td>
- </tr>
-
-
-
- <tr class="th">
- <td colspan="2"> <b>{lang_appearance}</b></td>
- </tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Use_SMTP_auth}:</td>
+ <td>
+ <select name="newsettings[smtpAuth]">
+ <option
value="">{lang_no}</option>
+ <option value="yes"
{selected_smtpAuth_yes}>{lang_yes}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_Enter_your_SMTP_server_user}:</td>
+ <td><input name="newsettings[smtpUser]"
value="{value_smtpUser}"></td>
+ </tr>
+ <tr class="pure-table-odd">
+ <td>{lang_Enter_your_SMTP_server_password}:</td>
+ <td><input type= "password"
name="newsettings[smtpPassword]" value="{value_smtpPassword}"></td>
+ </tr>
+ <tr>
+ <td>{lang_SMTPSecure}:</td>
+ <td>
+ <select name="newsettings[smtpSecure]">
+ <option
value="">{lang_No}</option>
+ <option
value="ssl"{selected_smtpSecure_ssl}>ssl</option>
+ <option
value="tls"{selected_smtpSecure_tls}>tls</option>
+ </select>
+ </td>
+ </tr>
- <tr class="pure-table-odd">
- <td>{lang_Enter_the_title_for_your_site}:</td>
- <td><input name="newsettings[site_title]"
value="{value_site_title}"></td>
- </tr>
-
- <tr>
- <td>{lang_Enter_the_background_color_for_the_site_title}:</td>
- <td>#<input name="newsettings[login_bg_color_title]"
value="{value_login_bg_color_title}"></td>
- </tr>
+ <tr class="pure-table-odd">
+ <td>{lang_SMTPDebug}:</td>
+ <td>
+ <select name="newsettings[SMTPDebug]">
+ <option
value="0">{lang_No}</option>
+ <option
value="1"{selected_SMTPDebug_1}>commands</option>
+ <option
value="2"{selected_SMTPDebug_2}>commands and data</option>
+ </select>
+ </td>
+ </tr>
- <tr class="pure-table-odd">
- <td>{lang_Enter_the_background_color_for_the_login_page}:</td>
- <td>#<input name="newsettings[login_bg_color]"
value="{value_login_bg_color}"></td>
- </tr>
+ <tr>
+ <td>{lang_Debugoutput}:</td>
+ <td>
+ <select name="newsettings[Debugoutput]">
+ <option
value="echo">echo</option>
+ <option
value="html"{selected_Debugoutput_html}>html</option>
+ <option
value="errorlog"{selected_Debugoutput_errorlog}>error log</option>
+ </select>
+ </td>
+ </tr>
- <tr>
- <td>{lang_Enter_the_file_name_of_your_logo_at_login}:</td>
- <td><input name="newsettings[login_logo_file]"
value="{value_login_logo_file}"></td>
- </tr>
-
- <tr class="pure-table-odd">
- <td>{lang_Enter_the_file_name_of_your_logo}:</td>
- <td><input name="newsettings[logo_file]"
value="{value_logo_file}"></td>
- </tr>
-
- <tr>
- <td>{lang_Enter_the_url_where_your_logo_should_link_to}:</td>
- <td>http://<input name="newsettings[login_logo_url]"
value="{value_login_logo_url}"></td>
- </tr>
-
- <tr class="pure-table-odd">
- <td>{lang_Enter_the_title_of_your_logo}:</td>
- <td><input name="newsettings[login_logo_title]"
value="{value_login_logo_title}"></td>
- </tr>
- <tr class="th">
- <td colspan="2"> <b>{lang_security}</b></td>
- </tr>
- <tr class="pure-table-odd">
- <td>{lang_Use_cookies_to_pass_sessionid}:</td>
- <td>
- <select name="newsettings[usecookies]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td>{lang_check_ip_address_of_all_sessions}:</td>
- <td>
- <select name="newsettings[sessions_checkip]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_sessions_checkip_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
-
- <tr class="pure-table-odd">
-
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
- <td>
- <select name="newsettings[deny_user_grants_access]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_deny_user_grants_access_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
-
- <tr>
-
<td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
- <td>
- <input name="newsettings[max_access_log_age]"
value="{value_max_access_log_age}" size="5">
- </td>
- </tr>
-
- <tr class="pure-table-odd">
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
- <td>
- <input name="newsettings[num_unsuccessful_id]"
value="{value_num_unsuccessful_id}" size="5">
- </td>
- </tr>
-
- <tr>
-
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
- <td>
- <input name="newsettings[num_unsuccessful_ip]"
value="{value_num_unsuccessful_ip}" size="5">
- </td>
- </tr>
-
- <tr class="pure-table-odd">
-
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
- <td>
- <input name="newsettings[block_time]" value="{value_block_time}" size="5">
- </td>
- </tr>
-
- <tr>
-
<td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
- <td>
- <input name="newsettings[admin_mails]" value="{value_admin_mails}"
size="40">
- </td>
- </tr>
-
- <tr class="pure-table-odd">
- <td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
- <td>
- <select name="newsettings[autocomplete_login]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_autocomplete_login_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td>{lang_collect_missing_translations_}:</td>
- <td>
- <select name="newsettings[collect_missing_translations]">
- <option value="">{lang_No}</option>
- <option
value="True"{selected_collect_missing_translations_True}>{lang_Yes}</option>
- </select>
- </td>
- </tr>
- <tr>
- <td>{lang_support_email_address}:</td>
- <td>
- <input name="newsettings[support_address]"
value="{value_support_address}" size="40">
- </td>
- </tr>
+ <tr class="th">
+ <td
colspan="2"> <b>{lang_appearance}</b></td>
+ </tr>
-
-<!-- END body -->
+ <tr class="pure-table-odd">
+ <td>{lang_Enter_the_title_for_your_site}:</td>
+ <td><input name="newsettings[site_title]"
value="{value_site_title}"></td>
+ </tr>
-<!-- BEGIN footer -->
- </tbody>
-</table>
-<div class="button_group">
- <input type="submit" name="submit" value="{lang_submit}">
- <input type="submit" name="cancel" value="{lang_cancel}">
-</div>
+ <tr>
+
<td>{lang_Enter_the_background_color_for_the_site_title}:</td>
+ <td>#<input
name="newsettings[login_bg_color_title]"
value="{value_login_bg_color_title}"></td>
+ </tr>
+
+ <tr class="pure-table-odd">
+
<td>{lang_Enter_the_background_color_for_the_login_page}:</td>
+ <td>#<input name="newsettings[login_bg_color]"
value="{value_login_bg_color}"></td>
+ </tr>
+
+ <tr>
+
<td>{lang_Enter_the_file_name_of_your_logo_at_login}:</td>
+ <td><input name="newsettings[login_logo_file]"
value="{value_login_logo_file}"></td>
+ </tr>
+
+ <tr class="pure-table-odd">
+
<td>{lang_Enter_the_file_name_of_your_logo}:</td>
+ <td><input name="newsettings[logo_file]"
value="{value_logo_file}"></td>
+ </tr>
+
+ <tr>
+
<td>{lang_Enter_the_url_where_your_logo_should_link_to}:</td>
+ <td>http://<input
name="newsettings[login_logo_url]" value="{value_login_logo_url}"></td>
+ </tr>
+
+ <tr class="pure-table-odd">
+ <td>{lang_Enter_the_title_of_your_logo}:</td>
+ <td><input name="newsettings[login_logo_title]"
value="{value_login_logo_title}"></td>
+ </tr>
+
+ <tr class="th">
+ <td
colspan="2"> <b>{lang_security}</b></td>
+ </tr>
+
+ <tr class="pure-table-odd">
+ <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+ <td>
+ <select name="newsettings[usecookies]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_usecookies_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+
<td>{lang_check_ip_address_of_all_sessions}:</td>
+ <td>
+ <select
name="newsettings[sessions_checkip]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_sessions_checkip_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr class="pure-table-odd">
+
<td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
+ <td>
+ <select
name="newsettings[deny_user_grants_access]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_deny_user_grants_access_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+
<td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+ <td>
+ <input
name="newsettings[max_access_log_age]" value="{value_max_access_log_age}"
size="5">
+ </td>
+ </tr>
+
+ <tr class="pure-table-odd">
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+ <td>
+ <input
name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}"
size="5">
+ </td>
+ </tr>
+
+ <tr>
+
<td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+ <td>
+ <input
name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}"
size="5">
+ </td>
+ </tr>
+
+ <tr class="pure-table-odd">
+
<td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+ <td>
+ <input name="newsettings[block_time]"
value="{value_block_time}" size="5">
+ </td>
+ </tr>
+
+ <tr>
+
<td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+ <td>
+ <input name="newsettings[admin_mails]"
value="{value_admin_mails}" size="40">
+ </td>
+ </tr>
+
+ <tr class="pure-table-odd">
+
<td>{lang_Disable_"auto_completion"_of_the_login_form_}:</td>
+ <td>
+ <select
name="newsettings[autocomplete_login]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_autocomplete_login_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_collect_missing_translations_}:</td>
+ <td>
+ <select
name="newsettings[collect_missing_translations]">
+ <option
value="">{lang_No}</option>
+ <option
value="True"{selected_collect_missing_translations_True}>{lang_Yes}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_support_email_address}:</td>
+ <td>
+ <input
name="newsettings[support_address]" value="{value_support_address}" size="40">
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_email_domain}:</td>
+ <td><input name="newsettings[email_domain]"
value="{value_email_domain}"></td>
+ </tr>
+
+ <!-- END body -->
+
+ <!-- BEGIN footer -->
+ </tbody>
+ </table>
+ <div class="button_group">
+ <input type="submit" name="submit" value="{lang_submit}">
+ <input type="submit" name="cancel" value="{lang_cancel}">
+ </div>
</form>
<!-- END footer -->
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind-2/booking:14933-15891
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900
+ /branches/dev-syncromind-2/booking:14933-15891
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046
Modified: branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uiallocation.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -438,8 +438,8 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
array_set_default($allocation, 'cost', '0');
- $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'time');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time');
$tabs = array();
$tabs['generic'] = array('label' => lang('Allocation
New'), 'link' => '#allocation_new');
@@ -567,8 +567,8 @@
'date', 'security', 'file'));
$cost_history = $this->bo->so->get_ordered_costs($id);
- $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'datetime');
self::render_template_xsl('allocation_edit',
array('allocation' => $allocation,
'cost_history' => $cost_history));
@@ -691,7 +691,7 @@
$active_tab = 'generic';
$allocation['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
if ($step < 2)
{
Modified: branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uiapplication.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -31,6 +31,9 @@
public function __construct()
{
parent::__construct();
+
+ phpgwapi_jquery::load_widget('autocomplete');
+
$this->set_module();
// Analizar esta linea
self::process_booking_unauthorized_exceptions();
$this->bo = CreateObject('booking.boapplication');
@@ -789,8 +792,10 @@
$date['to_'] = pretty_timestamp($date['to_']);
}
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+// $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
+// $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
if ($GLOBALS['phpgw_info']['flags']['currentapp'] !=
'bookingfrontend')
{
@@ -895,8 +900,8 @@
$application['audience_json'] =
json_encode(array_map('intval', $application['audience']));
//test
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
//
self::render_template('application_edit', array('application' => $application,
'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience));
if ($GLOBALS['phpgw_info']['flags']['currentapp'] !=
'bookingfrontend')
Modified: branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uibooking.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -640,9 +640,9 @@
$tabs['generic'] = array('label' => lang('Booking
New'), 'link' => '#booking_new');
$active_tab = 'generic';
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
$booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
$booking['validator'] =
phpgwapi_jquery::formvalidator_generate(array('location',
@@ -789,8 +789,8 @@
$cost_history = $this->bo->so->get_ordered_costs($id);
$booking['audience_json'] =
json_encode(array_map('intval', $booking['audience']));
- $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'datetime');
$booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
$booking['validator'] =
phpgwapi_jquery::formvalidator_generate(array('location',
@@ -947,7 +947,7 @@
$active_tab = 'generic';
$booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
if ($step < 2)
{
Modified: branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uicommon.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -153,13 +153,6 @@
$this->config = CreateObject('phpgwapi.config',
'bookingfrontend');
$this->config->read();
- // Add configurable bookingfrontend template search
path.
- // This is being done here in booking because
ui-classes in bookingfrontend inherit either directly or indirectly from this
class.
- if
(strlen($this->config->config_data['customtemplate']))
- {
- array_push($this->tmpl_search_path,
PHPGW_SERVER_ROOT . '/' . $GLOBALS['phpgw_info']['flags']['currentapp'] .
'/templates/' . $this->config->config_data['customtemplate']);
- }
-
if ($this->current_app() == 'bookingfrontend')
{
$GLOBALS['phpgw']->translation->add_app('booking');
@@ -707,7 +700,7 @@
}
}
- public function adddatetimepicker( $type = 'datetime' )
+ public function adddatetimepicker_old( $type = 'datetime' )
{
phpgwapi_jquery::load_widget('datepicker');
if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'bookingfrontend')
@@ -718,19 +711,19 @@
{
$theme = 'ui-lightness';
}
-// $theme = 'ui-lightness';
-
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui-1.10.4.custom.css");
+ $theme = 'redmond';
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui.min.css");
switch ($type)
{
case 'datetime':
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
-
$GLOBALS['phpgw']->js->validate_file('jquery', 'js/jquery-ui-timepicker-addon');
+
$GLOBALS['phpgw']->js->validate_file('jquery',
'js/jquery-ui-timepicker-addon.min');
$_type = 'datetime';
break;
case 'time':
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
-
$GLOBALS['phpgw']->js->validate_file('jquery', 'js/jquery-ui-timepicker-addon');
+
$GLOBALS['phpgw']->js->validate_file('jquery',
'js/jquery-ui-timepicker-addon.min');
$_type = 'time';
break;
default:
@@ -800,11 +793,11 @@
$('#add-date-link').click(function(){
var add = $(this);
var html = '';
-
+
this.counter =
$('.date-container').length - 1;
if (!this.counter) { this.counter = 0; }
-
+
{$html}
add.parent().parent().children('#dates-container').append(html);
@@ -836,4 +829,140 @@
JS;
$GLOBALS['phpgw']->js->add_code('', $js);
}
+
+ public function adddatetimepicker( $type = 'datetime' )
+ {
+ phpgwapi_jquery::load_widget('datetimepicker');
+
+ $dateformat = str_ireplace(array('y'), array('Y'),
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+
+ switch($type)
+ {
+ case 'datetime':
+ $_type = 'datetime';
+ $dateformat .= " H:i";
+ break;
+ case 'time':
+ $_type = 'time';
+ $dateformat = "H:i";
+ break;
+ default:
+ $_type = 'date';
+ }
+
+ $img_cal = $GLOBALS['phpgw']->common->image('phpgwapi',
'cal');
+
+ $userlang = 'en';
+ if (
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) )
+ {
+ $userlang =
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+ }
+
+ $lang_select_date = lang('select date');
+ $lang_from = lang('from');
+ $lang_to = lang('to');
+ $lang_remove = lang('remove date');
+
+ $placeholder = str_ireplace(array('Y','m', 'd', 'H',
'i'), array('YYYY', 'MM', 'DD', 'HH', 'mm' ),$dateformat);
+
+ if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'bookingfrontend')
+ {
+ $html = 'var html = "<div
class=\'date-container\'>"+
+ "<a class=\'close-btn btnclose\'
href=\'javascript:void(0);\'>' . $lang_remove . '</a>"+
+ "<dt><label
for=\'new_start_date_"+this.counter+"\'>' . $lang_from . '</label></dt>"+
+ "<dd><input class=\'new_datepicker time\'
name=\'from_[]\' id=\'new_start_date_"+this.counter+"\' type=\'text\'
placeholder =\'' . $placeholder . '\'>"+
+ "</input></dd>"+
+ "<dt><label for=\'new_end_date_"+this.counter+"\'
>' . $lang_to . '</label></dt>"+
+ "<dd><input class=\'new_datepicker time\'
name=\'to_[]\' id=\'new_end_date_"+this.counter+"\' type=\'text\' placeholder
=\'' . $placeholder . '\'>"+
+ "</input></dd>"+
+ "</div>"';
+ }
+ else
+ {
+ $html = 'var html = "<div
class=\'date-container\'>"+
+ "<a class=\'close-btn
btnclose\' href=\'javascript:void(0);\'>-</a>"+
+ "<div
class=\'pure-control-group\'>"+
+ "<label
for=\'new_start_date_"+this.counter+"\'><h4>' . $lang_from . '</h4></label>"+
+ "<input
class=\'new_datepicker time pure-input-2-3\' name=\'from_[]\'
id=\'new_start_date_"+this.counter+"\' type=\'text\' placeholder =\'' .
$placeholder . '\'>"+
+ "</input>"+
+ "</div>"+
+ "<div
class=\'pure-control-group\'>"+
+ "<label
for=\'new_end_date_"+this.counter+"\' ><h4>' . $lang_to . '</h4></label>"+
+ "<input
class=\'new_datepicker time pure-input-2-3\' name=\'to_[]\'
id=\'new_end_date_"+this.counter+"\' type=\'text\' placeholder =\'' .
$placeholder . '\'>"+
+ "</input>"+
+ "</div>"+
+ "</div>"';
+ }
+
+// echo $html;
+// exit();
+
+ $datepicker = $_type == 'time' ? false : true;
+ $timepicker = $_type == 'date' ? false : true;
+
+ $js = <<<JS
+
+ $(function() {
+
+ var logic = function( currentDateTime ){
+ console.log(currentDateTime);
+
+ };
+
+ $.each($('.newaddedpicker'), function(i, v)
+ {
+ var id = v.id;
+ v.classList.remove('newaddedpicker');
+
+ $( "#"+id ).datetimepicker({
+ format: '{$dateformat}',
+ datepicker:{$datepicker},
+ timepicker: {$timepicker},
+ step: 15,
+ weeks: true,
+ dayOfWeekStart:1,
+ minDate:0,
+// onChangeDateTime:logic
+ });
+ });
+
+ $('#add-date-link').click(function(){
+ var add = $(this);
+ var html = '';
+
+ this.counter =
$('.date-container').length - 1;
+
+ if (!this.counter) { this.counter = 0; }
+
+ {$html}
+
+
add.parent().parent().children('#dates-container').append(html);
+
+ $( ".new_datepicker" ).datetimepicker(
+ {
+ format: '{$dateformat}',
+ datepicker:{$datepicker},
+ timepicker: {$timepicker},
+ step: 15,
+ weeks: true,
+ dayOfWeekStart:1,
+ minDate:0,
+ onChangeDateTime:logic
+ });
+ this.counter++;
+ });
+ });
+
+ $(document).on("click",".btnclose",function(){
+ var the = $(this);
+ RemoveDate(the);
+ });
+
+ RemoveDate = function(the){
+ the.parent().remove();
+ }
+
+JS;
+ $GLOBALS['phpgw']->js->add_code('', $js);
+ }
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
---
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -124,7 +124,7 @@
return $this->export();
}
- $GLOBALS['phpgw']->jqcal->add_listener('filter_to');
+ $GLOBALS['phpgw']->jqcal2->add_listener('filter_to');
phpgwapi_jquery::load_widget('datepicker');
self::add_javascript('booking', 'booking',
'completed_reservation.js');
Modified:
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -99,7 +99,7 @@
$this->generate_files();
}
- $GLOBALS['phpgw']->jqcal->add_listener('filter_to');
+ $GLOBALS['phpgw']->jqcal2->add_listener('filter_to');
phpgwapi_jquery::load_widget('datepicker');
self::add_javascript('booking', 'booking',
'completed_reservation_export.js');
Modified: branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uievent.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -581,8 +581,8 @@
$date['to_'] = pretty_timestamp($date['to_']);
}
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
$tabs = array();
$tabs['generic'] = array('label' => lang('Event New'),
'link' => '#event_new');
@@ -990,8 +990,8 @@
$event['from_'] = pretty_timestamp($event['from_']);
$event['to_'] = pretty_timestamp($event['to_']);
- $GLOBALS['phpgw']->jqcal->add_listener('from_',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('to_',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_',
'datetime');
phpgwapi_jquery::load_widget('datepicker');
Modified: branches/Version-2_0-branch/booking/inc/class.uireports.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uireports.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uireports.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -167,8 +167,8 @@
$entry['selected'] = $entry['id'] ==
$report['variable_vertical'] ? 1 : 0;
}
- $GLOBALS['phpgw']->jqcal->add_listener('start_date');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Report New'),
'link' => '#report_new');
@@ -600,8 +600,8 @@
phpgwapi_cache::message_set($errors, 'error');
- $GLOBALS['phpgw']->jqcal->add_listener('from', 'date');
- $GLOBALS['phpgw']->jqcal->add_listener('to', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to', 'date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Report
Participants'), 'link' => '#report_part');
@@ -668,8 +668,8 @@
phpgwapi_cache::message_set($errors, 'error');
//$this->flash_form_errors($errors);
- $GLOBALS['phpgw']->jqcal->add_listener('from', 'date');
- $GLOBALS['phpgw']->jqcal->add_listener('to', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to', 'date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Report
FreeTime'), 'link' => '#report_freetime');
Modified: branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/inc/class.uiseason.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -191,8 +191,8 @@
$season['resources_json'] =
json_encode(array_map('intval', $season['resources']));
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.index'));
- $GLOBALS['phpgw']->jqcal->add_listener('from_', 'date');
- $GLOBALS['phpgw']->jqcal->add_listener('to_', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_', 'date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Season New'),
'link' => '#season_new');
@@ -244,8 +244,8 @@
$season['cancel_link'] = self::link(array('menuaction'
=> 'booking.uiseason.show',
'id' => $season['id']));
- $GLOBALS['phpgw']->jqcal->add_listener('from_', 'date');
- $GLOBALS['phpgw']->jqcal->add_listener('to_', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_', 'date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Season
Edit'), 'link' => '#season_new');
@@ -349,8 +349,8 @@
$boundary['to_'] = "{$to_arr[0]}:{$to_arr[1]}";
}
- $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'time');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time');
self::render_template('season_boundaries',
array('boundary' => $boundary, 'boundaries' => $boundaries,
'season' => $season));
@@ -541,8 +541,8 @@
$to = pretty_timestamp($season['to_']);
$interval = 1;
- $GLOBALS['phpgw']->jqcal->add_listener('from_', 'date');
- $GLOBALS['phpgw']->jqcal->add_listener('to_', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_', 'date');
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -580,8 +580,8 @@
$this->flash_form_errors($errors);
- /* $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'date');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'date');
+ /*
$GLOBALS['phpgw']->jqcal2->add_listener('field_from', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'date');
$tabs = array();
$tabs['generic'] = array('label' => lang('Season'),
'link' => '#season_generate');
Modified: branches/Version-2_0-branch/booking/js/booking/allocation.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/allocation.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/allocation.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -23,7 +23,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id)
Modified: branches/Version-2_0-branch/booking/js/booking/application.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/application.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/application.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -79,7 +79,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
regulations_select_all = initialAcceptAllTerms;
Modified: branches/Version-2_0-branch/booking/js/booking/booking.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/booking.js 2016-12-05
08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/booking.js 2016-12-05
08:57:35 UTC (rev 16047)
@@ -88,7 +88,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
var organization_id = $('#field_org_id').val();
Modified: branches/Version-2_0-branch/booking/js/booking/email_send.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/email_send.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/email_send.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -7,7 +7,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
if (building_id)
Modified: branches/Version-2_0-branch/booking/js/booking/event.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/event.js 2016-12-05
08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/event.js 2016-12-05
08:57:35 UTC (rev 16047)
@@ -73,7 +73,7 @@
});
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id)
Modified: branches/Version-2_0-branch/booking/js/booking/report.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/report.js 2016-12-05
08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/report.js 2016-12-05
08:57:35 UTC (rev 16047)
@@ -6,7 +6,7 @@
JqueryPortico.autocompleteHelper(requestUrl, 'field_building_name',
'field_building_id', 'building_container');
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id > 0)
Modified: branches/Version-2_0-branch/booking/js/booking/season.js
===================================================================
--- branches/Version-2_0-branch/booking/js/booking/season.js 2016-12-05
08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/js/booking/season.js 2016-12-05
08:57:35 UTC (rev 16047)
@@ -9,7 +9,7 @@
'field_building_name', 'field_building_id',
'building_container');
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
if (building_id)
Modified: branches/Version-2_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2016-12-05
08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/setup/phpgw_no.lang 2016-12-05
08:57:35 UTC (rev 16047)
@@ -188,8 +188,6 @@
new root permission booking no Nye systemrettigheter
new season booking no Ny sesong
new season permission booking no Nye rettigheter sesong
-next booking no Neste
-next week booking no Neste uke
no Data. booking no Ingen treff.
no description yet booking no Beskrivelse manglar
no parents booking no Ingen overordnet
@@ -213,7 +211,6 @@
planning booking no Planlegging
prev booking no Forrige
preview booking no Forhåndsvisning
-previous week booking no Forrige uke
price list booking no Prisliste
primary admin booking no Kontaktperson 1
primary contact booking no Kontaktperson 1
@@ -259,8 +256,6 @@
upload document booking no Last opp dokument
user booking no Bruker
we booking no on.
-week booking no Uke
-week day booking no Ukedag
week template booking no Ukeplan
when booking no Når
when? booking no Når?
Modified:
branches/Version-2_0-branch/booking/templates/base/building_schedule.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/building_schedule.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/templates/base/building_schedule.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -46,7 +46,7 @@
</div>
</form>
<script type="text/javascript">
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
schedule.includeResource = true;
Modified:
branches/Version-2_0-branch/booking/templates/base/massbooking_schedule.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/massbooking_schedule.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/templates/base/massbooking_schedule.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -55,7 +55,7 @@
schedule.createDialogSchedule(300);
- $(window).load(function() {
+ $(window).on('load', function() {
$('body').prepend($('#content_overlay'));
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
Modified:
branches/Version-2_0-branch/booking/templates/base/resource_schedule.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/resource_schedule.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/templates/base/resource_schedule.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -46,7 +46,7 @@
</div>
</form>
<script type="text/javascript">
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url"/>';
schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link"/>';
Modified:
branches/Version-2_0-branch/booking/templates/base/season_wtemplate.xsl
===================================================================
--- branches/Version-2_0-branch/booking/templates/base/season_wtemplate.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/booking/templates/base/season_wtemplate.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -94,7 +94,7 @@
var weekUrl =
'index.php?menuaction=booking.uiseason.wtemplate_json&id=' + season_id +
'&phpgw_return_as=json&';
]]>
var colDefs = [];
- $(window).load(function() {
+ $(window).on('load', function() {
colDefs = [
{key: 'time', label: '<xsl:value-of
select="php:function('lang', 'Time')" />', type: 'th'},
{key: 'resource', label: '<xsl:value-of
select="php:function('lang', 'Resources')" />', formatter:
'scheduleResourceColumn'},
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind-2/bookingfrontend:14933-15891
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900
+ /branches/dev-syncromind-2/bookingfrontend:14933-15891
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046
Modified: branches/Version-2_0-branch/bookingfrontend/css/bookingfrontend.css
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/css/bookingfrontend.css
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/css/bookingfrontend.css
2016-12-05 08:57:35 UTC (rev 16047)
@@ -232,7 +232,7 @@
/* BOOKINGFRONTEND */
-#content {
+.content {
margin: 2em 1em;
}
.clr {
@@ -738,3 +738,16 @@
.dataTable th,
.dataTable .th {background-color: transparent;}
.dataTable {text-align: initial;}
+
+.scrollup {
+ position: fixed;
+ bottom: 50px;
+ right: 10px;
+ display: none;
+ text-indent: -9999px;
+ width: 50px;
+ height: 50px;
+ background-repeat: no-repeat;
+ background-image:
url("../../phpgwapi/templates/pure/images/arrow34.png");
+}
+
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uiallocation.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -125,7 +125,7 @@
$allocation['from_'] =
pretty_timestamp($allocation['from_']);
$allocation['to_'] =
pretty_timestamp($allocation['to_']);
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
self::rich_text_editor('field-message');
self::render_template_xsl('allocation_cancel',
array('allocation' => $allocation));
@@ -322,7 +322,7 @@
$allocation['from_'] =
pretty_timestamp($allocation['from_']);
$allocation['to_'] =
pretty_timestamp($allocation['to_']);
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
if ($step < 2)
{
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uibooking.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -270,9 +270,9 @@
$res_names[] = array('id' => $res['id'], 'name'
=> $res['name']);
}
- $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'time');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'time');
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'time');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
$booking['from_'] = pretty_timestamp($booking['from_']);
$booking['to_'] = pretty_timestamp($booking['to_']);
@@ -517,10 +517,10 @@
'active' => 1)));
$groups = $groups['results'];
- $GLOBALS['phpgw']->jqcal->add_listener('field_from',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('field_to',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_from',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('field_to',
'datetime');
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
$booking['from_'] = pretty_timestamp($booking['from_']);
$booking['to_'] = pretty_timestamp($booking['to_']);
@@ -853,7 +853,7 @@
$booking['from_'] =
pretty_timestamp($booking['from_']);
$booking['to_'] =
pretty_timestamp($booking['to_']);
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
$this->flash_form_errors($errors);
@@ -1111,7 +1111,7 @@
$booking['booking_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibooking.show',
'id' => $booking['id']));
-
$GLOBALS['phpgw']->jqcal->add_listener('field_repeat_until', 'date');
+
$GLOBALS['phpgw']->jqcal2->add_listener('field_repeat_until', 'date');
if ($step < 2)
{
Modified: branches/Version-2_0-branch/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/class.uievent.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/inc/class.uievent.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -166,8 +166,8 @@
$event['from_2'] = date("H:i",
phpgwapi_datetime::date_to_timestamp($event['from_']));
$event['to_2'] = date("H:i",
phpgwapi_datetime::date_to_timestamp($event['to_']));
- $GLOBALS['phpgw']->jqcal->add_listener('from_', 'time');
- $GLOBALS['phpgw']->jqcal->add_listener('to_', 'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'time');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_', 'time');
phpgwapi_jquery::load_widget('datepicker');
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/application.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -77,7 +77,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
regulations_select_all = initialAcceptAllTerms;
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking.js
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -59,7 +59,7 @@
});
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
var organization_id = $('#field_org_id').val();
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking_massupdate.js
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,4 +1,4 @@
-$(window).load(function ()
+$(window).on('load', function()
{
$('header').hide();
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/event.js
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/event.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/event.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -52,7 +52,7 @@
});
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id)
Modified:
branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/search.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/js/bookingfrontend/search.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -18,6 +18,21 @@
autoOpen: false
});
+ $(window).scroll(function () {
+ if ($(this).scrollTop() > 100) {
+ $('.scrollup').fadeIn();
+ } else {
+ $('.scrollup').fadeOut();
+ }
+ });
+
+ $('.scrollup').click(function () {
+ $("html, body").animate({
+ scrollTop: 0
+ }, 600);
+ return false;
+ });
+
update_autocompleteHelper = function ()
{
oArgs = {
@@ -224,9 +239,12 @@
{
$("#loading").dialog('close');
// $('#loading').html("<p>Result Complete...</p>");
- $("#no_result").hide();
+ $(".no_result").hide();
$("#result").html(data);
$("#total_records_top").html($("#total_records").html());
+
+ var top =
$("#total_records_top").position().top;
+ $(window).scrollTop( top );
}
}
});
@@ -254,7 +272,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
$("#field_building_name").on("autocompleteselect", function (event, ui)
{
Modified: branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/setup/phpgw_no.lang
2016-12-05 08:57:35 UTC (rev 16047)
@@ -157,8 +157,6 @@
new root permission bookingfrontend no Nye systemrettigheter
new season bookingfrontend no Ny sesong
new season permission bookingfrontend no Nye rettigheter sesong
-next bookingfrontend no Neste
-next week bookingfrontend no Neste uke
no Data. bookingfrontend no Ingen treff.
no description yet bookingfrontend no Beskrivelse mangler
no parents bookingfrontend no Ingen overordnet
@@ -183,7 +181,6 @@
planning bookingfrontend no Planlegging
prev bookingfrontend no Forrige
preview bookingfrontend no Forhåndsvisning
-previous week bookingfrontend no Forrige uke
price list bookingfrontend no Prisliste
primary admin bookingfrontend no Kontaktperson 1
primary contact bookingfrontend no Kontaktperson 1
@@ -228,8 +225,6 @@
upload document bookingfrontend no Last opp dokument
user bookingfrontend no Bruker
we bookingfrontend no on.
-week bookingfrontend no Uke
-week day bookingfrontend no Ukedag
week template bookingfrontend no Ukeplan
when bookingfrontend no Når
when? bookingfrontend no Når?
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/access_denied.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/access_denied.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/access_denied.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<div class="error">
<xsl:value-of select="php:function('lang', 'Access
denied')" />
</div>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_cancel.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete_preview.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete_preview.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/allocation_delete_preview.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/application.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -16,7 +16,7 @@
</func:function>
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<ul class="pathway">
<li>
<a>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/application_edit.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<h3>
<xsl:value-of select="php:function('lang',
'Application')"/> (<xsl:value-of select="application/id"/>)</h3>
@@ -321,7 +321,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/>
@@ -329,7 +329,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/application_new.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<h3>
<xsl:value-of select="php:function('lang', 'New
application')"/>
@@ -8,7 +8,7 @@
<form action="" method="POST" id='application_form'
enctype='multipart/form-data' name="form">
<xsl:if test="config/application_new_application">
- <p style="width: 750px;">
+ <p >
<xsl:value-of
select="config/application_new_application"/>
</p>
</xsl:if>
@@ -125,7 +125,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/>
@@ -133,7 +133,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/>
@@ -301,6 +301,7 @@
</input>
</dd>
</div>
+
<!--div id="dtBox"></div-->
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/booking.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<ul class="pathway">
<li>
<a href="{booking/bookings_link}">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_cancel.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_cancel.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete_preview.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete_preview.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_delete_preview.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
@@ -311,7 +311,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../booking/agegroups/male[../agegroup_id = $id]"/>
@@ -319,7 +319,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../booking/agegroups/female[../agegroup_id = $id]"/>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit_preview.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit_preview.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_edit_preview.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_massupdate.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_massupdate.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_massupdate.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
@@ -175,7 +175,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../booking/agegroups/male[../agegroup_id = $id]"/>
@@ -183,7 +183,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../booking/agegroups/female[../agegroup_id = $id]"/>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
@@ -321,7 +321,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../booking/agegroups/male[../agegroup_id = $id]"/>
@@ -329,7 +329,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../booking/agegroups/female[../agegroup_id = $id]"/>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new_preview.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new_preview.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/booking_new_preview.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/building.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<ul class="pathway">
<li>
<a
href="index.php?menuaction=bookingfrontend.uisearch.index">
@@ -160,7 +160,7 @@
createTable('documents_container', documentURL,
colDefsDocument);
createTable('building_users_container',
building_usersURL, colDefsBuilding_users, rBuilding_users, '',
paginatorTableBuilding_users);
- $(window).load(function(){
+ $(window).on('load', function(){
// Load image
JqueryPortico.booking.inlineImages('images_container', document_buildingURL);
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/building_schedule.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<xsl:if test="backend != 'true'">
<ul class="pathway">
<li>
@@ -57,7 +57,7 @@
<script type="text/javascript">
schedule.createDialogSchedule(300);
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/config.tpl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -13,6 +13,14 @@
<td
colspan="2"> <b>{lang_bookingfrontend_settings}</b></td>
</tr>
<tr class="row_on">
+ <td>{lang_site_title}</td>
+ <td><input name="newsettings[site_title]"
value="{value_site_title}"></td>
+ </tr>
+ <tr class="row_on">
+ <td>{lang_footer_info}</td>
+ <td><input name="newsettings[footer_info]"
value="{value_footer_info}"></td>
+ </tr>
+ <tr class="row_off">
<td>{lang_remote_authentication}:</td>
<td>
<select
name="newsettings[authentication_method]">
@@ -20,19 +28,19 @@
</select>
</td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_cookie_domain_for_sessions_-_if_Same_as_framework_leave_empty}</td>
<td><input name="newsettings[cookie_domain]"
value="{value_cookie_domain}"></td>
</tr>
- <tr class="row_on">
+ <tr class="row_off">
<td>{lang_Anonymous_user}:</td>
<td><input name="newsettings[anonymous_user]"
value="{value_anonymous_user}"></td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_Anonymous_password}:</td>
<td><input type="password"
name="newsettings[anonymous_passwd]" value="{value_anonymous_passwd}"></td>
</tr>
- <tr class="row_on">
+ <tr class="row_off">
<td>{lang_custom_login_url}:</td>
<td><input name="newsettings[custom_login_url]"
value="{value_custom_login_url}"></td>
</tr>
@@ -105,12 +113,6 @@
</td>
<td><input name="newsettings[bookingfrontend_host]"
value="{value_bookingfrontend_host}"></td>
</tr>
- <tr class="row_off">
- <td>{lang_customtemplate}:
- <br/> Custom template for frontend
- </td>
- <td><input name="newsettings[customtemplate]"
value="{value_customtemplate}"/></td>
- </tr>
<!-- END body -->
<!-- BEGIN footer -->
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/event_delete.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/event_delete.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/event_delete.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<div class="pure-g">
<div class="pure-u-1">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/event_edit.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/event_edit.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/event_edit.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<ul class="pathway">
<li>
<xsl:value-of select="php:function('lang',
'Edit Events')" />
@@ -283,7 +283,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../event/agegroups/male[../agegroup_id = $id]"/>
@@ -291,7 +291,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../event/agegroups/female[../agegroup_id = $id]"/>
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/group.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<ul class="pathway">
<li>
<a
href="index.php?menuaction=bookingfrontend.uisearch.index">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/group_edit.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<div class="pure-g">
<div class="pure-u-1">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/organization.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<ul class="pathway">
<li>
<a
href="index.php?menuaction=bookingfrontend.uisearch.index">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/organization_edit.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/organization_edit.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/organization_edit.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -16,7 +16,7 @@
</func:function>
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<div class="pure-g">
<div class="pure-u-1">
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/report_numbers.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/report_numbers.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/report_numbers.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<xsl:call-template name="msgbox"/>
<xsl:if test="step = 1">
@@ -70,7 +70,7 @@
<xsl:value-of select="name"/>
</th>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../event_object/agegroups/male[../agegroup_id = $id]"/>
@@ -78,7 +78,7 @@
</input>
</td>
<td>
-
<input type="text">
+
<input type="text" size="4">
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
<xsl:attribute name="value">
<xsl:value-of
select="../event_object/agegroups/female[../agegroup_id = $id]"/>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/resource.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<xsl:for-each select="pathway">
<ul class="pathway">
<li>
@@ -92,7 +92,7 @@
var colDefsDocumentsResource = [{key: 'name', label:
lang['Name'], formatter: genericLink}];
createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource);
- $(window).load(function(){
+ $(window).on('load', function(){
JqueryPortico.booking.inlineImages('images_container',
documentsResourceImagesURL);
// Load Google map
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/resource_schedule.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,6 +1,6 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<xsl:for-each select="pathway">
<ul class="pathway">
<li>
@@ -58,7 +58,7 @@
<script type="text/javascript">
schedule.createDialogSchedule(300);
- $(window).load(function(){
+ $(window).on('load', function(){
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url" />';
schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link" />';
Modified: branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/bookingfrontend/templates/base/search.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -10,24 +10,29 @@
<xsl:value-of select="php:function('lang', 'please
wait')" />
</p>
</div>
- <div class="pure-g">
- <div class="pure-u-1" id="no_result">
+ <div class="content">
+ <div class="pure-g">
<xsl:if test="not(search)">
- <div id="cloud">
- <xsl:value-of
disable-output-escaping="yes" select="frontpagetext"/>
+ <div class="pure-u-1 no_result">
+ <div class="cloud">
+ <xsl:value-of
disable-output-escaping="yes" select="frontpagetext"/>
+ </div>
</div>
</xsl:if>
</div>
</div>
- <div id="content">
- <form action="" method="GET" id="search">
+ <div class="content">
+ <a href="#" class="scrollup">
+ <xsl:value-of select="php:function('lang', 'scroll to
top')" />
+ </a>
+
+ <form method="GET" id="search">
<input type="hidden" id="menuaction" name="menuaction"
value="bookingfrontend.uisearch.index" />
<!--input type="hidden" id="activity_top_level"
name="activity_top_level" value="{activity_top_level}" /-->
</form>
<div class="pure-g">
<div class="pure-u-1 pure-u-lg-1-2">
- <div id = "total_records_top"></div>
<div class="pure-u-1">
<div class="heading">
<xsl:value-of
select="php:function('lang', 'building')" />
@@ -154,7 +159,7 @@
<div class="pure-u-1">
<div class="heading">
<!--xsl:value-of
select="php:function('lang', 'type')" /-->
- Vis kun treff som er:
+ Vis kun treff som er:
</div>
<ul id="search_type">
<li>
@@ -186,14 +191,15 @@
</div>
<div class="pure-u-1 pure-u-lg-1-2">
+ <div id = "total_records_top"></div>
<div id="result"></div>
</div>
</div>
- <div class="pure-g">
- <div class="pure-u-1 pure-u-lg-1-1" id="no_result">
- <xsl:if test="not(search)">
- <div id="cloud">
+ <xsl:if test="not(search)">
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-lg-1-1 no_result">
+ <div class="cloud">
<div class="frontpagetext">
</div>
</div>
@@ -204,9 +210,8 @@
</xsl:attribute>
</img>
</div>
- </xsl:if>
+ </div>
</div>
- </div>
-
+ </xsl:if>
</div>
</xsl:template>
Modified:
branches/Version-2_0-branch/bookingfrontend/templates/base/system_message.xsl
===================================================================
---
branches/Version-2_0-branch/bookingfrontend/templates/base/system_message.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/bookingfrontend/templates/base/system_message.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
- <div id="content">
+ <div class="content">
<dl class="form">
<dt class="heading">
Modified: branches/Version-2_0-branch/calendar/templates/base/contacts_popup.tpl
===================================================================
--- branches/Version-2_0-branch/calendar/templates/base/contacts_popup.tpl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/calendar/templates/base/contacts_popup.tpl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -4,7 +4,6 @@
<title>{lang_title}</title>
<script type="text/javascript"
src="{webserver_url}/phpgwapi/js/core/base.js"></script>
<script type="text/javascript"
src="{webserver_url}/phpgwapi/js/core/events.js"></script>
- <!--<script type="text/javascript"
src="{webserver_url}/phpgwapi/js/json/json.js"></script> -->
<script type="text/javascript"
src="{webserver_url}/phpgwapi/js/sarissa/sarissa.js"></script>
<script type="text/javascript">
Modified: branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -98,7 +98,7 @@
{
$GLOBALS['phpgw_info']['flags']['noframework']
= true;
}
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
public function view_calendar_for_month()
Modified: branches/Version-2_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicase.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uicase.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -107,7 +107,7 @@
{
$GLOBALS['phpgw_info']['flags']['noframework']
= true;
}
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
private function _get_case_data()
Modified: branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -106,7 +106,7 @@
{
$GLOBALS['phpgw_info']['flags']['noframework']
= true;
}
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
/**
Modified:
branches/Version-2_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/inc/class.uicheck_list_for_component.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -84,7 +84,7 @@
$this->location_code = $this->bo->location_code;
self::set_active_menu('controller::control::component_for_check_list');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
function index()
Modified: branches/Version-2_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicontrol.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uicontrol.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -106,7 +106,7 @@
$this->home_alternative =
isset($config->config_data['home_alternative']) &&
$config->config_data['home_alternative'] == 1 ? true : false;
self::set_active_menu('controller::control');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
/**
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicontrol_group.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uicontrol_group.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -79,7 +79,7 @@
$this->add = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_ADD, 'controller');//2
$this->edit = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_EDIT, 'controller');//4
$this->delete =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_DELETE, 'controller');//8
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
public function index()
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_group_component.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/class.uicontrol_group_component.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/inc/class.uicontrol_group_component.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -74,7 +74,7 @@
$this->location_code = $this->bo->location_code;
self::set_active_menu('controller::control_group::component_for_control_group');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
function index()
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uicontrol_item.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -77,7 +77,7 @@
$this->add = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_ADD, 'controller');//2
$this->edit = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_EDIT, 'controller');//4
$this->delete =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_DELETE, 'controller');//8
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
public function index()
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_component.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -84,7 +84,7 @@
$this->location_code = $this->bo->location_code;
self::set_active_menu('controller::control::location_for_check_list');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
function index()
Modified:
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/inc/class.uicontrol_register_to_location.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -87,7 +87,7 @@
$this->location_code = $this->bo->location_code;
self::set_active_menu('controller::control::location_for_check_list');
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
function index()
Modified: branches/Version-2_0-branch/controller/inc/class.uidocument.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uidocument.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uidocument.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -60,7 +60,7 @@
$this->add =
$GLOBALS['phpgw']->acl->check('.procedure', PHPGW_ACL_ADD, 'controller');//2
$this->edit =
$GLOBALS['phpgw']->acl->check('.procedure', PHPGW_ACL_EDIT, 'controller');//4
$this->delete =
$GLOBALS['phpgw']->acl->check('.procedure', PHPGW_ACL_DELETE, 'controller');//8
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
public function query()
Modified: branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/inc/class.uiprocedure.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -76,7 +76,7 @@
$config = CreateObject('phpgwapi.config', 'controller');
$config->read();
$this->_category_acl =
isset($config->config_data['acl_at_control_area']) &&
$config->config_data['acl_at_control_area'] == 1 ? true : false;
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
+//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
public function index()
Modified: branches/Version-2_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-2_0-branch/controller/js/controller/ajax.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/js/controller/ajax.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -54,7 +54,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -100,7 +100,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontroll</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -146,7 +146,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontrollgruppe</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -183,7 +183,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -222,7 +222,7 @@
if (data != null)
{
htmlString = "<option>Velg
type</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -262,7 +262,7 @@
if (data != null)
{
htmlString = "<option>Velg
prosedyre</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -304,7 +304,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontrollgruppe</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -400,7 +400,7 @@
var thisRadio = $(this).find("input[type=radio]");
// Clears active button and checked underlying radiobutton
-
$(".control_item_type").find("input[type=radio]").removeAttr("checked");
+ $(".control_item_type").find("input[type=radio]").prop(
"checked", false );
$(".control_item_type").find(".btn").removeClass("active");
// Makes button active and checkes underlying radiobutton
@@ -732,7 +732,7 @@
{
if (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
// Show info box with info about check
list
var infoBox =
$(divWrp).find("#info_box");
Modified:
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_component.js
===================================================================
---
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_component.js
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_component.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -23,7 +23,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontroll</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -161,7 +161,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
Modified:
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_location.js
===================================================================
---
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_location.js
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/js/controller/ajax_control_to_location.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -23,7 +23,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontroll</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -124,7 +124,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
Modified: branches/Version-2_0-branch/controller/js/controller/case.js
===================================================================
--- branches/Version-2_0-branch/controller/js/controller/case.js
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/js/controller/case.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -37,7 +37,7 @@
{
if (data)
{
- var jsonObj =
jQuery.parseJSON(data);
+ var jsonObj = JSON.parse(data);
if (jsonObj.status == "saved")
{
@@ -86,7 +86,7 @@
{
if (data != null)
{
- var obj =
jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i,
control_group)
{
@@ -148,7 +148,7 @@
{
if (data)
{
- var jsonObj = jQuery.parseJSON(data);
+ var jsonObj = JSON.parse(data);
if (jsonObj.status == "saved")
{
@@ -240,7 +240,7 @@
url: url,
success: function (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
if (obj.status == "deleted")
{
@@ -290,7 +290,7 @@
url: url,
success: function (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
if (obj.status == "true")
{
@@ -340,7 +340,7 @@
url: url,
success: function (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
if (obj.status == "true")
{
Modified:
branches/Version-2_0-branch/controller/js/controller/check_list_update_status.js
===================================================================
---
branches/Version-2_0-branch/controller/js/controller/check_list_update_status.js
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/js/controller/check_list_update_status.js
2016-12-05 08:57:35 UTC (rev 16047)
@@ -21,7 +21,7 @@
{
if (data)
{
- var jsonObj = jQuery.parseJSON(data);
+ var jsonObj = JSON.parse(data);
if (jsonObj.status == 'not_saved')
{
Modified: branches/Version-2_0-branch/controller/templates/base/component.xsl
===================================================================
--- branches/Version-2_0-branch/controller/templates/base/component.xsl
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/controller/templates/base/component.xsl
2016-12-05 08:57:35 UTC (rev 16047)
@@ -17,19 +17,20 @@
</func:function>
<xsl:template match="data">
- <h2>
- <xsl:value-of select="datatable_name"/>
- </h2>
- <div id="receipt"></div>
+ <h2>
+ <xsl:value-of select="datatable_name"/>
+ </h2>
+ <div class="content">
+ <div id="receipt"></div>
- <div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2">
- <xsl:apply-templates select="form" />
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2">
+ <xsl:apply-templates select="form" />
+ </div>
+ <div class="pure-u-1 pure-u-md-1-2">
+ <xsl:call-template name="icon_color_map" />
+ </div>
</div>
- <div class="pure-u-1 pure-u-md-1-2">
- <xsl:call-template name="icon_color_map" />
- </div>
- </div>
<xsl:apply-templates select="paging"/>
@@ -38,6 +39,7 @@
</div>
<xsl:apply-templates select="datatable"/>
<xsl:apply-templates select="form/list_actions"/>
+ </div>
</xsl:template>
@@ -202,9 +204,9 @@
<tr id = 'location_code'>
<td>
<label for='location_code'>
- <xsl:value-of
select="php:function('lang', 'location')"/>
+ <xsl:value-of
select="php:function('lang', 'location')"/>
</label>
- </td>
+ </td>
<td>
<input type="hidden"
id="location_code" name="location_code" />
<input type="text"
id="location_name" name="location_name" />
@@ -216,7 +218,7 @@
<label for='extra_filter'>
Extra
</label>
- </td>
+ </td>
<td>
<div id="extra_filter">
</div>
Deleted:
branches/Version-2_0-branch/controller/templates/base/css/jquery-ui.custom.css
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/css/jquery-ui.custom.css
2016-12-05 08:50:42 UTC (rev 16046)
+++
branches/Version-2_0-branch/controller/templates/base/css/jquery-ui.custom.css
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,565 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px
1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height:
1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display:
table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden;
background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height:
100%; }
-
-
-/*!
- * jQuery UI CSS Framework 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit
http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif;
font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee
url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color:
#333333; }
-.ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828
url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color:
#ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header
.ui-state-default { border: 1px solid #cccccc; background: #f6f6f6
url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight:
bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header
.ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background:
#fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x;
font-weight: bold; color: #c77405; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration:
none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header
.ui-state-active { border: 1px solid #fbd850; background: #ffffff
url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight:
bold; color: #eb8f00; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: #eb8f00; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header
.ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c
url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color:
#363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight
a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header
.ui-state-error {border: 1px solid #cd0a0a; background: #b81900
url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color:
#ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header
.ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text,
.ui-widget-header .ui-state-error-text { color: #ffffff; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary,
.ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,
.ui-widget-header .ui-priority-secondary { opacity: .7;
filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header
.ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image:
none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image:
url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image:
url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image:
url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image:
url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image:
url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-active .ui-icon {background-image:
url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-highlight .ui-icon {background-image:
url(images/ui-icons_228ef1_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image:
url(images/ui-icons_ffd27a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
-moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px;
-khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
-moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px;
-khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl {
-moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px;
-khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br {
-moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px;
-khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #666666
url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity:
.50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000
url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity:
.20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius:
5px; -webkit-border-radius: 5px; border-radius: 5px; }/*!
- * jQuery UI Resizable 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide
.ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left:
0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px;
left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height:
100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height:
100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px;
bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px;
bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px;
top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px;
top: -5px;}/*!
- * jQuery UI Selectable 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted
black; }
-/*!
- * jQuery UI Accordion 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative;
margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em;
padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em;
top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0;
margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow:
auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*!
- * jQuery UI Autocomplete 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to
100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.20
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
- list-style:none;
- padding: 2px;
- margin: 0;
- display:block;
- float: left;
-}
-.ui-menu .ui-menu {
- margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
- margin:0;
- padding: 0;
- zoom: 1;
- float: left;
- clear: left;
- width: 100%;
-}
-.ui-menu .ui-menu-item a {
- text-decoration:none;
- display:block;
- padding:.2em .4em;
- line-height:1.5;
- zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
- font-weight: normal;
- margin: -1px;
-}
-/*!
- * jQuery UI Button 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0;
margin-right: .1em; text-decoration: none !important; cursor: pointer;
text-align: center; zoom: 1; overflow: visible; } /* the overflow property
removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width
needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a
little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4; }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text {
padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons
.ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons
.ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right:
2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon,
.ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon,
.ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top:
-8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons
.ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left:
.5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary,
.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only
.ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only
.ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra
padding in Firefox */
-/*!
- * jQuery UI Dialog 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow:
hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top:
50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog
.ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em
1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0;
background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor:
pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom:
3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*!
- * jQuery UI Slider 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em;
height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em;
display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0;
margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative
prevents IE scroll bug (element with position: relative inside container with
overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative;
top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0;
white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration:
none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom:
1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav
li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a {
cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav
li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems
obsolete, but required to overcome bug in Opera applying cursor: text overall
if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em;
background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*!
- * jQuery UI Datepicker 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker
.ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next
span { display: block; position: absolute; left: 50%; margin-left: -8px; top:
50%; margin-top: -8px; }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em;
text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse;
margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold;
border: 0; }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em;
text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin:
.7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em
.2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto;
overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto
.4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header {
border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current {
float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header {
border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}/*!
- * jQuery UI Progressbar 1.8.20
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/eventplanner/inc/class.bobooking.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -101,4 +101,26 @@
return $values;
}
+
+ public function update_active_status( $ids, $action )
+ {
+ return
eventplanner_sobooking::get_instance()->update_active_status($ids, $action);
+ }
+
+ public function update_schedule( $id, $from_ )
+ {
+ $booking =
eventplanner_sobooking::get_instance()->read_single($id, true);
+ $booking->from_ = $from_;
+// $application =
createObject('eventplanner.boapplication')->read_single($entity->application_id);
+// $booking->to_ = $booking->from_ +
((int)$application->timespan * 60);
+ $booking->customer_id = $booking->customer_id ?
$booking->customer_id : '';//foreigns key
+
+ if($booking->validate())
+ {
+ return $booking->store();
+ }
+// return
eventplanner_sobooking::get_instance()->update($booking);
+ }
+
+
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/eventplanner/inc/class.sobooking.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -67,17 +67,26 @@
protected function update( $object )
{
$this->db->transaction_begin();
+ $this->update_history($object, $this->fields);
+
+ parent::update($object);
+
+ return $this->db->transaction_commit();
+ }
+
+ protected function update_history( $object, $fields )
+ {
// $status_text = eventplanner_booking::get_status_list();
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$lang_active = lang('active');
$lang_inactive = lang('inactive');
$original =
$this->read_single($object->get_id());//returned as array()
- foreach ($this->fields as $field => $params)
+ foreach ($fields as $field => $params)
{
$new_value = $object->$field;
$old_value = $original[$field];
- if (!empty($params['history']) && ($new_value
!= $old_value))
+ if (!empty($params['history']) && $new_value &&
$old_value && ($new_value != $old_value))
{
$label = !empty($params['label']) ?
lang($params['label']) : $field;
switch ($field)
@@ -90,6 +99,16 @@
$old_value = $old_value
? $lang_active : $lang_inactive;
$new_value = $new_value
? $lang_active : $lang_inactive;
break;
+ case 'from_':
+ case 'to_':
+ if(($old_value +
phpgwapi_datetime::user_timezone()) == $new_value)
+ {
+ continue;
+ }
+
+ $old_value =
$GLOBALS['phpgw']->common->show_date($old_value);
+ $new_value =
$GLOBALS['phpgw']->common->show_date($new_value);
+ break;
default:
break;
}
@@ -107,10 +126,36 @@
}
}
+ }
- parent::update($object);
+ public function update_active_status($ids, $action )
+ {
+ if(!$ids || !is_array($ids))
+ {
+ return;
+ }
+ switch ($action)
+ {
+ case 'disable':
+ $sql = "UPDATE eventplanner_booking SET
active = 0";
+
+ break;
+ case 'enable':
+ $sql = "UPDATE eventplanner_booking SET
active = 1";
+ break;
+
+ default:
+ throw new Exception("action {$action}
not supported");
+ break;
+ }
+
+ $sql .= 'WHERE id IN(' . implode(',', $ids) . ')';
+ $this->db->transaction_begin();
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+
return $this->db->transaction_commit();
}
-
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -237,14 +237,12 @@
$tabs['calendar'] = array(
'label' => lang('calendar'),
'link' => '#calendar',
- 'function' => "set_tab('calendar')"
+ 'function' => "set_tab('calendar')",
+ 'disable' => $id ? false : true
);
$bocommon = CreateObject('property.bocommon');
- $GLOBALS['phpgw']->jqcal->add_listener('date_start');
- $GLOBALS['phpgw']->jqcal->add_listener('date_end');
-
$accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_EDIT, '.application',
'eventplanner');
$case_officer_options[] = array('id' => '', 'name' =>
lang('select'), 'selected' => 0);
foreach ($accounts as $account)
@@ -281,7 +279,7 @@
);
$dates_def = array(
- array('key' => 'id', 'hidden' => true),
+ array('key' => 'id', 'label' => lang('id'),
'sortable' => true, 'resizeable' => true,'formatter' =>
'JqueryPortico.formatLink'),
array('key' => 'from_', 'label' =>
lang('From'), 'sortable' => false, 'resizeable' => true),
array('key' => 'to_', 'label' => lang('To'),
'sortable' => false, 'resizeable' => true),
array('key' => 'active', 'label' =>
lang('active'), 'sortable' => false, 'resizeable' => true),
@@ -340,8 +338,13 @@
array('disablePagination' => true)
)
);
- $GLOBALS['phpgw']->jqcal->add_listener('from_',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('to_',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('date_start');
+ $GLOBALS['phpgw']->jqcal->add_listener('date_end');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'datetime', '', array(
+ 'min_date' => date('Y/m/d',
$application->date_start),
+ 'max_date' => date('Y/m/d',
$application->date_end)
+ )
+ );
$application_type_list =
execMethod('eventplanner.bogeneric.get_list', array('type' =>
'application_type'));
$types = (array)$application->types;
@@ -351,7 +354,7 @@
{
foreach ($types as $type)
{
- if($type['type_id'] ==
$application_type['id'])
+ if((!empty($type['type_id']) &&
$type['type_id'] == $application_type['id']) || ($type ==
$application_type['id']))
{
$application_type['selected'] = 1;
break;
@@ -376,6 +379,7 @@
'form_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'eventplanner.uiapplication.save')),
'cancel_url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'eventplanner.uiapplication.index',)),
'application' => $application,
+ 'new_vendor_url' =>
self::link(array('menuaction' => 'eventplanner.uivendor.add')),
'list_case_officer' => array('options' =>
$case_officer_options),
'cat_select' =>
$this->cats->formatted_xslt_list(array(
'select_name' => 'category_id',
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uibooking.inc.php
2016-12-05 08:57:35 UTC (rev 16047)
@@ -1,5 +1,5 @@
<?php
-/**
+ /**
* phpGroupWare - eventplanner: a part of a Facilities Management
System.
*
* @author Sigurd Nes <address@hidden>
@@ -41,9 +41,10 @@
'view' => true,
'edit' => true,
'save' => true,
- 'save_ajax' => true
+ 'save_ajax' => true,
+ 'update_active_status' => true,
+ 'update_schedule' => true
);
-
protected
$fields,
$permissions;
@@ -58,7 +59,6 @@
$this->permissions =
eventplanner_booking::get_instance()->get_permission_array();
}
-
public function index()
{
if (empty($this->permissions[PHPGW_ACL_READ]))
@@ -93,8 +93,8 @@
'type' =>
'checkbox',
'name' =>
'filter_active',
'text' =>
lang('showall'),
- 'value' => 1,
- 'checked'=> 1,
+ 'value' => 1,
+ 'checked' => 1,
)
)
)
@@ -105,7 +105,7 @@
'phpgw_return_as' => 'json'
)),
'allrows' => true,
- 'new_item' =>
self::link(array('menuaction' => 'eventplanner.uibooking.add')),
+ // 'new_item' =>
self::link(array('menuaction' => 'eventplanner.uibooking.add')),
'editor_action' => '',
'field' => parent::_get_fields()
)
@@ -147,7 +147,6 @@
self::render_template_xsl('datatable_jquery', $data);
}
-
/*
* Edit the price item with the id given in the http variable
'id'
*/
@@ -188,12 +187,12 @@
}
$comments_def = array(
- array('key' => 'from_', 'label' =>
lang('From'), 'sortable' => false, 'resizeable' => true),
- array('key' => 'to_', 'label' => lang('To'),
'sortable' => false, 'resizeable' => true),
- array('key' => 'author', 'label' =>
lang('User'), 'sortable' => false, 'resizeable' => true),
- array('key' => 'comment', 'label' =>
lang('Note'), 'sortable' => false, 'resizeable' => true)
+ array('key' => 'value_count', 'label' => '#',
'sortable' => true, 'resizeable' => true),
+ array('key' => 'value_date', 'label' =>
lang('Date'), 'sortable' => true, 'resizeable' => true),
+ array('key' => 'author', 'label' =>
lang('User'), 'sortable' => true, 'resizeable' => true),
+ array('key' => 'comment', 'label' =>
lang('Note'), 'sortable' => true, 'resizeable' => true)
);
-
+
$datatable_def[] = array(
'container' => 'datatable-container_0',
'requestUrl' => "''",
@@ -205,26 +204,106 @@
)
);
+ $application =
createObject('eventplanner.boapplication')->read_single($booking->application_id);
+
+// $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'datetime', $booking->from_, array(
+// 'min_date' => date('Y/m/d',
$application->date_start),
+// 'max_date' => date('Y/m/d',
$application->date_end)
+// )
+// );
+
+ $application_type_list =
execMethod('eventplanner.bogeneric.get_list', array('type' =>
'application_type'));
+ $types = (array)$application->types;
+ if($types)
+ {
+ foreach ($application_type_list as
&$application_type)
+ {
+ foreach ($types as $type)
+ {
+ if((!empty($type['type_id']) &&
$type['type_id'] == $application_type['id']) || ($type ==
$application_type['id']))
+ {
+
$application_type['selected'] = 1;
+ break;
+ }
+ }
+ }
+ }
+
$data = array(
'datatable_def' => $datatable_def,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'eventplanner.uibooking.save')),
'cancel_url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'eventplanner.uibooking.index',)),
'booking' => $booking,
+ 'application' => $application,
+ 'application_type_list' =>
$application_type_list,
+ 'new_customer_url' =>
self::link(array('menuaction' => 'eventplanner.uicustomer.add')),
+ 'application_url' =>
self::link(array('menuaction' => 'eventplanner.uiapplication.edit', 'id' =>
$booking->application_id)),
+ 'customer_url' => self::link(array('menuaction'
=> 'eventplanner.uicustomer.edit', 'id' => $booking->customer_id)),
'mode' => $mode,
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'value_active_tab' => $active_tab
);
phpgwapi_jquery::formvalidator_generate(array());
self::add_javascript('eventplanner', 'portico',
'booking.edit.js');
+ phpgwapi_jquery::load_widget('autocomplete');
self::render_template_xsl(array('booking',
'datatable_inline'), array($mode => $data));
}
-
+
public function save()
{
parent::save();
}
+
public function save_ajax()
{
return parent::save(true);
}
+
+ public function update_active_status()
+ {
+ $ids = phpgw::get_var('ids', 'int');
+ $action = phpgw::get_var('action', 'string');
+
+ if ($this->bo->update_active_status($ids, $action))
+ {
+ return array(
+ 'status_kode' => 'ok',
+ 'status' => lang('ok'),
+ 'msg' => lang('messages_saved_form')
+ );
+ }
+ else
+ {
+ return array
+ (
+ 'status_kode' => 'error',
+ 'status' => lang('error'),
+ 'msg' => lang('messages_form_error')
+ );
+ }
+ }
+
+ public function update_schedule( )
+ {
+ $id = phpgw::get_var('id', 'int');
+ $from_ = phpgw::get_var('from_', 'date');
+ if ($this->bo->update_schedule($id, $from_))
+ {
+ return array(
+ 'status_kode' => 'ok',
+ 'status' => lang('ok'),
+ 'msg' => lang('messages_saved_form')
+ );
+ }
+ else
+ {
+ return array
+ (
+ 'status_kode' => 'error',
+ 'status' => lang('error'),
+ 'msg' => lang('messages_form_error')
+ );
+ }
+
+ }
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uicommon.inc.php
2016-12-05 08:50:42 UTC (rev 16046)
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16047] Stable: Merge 15901:16046 from trunk,
sigurdne <=