[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15305] Syncromind: merge 15252:15304 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15305] Syncromind: merge 15252:15304 from trunk |
Date: |
Mon, 20 Jun 2016 07:06:17 +0000 (UTC) |
Revision: 15305
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15305
Author: sigurdne
Date: 2016-06-20 07:06:16 +0000 (Mon, 20 Jun 2016)
Log Message:
-----------
Syncromind: merge 15252:15304 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind-2/booking/inc/class.uibooking.inc.php
branches/dev-syncromind-2/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind-2/booking/inc/class.uievent.inc.php
branches/dev-syncromind-2/booking/inc/class.uiresource.inc.php
branches/dev-syncromind-2/booking/templates/base/booking_delete_preview.xsl
branches/dev-syncromind-2/bookingfrontend/inc/class.uiapplication.inc.php
branches/dev-syncromind-2/bookingfrontend/templates/base/application.xsl
branches/dev-syncromind-2/controller/inc/class.menu.inc.php
branches/dev-syncromind-2/logistic/inc/class.uiactivity.inc.php
branches/dev-syncromind-2/logistic/inc/class.uiproject.inc.php
branches/dev-syncromind-2/logistic/inc/class.uiresource_type_requirement.inc.php
branches/dev-syncromind-2/logistic/js/logistic/requirement_overview.js
branches/dev-syncromind-2/logistic/js/logistic/resource_allocation.js
branches/dev-syncromind-2/logistic/templates/base/activity/add_activity_item.xsl
branches/dev-syncromind-2/logistic/templates/base/allocation/book_resources.xsl
branches/dev-syncromind-2/logistic/templates/base/css/base.css
branches/dev-syncromind-2/logistic/templates/base/project/project_type_item.xsl
branches/dev-syncromind-2/logistic/templates/base/requirement/requirement_overview.xsl
branches/dev-syncromind-2/phpgwapi/js/DataTables/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/alwaysAsk.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/columns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/events.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/fills.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/focus.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/keyTable.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/plugins.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/scrolling.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/License.txt
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.dataTables.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.foundation.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.foundation.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/mixins.scss
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/api/addRemove.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/api/enable.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/api/group.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/api/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/api/text.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/columnGroups.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/columns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/columnsToggle.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/layout.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/restore.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/stateSave.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/column_visibility/text.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/copyi18n.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/filename.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/hidden.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/pdfMessage.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/pdfPage.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/swfPath.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/flash/tsv.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/columns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/copyi18n.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/filename.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/outputFormat-function.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/outputFormat-orthogonal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfImage.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfMessage.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfOpen.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/pdfPage.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/tsv.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/className.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/collections-sub.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/collections.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/custom.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/export.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/keys.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/multiple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/new.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/pageLength.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/plugins.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/autoPrint.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/columns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/customisation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/message.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/select.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/print/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/icons.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.bootstrap.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.bootstrap.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.colVis.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.colVis.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.flash.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.flash.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.foundation.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.foundation.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.html5.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.html5.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.jqueryui.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.jqueryui.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.print.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.print.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/dataTables.buttons.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/dataTables.buttons.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/swf/flashExport.swf
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.bootstrap.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.bootstrap.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.dataTables.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.dataTables.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.foundation.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.foundation.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.jqueryui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.jqueryui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/col_filter.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/new_init.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/predefined.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/realtime.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/reset.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/scrolling.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/colvis.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/fixedcolumns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/fixedheader.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/server_side.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/state_save.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/alt_insert.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/js/dataTables.colReorder.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/js/dataTables.colReorder.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/License.txt
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.bootstrap.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.bootstrap.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/colvis.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/css_size.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/index_column.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/left_right_columns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/right_column.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/server-side-processing.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/size_fixed.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/size_fluid.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/two_columns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/col_filter.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/colvis.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/rowspan.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/server-side-processing.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/colreorder.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/responsive.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/enable-disable.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/header_footer.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/horizontal-scroll.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/new.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/offset.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/show-hide.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/two_tables.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/js/dataTables.fixedHeader.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/js/dataTables.fixedHeader.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/events.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/scrolling.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/server-side.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/stateSave.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/focusStyle.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/js/dataTables.keyTable.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/js/dataTables.keyTable.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.bootstrap.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.bootstrap.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.dataTables.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.foundation.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.foundation.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.jqueryui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.jqueryui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/column-control.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/custom-renderer.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/disable-child-rows.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/right-column.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/whole-row-control.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/auto.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/classes.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/colreorder.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/column-visibility.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/columnPriority.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/fixedHeader.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/column-control/init-classes.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/bootstrap-modal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/foundation-modal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/immediateShow.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/jqueryui-modal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/modal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/ajax.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/className.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/default.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/new.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/option.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/compact.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/scrolling.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/dataTables.responsive.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/dataTables.responsive.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.bootstrap.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.bootstrap.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.bootstrap.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.bootstrap.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.dataTables.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.dataTables.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.foundation.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.foundation.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.jqueryui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.jqueryui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/defaults.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/events.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/responsive.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/restrictedOrdering.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/selector.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/reorderClass.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/snapX.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/js/dataTables.rowReorder.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/js/dataTables.rowReorder.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.bootstrap.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.bootstrap.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.dataTables.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.dataTables.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.foundation.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.foundation.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.jqueryui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.jqueryui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/api_scrolling.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/fixedColumns.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/large_js_source.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/server-side_processing.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/state_saving.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/js/dataTables.scroller.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/js/dataTables.scroller.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/License.txt
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/Readme.md
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/api/events.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/api/get.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/api/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/api/select.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/blurable.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/buttons.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/cells.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/checkbox.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/deferRender.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/i18n.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/multi.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/reload.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/simple.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/initialisation/single.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/styling/bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/styling/foundation.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/styling/jqueryui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/js/dataTables.select.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/js/dataTables.select.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.bootstrap.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.bootstrap.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.foundation.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.foundation.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.jqueryui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.jqueryui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/jquery.dataTables.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/jquery.dataTables.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.bootstrap.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.bootstrap.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.foundation.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.foundation.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/jquery.dataTables.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/jquery.dataTables.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/jquery.js
branches/dev-syncromind-2/phpgwapi/js/jquery/common.js
branches/dev-syncromind-2/phpgwapi/templates/base/datatable_inline.xsl
branches/dev-syncromind-2/phpgwapi/templates/base/datatable_jquery.xsl
branches/dev-syncromind-2/property/inc/class.boproject.inc.php
branches/dev-syncromind-2/property/inc/class.uiproject.inc.php
branches/dev-syncromind-2/property/inc/class.uitts.inc.php
branches/dev-syncromind-2/property/inc/class.uiworkorder.inc.php
branches/dev-syncromind-2/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
branches/dev-syncromind-2/property/inc/custom/default/BkBygg_exporter_data_til_Agresso.php
branches/dev-syncromind-2/property/inc/custom/default/EBF_update_ticket_on_project_change.php
branches/dev-syncromind-2/property/js/portico/tts.view.js
branches/dev-syncromind-2/property/setup/default_records.inc.php
branches/dev-syncromind-2/property/templates/base/project.xsl
branches/dev-syncromind-2/property/templates/base/tts.xsl
branches/dev-syncromind-2/rental/inc/class.menu.inc.php
Added Paths:
-----------
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/css/buttons.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/customFile.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/excelBorder.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/excelCellShading.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/html5/excelTextBold.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/initialisation/collections-autoClose.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.bootstrap4.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.bootstrap4.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.semanticui.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Buttons/js/buttons.semanticui.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/css/colReorder.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/integration/responsive.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColReorder/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/css/fixedColumns.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/integration/
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/rtl.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedColumns/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/css/fixedHeader.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/buttons.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/integration/responsive-bootstrap.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/options/offset-automatic.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/FixedHeader/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/css/keyTable.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/initialisation/scroller.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/KeyTable/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/css/responsive.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/bootstrap4-modal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/display-types/semanticui-modal.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.bootstrap4.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.bootstrap4.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.semanticui.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Responsive/js/responsive.semanticui.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/rowReorder.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/css/semanticui.scss
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/initialisation/scroll.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/RowReorder/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/css/scroller.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/initialisation/select.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/index.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Scroller/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/css/select.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/css/select.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/css/select.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/css/select.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/api/cancellableEvents.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/styling/bootstrap4.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/Select/examples/styling/semanticui.html
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.bootstrap4.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.bootstrap4.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.material.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.material.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.semanticui.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.semanticui.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.uikit.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/css/dataTables.uikit.min.css
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.bootstrap4.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.bootstrap4.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.material.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.material.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.semanticui.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.semanticui.min.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.uikit.js
branches/dev-syncromind-2/phpgwapi/js/DataTables/media/js/dataTables.uikit.min.js
Removed Paths:
-------------
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/ColVis/
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/TableTools/
Property Changed:
----------------
branches/dev-syncromind-2/
branches/dev-syncromind-2/booking/
branches/dev-syncromind-2/bookingfrontend/
Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15252
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304
Property changes on: branches/dev-syncromind-2/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14937-15027,15165-15215
+ /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14937-15027,15165-15215,15253-15304
Modified: branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/inc/class.uiallocation.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -299,17 +299,26 @@
$from_date = $_POST['from_'];
$to_date = $_POST['to_'];
+ $from_date_arr = explode(' ', $_POST['from_']);
+ $to_date_arr = explode(' ', $_POST['to_']);
+ if(!isset($_POST['weekday']))
+ {
+ $_POST['weekday'] = strtolower
(date('l', phpgwapi_datetime::date_to_timestamp($_POST['from_'])));
+ }
+
$weekday = $_POST['weekday'];
- $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
- $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
+// $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_']));
+// $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $_POST['to_']));
+ $allocation['from_'] = strftime("%Y-%m-%d
%H:%M", strtotime($_POST['weekday'] . " " . $from_date_arr[1]));
+ $allocation['to_'] = strftime("%Y-%m-%d %H:%M",
strtotime($_POST['weekday'] . " " . $to_date_arr[1]));
- if (($_POST['weekday'] != 'sunday' && date('w')
> date('w', strtotime($_POST['weekday']))) || (date('w') == 'sunday' &&
date('w') < date('w', strtotime($_POST['weekday']))))
+ if (($_POST['weekday'] != 'sunday' && date('w')
> date('w', strtotime($_POST['weekday']))) || (date('w') == '0' && date('w') <
date('w', strtotime($_POST['weekday']))))
{
- if (phpgw::get_var('weekday', 'string')
== '')
+ if (!phpgw::get_var('weekday',
'string', 'POST'))
{
- $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " . $_POST['from_'])
- 60 * 60 * 24 * 7);
- $allocation['to_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " . $_POST['to_']) -
60 * 60 * 24 * 7);
+ $allocation['from_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " .
$from_date_arr[1]) - 60 * 60 * 24 * 7);
+ $allocation['to_'] =
strftime("%Y-%m-%d %H:%M", strtotime($_POST['weekday'] . " " . $to_date_arr[1])
- 60 * 60 * 24 * 7);
}
}
$_POST['from_'] = $allocation['from_'];
@@ -409,7 +418,7 @@
array_set_default($allocation, 'building_name',
phpgw::get_var('building_name', 'string'));
array_set_default($allocation, 'from_',
$timeFrom);
array_set_default($allocation, 'to_', $timeTo);
- $weekday = phpgw::get_var('weekday', 'string');
+ $weekday = phpgw::get_var('weekday', 'string',
'POST');
}
$this->flash_form_errors($errors);
Modified: branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/inc/class.uiapplication.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -43,7 +43,9 @@
$this->resource_bo = CreateObject('booking.boresource');
$this->building_bo = CreateObject('booking.bobuilding');
$this->organization_bo =
CreateObject('booking.boorganization');
- $this->document_bo =
CreateObject('booking.bodocument_building');
+ $this->document_building =
CreateObject('booking.bodocument_building');
+ $this->document_resource =
CreateObject('booking.bodocument_resource');
+
self::set_active_menu('booking::applications');
$this->fields = array('description', 'equipment',
'resources', 'activity_id',
'building_id', 'building_name', 'contact_name',
@@ -550,8 +552,19 @@
$comment_text = lang('The user has accepted the
following documents') . ': ';
foreach ($application['accepted_documents'] as $doc)
{
- $doc_id = substr($doc, strrpos($doc, ':') + 1);
// finding the document_building.id
- $document =
$this->document_bo->read_single($doc_id);
+ $doc_info = explode('::', $doc);
+ $doc_type = $doc_info[0];
+ $doc_id = $doc_info[1];
+ switch ($doc_type)
+ {
+ default:
+ case 'building':
+ $document =
$this->document_building->read_single($doc_id);
+ break;
+ case 'resource':
+ $document =
$this->document_resource->read_single($doc_id);
+ break;
+ }
$comment_text .= $document['description'] . '
(' . $document['name'] . '), ';
}
$comment_text = substr($comment_text, 0, -2);
@@ -930,8 +943,8 @@
}
}
$event = array();
- $event[] = array('from_', $date['from_']);
- $event[] = array('to_', $date['to_']);
+ $event[] = array('from_',
pretty_timestamp($date['from_']));
+ $event[] = array('to_', pretty_timestamp($date['to_']));
$event[] = array('cost', '0');
$event[] = array('application_id', $application['id']);
$event[] = array('reminder', '0');
Modified: branches/dev-syncromind-2/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uibooking.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/inc/class.uibooking.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -89,6 +89,7 @@
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'booking.uibooking.index', 'phpgw_return_as'
=> 'json')),
+ 'sorted_by' => array('key' => 4, 'dir'
=> 'desc'),//id
'field' => array(
array(
'key' =>
'activity_name',
@@ -371,13 +372,9 @@
$step = phpgw::get_var('step', 'int', 'REQUEST', 1);
- if (!isset($allocation_id))
- {
- $noallocation = 1;
- }
$invalid_dates = array();
$valid_dates = array();
- if (isset($allocation_id))
+ if ($allocation_id)
{
$allocation =
$this->allocation_bo->read_single($allocation_id);
$season =
$this->season_bo->read_single($allocation['season_id']);
@@ -392,6 +389,7 @@
}
else
{
+ $allocation = array();
$season =
$this->season_bo->read_single(phpgw::get_var('season_id','int', 'POST'));
$booking['organization_id'] =
phpgw::get_var('organization_id','int', 'POST');
$booking['organization_name'] =
phpgw::get_var('organization_name','string', 'POST');
@@ -413,9 +411,11 @@
$this->add_cost_history($booking,
phpgw::get_var('cost_comment'), phpgw::get_var('cost', 'float'));
}
- $timestamp = strtotime($booking['from_']);
+// $timestamp = strtotime($booking['from_']);
+ $timestamp =
phpgwapi_datetime::date_to_timestamp($booking['from_']);
$booking['from_'] = date("Y-m-d H:i:s",
$timestamp);
- $timestamp = strtotime($booking['to_']);
+// $timestamp = strtotime($booking['to_']);
+ $timestamp =
phpgwapi_datetime::date_to_timestamp($booking['to_']);
$booking['to_'] = date("Y-m-d H:i:s",
$timestamp);
if (strlen($_POST['from_']) < 6)
@@ -471,7 +471,7 @@
$allocation['season_id'] =
$booking['season_id'];
$allocation['organization_id']
= $booking['organization_id'];
$allocation['organization_name'] = $booking['organization_name'];
- if ($application_id != '0')
+ if ($application_id)
{
$allocation['application_id'] = $application_id;
}
@@ -495,15 +495,15 @@
{
if ($_POST['recurring'] == 'on')
{
- $repeat_until =
strtotime($_POST['repeat_until']) + 60 * 60 * 24;
+ $repeat_until =
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until']) + 60 * 60 * 24;
}
else
{
$repeat_until =
strtotime($season['to_']) + 60 * 60 * 24;
- $_POST['repeat_until'] =
$season['to_'];
+ $_POST['repeat_until'] =
pretty_timestamp($season['to_']);
}
- $max_dato = strtotime($_POST['to_']);
// highest date from input
+ $max_dato =
phpgwapi_datetime::date_to_timestamp($_POST['to_']); // highest date from input
$interval = $_POST['field_interval'] *
60 * 60 * 24 * 7; // weeks in seconds
$i = 0;
// calculating valid and invalid dates
from the first booking's to-date to the repeat_until date is reached
@@ -511,8 +511,8 @@
while (($max_dato + ($interval * $i))
<= $repeat_until)
{
- $fromdate = date('Y-m-d H:i',
strtotime($_POST['from_']) + ($interval * $i));
- $todate = date('Y-m-d H:i',
strtotime($_POST['to_']) + ($interval * $i));
+ $fromdate = date('Y-m-d H:i',
phpgwapi_datetime::date_to_timestamp($_POST['from_']) + ($interval * $i));
+ $todate = date('Y-m-d H:i',
phpgwapi_datetime::date_to_timestamp($_POST['to_']) + ($interval * $i));
$booking['from_'] = $fromdate;
$booking['to_'] = $todate;
$fromdate =
pretty_timestamp($fromdate);
@@ -676,9 +676,12 @@
'recurring' => $_POST['recurring'],
'outseason' => $_POST['outseason'],
'interval' => $_POST['field_interval'],
- 'repeat_until' =>
pretty_timestamp($_POST['repeat_until']),
- 'from_date' =>
pretty_timestamp($_POST['from_']),
- 'to_date' =>
pretty_timestamp($_POST['to_']),
+// 'repeat_until' =>
pretty_timestamp($_POST['repeat_until']),
+// 'from_date' =>
pretty_timestamp($_POST['from_']),
+// 'to_date' =>
pretty_timestamp($_POST['to_']),
+ 'repeat_until' =>
$_POST['repeat_until'],
+ 'from_date' => $_POST['from_'],
+ 'to_date' => $_POST['to_'],
'valid_dates' => $valid_dates,
'invalid_dates' => $invalid_dates,
'groups' => $groups,
@@ -819,14 +822,14 @@
{
$_POST['from_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['from_']));
$_POST['to_'] = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($_POST['to_']));
- $_POST['repeat_until'] = date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until']));
+ $_POST['repeat_until'] =
isset($_POST['repeat_until']) && $_POST['repeat_until'] ? date("Y-m-d",
phpgwapi_datetime::date_to_timestamp($_POST['repeat_until'])) : false;
$from_date = $_POST['from_'];
$to_date = $_POST['to_'];
if ($_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on')
{
- if ($_POST['allocation_delete'] != 'on')
+ if ($_POST['delete_allocation'] != 'on')
{
$this->bo->so->delete_booking($id);
$this->redirect(array('menuaction' => 'booking.uimassbooking.schedule', 'id' =>
$booking['building_id']));
@@ -896,16 +899,16 @@
}
if ($_POST['delete_allocation']
== 'on')
{
- if (!$aid)
+// if (!$aid)
+// {
+//
$allocation_keep[$i]['from_'] = $fromdate;
+//
$allocation_keep[$i]['to_'] = $todate;
+// }
+// else
{
-
$allocation_keep[$i]['from_'] = $fromdate;
-
$allocation_keep[$i]['to_'] = $todate;
- }
- else
- {
$allocation_delete[$i]['from_'] = $fromdate;
$allocation_delete[$i]['to_'] = $todate;
- if ($step == 3)
+ if ($step == 3
&& $aid)
{
$stat =
$this->bo->so->delete_allocation($aid);
}
Modified: branches/dev-syncromind-2/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uibuilding.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/inc/class.uibuilding.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -307,6 +307,9 @@
public function schedule()
{
$building =
$this->bo->get_schedule(phpgw::get_var('id', 'int'), "booking.uibuilding");
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('booking') . "::{$building['name']}";
+
$building['cancel_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show',
'id' => $building['id']));
$building['datasource_url'] = self::link(array(
Modified: branches/dev-syncromind-2/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uievent.inc.php 2016-06-20
06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/inc/class.uievent.inc.php 2016-06-20
07:06:16 UTC (rev 15305)
@@ -363,18 +363,28 @@
$event = array('customer_internal' => 0);
if ($_SERVER['REQUEST_METHOD'] == 'POST')
{
-
array_set_default($_POST, 'from_', array());
array_set_default($_POST, 'to_', array());
- foreach ($_POST['from_'] as &$from)
+ if(isset($_POST['from_']))
{
-// $from = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($from));
+ if(is_array($_POST['from_']))
+ {
+ foreach ($_POST['from_'] as
&$from)
+ {
+ $from = date("Y-m-d
H:i:s", phpgwapi_datetime::date_to_timestamp($from));
+ }
+ foreach ($_POST['to_'] as &$to)
+ {
+ $to = date("Y-m-d
H:i:s", phpgwapi_datetime::date_to_timestamp($to));
+ }
+ }
+ else
+ {
+ $_POST['from_'] = date("Y-m-d
H:i:s", phpgwapi_datetime::date_to_timestamp($_POST['from_']));
+ $_POST['to_'] = date("Y-m-d
H:i:s", phpgwapi_datetime::date_to_timestamp($_POST['to_']));
+ }
}
- foreach ($_POST['to_'] as &$to)
- {
-// $to = date("Y-m-d H:i:s",
phpgwapi_datetime::date_to_timestamp($to));
- }
$event['dates'] = array_map(array(self,
'_combine_dates'), $_POST['from_'], $_POST['to_']);
@@ -1020,6 +1030,10 @@
{
$this->bo->so->delete_event($event_id);
}
+ else
+ {
+ phpgwapi_cache::message_set('Mangler rettighet
for å slette', 'error');
+ }
if (isset($application_id))
{
$this->redirect(array('menuaction' =>
'booking.uiapplication.show', 'id' => $application_id));
Modified: branches/dev-syncromind-2/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind-2/booking/inc/class.uiresource.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/inc/class.uiresource.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -440,6 +440,19 @@
public function schedule()
{
$resource =
$this->bo->get_schedule(phpgw::get_var('id', 'int'), 'booking.uibuilding',
'booking.uiresource');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('booking') . "::{$resource['name']}";
+ $building_names = array();
+ if(is_array($resource['buildings']))
+ {
+ foreach ($resource['buildings'] as $building_id)
+ {
+ $building =
$this->bo->read_single($building_id);
+ $building_names[] = $building['name'];
+ }
+ $GLOBALS['phpgw_info']['flags']['app_header']
.= ' (' . implode('',$building_names) . ')';
+ }
+
$resource['application_link'] = self::link(array(
'menuaction' =>
'booking.uiapplication.add',
'building_id' =>
$resource['building_id'],
Modified:
branches/dev-syncromind-2/booking/templates/base/booking_delete_preview.xsl
===================================================================
--- branches/dev-syncromind-2/booking/templates/base/booking_delete_preview.xsl
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/booking/templates/base/booking_delete_preview.xsl
2016-06-20 07:06:16 UTC (rev 15305)
@@ -67,6 +67,7 @@
</li>
</xsl:for-each>
</div>
+ <!--
<h4>
<xsl:value-of
select="php:function('lang', 'Allocations with still existing bookings (%1)',
count(allocation_keep[from_]))" />
</h4>
@@ -77,6 +78,7 @@
</li>
</xsl:for-each>
</div>
+ -->
</xsl:if>
<div class="form-buttons">
<input type="submit" name="delete"
class="pure-button pure-button-primary">
Property changes on: branches/dev-syncromind-2/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14937-15027
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12986
/trunk/bookingfrontend:14937-15027,15253-15304
Modified:
branches/dev-syncromind-2/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind-2/bookingfrontend/inc/class.uiapplication.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/bookingfrontend/inc/class.uiapplication.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -129,7 +129,17 @@
phpgwapi_jquery::formvalidator_generate(array('file'),
'file_form');
- self::render_template_xsl('application',
array('application' => $application,
- 'audience' => $audience, 'agegroups' =>
$agegroups, 'frontend' => 'true'));
+ $config = CreateObject('phpgwapi.config', 'booking');
+ $config->read();
+ $application_text = $config->config_data;
+
+ self::render_template_xsl('application', array(
+ 'application' => $application,
+ 'audience' => $audience,
+ 'agegroups' => $agegroups,
+ 'frontend' => 'true',
+ 'config' => $application_text
+ )
+ );
}
}
\ No newline at end of file
Modified:
branches/dev-syncromind-2/bookingfrontend/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind-2/bookingfrontend/templates/base/application.xsl
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/bookingfrontend/templates/base/application.xsl
2016-06-20 07:06:16 UTC (rev 15305)
@@ -393,9 +393,11 @@
<div class="heading">
<br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" />
</div>
- <p>
- <xsl:value-of
select="php:function('lang', 'All that borrow premises from Bergen Kommune must
verify that they have read the terms and conditions, this is usually fire
regulations and house rules.')" />
- </p>
+ <xsl:if
test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
<br />
<div
id='regulation_documents'> </div>
<br />
Modified: branches/dev-syncromind-2/controller/inc/class.menu.inc.php
===================================================================
--- branches/dev-syncromind-2/controller/inc/class.menu.inc.php 2016-06-20
06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/controller/inc/class.menu.inc.php 2016-06-20
07:06:16 UTC (rev 15305)
@@ -36,14 +36,24 @@
$incoming_app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['flags']['currentapp'] =
'controller';
$menus = array();
+ $config = CreateObject('phpgwapi.config', 'controller');
+ $config->read();
+ if (isset($config->config_data['home_alternative']) &&
$config->config_data['home_alternative'])
+ {
+ $main = 'controller.uicomponent.index';
+ }
+ else
+ {
+ $main = 'controller.uicontrol.control_list';
+ }
+
$menus['navbar'] = array
(
'controller' => array
(
'text' => lang('Controller'),
- // 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.control_list')),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicomponent.index')),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => $main)),
'image' => array('property',
'location'),
'order' => 10,
'group' => 'office'
@@ -56,13 +66,10 @@
$menus['navigation']['control'] = array(
'text' => lang('Control types'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.control_list')),
- 'image' => array('property',
'location_1'));
+ 'image' => array('property',
'location_1')
+ );
-
- $config = CreateObject('phpgwapi.config',
'controller');
- $config->read();
-
if
(!isset($config->config_data['home_alternative']) ||
!$config->config_data['home_alternative'])
{
Modified: branches/dev-syncromind-2/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/dev-syncromind-2/logistic/inc/class.uiactivity.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/logistic/inc/class.uiactivity.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -103,20 +103,15 @@
'name' =>
'user',
'text' =>
lang('Responsible user') . ':',
'list' =>
$user_array,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('Add activity'),
- 'href' =>
self::link(array('menuaction' => 'logistic.uiactivity.add')),
- 'class' =>
'new_item'
- ),
- ),
- ),
+ )
+ )
+ )
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'logistic.uiactivity.index', 'phpgw_return_as'
=> 'json',
'filter' =>
phpgw::get_var('filter', 'int'))),
'allrows' => true,
+ 'new_item' =>
self::link(array('menuaction' => 'logistic.uiactivity.add')),
'field' => array(
array(
'key' => 'id',
@@ -670,7 +665,7 @@
$datatable_def[] = array
(
- 'container' => 'requirement-container',
+ 'container' => 'requirement-container_0',
'requestUrl' =>
json_encode(self::link(array('menuaction' => 'logistic.uirequirement.index',
'activity_id' => $activity_id,
'phpgw_return_as' => 'json'))),
'ColumnDefs' => $ColumnDefs0,
@@ -698,7 +693,7 @@
$datatable_def[] = array
(
- 'container' => 'allocation-container',
+ 'container' => 'allocation-container_0',
'requestUrl' => "''",
//json_encode(self::link(array('menuaction' =>
'logistic.uirequirement_resource_allocation.index', 'requirement_id' =>
$requirement_id, 'type' => "requirement_id", 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $ColumnDefs1,
'data' => json_encode(array()),
Modified: branches/dev-syncromind-2/logistic/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind-2/logistic/inc/class.uiproject.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/logistic/inc/class.uiproject.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -142,6 +142,8 @@
$project = $result->serialize();
$href = self::link(array('menuaction'
=> 'logistic.uiactivity.edit', 'project_id' => $project['id']));
$project['add_activity_link'] = "<a
class=\"btn-sm delete\" href=\"{$href}\">Legg til aktivitet</a>";
+ $href_view =
self::link(array('menuaction' => 'logistic.uiactivity.index', 'project_id' =>
$project['id']));
+ $project['view_activity_link'] = "<a
class=\"btn-sm delete\" href=\"{$href_view}\">Vis aktiviteter</a>";
$rows[] = $project;
}
}
@@ -192,20 +194,15 @@
'name' =>
'project_type',
'text' =>
lang('Project_type') . ':',
'list' =>
$project_type_array,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('t_new_project'),
- 'href' =>
self::link(array('menuaction' => 'logistic.uiproject.add')),
- 'class' =>
'new_item'
- ),
- ),
- ),
+ )
+ )
+ )
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'logistic.uiproject.index', 'phpgw_return_as'
=> 'json')),
'allrows' => true,
'editor_action' =>
self::link(array('menuaction' => 'logistic.uiproject.edit_project_name')),
+ 'new_item' =>
self::link(array('menuaction' => 'logistic.uiproject.add')),
'field' => array(
array(
'key' => 'id',
@@ -245,6 +242,11 @@
'sortable' => false
),
array(
+ 'key' =>
'view_activity_link',
+ 'label' => lang('view
activities'),
+ 'sortable' => false
+ ),
+ array(
'key' => 'link',
'hidden' => true
)
@@ -302,29 +304,15 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array('type' =>
'text',
- 'text'
=> lang('search'),
- 'name'
=> 'query'
- ),
- array(
- 'type'
=> 'submit',
- 'name'
=> 'search',
- 'value'
=> lang('Search')
- ),
- array(
- 'type'
=> 'link',
- 'value'
=> lang('t_new_project_type'),
- 'href'
=> self::link(array('menuaction' => 'logistic.uiproject.project_types',
-
'new_type' => 'yes')),
- 'class'
=> 'new_item'
- ),
- ),
- ),
+ )
+ )
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'logistic.uiproject.project_types',
'phpgw_return_as' =>
'json', 'type' => 'project_type')),
'editor_action' =>
self::link(array('menuaction' => 'logistic.uiproject.edit_project_type_name')),
+ 'new_item' =>
self::link(array('menuaction' => 'logistic.uiproject.project_types',
+
'new_type' => 'yes')),
'field' => array(
array(
'key' => 'id',
@@ -346,6 +334,29 @@
),
);
+ $parameters = array(
+ 'parameter' => array(
+ array(
+ 'name' => 'id',
+ 'source' => 'id'
+ )
+ )
+ );
+
+ if ($this->acl_read)
+ {
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view',
+ 'statustext' => lang('view'),
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array(
+ 'menuaction' =>
'logistic.uiproject.edit_project_type'
+ )),
+ 'parameters' =>
json_encode($parameters)
+ );
+ }
+
self::render_template_xsl(array('datatable_jquery'), $data);
}
}
@@ -390,6 +401,10 @@
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiproject.edit_project_type',
'id' => $project_type_id));
}
+ else if (isset($_POST['cancel_project_type']))
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiproject.project_types'));
+ }
else
{
if ($project_type_id &&
is_numeric($project_type_id))
@@ -402,8 +417,7 @@
$project = $objects[$keys[0]];
}
}
- $data = array
- (
+ $data = array(
'project' => $project
);
@@ -446,13 +460,11 @@
}
else if (isset($_POST['cancel_project_type']))
{
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiproject.view_project_type',
- 'id' => $project_type_id));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uiproject.project_types'));
}
else
{
- $data = array
- (
+ $data = array(
'project' => $project,
'editable' => true
);
Modified:
branches/dev-syncromind-2/logistic/inc/class.uiresource_type_requirement.inc.php
===================================================================
---
branches/dev-syncromind-2/logistic/inc/class.uiresource_type_requirement.inc.php
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/logistic/inc/class.uiresource_type_requirement.inc.php
2016-06-20 07:06:16 UTC (rev 15305)
@@ -60,11 +60,11 @@
$this->so =
CreateObject('logistic.soresource_type_requirement');
$this->so_project = CreateObject('logistic.soproject');
- $this->read = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_READ, 'logistic');//1
- $this->add = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_ADD, 'logistic');//2
- $this->edit = $GLOBALS['phpgw']->acl->check('.project',
PHPGW_ACL_EDIT, 'logistic');//4
- $this->delete =
$GLOBALS['phpgw']->acl->check('.project', PHPGW_ACL_DELETE, 'logistic');//8
- $this->manage =
$GLOBALS['phpgw']->acl->check('.project', 16, 'logistic');//16
+ $this->acl_read =
$GLOBALS['phpgw']->acl->check('.project', PHPGW_ACL_READ, 'logistic');//1
+ $this->acl_add =
$GLOBALS['phpgw']->acl->check('.project', PHPGW_ACL_ADD, 'logistic');//2
+ $this->acl_edit =
$GLOBALS['phpgw']->acl->check('.project', PHPGW_ACL_EDIT, 'logistic');//4
+ $this->acl_delete =
$GLOBALS['phpgw']->acl->check('.project', PHPGW_ACL_DELETE, 'logistic');//8
+ $this->acl_manage =
$GLOBALS['phpgw']->acl->check('.project', 16, 'logistic');//16
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"admin::logistic::resource_type_requirement";
$GLOBALS['phpgw']->css->add_external_file('logistic/templates/base/css/base.css');
@@ -126,6 +126,8 @@
switch ($query_type)
{
case 'resource_type_requirement_list':
+ $filters = array();//FIXME
+
$search_type =
'resource_type_requirement_list';
$sort_field =
'type_requirement.location_id';
$result_objects =
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending,
$search_for, $search_type, $filters, $params['allrows']);
@@ -184,19 +186,14 @@
'name' =>
'entity_type',
'text' =>
lang('Entity types') . ':',
'list' =>
$entity_list,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('t_new_type_requirement'),
- 'href' =>
self::link(array('menuaction' => 'logistic.uiresource_type_requirement.add')),
- 'class' =>
'new_item'
- ),
- ),
- ),
+ )
+ )
+ )
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'logistic.uiresource_type_requirement.index',
'phpgw_return_as' => 'json',
'type' => 'resource_type_requirement_list')),
+ 'new_item' =>
self::link(array('menuaction' => 'logistic.uiresource_type_requirement.add')),
'field' => array(
array(
'key' => 'id',
@@ -234,6 +231,29 @@
),
);
+ $parameters = array(
+ 'parameter' => array(
+ array(
+ 'name' => 'id',
+ 'source' => 'id'
+ )
+ )
+ );
+
+ if ($this->acl_read)
+ {
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view',
+ 'statustext' => lang('view'),
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array(
+ 'menuaction' =>
'logistic.uiresource_type_requirement.view'
+ )),
+ 'parameters' =>
json_encode($parameters)
+ );
+ }
+
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind-2/logistic/js/logistic/requirement_overview.js
===================================================================
--- branches/dev-syncromind-2/logistic/js/logistic/requirement_overview.js
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/logistic/js/logistic/requirement_overview.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -30,7 +30,7 @@
var callback = function (result)
{
-
JqueryPortico.updateinlineTableHelper('requirement-container');
+
JqueryPortico.updateinlineTableHelper('requirement-container_0');
};
JqueryPortico.execute_ajax(requestUrl, callback, {}, 'POST',
'json');
}
@@ -61,8 +61,8 @@
var requestUrl2 =
phpGWLink('index.php', oArgs2, true);
-
JqueryPortico.updateinlineTableHelper('allocation-container', requestUrl2);
-
JqueryPortico.updateinlineTableHelper('requirement-container');
+
JqueryPortico.updateinlineTableHelper('allocation-container_0', requestUrl2);
+
JqueryPortico.updateinlineTableHelper('requirement-container_0');
}
},
error: function (XMLHttpRequest, textStatus,
errorThrown)
@@ -120,7 +120,7 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper('requirement-container',
requestUrl);
+ JqueryPortico.updateinlineTableHelper('requirement-container_0',
requestUrl);
}
@@ -134,6 +134,6 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper(oTable1, requestUrl);
+ JqueryPortico.updateinlineTableHelper('requirement-container_0',
requestUrl);
}
Modified: branches/dev-syncromind-2/logistic/js/logistic/resource_allocation.js
===================================================================
--- branches/dev-syncromind-2/logistic/js/logistic/resource_allocation.js
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/logistic/js/logistic/resource_allocation.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -1,7 +1,7 @@
$(document).ready(function ()
{
- $("#requirement-container tr").on("click", function (e)
+ $("#requirement-container_0 tr").on("click", function (e)
{
var requirement_id = $('td', this).eq(0).text();
updateAllocationTable(requirement_id);
@@ -23,5 +23,5 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- JqueryPortico.updateinlineTableHelper('allocation-container',
requestUrl);
+ JqueryPortico.updateinlineTableHelper('allocation-container_0',
requestUrl);
}
Modified:
branches/dev-syncromind-2/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
---
branches/dev-syncromind-2/logistic/templates/base/activity/add_activity_item.xsl
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/logistic/templates/base/activity/add_activity_item.xsl
2016-06-20 07:06:16 UTC (rev 15305)
@@ -350,7 +350,7 @@
<form name="cancel_form" id="cancel_form" action="{$cancel_url}"
method="post">
</form>
- <xsl:call-template name="jquery_phpgw_i18n"/>
+ <!--xsl:call-template name="jquery_phpgw_i18n"/-->
</xsl:template>
Modified:
branches/dev-syncromind-2/logistic/templates/base/allocation/book_resources.xsl
===================================================================
---
branches/dev-syncromind-2/logistic/templates/base/allocation/book_resources.xsl
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/logistic/templates/base/allocation/book_resources.xsl
2016-06-20 07:06:16 UTC (rev 15305)
@@ -158,5 +158,4 @@
</form>
</div>
</div>
-<xsl:call-template name="jquery_phpgw_i18n"/>
</xsl:template>
Modified: branches/dev-syncromind-2/logistic/templates/base/css/base.css
===================================================================
--- branches/dev-syncromind-2/logistic/templates/base/css/base.css
2016-06-20 06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/logistic/templates/base/css/base.css
2016-06-20 07:06:16 UTC (rev 15305)
@@ -763,7 +763,7 @@
padding: 20px;
}
-#datatable-container {
+#datatable-container_0 {
margin: 20px;
}
@@ -1971,7 +1971,7 @@
float: left;
}
-#choose-location #datatable-container{
+#choose-location #datatable-container_0{
margin: 20px 0;
}
@@ -2369,7 +2369,7 @@
margin-top: 0;
}
-#requirement-container .btn-sm {
+#requirement-container_0 .btn-sm {
border-color: #4378B1 #2663A3 #366CA4;
font-size: 12px;
padding: 1px 8px;
@@ -2380,7 +2380,7 @@
padding: 0;
}
-#requirement-container table td{
+#requirement-container_0 table td{
padding: 5px 0;
}
@@ -2398,7 +2398,7 @@
}
-#allocation-container .yui-dt-col-delete_link .yui-dt-liner {
+#allocation-container_0 .yui-dt-col-delete_link .yui-dt-liner {
text-align: center;
}
@@ -2417,11 +2417,11 @@
width: 136px;
}
-#sub-activities-container th div, #requirement-container th div {
+#sub-activities-container th div, #requirement-container_0 th div {
/*background: #6292C5;*/
}
-#sub-activities-container .yui-dt table, #requirement-container .yui-dt table {
+#sub-activities-container .yui-dt table, #requirement-container_0 .yui-dt
table {
/*border: 1px solid #98BFE8;*/
}
@@ -2429,14 +2429,14 @@
width: 800px;
}
-#requirement-container .yui-dt table, #allocation-container .yui-dt table {
+#requirement-container_0 .yui-dt table, #allocation-container_0 .yui-dt table {
width: 1000px;
}
#sub-activities-container th a, #sub-activities-container th span,
-#requirement-container th a, #requirement-container th span,
-#allocation-container th a, #allocation-container th span,
-#datatable-container th a, #datatable-container th span
+#requirement-container_0 th a, #requirement-container_0 th span,
+#allocation-container_0 th a, #allocation-container_0 th span,
+#datatable-container_0 th a, #datatable-container_0 th span
{
/*color: #F9FCFE;*/
font-weight: bold;
@@ -2465,6 +2465,6 @@
text-decoration: underline;
}
-#requirement-container .btn-sm.cancel {
+#requirement-container_0 .btn-sm.cancel {
border: 1px solid #CCCCCC;
}
Modified:
branches/dev-syncromind-2/logistic/templates/base/project/project_type_item.xsl
===================================================================
---
branches/dev-syncromind-2/logistic/templates/base/project/project_type_item.xsl
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/logistic/templates/base/project/project_type_item.xsl
2016-06-20 07:06:16 UTC (rev 15305)
@@ -7,7 +7,7 @@
<h1>Prosjekttype</h1>
<div style="padding:20px;" class="content-wrp">
<form action="#" method="post">
- <input type="hidden" name="id" value =
"{value_id}">
+ <input type="hidden" name="id" value =
"{project/id}">
</input>
<dl class="proplist-col">
<dt>
@@ -26,16 +26,17 @@
</dl>
<div class="form-buttons">
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
<xsl:choose>
<xsl:when test="editable">
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
<input type="submit"
name="save_project_type" value="{$lang_save}" title = "{$lang_save}" />
<input type="submit"
name="cancel_project_type" value="{$lang_cancel}" title = "{$lang_cancel}" />
</xsl:when>
<xsl:otherwise>
<xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
<input type="submit"
name="edit_project_type" value="{$lang_edit}" title = "{$lang_edit}" />
+ <input type="submit"
name="cancel_project_type" value="{$lang_cancel}" title = "{$lang_cancel}" />
</xsl:otherwise>
</xsl:choose>
</div>
Modified:
branches/dev-syncromind-2/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
---
branches/dev-syncromind-2/logistic/templates/base/requirement/requirement_overview.xsl
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/logistic/templates/base/requirement/requirement_overview.xsl
2016-06-20 07:06:16 UTC (rev 15305)
@@ -27,7 +27,7 @@
<div style="clear:both;" id="paging"></div>
<div style="margin-bottom: 40px;">
<xsl:for-each select="datatable_def">
- <xsl:if test="container =
'requirement-container'">
+ <xsl:if test="container =
'requirement-container_0'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
<xsl:with-param
name="requestUrl" select ='requestUrl' />
@@ -46,7 +46,7 @@
<!-- // Needed for case of only one checkbox in
datatable-->
<input type='hidden' name='assign_requirement'
value = '0'/>
<xsl:for-each select="datatable_def">
- <xsl:if test="container =
'allocation-container'">
+ <xsl:if test="container =
'allocation-container_0'">
<xsl:call-template
name="table_setup">
<xsl:with-param
name="container" select ='container'/>
<xsl:with-param
name="requestUrl" select ='requestUrl' />
Modified: branches/dev-syncromind-2/phpgwapi/js/DataTables/Readme.md
===================================================================
--- branches/dev-syncromind-2/phpgwapi/js/DataTables/Readme.md 2016-06-20
06:58:27 UTC (rev 15304)
+++ branches/dev-syncromind-2/phpgwapi/js/DataTables/Readme.md 2016-06-20
07:06:16 UTC (rev 15305)
@@ -11,11 +11,17 @@
* End users. For those using the interface DataTables presents, actions to get
the most from the information contained in tables, such as sorting and
filtering, along with paging and scrolling of the data in table, are easy to
use, intuitive and fast.
-## Installation
+## Installing DataTables
-In most cases, to use DataTables all you need to do is include jQuery, the
DataTables Javascript and DataTables CSS files in your HTML page. See the
[DataTables
manual](http://datatables.net/manual/installation#Including-Javascript-/-CSS)
for details on how to do this using the latest version of DataTables.
+To use DataTables, the primary way to obtain the software is to use the
[DataTables downloader](//datatables.net/download). You can also include the
individual files from the [DataTables CDN](//cdn.datatables.net). See the
[documentation](//datatables.net/manual/installation) for full details.
+### NPM and Bower
+If you prefer to use a package manager such as NPM or Bower, distribution
repositories are available with software built from this repository under the
name `datatables.net`. Styling packages for Bootstrap, Foundation and other
styling libraries are also available by adding a suffix to the package name.
+
+Please see the DataTables [NPM](//datatables.net/download/npm) and
[Bower](//datatables.net/download/bower) installation pages for further
information. The [DataTables installation
manual](//datatables.net/manual/installation) also has details on how to use
package managers with DataTables.
+
+
## Usage
In its simplest case, DataTables can be initialised with a single line of
Javascript:
@@ -40,7 +46,7 @@
## Documentation
-Full documentation of the DataTables options, API and pug-in interface are
available on the [DataTables web-site](//datatables.net). The site also
contains information on the wide variety of plug-ins that are available for
DataTables, which can be used to enhance and customise your table even further.
+Full documentation of the DataTables options, API and plug-in interface are
available on the [DataTables web-site](//datatables.net). The site also
contains information on the wide variety of plug-ins that are available for
DataTables, which can be used to enhance and customise your table even further.
## Support
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/Readme.md
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/Readme.md
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/Readme.md
2016-06-20 07:06:16 UTC (rev 15305)
@@ -7,7 +7,13 @@
To use AutoFill the best way to obtain the software is to use the [DataTables
downloader](//datatables.net/download). You can also include the individual
files from the [DataTables CDN](//cdn.datatables.net). See the
[documentation](http://datatables.net/extensions/autofill/) for full details.
+## NPM and Bower
+If you prefer to use a package manager such as NPM or Bower, distribution
repositories are available with software built from this repository under the
name `datatables.net-autofill`. Styling packages for Bootstrap, Foundation and
other styling libraries are also available by adding a suffix to the package
name.
+
+Please see the DataTables [NPM](//datatables.net/download/npm) and
[Bower](//datatables.net/download/bower) installation pages for further
information. The [DataTables installation
manual](//datatables.net/manual/installation) also has details on how to use
package managers with DataTables.
+
+
# Basic usage
AutoFill is initialised using the `autoFill` option in the DataTables
constructor. Further options can be specified using this option as an object -
see the documentation for details. For example:
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.css
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.css)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.css
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.css
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,81 @@
+div.dt-autofill-handle {
+ position: absolute;
+ height: 8px;
+ width: 8px;
+ z-index: 102;
+ box-sizing: border-box;
+ border: 1px solid #0275d8;
+ background: #0275d8;
+}
+
+div.dt-autofill-select {
+ position: absolute;
+ z-index: 1001;
+ background-color: #0275d8;
+ background-image: repeating-linear-gradient(45deg, transparent, transparent
5px, rgba(255, 255, 255, 0.5) 5px, rgba(255, 255, 255, 0.5) 10px);
+}
+div.dt-autofill-select.top, div.dt-autofill-select.bottom {
+ height: 3px;
+ margin-top: -1px;
+}
+div.dt-autofill-select.left, div.dt-autofill-select.right {
+ width: 3px;
+ margin-left: -1px;
+}
+
+div.dt-autofill-list {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 500px;
+ margin-left: -250px;
+ background-color: white;
+ border-radius: 6px;
+ box-shadow: 0 0 5px #555;
+ border: 2px solid #444;
+ z-index: 11;
+ box-sizing: border-box;
+ padding: 1.5em 2em;
+}
+div.dt-autofill-list ul {
+ display: table;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ width: 100%;
+}
+div.dt-autofill-list ul li {
+ display: table-row;
+}
+div.dt-autofill-list ul li:last-child div.dt-autofill-question,
div.dt-autofill-list ul li:last-child div.dt-autofill-button {
+ border-bottom: none;
+}
+div.dt-autofill-list ul li:hover {
+ background-color: #f6f6f6;
+}
+div.dt-autofill-list div.dt-autofill-question {
+ display: table-cell;
+ padding: 0.5em 0;
+ border-bottom: 1px solid #ccc;
+}
+div.dt-autofill-list div.dt-autofill-question input[type=number] {
+ padding: 6px;
+ width: 30px;
+ margin: -2px 0;
+}
+div.dt-autofill-list div.dt-autofill-button {
+ display: table-cell;
+ padding: 0.5em 0;
+ border-bottom: 1px solid #ccc;
+}
+
+div.dt-autofill-background {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.7);
+ background: radial-gradient(ellipse farthest-corner at center, rgba(0, 0, 0,
0.3) 0%, rgba(0, 0, 0, 0.7) 100%);
+ z-index: 10;
+}
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.min.css
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.min.css)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.min.css
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.bootstrap4.min.css
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1 @@
+div.dt-autofill-handle{position:absolute;height:8px;width:8px;z-index:102;box-sizing:border-box;border:1px
solid
#0275d8;background:#0275d8}div.dt-autofill-select{position:absolute;z-index:1001;background-color:#0275d8;background-image:repeating-linear-gradient(45deg,
transparent, transparent 5px, rgba(255,255,255,0.5) 5px, rgba(255,255,255,0.5)
10px)}div.dt-autofill-select.top,div.dt-autofill-select.bottom{height:3px;margin-top:-1px}div.dt-autofill-select.left,div.dt-autofill-select.right{width:3px;margin-left:-1px}div.dt-autofill-list{position:fixed;top:50%;left:50%;width:500px;margin-left:-250px;background-color:white;border-radius:6px;box-shadow:0
0 5px #555;border:2px solid
#444;z-index:11;box-sizing:border-box;padding:1.5em 2em}div.dt-autofill-list
ul{display:table;margin:0;padding:0;list-style:none;width:100%}div.dt-autofill-list
ul li{display:table-row}div.dt-autofill-list ul li:last-child
div.dt-autofill-question,div.dt-autofill-list ul li:last-child
div.dt-autofill-button{border-bottom:none}div.dt-autofill-list ul
li:hover{background-color:#f6f6f6}div.dt-autofill-list
div.dt-autofill-question{display:table-cell;padding:0.5em 0;border-bottom:1px
solid #ccc}div.dt-autofill-list div.dt-autofill-question
input[type=number]{padding:6px;width:30px;margin:-2px 0}div.dt-autofill-list
div.dt-autofill-button{display:table-cell;padding:0.5em 0;border-bottom:1px
solid
#ccc}div.dt-autofill-background{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.7);background:radial-gradient(ellipse
farthest-corner at center, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7)
100%);z-index:10}
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.css
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.css)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.css
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.css
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,81 @@
+div.dt-autofill-handle {
+ position: absolute;
+ height: 8px;
+ width: 8px;
+ z-index: 102;
+ box-sizing: border-box;
+ border: 1px solid #888;
+ background: #888;
+}
+
+div.dt-autofill-select {
+ position: absolute;
+ z-index: 1001;
+ background-color: #888;
+ background-image: repeating-linear-gradient(45deg, transparent, transparent
5px, rgba(255, 255, 255, 0.5) 5px, rgba(255, 255, 255, 0.5) 10px);
+}
+div.dt-autofill-select.top, div.dt-autofill-select.bottom {
+ height: 3px;
+ margin-top: -1px;
+}
+div.dt-autofill-select.left, div.dt-autofill-select.right {
+ width: 3px;
+ margin-left: -1px;
+}
+
+div.dt-autofill-list {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ width: 500px;
+ margin-left: -250px;
+ background-color: white;
+ border-radius: 6px;
+ box-shadow: 0 0 5px #555;
+ border: 2px solid #444;
+ z-index: 11;
+ box-sizing: border-box;
+ padding: 1.5em 2em;
+}
+div.dt-autofill-list ul {
+ display: table;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ width: 100%;
+}
+div.dt-autofill-list ul li {
+ display: table-row;
+}
+div.dt-autofill-list ul li:last-child div.dt-autofill-question,
div.dt-autofill-list ul li:last-child div.dt-autofill-button {
+ border-bottom: none;
+}
+div.dt-autofill-list ul li:hover {
+ background-color: #f6f6f6;
+}
+div.dt-autofill-list div.dt-autofill-question {
+ display: table-cell;
+ padding: 0.5em 0;
+ border-bottom: 1px solid #ccc;
+}
+div.dt-autofill-list div.dt-autofill-question input[type=number] {
+ padding: 6px;
+ width: 30px;
+ margin: -2px 0;
+}
+div.dt-autofill-list div.dt-autofill-button {
+ display: table-cell;
+ padding: 0.5em 0;
+ border-bottom: 1px solid #ccc;
+}
+
+div.dt-autofill-background {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.7);
+ background: radial-gradient(ellipse farthest-corner at center, rgba(0, 0, 0,
0.3) 0%, rgba(0, 0, 0, 0.7) 100%);
+ z-index: 10;
+}
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.min.css
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.min.css)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.min.css
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/css/autoFill.semanticui.min.css
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1 @@
+div.dt-autofill-handle{position:absolute;height:8px;width:8px;z-index:102;box-sizing:border-box;border:1px
solid
#888;background:#888}div.dt-autofill-select{position:absolute;z-index:1001;background-color:#888;background-image:repeating-linear-gradient(45deg,
transparent, transparent 5px, rgba(255,255,255,0.5) 5px, rgba(255,255,255,0.5)
10px)}div.dt-autofill-select.top,div.dt-autofill-select.bottom{height:3px;margin-top:-1px}div.dt-autofill-select.left,div.dt-autofill-select.right{width:3px;margin-left:-1px}div.dt-autofill-list{position:fixed;top:50%;left:50%;width:500px;margin-left:-250px;background-color:white;border-radius:6px;box-shadow:0
0 5px #555;border:2px solid
#444;z-index:11;box-sizing:border-box;padding:1.5em 2em}div.dt-autofill-list
ul{display:table;margin:0;padding:0;list-style:none;width:100%}div.dt-autofill-list
ul li{display:table-row}div.dt-autofill-list ul li:last-child
div.dt-autofill-question,div.dt-autofill-list ul li:last-child
div.dt-autofill-button{border-bottom:none}div.dt-autofill-list ul
li:hover{background-color:#f6f6f6}div.dt-autofill-list
div.dt-autofill-question{display:table-cell;padding:0.5em 0;border-bottom:1px
solid #ccc}div.dt-autofill-list div.dt-autofill-question
input[type=number]{padding:6px;width:30px;margin:-2px 0}div.dt-autofill-list
div.dt-autofill-button{display:table-cell;padding:0.5em 0;border-bottom:1px
solid
#ccc}div.dt-autofill-background{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0,0,0,0.7);background:radial-gradient(ellipse
farthest-corner at center, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0.7)
100%);z-index:10}
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/index.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/index.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/index.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
<link rel="stylesheet" type="text/css"
href="../../../examples/resources/syntax/shCore.css">
<link rel="stylesheet" type="text/css"
href="../../../examples/resources/demo.css">
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../examples/resources/syntax/shCore.js">
</script>
@@ -69,9 +69,15 @@
<a
href="./styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="./styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="./styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="./styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="./styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -81,7 +87,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/alwaysAsk.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/alwaysAsk.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/alwaysAsk.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -550,7 +550,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -635,9 +635,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -647,7 +653,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/columns.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/columns.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/columns.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -13,7 +13,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -576,7 +576,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -667,9 +667,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -679,7 +685,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/events.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/events.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/events.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -559,7 +559,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -644,9 +644,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -656,7 +662,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/fills.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/fills.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/fills.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -550,7 +550,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -635,9 +635,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -647,7 +653,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/focus.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/focus.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/focus.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -555,7 +555,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -640,9 +640,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -652,7 +658,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/index.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/index.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/index.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
<link rel="stylesheet" type="text/css"
href="../../../../examples/resources/syntax/shCore.css">
<link rel="stylesheet" type="text/css"
href="../../../../examples/resources/demo.css">
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../examples/resources/syntax/shCore.js">
</script>
@@ -68,7 +68,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/keyTable.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/keyTable.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/keyTable.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -13,7 +13,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -549,7 +549,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -640,9 +640,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -652,7 +658,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/plugins.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/plugins.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/plugins.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -599,7 +599,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -684,9 +684,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -696,7 +702,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/scrolling.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/scrolling.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/scrolling.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -30,7 +30,7 @@
scrollY: 400,
scrollX: true,
scrollCollapse: true,
- paginate: false,
+ paging: false,
autoFill: true
} );
} );
@@ -540,14 +540,14 @@
scrollY: 400,
scrollX: true,
scrollCollapse: true,
- paginate: false,
+ paging: false,
autoFill: true
} );
} );</code>
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -632,9 +632,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -644,7 +650,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/simple.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/simple.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/initialisation/simple.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -12,7 +12,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -542,7 +542,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -627,9 +627,15 @@
<a
href="../styling/bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="../styling/bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="../styling/foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="../styling/semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="../styling/jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -639,7 +645,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -5,7 +5,7 @@
<link rel="shortcut icon" type="image/ico"
href="http://www.datatables.net/favicon.ico">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
<title>AutoFill example - Bootstrap styling</title>
- <link rel="stylesheet" type="text/css"
href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css"
href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css"
href="../../../../media/css/dataTables.bootstrap.css">
<link rel="stylesheet" type="text/css"
href="../../css/autoFill.bootstrap.css">
<link rel="stylesheet" type="text/css"
href="../../../../examples/resources/syntax/shCore.css">
@@ -13,7 +13,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -547,7 +547,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -574,7 +574,7 @@
<p>The following CSS library files are
loaded for use in this example to provide the styling of the table:</p>
<ul>
<li>
- <a
href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css</a>
+ <a
href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css</a>
</li>
<li>
<a
href="../../../../media/css/dataTables.bootstrap.css">../../../../media/css/dataTables.bootstrap.css</a>
@@ -641,9 +641,15 @@
<a
href="./bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="./bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="./foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="./semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="./jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -653,7 +659,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap4.html
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap4.html)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap4.html
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/bootstrap4.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,669 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="shortcut icon" type="image/ico"
href="http://www.datatables.net/favicon.ico">
+ <meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
+ <title>AutoFill example - Bootstrap 4 styling</title>
+ <link rel="stylesheet" type="text/css"
href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.css">
+ <link rel="stylesheet" type="text/css"
href="../../../../media/css/dataTables.bootstrap4.css">
+ <link rel="stylesheet" type="text/css"
href="../../css/autoFill.bootstrap4.css">
+ <link rel="stylesheet" type="text/css"
href="../../../../examples/resources/syntax/shCore.css">
+ <link rel="stylesheet" type="text/css"
href="../../../../examples/resources/demo.css">
+ <style type="text/css" class="init">
+
+ </style>
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../media/js/dataTables.bootstrap4.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../js/dataTables.autoFill.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../js/autoFill.bootstrap4.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../examples/resources/syntax/shCore.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../examples/resources/demo.js">
+ </script>
+ <script type="text/javascript" language="javascript" class="init">
+
+
+
+$(document).ready(function() {
+ $('#example').DataTable( {
+ autoFill: true
+ } );
+} );
+
+
+
+ </script>
+</head>
+<body class="dt-example dt-example-bootstrap4">
+ <div class="container">
+ <section>
+ <h1>AutoFill example <span>Bootstrap 4
styling</span></h1>
+ <div class="info">
+ <p>This example shows DataTables and the
AutoFill extension being used with <a href="http://getbootstrap.com">Bootstrap
4</a> providing the styling. The DataTables
+ / Bootstrap integration provides seamless
integration for DataTables to be used in a Bootstrap 4 page.</p>
+ </div>
+ <table id="example" class="table table-striped
table-bordered" cellspacing="0" width="100%">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Position</th>
+ <th>Office</th>
+ <th>Age</th>
+ <th>Start date</th>
+ <th>Salary</th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <th>Name</th>
+ <th>Position</th>
+ <th>Office</th>
+ <th>Age</th>
+ <th>Start date</th>
+ <th>Salary</th>
+ </tr>
+ </tfoot>
+ <tbody>
+ <tr>
+ <td>Tiger Nixon</td>
+ <td>System Architect</td>
+ <td>Edinburgh</td>
+ <td>61</td>
+ <td>2011/04/25</td>
+ <td>$320,800</td>
+ </tr>
+ <tr>
+ <td>Garrett Winters</td>
+ <td>Accountant</td>
+ <td>Tokyo</td>
+ <td>63</td>
+ <td>2011/07/25</td>
+ <td>$170,750</td>
+ </tr>
+ <tr>
+ <td>Ashton Cox</td>
+ <td>Junior Technical Author</td>
+ <td>San Francisco</td>
+ <td>66</td>
+ <td>2009/01/12</td>
+ <td>$86,000</td>
+ </tr>
+ <tr>
+ <td>Cedric Kelly</td>
+ <td>Senior Javascript
Developer</td>
+ <td>Edinburgh</td>
+ <td>22</td>
+ <td>2012/03/29</td>
+ <td>$433,060</td>
+ </tr>
+ <tr>
+ <td>Airi Satou</td>
+ <td>Accountant</td>
+ <td>Tokyo</td>
+ <td>33</td>
+ <td>2008/11/28</td>
+ <td>$162,700</td>
+ </tr>
+ <tr>
+ <td>Brielle Williamson</td>
+ <td>Integration Specialist</td>
+ <td>New York</td>
+ <td>61</td>
+ <td>2012/12/02</td>
+ <td>$372,000</td>
+ </tr>
+ <tr>
+ <td>Herrod Chandler</td>
+ <td>Sales Assistant</td>
+ <td>San Francisco</td>
+ <td>59</td>
+ <td>2012/08/06</td>
+ <td>$137,500</td>
+ </tr>
+ <tr>
+ <td>Rhona Davidson</td>
+ <td>Integration Specialist</td>
+ <td>Tokyo</td>
+ <td>55</td>
+ <td>2010/10/14</td>
+ <td>$327,900</td>
+ </tr>
+ <tr>
+ <td>Colleen Hurst</td>
+ <td>Javascript Developer</td>
+ <td>San Francisco</td>
+ <td>39</td>
+ <td>2009/09/15</td>
+ <td>$205,500</td>
+ </tr>
+ <tr>
+ <td>Sonya Frost</td>
+ <td>Software Engineer</td>
+ <td>Edinburgh</td>
+ <td>23</td>
+ <td>2008/12/13</td>
+ <td>$103,600</td>
+ </tr>
+ <tr>
+ <td>Jena Gaines</td>
+ <td>Office Manager</td>
+ <td>London</td>
+ <td>30</td>
+ <td>2008/12/19</td>
+ <td>$90,560</td>
+ </tr>
+ <tr>
+ <td>Quinn Flynn</td>
+ <td>Support Lead</td>
+ <td>Edinburgh</td>
+ <td>22</td>
+ <td>2013/03/03</td>
+ <td>$342,000</td>
+ </tr>
+ <tr>
+ <td>Charde Marshall</td>
+ <td>Regional Director</td>
+ <td>San Francisco</td>
+ <td>36</td>
+ <td>2008/10/16</td>
+ <td>$470,600</td>
+ </tr>
+ <tr>
+ <td>Haley Kennedy</td>
+ <td>Senior Marketing
Designer</td>
+ <td>London</td>
+ <td>43</td>
+ <td>2012/12/18</td>
+ <td>$313,500</td>
+ </tr>
+ <tr>
+ <td>Tatyana Fitzpatrick</td>
+ <td>Regional Director</td>
+ <td>London</td>
+ <td>19</td>
+ <td>2010/03/17</td>
+ <td>$385,750</td>
+ </tr>
+ <tr>
+ <td>Michael Silva</td>
+ <td>Marketing Designer</td>
+ <td>London</td>
+ <td>66</td>
+ <td>2012/11/27</td>
+ <td>$198,500</td>
+ </tr>
+ <tr>
+ <td>Paul Byrd</td>
+ <td>Chief Financial Officer
(CFO)</td>
+ <td>New York</td>
+ <td>64</td>
+ <td>2010/06/09</td>
+ <td>$725,000</td>
+ </tr>
+ <tr>
+ <td>Gloria Little</td>
+ <td>Systems Administrator</td>
+ <td>New York</td>
+ <td>59</td>
+ <td>2009/04/10</td>
+ <td>$237,500</td>
+ </tr>
+ <tr>
+ <td>Bradley Greer</td>
+ <td>Software Engineer</td>
+ <td>London</td>
+ <td>41</td>
+ <td>2012/10/13</td>
+ <td>$132,000</td>
+ </tr>
+ <tr>
+ <td>Dai Rios</td>
+ <td>Personnel Lead</td>
+ <td>Edinburgh</td>
+ <td>35</td>
+ <td>2012/09/26</td>
+ <td>$217,500</td>
+ </tr>
+ <tr>
+ <td>Jenette Caldwell</td>
+ <td>Development Lead</td>
+ <td>New York</td>
+ <td>30</td>
+ <td>2011/09/03</td>
+ <td>$345,000</td>
+ </tr>
+ <tr>
+ <td>Yuri Berry</td>
+ <td>Chief Marketing Officer
(CMO)</td>
+ <td>New York</td>
+ <td>40</td>
+ <td>2009/06/25</td>
+ <td>$675,000</td>
+ </tr>
+ <tr>
+ <td>Caesar Vance</td>
+ <td>Pre-Sales Support</td>
+ <td>New York</td>
+ <td>21</td>
+ <td>2011/12/12</td>
+ <td>$106,450</td>
+ </tr>
+ <tr>
+ <td>Doris Wilder</td>
+ <td>Sales Assistant</td>
+ <td>Sidney</td>
+ <td>23</td>
+ <td>2010/09/20</td>
+ <td>$85,600</td>
+ </tr>
+ <tr>
+ <td>Angelica Ramos</td>
+ <td>Chief Executive Officer
(CEO)</td>
+ <td>London</td>
+ <td>47</td>
+ <td>2009/10/09</td>
+ <td>$1,200,000</td>
+ </tr>
+ <tr>
+ <td>Gavin Joyce</td>
+ <td>Developer</td>
+ <td>Edinburgh</td>
+ <td>42</td>
+ <td>2010/12/22</td>
+ <td>$92,575</td>
+ </tr>
+ <tr>
+ <td>Jennifer Chang</td>
+ <td>Regional Director</td>
+ <td>Singapore</td>
+ <td>28</td>
+ <td>2010/11/14</td>
+ <td>$357,650</td>
+ </tr>
+ <tr>
+ <td>Brenden Wagner</td>
+ <td>Software Engineer</td>
+ <td>San Francisco</td>
+ <td>28</td>
+ <td>2011/06/07</td>
+ <td>$206,850</td>
+ </tr>
+ <tr>
+ <td>Fiona Green</td>
+ <td>Chief Operating Officer
(COO)</td>
+ <td>San Francisco</td>
+ <td>48</td>
+ <td>2010/03/11</td>
+ <td>$850,000</td>
+ </tr>
+ <tr>
+ <td>Shou Itou</td>
+ <td>Regional Marketing</td>
+ <td>Tokyo</td>
+ <td>20</td>
+ <td>2011/08/14</td>
+ <td>$163,000</td>
+ </tr>
+ <tr>
+ <td>Michelle House</td>
+ <td>Integration Specialist</td>
+ <td>Sidney</td>
+ <td>37</td>
+ <td>2011/06/02</td>
+ <td>$95,400</td>
+ </tr>
+ <tr>
+ <td>Suki Burks</td>
+ <td>Developer</td>
+ <td>London</td>
+ <td>53</td>
+ <td>2009/10/22</td>
+ <td>$114,500</td>
+ </tr>
+ <tr>
+ <td>Prescott Bartlett</td>
+ <td>Technical Author</td>
+ <td>London</td>
+ <td>27</td>
+ <td>2011/05/07</td>
+ <td>$145,000</td>
+ </tr>
+ <tr>
+ <td>Gavin Cortez</td>
+ <td>Team Leader</td>
+ <td>San Francisco</td>
+ <td>22</td>
+ <td>2008/10/26</td>
+ <td>$235,500</td>
+ </tr>
+ <tr>
+ <td>Martena Mccray</td>
+ <td>Post-Sales support</td>
+ <td>Edinburgh</td>
+ <td>46</td>
+ <td>2011/03/09</td>
+ <td>$324,050</td>
+ </tr>
+ <tr>
+ <td>Unity Butler</td>
+ <td>Marketing Designer</td>
+ <td>San Francisco</td>
+ <td>47</td>
+ <td>2009/12/09</td>
+ <td>$85,675</td>
+ </tr>
+ <tr>
+ <td>Howard Hatfield</td>
+ <td>Office Manager</td>
+ <td>San Francisco</td>
+ <td>51</td>
+ <td>2008/12/16</td>
+ <td>$164,500</td>
+ </tr>
+ <tr>
+ <td>Hope Fuentes</td>
+ <td>Secretary</td>
+ <td>San Francisco</td>
+ <td>41</td>
+ <td>2010/02/12</td>
+ <td>$109,850</td>
+ </tr>
+ <tr>
+ <td>Vivian Harrell</td>
+ <td>Financial Controller</td>
+ <td>San Francisco</td>
+ <td>62</td>
+ <td>2009/02/14</td>
+ <td>$452,500</td>
+ </tr>
+ <tr>
+ <td>Timothy Mooney</td>
+ <td>Office Manager</td>
+ <td>London</td>
+ <td>37</td>
+ <td>2008/12/11</td>
+ <td>$136,200</td>
+ </tr>
+ <tr>
+ <td>Jackson Bradshaw</td>
+ <td>Director</td>
+ <td>New York</td>
+ <td>65</td>
+ <td>2008/09/26</td>
+ <td>$645,750</td>
+ </tr>
+ <tr>
+ <td>Olivia Liang</td>
+ <td>Support Engineer</td>
+ <td>Singapore</td>
+ <td>64</td>
+ <td>2011/02/03</td>
+ <td>$234,500</td>
+ </tr>
+ <tr>
+ <td>Bruno Nash</td>
+ <td>Software Engineer</td>
+ <td>London</td>
+ <td>38</td>
+ <td>2011/05/03</td>
+ <td>$163,500</td>
+ </tr>
+ <tr>
+ <td>Sakura Yamamoto</td>
+ <td>Support Engineer</td>
+ <td>Tokyo</td>
+ <td>37</td>
+ <td>2009/08/19</td>
+ <td>$139,575</td>
+ </tr>
+ <tr>
+ <td>Thor Walton</td>
+ <td>Developer</td>
+ <td>New York</td>
+ <td>61</td>
+ <td>2013/08/11</td>
+ <td>$98,540</td>
+ </tr>
+ <tr>
+ <td>Finn Camacho</td>
+ <td>Support Engineer</td>
+ <td>San Francisco</td>
+ <td>47</td>
+ <td>2009/07/07</td>
+ <td>$87,500</td>
+ </tr>
+ <tr>
+ <td>Serge Baldwin</td>
+ <td>Data Coordinator</td>
+ <td>Singapore</td>
+ <td>64</td>
+ <td>2012/04/09</td>
+ <td>$138,575</td>
+ </tr>
+ <tr>
+ <td>Zenaida Frank</td>
+ <td>Software Engineer</td>
+ <td>New York</td>
+ <td>63</td>
+ <td>2010/01/04</td>
+ <td>$125,250</td>
+ </tr>
+ <tr>
+ <td>Zorita Serrano</td>
+ <td>Software Engineer</td>
+ <td>San Francisco</td>
+ <td>56</td>
+ <td>2012/06/01</td>
+ <td>$115,000</td>
+ </tr>
+ <tr>
+ <td>Jennifer Acosta</td>
+ <td>Junior Javascript
Developer</td>
+ <td>Edinburgh</td>
+ <td>43</td>
+ <td>2013/02/01</td>
+ <td>$75,650</td>
+ </tr>
+ <tr>
+ <td>Cara Stevens</td>
+ <td>Sales Assistant</td>
+ <td>New York</td>
+ <td>46</td>
+ <td>2011/12/06</td>
+ <td>$145,600</td>
+ </tr>
+ <tr>
+ <td>Hermione Butler</td>
+ <td>Regional Director</td>
+ <td>London</td>
+ <td>47</td>
+ <td>2011/03/21</td>
+ <td>$356,250</td>
+ </tr>
+ <tr>
+ <td>Lael Greer</td>
+ <td>Systems Administrator</td>
+ <td>London</td>
+ <td>21</td>
+ <td>2009/02/27</td>
+ <td>$103,500</td>
+ </tr>
+ <tr>
+ <td>Jonas Alexander</td>
+ <td>Developer</td>
+ <td>San Francisco</td>
+ <td>30</td>
+ <td>2010/07/14</td>
+ <td>$86,500</td>
+ </tr>
+ <tr>
+ <td>Shad Decker</td>
+ <td>Regional Director</td>
+ <td>Edinburgh</td>
+ <td>51</td>
+ <td>2008/11/13</td>
+ <td>$183,000</td>
+ </tr>
+ <tr>
+ <td>Michael Bruce</td>
+ <td>Javascript Developer</td>
+ <td>Singapore</td>
+ <td>29</td>
+ <td>2011/06/27</td>
+ <td>$183,000</td>
+ </tr>
+ <tr>
+ <td>Donna Snider</td>
+ <td>Customer Support</td>
+ <td>New York</td>
+ <td>27</td>
+ <td>2011/01/25</td>
+ <td>$112,000</td>
+ </tr>
+ </tbody>
+ </table>
+ <ul class="tabs">
+ <li class="active">Javascript</li>
+ <li>HTML</li>
+ <li>CSS</li>
+ <li>Ajax</li>
+ <li>Server-side script</li>
+ </ul>
+ <div class="tabs">
+ <div class="js">
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
+ $('#example').DataTable( {
+ autoFill: true
+ } );
+} );</code>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
+ <ul>
+ <li>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
+ </li>
+ <li>
+ <a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
+ </li>
+ <li>
+ <a
href="../../../../media/js/dataTables.bootstrap4.js">../../../../media/js/dataTables.bootstrap4.js</a>
+ </li>
+ <li>
+ <a
href="../../js/dataTables.autoFill.js">../../js/dataTables.autoFill.js</a>
+ </li>
+ <li>
+ <a
href="../../js/autoFill.bootstrap4.js">../../js/autoFill.bootstrap4.js</a>
+ </li>
+ </ul>
+ </div>
+ <div class="table">
+ <p>The HTML shown below is the raw HTML
table element, before it has been enhanced by DataTables:</p>
+ </div>
+ <div class="css">
+ <div>
+ <p>This example uses a little
bit of additional CSS beyond what is loaded from the library files (below), in
order to correctly display the table. The
+ additional CSS used is shown
below:</p><code class="multiline language-css"></code>
+ </div>
+ <p>The following CSS library files are
loaded for use in this example to provide the styling of the table:</p>
+ <ul>
+ <li>
+ <a href=
+
"//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.css">//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.css</a>
+ </li>
+ <li>
+ <a
href="../../../../media/css/dataTables.bootstrap4.css">../../../../media/css/dataTables.bootstrap4.css</a>
+ </li>
+ <li>
+ <a
href="../../css/autoFill.bootstrap4.css">../../css/autoFill.bootstrap4.css</a>
+ </li>
+ </ul>
+ </div>
+ <div class="ajax">
+ <p>This table loads data by Ajax. The
latest data that has been loaded is shown below. This data will update
automatically as any additional data is
+ loaded.</p>
+ </div>
+ <div class="php">
+ <p>The script used to perform the
server-side processing for this table is shown below. Please note that this is
just an example script using PHP. Server-side
+ processing scripts can be written in
any language, using <a href="//datatables.net/manual/server-side">the protocol
described in the DataTables
+ documentation</a>.</p>
+ </div>
+ </div>
+ </section>
+ </div>
+ <section>
+ <div class="footer">
+ <div class="gradient"></div>
+ <div class="liner">
+ <h2>Other examples</h2>
+ <div class="toc">
+ <div class="toc-group">
+ <h3><a
href="../initialisation/index.html">Initialisation</a></h3>
+ <ul class="toc">
+ <li>
+ <a
href="../initialisation/simple.html">Basic initialisation</a>
+ </li>
+ <li>
+ <a
href="../initialisation/fills.html">Fill types</a>
+ </li>
+ <li>
+ <a
href="../initialisation/keyTable.html">KeyTable integration</a>
+ </li>
+ <li>
+ <a
href="../initialisation/events.html">Events</a>
+ </li>
+ <li>
+ <a
href="../initialisation/alwaysAsk.html">Always confirm action</a>
+ </li>
+ <li>
+ <a
href="../initialisation/columns.html">Column selector</a>
+ </li>
+ <li>
+ <a
href="../initialisation/focus.html">Click focus</a>
+ </li>
+ <li>
+ <a
href="../initialisation/scrolling.html">Scrolling DataTable</a>
+ </li>
+ <li>
+ <a
href="../initialisation/plugins.html">Fill plug-ins</a>
+ </li>
+ </ul>
+ </div>
+ <div class="toc-group">
+ <h3><a
href="./index.html">Styling</a></h3>
+ <ul class="toc active">
+ <li>
+ <a
href="./bootstrap.html">Bootstrap styling</a>
+ </li>
+ <li class="active">
+ <a
href="./bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
+ <a
href="./foundation.html">Foundation styling</a>
+ </li>
+ <li>
+ <a
href="./semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
+ <a
href="./jqueryui.html">jQuery UI styling</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="epilogue">
+ <p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
+ Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
+
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
+ DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
+ </div>
+ </div>
+ </div>
+ </section>
+</body>
+</html>
\ No newline at end of file
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/foundation.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/foundation.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/foundation.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -13,7 +13,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -547,7 +547,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -641,10 +641,16 @@
<li>
<a
href="./bootstrap.html">Bootstrap styling</a>
</li>
+ <li>
+ <a
href="./bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
<li class="active">
<a
href="./foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="./semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="./jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -654,7 +660,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/index.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/index.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/index.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
<link rel="stylesheet" type="text/css"
href="../../../../examples/resources/syntax/shCore.css">
<link rel="stylesheet" type="text/css"
href="../../../../examples/resources/demo.css">
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../examples/resources/syntax/shCore.js">
</script>
@@ -37,9 +37,15 @@
<a
href="./bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="./bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="./foundation.html">Foundation styling</a>
</li>
<li>
+ <a
href="./semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
<a
href="./jqueryui.html">jQuery UI styling</a>
</li>
</ul>
@@ -49,7 +55,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/jqueryui.html
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/jqueryui.html
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/jqueryui.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -5,7 +5,7 @@
<link rel="shortcut icon" type="image/ico"
href="http://www.datatables.net/favicon.ico">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
<title>AutoFill example - jQuery UI styling</title>
- <link rel="stylesheet" type="text/css"
href="//code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css">
+ <link rel="stylesheet" type="text/css"
href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" type="text/css"
href="../../../../media/css/dataTables.jqueryui.css">
<link rel="stylesheet" type="text/css"
href="../../css/autoFill.jqueryui.css">
<link rel="stylesheet" type="text/css"
href="../../../../examples/resources/syntax/shCore.css">
@@ -13,7 +13,7 @@
<style type="text/css" class="init">
</style>
- <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.11.3.min.js">
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
</script>
<script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
</script>
@@ -545,7 +545,7 @@
<p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li>
- <a
href="//code.jquery.com/jquery-1.11.3.min.js">//code.jquery.com/jquery-1.11.3.min.js</a>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
</li>
<li>
<a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
@@ -572,7 +572,7 @@
<p>The following CSS library files are
loaded for use in this example to provide the styling of the table:</p>
<ul>
<li>
- <a
href="//code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css">//code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css</a>
+ <a
href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css</a>
</li>
<li>
<a
href="../../../../media/css/dataTables.jqueryui.css">../../../../media/css/dataTables.jqueryui.css</a>
@@ -639,8 +639,14 @@
<a
href="./bootstrap.html">Bootstrap styling</a>
</li>
<li>
+ <a
href="./bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
<a
href="./foundation.html">Foundation styling</a>
</li>
+ <li>
+ <a
href="./semanticui.html">Semantic UI styling</a>
+ </li>
<li class="active">
<a
href="./jqueryui.html">jQuery UI styling</a>
</li>
@@ -651,7 +657,7 @@
<p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
- <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2015<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
</div>
</div>
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/semanticui.html
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/semanticui.html)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/semanticui.html
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/examples/styling/semanticui.html
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,668 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <link rel="shortcut icon" type="image/ico"
href="http://www.datatables.net/favicon.ico">
+ <meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
+ <title>AutoFill example - Semantic UI styling</title>
+ <link rel="stylesheet" type="text/css"
href="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css">
+ <link rel="stylesheet" type="text/css"
href="../../../../media/css/dataTables.semanticui.css">
+ <link rel="stylesheet" type="text/css"
href="../../css/autoFill.semanticui.css">
+ <link rel="stylesheet" type="text/css"
href="../../../../examples/resources/syntax/shCore.css">
+ <link rel="stylesheet" type="text/css"
href="../../../../examples/resources/demo.css">
+ <style type="text/css" class="init">
+
+ </style>
+ <script type="text/javascript" language="javascript"
src="//code.jquery.com/jquery-1.12.3.min.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../media/js/jquery.dataTables.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../media/js/dataTables.semanticui.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../js/dataTables.autoFill.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../js/autoFill.semanticui.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../examples/resources/syntax/shCore.js">
+ </script>
+ <script type="text/javascript" language="javascript"
src="../../../../examples/resources/demo.js">
+ </script>
+ <script type="text/javascript" language="javascript" class="init">
+
+
+
+$(document).ready(function() {
+ $('#example').DataTable( {
+ autoFill: true
+ } );
+} );
+
+
+
+ </script>
+</head>
+<body class="dt-example dt-example-semanticui">
+ <div class="container">
+ <section>
+ <h1>AutoFill example <span>Semantic UI
styling</span></h1>
+ <div class="info">
+ <p>This example shows DataTables and the
AutoFill extension being used with <a href="http://semantic-ui.com">Semantic
UI</a> providing the styling. The DataTables
+ / Semantic UI integration provides seamless
integration for DataTables to be used in a Semantic UI page.</p>
+ </div>
+ <table id="example" class="ui celled table"
cellspacing="0" width="100%">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Position</th>
+ <th>Office</th>
+ <th>Age</th>
+ <th>Start date</th>
+ <th>Salary</th>
+ </tr>
+ </thead>
+ <tfoot>
+ <tr>
+ <th>Name</th>
+ <th>Position</th>
+ <th>Office</th>
+ <th>Age</th>
+ <th>Start date</th>
+ <th>Salary</th>
+ </tr>
+ </tfoot>
+ <tbody>
+ <tr>
+ <td>Tiger Nixon</td>
+ <td>System Architect</td>
+ <td>Edinburgh</td>
+ <td>61</td>
+ <td>2011/04/25</td>
+ <td>$320,800</td>
+ </tr>
+ <tr>
+ <td>Garrett Winters</td>
+ <td>Accountant</td>
+ <td>Tokyo</td>
+ <td>63</td>
+ <td>2011/07/25</td>
+ <td>$170,750</td>
+ </tr>
+ <tr>
+ <td>Ashton Cox</td>
+ <td>Junior Technical Author</td>
+ <td>San Francisco</td>
+ <td>66</td>
+ <td>2009/01/12</td>
+ <td>$86,000</td>
+ </tr>
+ <tr>
+ <td>Cedric Kelly</td>
+ <td>Senior Javascript
Developer</td>
+ <td>Edinburgh</td>
+ <td>22</td>
+ <td>2012/03/29</td>
+ <td>$433,060</td>
+ </tr>
+ <tr>
+ <td>Airi Satou</td>
+ <td>Accountant</td>
+ <td>Tokyo</td>
+ <td>33</td>
+ <td>2008/11/28</td>
+ <td>$162,700</td>
+ </tr>
+ <tr>
+ <td>Brielle Williamson</td>
+ <td>Integration Specialist</td>
+ <td>New York</td>
+ <td>61</td>
+ <td>2012/12/02</td>
+ <td>$372,000</td>
+ </tr>
+ <tr>
+ <td>Herrod Chandler</td>
+ <td>Sales Assistant</td>
+ <td>San Francisco</td>
+ <td>59</td>
+ <td>2012/08/06</td>
+ <td>$137,500</td>
+ </tr>
+ <tr>
+ <td>Rhona Davidson</td>
+ <td>Integration Specialist</td>
+ <td>Tokyo</td>
+ <td>55</td>
+ <td>2010/10/14</td>
+ <td>$327,900</td>
+ </tr>
+ <tr>
+ <td>Colleen Hurst</td>
+ <td>Javascript Developer</td>
+ <td>San Francisco</td>
+ <td>39</td>
+ <td>2009/09/15</td>
+ <td>$205,500</td>
+ </tr>
+ <tr>
+ <td>Sonya Frost</td>
+ <td>Software Engineer</td>
+ <td>Edinburgh</td>
+ <td>23</td>
+ <td>2008/12/13</td>
+ <td>$103,600</td>
+ </tr>
+ <tr>
+ <td>Jena Gaines</td>
+ <td>Office Manager</td>
+ <td>London</td>
+ <td>30</td>
+ <td>2008/12/19</td>
+ <td>$90,560</td>
+ </tr>
+ <tr>
+ <td>Quinn Flynn</td>
+ <td>Support Lead</td>
+ <td>Edinburgh</td>
+ <td>22</td>
+ <td>2013/03/03</td>
+ <td>$342,000</td>
+ </tr>
+ <tr>
+ <td>Charde Marshall</td>
+ <td>Regional Director</td>
+ <td>San Francisco</td>
+ <td>36</td>
+ <td>2008/10/16</td>
+ <td>$470,600</td>
+ </tr>
+ <tr>
+ <td>Haley Kennedy</td>
+ <td>Senior Marketing
Designer</td>
+ <td>London</td>
+ <td>43</td>
+ <td>2012/12/18</td>
+ <td>$313,500</td>
+ </tr>
+ <tr>
+ <td>Tatyana Fitzpatrick</td>
+ <td>Regional Director</td>
+ <td>London</td>
+ <td>19</td>
+ <td>2010/03/17</td>
+ <td>$385,750</td>
+ </tr>
+ <tr>
+ <td>Michael Silva</td>
+ <td>Marketing Designer</td>
+ <td>London</td>
+ <td>66</td>
+ <td>2012/11/27</td>
+ <td>$198,500</td>
+ </tr>
+ <tr>
+ <td>Paul Byrd</td>
+ <td>Chief Financial Officer
(CFO)</td>
+ <td>New York</td>
+ <td>64</td>
+ <td>2010/06/09</td>
+ <td>$725,000</td>
+ </tr>
+ <tr>
+ <td>Gloria Little</td>
+ <td>Systems Administrator</td>
+ <td>New York</td>
+ <td>59</td>
+ <td>2009/04/10</td>
+ <td>$237,500</td>
+ </tr>
+ <tr>
+ <td>Bradley Greer</td>
+ <td>Software Engineer</td>
+ <td>London</td>
+ <td>41</td>
+ <td>2012/10/13</td>
+ <td>$132,000</td>
+ </tr>
+ <tr>
+ <td>Dai Rios</td>
+ <td>Personnel Lead</td>
+ <td>Edinburgh</td>
+ <td>35</td>
+ <td>2012/09/26</td>
+ <td>$217,500</td>
+ </tr>
+ <tr>
+ <td>Jenette Caldwell</td>
+ <td>Development Lead</td>
+ <td>New York</td>
+ <td>30</td>
+ <td>2011/09/03</td>
+ <td>$345,000</td>
+ </tr>
+ <tr>
+ <td>Yuri Berry</td>
+ <td>Chief Marketing Officer
(CMO)</td>
+ <td>New York</td>
+ <td>40</td>
+ <td>2009/06/25</td>
+ <td>$675,000</td>
+ </tr>
+ <tr>
+ <td>Caesar Vance</td>
+ <td>Pre-Sales Support</td>
+ <td>New York</td>
+ <td>21</td>
+ <td>2011/12/12</td>
+ <td>$106,450</td>
+ </tr>
+ <tr>
+ <td>Doris Wilder</td>
+ <td>Sales Assistant</td>
+ <td>Sidney</td>
+ <td>23</td>
+ <td>2010/09/20</td>
+ <td>$85,600</td>
+ </tr>
+ <tr>
+ <td>Angelica Ramos</td>
+ <td>Chief Executive Officer
(CEO)</td>
+ <td>London</td>
+ <td>47</td>
+ <td>2009/10/09</td>
+ <td>$1,200,000</td>
+ </tr>
+ <tr>
+ <td>Gavin Joyce</td>
+ <td>Developer</td>
+ <td>Edinburgh</td>
+ <td>42</td>
+ <td>2010/12/22</td>
+ <td>$92,575</td>
+ </tr>
+ <tr>
+ <td>Jennifer Chang</td>
+ <td>Regional Director</td>
+ <td>Singapore</td>
+ <td>28</td>
+ <td>2010/11/14</td>
+ <td>$357,650</td>
+ </tr>
+ <tr>
+ <td>Brenden Wagner</td>
+ <td>Software Engineer</td>
+ <td>San Francisco</td>
+ <td>28</td>
+ <td>2011/06/07</td>
+ <td>$206,850</td>
+ </tr>
+ <tr>
+ <td>Fiona Green</td>
+ <td>Chief Operating Officer
(COO)</td>
+ <td>San Francisco</td>
+ <td>48</td>
+ <td>2010/03/11</td>
+ <td>$850,000</td>
+ </tr>
+ <tr>
+ <td>Shou Itou</td>
+ <td>Regional Marketing</td>
+ <td>Tokyo</td>
+ <td>20</td>
+ <td>2011/08/14</td>
+ <td>$163,000</td>
+ </tr>
+ <tr>
+ <td>Michelle House</td>
+ <td>Integration Specialist</td>
+ <td>Sidney</td>
+ <td>37</td>
+ <td>2011/06/02</td>
+ <td>$95,400</td>
+ </tr>
+ <tr>
+ <td>Suki Burks</td>
+ <td>Developer</td>
+ <td>London</td>
+ <td>53</td>
+ <td>2009/10/22</td>
+ <td>$114,500</td>
+ </tr>
+ <tr>
+ <td>Prescott Bartlett</td>
+ <td>Technical Author</td>
+ <td>London</td>
+ <td>27</td>
+ <td>2011/05/07</td>
+ <td>$145,000</td>
+ </tr>
+ <tr>
+ <td>Gavin Cortez</td>
+ <td>Team Leader</td>
+ <td>San Francisco</td>
+ <td>22</td>
+ <td>2008/10/26</td>
+ <td>$235,500</td>
+ </tr>
+ <tr>
+ <td>Martena Mccray</td>
+ <td>Post-Sales support</td>
+ <td>Edinburgh</td>
+ <td>46</td>
+ <td>2011/03/09</td>
+ <td>$324,050</td>
+ </tr>
+ <tr>
+ <td>Unity Butler</td>
+ <td>Marketing Designer</td>
+ <td>San Francisco</td>
+ <td>47</td>
+ <td>2009/12/09</td>
+ <td>$85,675</td>
+ </tr>
+ <tr>
+ <td>Howard Hatfield</td>
+ <td>Office Manager</td>
+ <td>San Francisco</td>
+ <td>51</td>
+ <td>2008/12/16</td>
+ <td>$164,500</td>
+ </tr>
+ <tr>
+ <td>Hope Fuentes</td>
+ <td>Secretary</td>
+ <td>San Francisco</td>
+ <td>41</td>
+ <td>2010/02/12</td>
+ <td>$109,850</td>
+ </tr>
+ <tr>
+ <td>Vivian Harrell</td>
+ <td>Financial Controller</td>
+ <td>San Francisco</td>
+ <td>62</td>
+ <td>2009/02/14</td>
+ <td>$452,500</td>
+ </tr>
+ <tr>
+ <td>Timothy Mooney</td>
+ <td>Office Manager</td>
+ <td>London</td>
+ <td>37</td>
+ <td>2008/12/11</td>
+ <td>$136,200</td>
+ </tr>
+ <tr>
+ <td>Jackson Bradshaw</td>
+ <td>Director</td>
+ <td>New York</td>
+ <td>65</td>
+ <td>2008/09/26</td>
+ <td>$645,750</td>
+ </tr>
+ <tr>
+ <td>Olivia Liang</td>
+ <td>Support Engineer</td>
+ <td>Singapore</td>
+ <td>64</td>
+ <td>2011/02/03</td>
+ <td>$234,500</td>
+ </tr>
+ <tr>
+ <td>Bruno Nash</td>
+ <td>Software Engineer</td>
+ <td>London</td>
+ <td>38</td>
+ <td>2011/05/03</td>
+ <td>$163,500</td>
+ </tr>
+ <tr>
+ <td>Sakura Yamamoto</td>
+ <td>Support Engineer</td>
+ <td>Tokyo</td>
+ <td>37</td>
+ <td>2009/08/19</td>
+ <td>$139,575</td>
+ </tr>
+ <tr>
+ <td>Thor Walton</td>
+ <td>Developer</td>
+ <td>New York</td>
+ <td>61</td>
+ <td>2013/08/11</td>
+ <td>$98,540</td>
+ </tr>
+ <tr>
+ <td>Finn Camacho</td>
+ <td>Support Engineer</td>
+ <td>San Francisco</td>
+ <td>47</td>
+ <td>2009/07/07</td>
+ <td>$87,500</td>
+ </tr>
+ <tr>
+ <td>Serge Baldwin</td>
+ <td>Data Coordinator</td>
+ <td>Singapore</td>
+ <td>64</td>
+ <td>2012/04/09</td>
+ <td>$138,575</td>
+ </tr>
+ <tr>
+ <td>Zenaida Frank</td>
+ <td>Software Engineer</td>
+ <td>New York</td>
+ <td>63</td>
+ <td>2010/01/04</td>
+ <td>$125,250</td>
+ </tr>
+ <tr>
+ <td>Zorita Serrano</td>
+ <td>Software Engineer</td>
+ <td>San Francisco</td>
+ <td>56</td>
+ <td>2012/06/01</td>
+ <td>$115,000</td>
+ </tr>
+ <tr>
+ <td>Jennifer Acosta</td>
+ <td>Junior Javascript
Developer</td>
+ <td>Edinburgh</td>
+ <td>43</td>
+ <td>2013/02/01</td>
+ <td>$75,650</td>
+ </tr>
+ <tr>
+ <td>Cara Stevens</td>
+ <td>Sales Assistant</td>
+ <td>New York</td>
+ <td>46</td>
+ <td>2011/12/06</td>
+ <td>$145,600</td>
+ </tr>
+ <tr>
+ <td>Hermione Butler</td>
+ <td>Regional Director</td>
+ <td>London</td>
+ <td>47</td>
+ <td>2011/03/21</td>
+ <td>$356,250</td>
+ </tr>
+ <tr>
+ <td>Lael Greer</td>
+ <td>Systems Administrator</td>
+ <td>London</td>
+ <td>21</td>
+ <td>2009/02/27</td>
+ <td>$103,500</td>
+ </tr>
+ <tr>
+ <td>Jonas Alexander</td>
+ <td>Developer</td>
+ <td>San Francisco</td>
+ <td>30</td>
+ <td>2010/07/14</td>
+ <td>$86,500</td>
+ </tr>
+ <tr>
+ <td>Shad Decker</td>
+ <td>Regional Director</td>
+ <td>Edinburgh</td>
+ <td>51</td>
+ <td>2008/11/13</td>
+ <td>$183,000</td>
+ </tr>
+ <tr>
+ <td>Michael Bruce</td>
+ <td>Javascript Developer</td>
+ <td>Singapore</td>
+ <td>29</td>
+ <td>2011/06/27</td>
+ <td>$183,000</td>
+ </tr>
+ <tr>
+ <td>Donna Snider</td>
+ <td>Customer Support</td>
+ <td>New York</td>
+ <td>27</td>
+ <td>2011/01/25</td>
+ <td>$112,000</td>
+ </tr>
+ </tbody>
+ </table>
+ <ul class="tabs">
+ <li class="active">Javascript</li>
+ <li>HTML</li>
+ <li>CSS</li>
+ <li>Ajax</li>
+ <li>Server-side script</li>
+ </ul>
+ <div class="tabs">
+ <div class="js">
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
+ $('#example').DataTable( {
+ autoFill: true
+ } );
+} );</code>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
+ <ul>
+ <li>
+ <a
href="//code.jquery.com/jquery-1.12.3.min.js">//code.jquery.com/jquery-1.12.3.min.js</a>
+ </li>
+ <li>
+ <a
href="../../../../media/js/jquery.dataTables.js">../../../../media/js/jquery.dataTables.js</a>
+ </li>
+ <li>
+ <a
href="../../../../media/js/dataTables.semanticui.js">../../../../media/js/dataTables.semanticui.js</a>
+ </li>
+ <li>
+ <a
href="../../js/dataTables.autoFill.js">../../js/dataTables.autoFill.js</a>
+ </li>
+ <li>
+ <a
href="../../js/autoFill.semanticui.js">../../js/autoFill.semanticui.js</a>
+ </li>
+ </ul>
+ </div>
+ <div class="table">
+ <p>The HTML shown below is the raw HTML
table element, before it has been enhanced by DataTables:</p>
+ </div>
+ <div class="css">
+ <div>
+ <p>This example uses a little
bit of additional CSS beyond what is loaded from the library files (below), in
order to correctly display the table. The
+ additional CSS used is shown
below:</p><code class="multiline language-css"></code>
+ </div>
+ <p>The following CSS library files are
loaded for use in this example to provide the styling of the table:</p>
+ <ul>
+ <li>
+ <a
href="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css">//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css</a>
+ </li>
+ <li>
+ <a
href="../../../../media/css/dataTables.semanticui.css">../../../../media/css/dataTables.semanticui.css</a>
+ </li>
+ <li>
+ <a
href="../../css/autoFill.semanticui.css">../../css/autoFill.semanticui.css</a>
+ </li>
+ </ul>
+ </div>
+ <div class="ajax">
+ <p>This table loads data by Ajax. The
latest data that has been loaded is shown below. This data will update
automatically as any additional data is
+ loaded.</p>
+ </div>
+ <div class="php">
+ <p>The script used to perform the
server-side processing for this table is shown below. Please note that this is
just an example script using PHP. Server-side
+ processing scripts can be written in
any language, using <a href="//datatables.net/manual/server-side">the protocol
described in the DataTables
+ documentation</a>.</p>
+ </div>
+ </div>
+ </section>
+ </div>
+ <section>
+ <div class="footer">
+ <div class="gradient"></div>
+ <div class="liner">
+ <h2>Other examples</h2>
+ <div class="toc">
+ <div class="toc-group">
+ <h3><a
href="../initialisation/index.html">Initialisation</a></h3>
+ <ul class="toc">
+ <li>
+ <a
href="../initialisation/simple.html">Basic initialisation</a>
+ </li>
+ <li>
+ <a
href="../initialisation/fills.html">Fill types</a>
+ </li>
+ <li>
+ <a
href="../initialisation/keyTable.html">KeyTable integration</a>
+ </li>
+ <li>
+ <a
href="../initialisation/events.html">Events</a>
+ </li>
+ <li>
+ <a
href="../initialisation/alwaysAsk.html">Always confirm action</a>
+ </li>
+ <li>
+ <a
href="../initialisation/columns.html">Column selector</a>
+ </li>
+ <li>
+ <a
href="../initialisation/focus.html">Click focus</a>
+ </li>
+ <li>
+ <a
href="../initialisation/scrolling.html">Scrolling DataTable</a>
+ </li>
+ <li>
+ <a
href="../initialisation/plugins.html">Fill plug-ins</a>
+ </li>
+ </ul>
+ </div>
+ <div class="toc-group">
+ <h3><a
href="./index.html">Styling</a></h3>
+ <ul class="toc active">
+ <li>
+ <a
href="./bootstrap.html">Bootstrap styling</a>
+ </li>
+ <li>
+ <a
href="./bootstrap4.html">Bootstrap 4 styling</a>
+ </li>
+ <li>
+ <a
href="./foundation.html">Foundation styling</a>
+ </li>
+ <li class="active">
+ <a
href="./semanticui.html">Semantic UI styling</a>
+ </li>
+ <li>
+ <a
href="./jqueryui.html">jQuery UI styling</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="epilogue">
+ <p>Please refer to the <a
href="http://www.datatables.net">DataTables documentation</a> for full
information about its API properties and methods.<br>
+ Additionally, there are a wide range of
<a href="http://www.datatables.net/extensions">extensions</a> and <a href=
+
"http://www.datatables.net/plug-ins">plug-ins</a> which extend the capabilities
of DataTables.</p>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk">SpryMedia Ltd</a>
© 2007-2016<br>
+ DataTables is licensed under the <a
href="http://www.datatables.net/mit">MIT license</a>.</p>
+ </div>
+ </div>
+ </div>
+ </section>
+</body>
+</html>
\ No newline at end of file
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.js
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.js)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.js
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,43 @@
+/*! Bootstrap integration for DataTables' AutoFill
+ * ©2015 SpryMedia Ltd - datatables.net/license
+ */
+
+(function( factory ){
+ if ( typeof define === 'function' && define.amd ) {
+ // AMD
+ define( ['jquery', 'datatables.net-bs4',
'datatables.net-autofill'], function ( $ ) {
+ return factory( $, window, document );
+ } );
+ }
+ else if ( typeof exports === 'object' ) {
+ // CommonJS
+ module.exports = function (root, $) {
+ if ( ! root ) {
+ root = window;
+ }
+
+ if ( ! $ || ! $.fn.dataTable ) {
+ $ = require('datatables.net-bs4')(root, $).$;
+ }
+
+ if ( ! $.fn.dataTable.AutoFill ) {
+ require('datatables.net-autofill')(root, $);
+ }
+
+ return factory( $, root, root.document );
+ };
+ }
+ else {
+ // Browser
+ factory( jQuery, window, document );
+ }
+}(function( $, window, document, undefined ) {
+'use strict';
+var DataTable = $.fn.dataTable;
+
+
+DataTable.AutoFill.classes.btn = 'btn btn-primary';
+
+
+return DataTable;
+}));
\ No newline at end of file
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.min.js
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.min.js)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.min.js
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.bootstrap4.min.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,5 @@
+/*!
+ Bootstrap integration for DataTables' AutoFill
+ ©2015 SpryMedia Ltd - datatables.net/license
+*/
+(function(a){"function"===typeof
define&&define.amd?define(["jquery","datatables.net-bs4","datatables.net-autofill"],function(b){return
a(b,window,document)}):"object"===typeof
exports?module.exports=function(b,c){b||(b=window);if(!c||!c.fn.dataTable)c=require("datatables.net-bs4")(b,c).$;c.fn.dataTable.AutoFill||require("datatables.net-autofill")(b,c);return
a(c,b,b.document)}:a(jQuery,window,document)})(function(a){a=a.fn.dataTable;a.AutoFill.classes.btn="btn
btn-primary";return a});
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.js
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.js)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.js
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,43 @@
+/*! Bootstrap integration for DataTables' AutoFill
+ * ©2015 SpryMedia Ltd - datatables.net/license
+ */
+
+(function( factory ){
+ if ( typeof define === 'function' && define.amd ) {
+ // AMD
+ define( ['jquery', 'datatables.net-se',
'datatables.net-autofill'], function ( $ ) {
+ return factory( $, window, document );
+ } );
+ }
+ else if ( typeof exports === 'object' ) {
+ // CommonJS
+ module.exports = function (root, $) {
+ if ( ! root ) {
+ root = window;
+ }
+
+ if ( ! $ || ! $.fn.dataTable ) {
+ $ = require('datatables.net-se')(root, $).$;
+ }
+
+ if ( ! $.fn.dataTable.AutoFill ) {
+ require('datatables.net-autofill')(root, $);
+ }
+
+ return factory( $, root, root.document );
+ };
+ }
+ else {
+ // Browser
+ factory( jQuery, window, document );
+ }
+}(function( $, window, document, undefined ) {
+'use strict';
+var DataTable = $.fn.dataTable;
+
+
+DataTable.AutoFill.classes.btn = 'ui button';
+
+
+return DataTable;
+}));
\ No newline at end of file
Copied:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.min.js
(from rev 15304,
trunk/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.min.js)
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.min.js
(rev 0)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/autoFill.semanticui.min.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -0,0 +1,5 @@
+/*!
+ Bootstrap integration for DataTables' AutoFill
+ ©2015 SpryMedia Ltd - datatables.net/license
+*/
+(function(a){"function"===typeof
define&&define.amd?define(["jquery","datatables.net-se","datatables.net-autofill"],function(b){return
a(b,window,document)}):"object"===typeof
exports?module.exports=function(b,c){b||(b=window);if(!c||!c.fn.dataTable)c=require("datatables.net-se")(b,c).$;c.fn.dataTable.AutoFill||require("datatables.net-autofill")(b,c);return
a(c,b,b.document)}:a(jQuery,window,document)})(function(a){a=a.fn.dataTable;a.AutoFill.classes.btn="ui
button";return a});
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.js
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.js
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -1,11 +1,11 @@
-/*! AutoFill 2.1.0
+/*! AutoFill 2.1.2
* ©2008-2015 SpryMedia Ltd - datatables.net/license
*/
/**
* @summary AutoFill
* @description Add Excel like click and drag auto-fill options to DataTables
- * @version 2.1.0
+ * @version 2.1.2
* @file dataTables.autoFill.js
* @author SpryMedia Ltd (www.sprymedia.co.uk)
* @contact www.sprymedia.co.uk/contact
@@ -192,6 +192,8 @@
var idx = dt.cell( node ).index();
var handle = this.dom.handle;
var handleDim = this.s.handle;
+ var dtScroll = $('div.dataTables_scrollBody',
this.s.dt.table().container() );
+ var scrollOffsetX=0, scrollOffsetY=0;
if ( ! idx || dt.columns( this.c.columns ).indexes().indexOf(
idx.column ) === -1 ) {
this._detach();
@@ -212,11 +214,18 @@
var offset = $(node).position();
+ // If scrolling, and the table is not itself the offset parent,
need to
+ // offset for the scrolling position
+ if ( dtScroll.length && this.dom.offsetParent[0] !==
dt.table().node() ) {
+ scrollOffsetY = dtScroll.scrollTop();
+ scrollOffsetX = dtScroll.scrollLeft();
+ }
+
this.dom.attachedTo = node;
handle
.css( {
- top: offset.top + node.offsetHeight -
handleDim.height,
- left: offset.left + node.offsetWidth -
handleDim.width
+ top: offset.top + node.offsetHeight -
handleDim.height + scrollOffsetY,
+ left: offset.left + node.offsetWidth -
handleDim.width + scrollOffsetX
} )
.appendTo( this.dom.offsetParent );
},
@@ -344,7 +353,7 @@
width = right.position().left + right.outerWidth() - left;
var dtScroll = this.dom.dtScroll;
- if ( dtScroll ) {
+ if ( dtScroll && this.dom.offsetParent[0] !== dt.table().node()
) {
top += dtScroll.scrollTop();
left += dtScroll.scrollLeft();
}
@@ -623,6 +632,8 @@
var rows = this._range( start.row, end.row );
var columns = this._range( start.column, end.column );
var selected = [];
+ var dtSettings = dt.settings()[0];
+ var dtColumns = dtSettings.aoColumns;
// Can't use Array.prototype.map as IE8 doesn't support it
// Can't use $.map as jQuery flattens 2D arrays
@@ -631,17 +642,29 @@
selected.push(
$.map( columns, function (column) {
var cell = dt.cell(
':eq('+rows[rowIdx]+')', column+':visible', {page:'current'} );
+ var data = cell.data();
+ var cellIndex = cell.index();
+ var editField = dtColumns[
cellIndex.column ].editField;
+ if ( editField !== undefined ) {
+ data =
dtSettings.oApi._fnGetObjectDataFn( editField )( dt.row( cellIndex.row ).data()
);
+ }
+
return {
cell: cell,
- data: cell.data(),
- index: cell.index()
+ data: data,
+ label: cell.data(),
+ index: cellIndex
};
} )
);
}
this._actionSelector( selected );
+
+ // Stop shiftScroll
+ clearInterval( this.s.scrollInterval );
+ this.s.scrollInterval = null;
},
@@ -842,7 +865,7 @@
AutoFill.actions = {
increment: {
available: function ( dt, cells ) {
- return $.isNumeric( cells[0][0].data );
+ return $.isNumeric( cells[0][0].label );
},
option: function ( dt, cells ) {
@@ -872,7 +895,7 @@
},
option: function ( dt, cells ) {
- return dt.i18n('autoFill.fill', 'Fill all cells with
<i>'+cells[0][0].data+'</i>' );
+ return dt.i18n('autoFill.fill', 'Fill all cells with
<i>'+cells[0][0].label+'</i>' );
},
execute: function ( dt, cells, node ) {
@@ -947,7 +970,7 @@
* @static
* @type String
*/
-AutoFill.version = '2.1.0';
+AutoFill.version = '2.1.2';
/**
Modified:
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.min.js
===================================================================
---
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.min.js
2016-06-20 06:58:27 UTC (rev 15304)
+++
branches/dev-syncromind-2/phpgwapi/js/DataTables/extensions/AutoFill/js/dataTables.autoFill.min.js
2016-06-20 07:06:16 UTC (rev 15305)
@@ -1,22 +1,23 @@
/*!
- AutoFill 2.1.0
+ AutoFill 2.1.2
©2008-2015 SpryMedia Ltd - datatables.net/license
*/
-(function(e){"function"===typeof
define&&define.amd?define(["jquery","datatables.net"],function(k){return
e(k,window,document)}):"object"===typeof
exports?module.exports=function(k,i){k||(k=window);if(!i||!i.fn.dataTable)i=require("datatables.net")(k,i).$;return
e(i,k,k.document)}:e(jQuery,window,document)})(function(e,k,i,r){var
j=e.fn.dataTable,o=0,g=function(c,b){if(!j.versionCheck||!j.versionCheck("1.10.8"))throw"Warning:
AutoFill requires DataTables 1.10.8 or
greater";this.c=e.extend(!0,{},j.defaults.autoFill,
-g.defaults,b);this.s={dt:new
j.Api(c),namespace:".autoFill"+o++,scroll:{},scrollInterval:null,handle:{height:0,width:0}};this.dom={handle:e('<div
class="dt-autofill-handle"/>'),select:{top:e('<div class="dt-autofill-select
top"/>'),right:e('<div class="dt-autofill-select right"/>'),bottom:e('<div
class="dt-autofill-select bottom"/>'),left:e('<div class="dt-autofill-select
left"/>')},background:e('<div class="dt-autofill-background"/>'),list:e('<div
class="dt-autofill-list">'+this.s.dt.i18n("autoFill.info",
-"")+"<ul/></div>"),dtScroll:null,offsetParent:null};this._constructor()};e.extend(g.prototype,{_constructor:function(){var
c=this,b=this.s.dt,a=e("div.dataTables_scrollBody",this.s.dt.table().container());a.length&&(this.dom.dtScroll=a,"static"===a.css("position")&&a.css("position","relative"));this._focusListener();this.dom.handle.on("mousedown",function(a){c._mousedown(a);return
false});b.on("destroy.autoFill",function(){b.off(".autoFill");e(b.table().body()).off(c.s.namespace);e(i.body).off(c.s.namespace)})},
-_attach:function(c){var
b=this.s.dt,a=b.cell(c).index(),d=this.dom.handle,f=this.s.handle;if(!a||-1===b.columns(this.c.columns).indexes().indexOf(a.column))this._detach();else{this.dom.offsetParent||(this.dom.offsetParent=e(c).offsetParent());if(!f.height||!f.width)d.appendTo("body"),f.height=d.outerHeight(),f.width=d.outerWidth();b=e(c).position();this.dom.attachedTo=c;d.css({top:b.top+c.offsetHeight-f.height,left:b.left+c.offsetWidth-f.width}).appendTo(this.dom.offsetParent)}},_actionSelector:function(c){var
b=
-this,a=this.s.dt,d=g.actions,f=[];e.each(d,function(b,d){d.available(a,c)&&f.push(b)});if(1===f.length&&!1===this.c.alwaysAsk){var
l=d[f[0]].execute(a,c);this._update(l,c)}else{var
h=this.dom.list.children("ul").empty();f.push("cancel");e.each(f,function(f,l){h.append(e("<li/>").append('<div
class="dt-autofill-question">'+d[l].option(a,c)+"<div>").append(e('<div
class="dt-autofill-button">').append(e('<button
class="'+g.classes.btn+'">'+a.i18n("autoFill.button",">")+"</button>").on("click",function(){var
f=
-d[l].execute(a,c,e(this).closest("li"));b._update(f,c);b.dom.background.remove();b.dom.list.remove()}))))});this.dom.background.appendTo("body");this.dom.list.appendTo("body");this.dom.list.css("margin-top",-1*(this.dom.list.outerHeight()/2))}},_detach:function(){this.dom.attachedTo=null;this.dom.handle.detach()},_drawSelection:function(c){var
b=this.s.dt,a=this.s.start,d=e(this.dom.start),f=e(c),l={row:b.rows({page:"current"}).nodes().indexOf(f.parent()[0]),column:f.index()};if(b.cell(f).any()&&
--1!==b.columns(this.c.columns).indexes().indexOf(l.column)){this.s.end=l;var
h,b=a.row<l.row?d:f;h=a.row<l.row?f:d;c=a.column<l.column?d:f;d=a.column<l.column?f:d;b=b.position().top;c=c.position().left;a=h.position().top+h.outerHeight()-b;d=d.position().left+d.outerWidth()-c;if(f=this.dom.dtScroll)b+=f.scrollTop(),c+=f.scrollLeft();f=this.dom.select;f.top.css({top:b,left:c,width:d});f.left.css({top:b,left:c,height:a});f.bottom.css({top:b+a,left:c,width:d});f.right.css({top:b,left:c+d,height:a})}},
-_editor:function(c){var b=this.s.dt,a=this.c.editor;if(a){for(var
d={},f=[],e=a.fields(),h=0,i=c.length;h<i;h++)for(var
g=0,k=c[h].length;g<k;g++){var
n=c[h][g],j=b.settings()[0].aoColumns[n.index.column],m=j.editField;if(m===r)for(var
j=j.mData,p=0,o=e.length;p<o;p++){var
q=a.field(e[p]);if(q.dataSrc()===j){m=q.name();break}}if(!m)throw"Could not
automatically determine field data. Please see
https://datatables.net/tn/11";d[m]||(d[m]={});j=b.row(n.index.row).id();d[m][j]=n.set;f.push(n.index)}a.bubble(f,
-!1).multiSet(d).submit()}},_emitEvent:function(c,b){this.s.dt.iterator("table",function(a){e(a.nTable).triggerHandler(c+".dt",b)})},_focusListener:function(){var
c=this,b=this.s.dt,a=this.s.namespace,d=null!==this.c.focus?this.c.focus:b.settings()[0].keytable?"focus":"hover";if("focus"===d)b.on("key-focus.autoFill",function(a,b,d){c._attach(d.node())}).on("key-blur.autoFill",function(){c._detach()});else
if("click"===d)e(b.table().body()).on("click"+a,"td,
th",function(){c._attach(this)}),e(i.body).on("click"+
-a,function(a){e(a.target).parents().filter(b.table().body()).length||c._detach()});else
e(b.table().body()).on("mouseenter"+a,"td,
th",function(){c._attach(this)}).on("mouseleave"+a,function(a){e(a.relatedTarget).hasClass("dt-autofill-handle")||c._detach()})},_mousedown:function(c){var
b=this,a=this.s.dt;this.dom.start=this.dom.attachedTo;this.s.start={row:a.rows({page:"current"}).nodes().indexOf(e(this.dom.start).parent()[0]),column:e(this.dom.start).index()};e(i.body).on("mousemove.autoFill",function(a){b._mousemove(a)}).on("mouseup.autoFill",
-function(a){b._mouseup(a)});var
a=this.dom.select,d=e(this.s.dt.table().body()).offsetParent();a.top.appendTo(d);a.left.appendTo(d);a.right.appendTo(d);a.bottom.appendTo(d);this._drawSelection(this.dom.start,c);this.dom.handle.css("display","none");c=this.dom.dtScroll;this.s.scroll={windowHeight:e(k).height(),windowWidth:e(k).width(),dtTop:c?c.offset().top:null,dtLeft:c?c.offset().left:null,dtHeight:c?c.outerHeight():null,dtWidth:c?c.outerWidth():null}},_mousemove:function(c){var
b=c.target.nodeName.toLowerCase();
-"td"!==b&&"th"!==b||(this._drawSelection(c.target,c),this._shiftScroll(c))},_mouseup:function(){e(i.body).off(".autoFill");var
c=this.s.dt,b=this.dom.select;b.top.remove();b.left.remove();b.right.remove();b.bottom.remove();this.dom.handle.css("display","block");var
b=this.s.start,a=this.s.end;if(!(b.row===a.row&&b.column===a.column)){for(var
d=this._range(b.row,a.row),b=this._range(b.column,a.column),a=[],f=0;f<d.length;f++)a.push(e.map(b,function(a){a=c.cell(":eq("+d[f]+")",a+":visible",{page:"current"});
-return{cell:a,data:a.data(),index:a.index()}}));this._actionSelector(a)}},_range:function(c,b){var
a=[],d;if(c<=b)for(d=c;d<=b;d++)a.push(d);else
for(d=c;d>=b;d--)a.push(d);return a},_shiftScroll:function(c){var
b=this,a=this.s.scroll,d=!1,f=c.pageY-i.body.scrollTop,e=c.pageX-i.body.scrollLeft,h,g,j,k;65>f?h=-5:f>a.windowHeight-65&&(h=5);65>e?g=-5:e>a.windowWidth-65&&(g=5);null!==a.dtTop&&c.pageY<a.dtTop+65?j=-5:null!==a.dtTop&&c.pageY>a.dtTop+a.dtHeight-65&&(j=5);null!==a.dtLeft&&c.pageX<a.dtLeft+
-65?k=-5:null!==a.dtLeft&&c.pageX>a.dtLeft+a.dtWidth-65&&(k=5);h||g||j||k?(a.windowVert=h,a.windowHoriz=g,a.dtVert=j,a.dtHoriz=k,d=!0):this.s.scrollInterval&&(clearInterval(this.s.scrollInterval),this.s.scrollInterval=null);!this.s.scrollInterval&&d&&(this.s.scrollInterval=setInterval(function(){if(a.windowVert)i.body.scrollTop=i.body.scrollTop+a.windowVert;if(a.windowHoriz)i.body.scrollLeft=i.body.scrollLeft+a.windowHoriz;if(a.dtVert||a.dtHoriz){var
c=b.dom.dtScroll[0];if(a.dtVert)c.scrollTop=c.scrollTop+
-a.dtVert;if(a.dtHoriz)c.scrollLeft=c.scrollLeft+a.dtHoriz}},20))},_update:function(c,b){if(!1!==c){var
a=this.s.dt,d;this._emitEvent("preAutoFill",[a,b]);this._editor(b);if(null!==this.c.update?this.c.update:!this.c.editor){for(var
f=0,e=b.length;f<e;f++)for(var
h=0,g=b[f].length;h<g;h++)d=b[f][h],d.cell.data(d.set);a.draw(!1)}this._emitEvent("autoFill",[a,b])}}});g.actions={increment:{available:function(c,b){return
e.isNumeric(b[0][0].data)},option:function(c){return
c.i18n("autoFill.increment",
-'Increment / decrement each cell by: <input type="number"
value="1">')},execute:function(c,b,a){for(var
c=1*b[0][0].data,a=1*e("input",a).val(),d=0,f=b.length;d<f;d++)for(var
l=0,h=b[d].length;l<h;l++)b[d][l].set=c,c+=a}},fill:{available:function(){return!0},option:function(c,b){return
c.i18n("autoFill.fill","Fill all cells with
<i>"+b[0][0].data+"</i>")},execute:function(c,b){for(var
a=b[0][0].data,d=0,f=b.length;d<f;d++)for(var
e=0,h=b[d].length;e<h;e++)b[d][e].set=a}},fillHorizontal:{available:function(c,
-b){return 1<b.length&&1<b[0].length},option:function(c){return
c.i18n("autoFill.fillHorizontal","Fill cells
horizontally")},execute:function(c,b){for(var a=0,d=b.length;a<d;a++)for(var
f=0,e=b[a].length;f<e;f++)b[a][f].set=b[a][0].data}},fillVertical:{available:function(c,b){return
1<b.length&&1<b[0].length},option:function(c){return
c.i18n("autoFill.fillVertical","Fill cells
vertically")},execute:function(c,b){for(var a=0,d=b.length;a<d;a++)for(var
e=0,g=b[a].length;e<g;e++)b[a][e].set=b[0][e].data}},
-cancel:{available:function(){return!1},option:function(c){return
c.i18n("autoFill.cancel","Cancel")},execute:function(){return!1}}};g.version="2.1.0";g.defaults={alwaysAsk:!1,focus:null,columns:"",update:null,editor:null};g.classes={btn:"btn"};e(i).on("preInit.dt.autofill",function(c,b){if("dt"===c.namespace){var
a=b.oInit.autoFill,d=j.defaults.autoFill;if(a||d)d=e.extend({},a,d),!1!==a&&new
g(b,d)}});j.AutoFill=g;return j.AutoFill=g});
+(function(e){"function"===typeof
define&&define.amd?define(["jquery","datatables.net"],function(j){return
e(j,window,document)}):"object"===typeof
exports?module.exports=function(j,i){j||(j=window);if(!i||!i.fn.dataTable)i=require("datatables.net")(j,i).$;return
e(i,j,j.document)}:e(jQuery,window,document)})(function(e,j,i,q){var
l=e.fn.dataTable,o=0,m=function(b,c){if(!l.versionCheck||!l.versionCheck("1.10.8"))throw"Warning:
AutoFill requires DataTables 1.10.8 or
greater";this.c=e.extend(!0,{},l.defaults.autoFill,
+m.defaults,c);this.s={dt:new
l.Api(b),namespace:".autoFill"+o++,scroll:{},scrollInterval:null,handle:{height:0,width:0}};this.dom={handle:e('<div
class="dt-autofill-handle"/>'),select:{top:e('<div class="dt-autofill-select
top"/>'),right:e('<div class="dt-autofill-select right"/>'),bottom:e('<div
class="dt-autofill-select bottom"/>'),left:e('<div class="dt-autofill-select
left"/>')},background:e('<div class="dt-autofill-background"/>'),list:e('<div
class="dt-autofill-list">'+this.s.dt.i18n("autoFill.info",
+"")+"<ul/></div>"),dtScroll:null,offsetParent:null};this._constructor()};e.extend(m.prototype,{_constructor:function(){var
b=this,c=this.s.dt,a=e("div.dataTables_scrollBody",this.s.dt.table().container());a.length&&(this.dom.dtScroll=a,"static"===a.css("position")&&a.css("position","relative"));this._focusListener();this.dom.handle.on("mousedown",function(a){b._mousedown(a);return
false});c.on("destroy.autoFill",function(){c.off(".autoFill");e(c.table().body()).off(b.s.namespace);e(i.body).off(b.s.namespace)})},
+_attach:function(b){var
c=this.s.dt,a=c.cell(b).index(),d=this.dom.handle,h=this.s.handle,f=e("div.dataTables_scrollBody",this.s.dt.table().container()),g=0,k=0;if(!a||-1===c.columns(this.c.columns).indexes().indexOf(a.column))this._detach();else{this.dom.offsetParent||(this.dom.offsetParent=e(b).offsetParent());if(!h.height||!h.width)d.appendTo("body"),h.height=d.outerHeight(),h.width=d.outerWidth();a=e(b).position();f.length&&this.dom.offsetParent[0]!==c.table().node()&&(k=f.scrollTop(),g=f.scrollLeft());
+this.dom.attachedTo=b;d.css({top:a.top+b.offsetHeight-h.height+k,left:a.left+b.offsetWidth-h.width+g}).appendTo(this.dom.offsetParent)}},_actionSelector:function(b){var
c=this,a=this.s.dt,d=m.actions,h=[];e.each(d,function(c,d){d.available(a,b)&&h.push(c)});if(1===h.length&&!1===this.c.alwaysAsk){var
f=d[h[0]].execute(a,b);this._update(f,b)}else{var
g=this.dom.list.children("ul").empty();h.push("cancel");e.each(h,function(h,f){g.append(e("<li/>").append('<div
class="dt-autofill-question">'+d[f].option(a,
+b)+"<div>").append(e('<div class="dt-autofill-button">').append(e('<button
class="'+m.classes.btn+'">'+a.i18n("autoFill.button",">")+"</button>").on("click",function(){var
h=d[f].execute(a,b,e(this).closest("li"));c._update(h,b);c.dom.background.remove();c.dom.list.remove()}))))});this.dom.background.appendTo("body");this.dom.list.appendTo("body");this.dom.list.css("margin-top",-1*(this.dom.list.outerHeight()/2))}},_detach:function(){this.dom.attachedTo=null;this.dom.handle.detach()},_drawSelection:function(b){var
c=
+this.s.dt,a=this.s.start,d=e(this.dom.start),h=e(b),f={row:c.rows({page:"current"}).nodes().indexOf(h.parent()[0]),column:h.index()};if(c.cell(h).any()&&-1!==c.columns(this.c.columns).indexes().indexOf(f.column)){this.s.end=f;var
g,k,b=a.row<f.row?d:h;g=a.row<f.row?h:d;k=a.column<f.column?d:h;d=a.column<f.column?h:d;b=b.position().top;k=k.position().left;a=g.position().top+g.outerHeight()-b;d=d.position().left+d.outerWidth()-k;if((g=this.dom.dtScroll)&&this.dom.offsetParent[0]!==c.table().node())b+=
+g.scrollTop(),k+=g.scrollLeft();c=this.dom.select;c.top.css({top:b,left:k,width:d});c.left.css({top:b,left:k,height:a});c.bottom.css({top:b+a,left:k,width:d});c.right.css({top:b,left:k+d,height:a})}},_editor:function(b){var
c=this.s.dt,a=this.c.editor;if(a){for(var
d={},h=[],e=a.fields(),g=0,k=b.length;g<k;g++)for(var
i=0,m=b[g].length;i<m;i++){var
n=b[g][i],j=c.settings()[0].aoColumns[n.index.column],l=j.editField;if(l===q)for(var
j=j.mData,p=0,o=e.length;p<o;p++){var r=a.field(e[p]);if(r.dataSrc()===
@@ Diff output truncated at 153600 characters. @@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15305] Syncromind: merge 15252:15304 from trunk,
sigurdne <=