[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13541] Merge 13508:13540 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13541] Merge 13508:13540 from trunk |
|
Date: |
Wed, 01 Jul 2015 08:12:52 +0000 |
Revision: 13541
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13541
Author: sigurdne
Date: 2015-07-01 08:12:51 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
Merge 13508:13540 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/about.php
branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
branches/Version-1_0-branch/phpgwapi/js/DataTables/bower.json
branches/Version-1_0-branch/phpgwapi/js/DataTables/composer.json
branches/Version-1_0-branch/phpgwapi/js/DataTables/dataTables.jquery.json
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/bootstrap.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/col_filter.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/colvis.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/css_size.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index_column.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/left_right_columns.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/right_column.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/rowspan.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/server-side-processing.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/simple.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fixed.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fluid.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/two_columns.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.css
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.scss
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/column-control.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/custom-renderer.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/disable-child-rows.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/index.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/right-column.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/child-rows/whole-row-control.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/display-control/auto.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/display-control/classes.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/display-control/index.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/display-control/init-classes.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/index.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/ajax.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/className.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/index.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/new.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/option.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/bootstrap.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/foundation.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/styling/index.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/js/dataTables.responsive.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/js/dataTables.responsive.min.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/Readme.txt
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.css
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.min.css
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/examples/bootstrap.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/js/dataTables.tableTools.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/js/dataTables.tableTools.min.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls.swf
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/css/jquery.dataTables_themeroller.css
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/back_disabled.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/back_enabled.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/back_enabled_hover.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/forward_disabled.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/forward_enabled.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/forward_enabled_hover.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/sort_asc.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/sort_asc_disabled.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/sort_both.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/sort_desc.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/images/sort_desc_disabled.png
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/js/jquery.dataTables.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/media/js/jquery.dataTables.min.js
branches/Version-1_0-branch/phpgwapi/js/DataTables/package.json
branches/Version-1_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-1_0-branch/property/inc/class.uidocument2.inc.php
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/display-control/fixedHeader.html
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Responsive/examples/initialisation/default.html
branches/Version-1_0-branch/phpgwapi/js/form-validator/
branches/Version-1_0-branch/phpgwapi/js/jquery/common.js
branches/Version-1_0-branch/phpgwapi/js/jquery/editable/
branches/Version-1_0-branch/phpgwapi/js/jquery/js/jquery-2.1.1.min.js
branches/Version-1_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.11.1.js
branches/Version-1_0-branch/phpgwapi/js/jquery/js/jquery-ui-1.11.1.min.js
branches/Version-1_0-branch/phpgwapi/js/jquery/number-format/
branches/Version-1_0-branch/phpgwapi/js/jquery/tabs/
branches/Version-1_0-branch/phpgwapi/js/jquery/treeview/
branches/Version-1_0-branch/phpgwapi/js/jquery/validator/
branches/Version-1_0-branch/phpgwapi/js/layout/
branches/Version-1_0-branch/phpgwapi/templates/base/datatable_inline.xsl
branches/Version-1_0-branch/phpgwapi/templates/base/jquery_phpgw_i18n.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
branches/Version-1_0-branch/phpgwapi/js/DataTables/
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/Scroller/examples/data/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune:12743-12875,12986
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431,13433-13434,13436,13438-13440,13442-13480,13482-13506
+ /branches/stavangerkommune:12743-12875,12986
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401,12403-12434,12436-12455,12457,12459-12461,12463-12465,12467,12469-12477,12479-12518,12520-12527,12529-12532,12534-12595,12597-12601,12603-12655,12657-12670,12672-12683,12685-12686,12688-12707,12709-12730,12732-12750,12752-12755,12757,12759-12761,12763-12819,12821,12823,12825-12890,12892-12896,12898,12900-12913,12915-13060,13062-13142,13144,13146-13331,13333-13338,13340-13347,13349-13365,13367-13381,13383,13385,13387-13391,13393-13401,13403,13405-13416,13418-13431,13433-13434,13436,13438-13440,13442-13480,13482-13506,13509-13540
Modified: branches/Version-1_0-branch/about.php
===================================================================
--- branches/Version-1_0-branch/about.php 2015-06-30 11:06:41 UTC (rev
13540)
+++ branches/Version-1_0-branch/about.php 2015-07-01 08:12:51 UTC (rev
13541)
@@ -153,5 +153,4 @@
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('About %1',$title);
$GLOBALS['phpgw']->common->phpgw_header(true);
$GLOBALS['phpgw']->template->pparse('out','phpgw_about');
- $GLOBALS['phpgw']->common->phpgw_footer();
-?>
+ $GLOBALS['phpgw']->common->phpgw_footer();
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
2015-06-30 11:06:41 UTC (rev 13540)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
2015-07-01 08:12:51 UTC (rev 13541)
@@ -1,111 +1,370 @@
<?php
- /**
- * phpGroupWare jQuery wrapper class
- *
- * @author Sigurd Nes
- * @copyright Copyright (C) 2012 Free Software Foundation, Inc.
http://www.fsf.org/
- * @license http://www.fsf.org/licenses/gpl.html GNU General Public
License
- * @package phpgroupware
- * @subpackage phpgwapi
- * @version $Id$
- */
- /*
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+/**
+ * phpGroupWare jQuery wrapper class
+ *
+ * @author Sigurd Nes
+ * @copyright Copyright (C) 2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.fsf.org/licenses/gpl.html GNU General Public License
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @version $Id$
+ */
+/*
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * phpGroupWare jQuery wrapper class
+ *
+ * @package phpgroupware
+ * @subpackage phpgwapi
+ * @category gui
+ */
+class phpgwapi_jquery {
+
+ /**
+ * @var int $counter the widget id counter
*/
+ private static $counter = 0;
/**
- * phpGroupWare jQuery wrapper class
+ * Load all the dependencies for a YUI widget
*
- * @package phpgroupware
- * @subpackage phpgwapi
- * @category gui
+ * @param string $widget the name of the widget to load, such as
autocomplete
+ *
+ * @return string yahoo namespace for widget - empty string on failure
+ *
+ * @internal this does not render the widget it only includes the
header js files
*/
+ public static function load_widget($widget) {
+ $_type = '.min'; // save some download
-
- class phpgwapi_jquery
- {
- /**
- * @var int $counter the widget id counter
- */
- private static $counter = 0;
-
- /**
- * Load all the dependencies for a YUI widget
- *
- * @param string $widget the name of the widget to load, such as
autocomplete
- *
- * @return string yahoo namespace for widget - empty string on
failure
- *
- * @internal this does not render the widget it only includes
the header js files
- */
- public static function load_widget($widget)
- {
- $_type = '.min'; // save some download
-
- $load = array();
- switch ( $widget )
- {
- case 'core':
- $load = array
+ $load = array();
+ switch ($widget) {
+ case 'core':
+ $load = array
(
- "js/jquery-1.11.1{$_type}",
+ //"js/jquery-1.11.1{$_type}",
+ "js/jquery-2.1.1{$_type}",
// "js/jquery-migrate-1.2.1"
- );
- break;
-
- case 'datepicker':
- $load = array
+ );
+ break;
+
+ case 'datepicker':
+ $load = array
(
- "js/jquery-1.11.1{$_type}",
-
"js/jquery-ui-1.10.4.custom{$_type}",
-
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
+ "js/jquery-2.1.1{$_type}",
+ "js/jquery-ui-1.11.1{$_type}",
+
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
// "js/jquery-migrate-1.2.1"
- );
- break;
+ );
+ break;
- case 'menu':
- case 'autocomplete':
- $load = array
+ case 'validator':
+ $load = array
(
- "js/jquery-1.11.1{$_type}",
-
"js/jquery-ui-1.10.4.custom{$_type}",
+ "js/jquery-2.1.1{$_type}",
+
"validator/jquery.form-validator{$_type}"
+ );
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/validator/css/main.css");
+ break;
+
+ case 'menu':
+ case 'autocomplete':
+ $load = array
+ (
+ "js/jquery-2.1.1{$_type}",
+ "js/jquery-ui-1.11.1{$_type}",
// "js/jquery-migrate-1.2.1"
- );
+ );
-
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.10.4.custom{$_type}.css");
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/ui-lightness/jquery-ui-1.10.4.custom{$_type}.css");
- break;
+ break;
- default:
- $err = "Unsupported YUI widget '%1'
supplied to phpgwapi_yui::load_widget()";
- trigger_error(lang($err, $widget),
E_USER_WARNING);
- return '';
+ case 'tabview':
+ $load = array
+ (
+ "js/jquery-2.1.1{$_type}",
+ // "tabs/jquery.responsiveTabs{$_type}",
+ "tabs/jquery.responsiveTabs",
+ 'common'
+ );
+
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/tabs/css/responsive-tabs.css");
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/tabs/css/style.css");
+
+ break;
+ case 'mmenu':
+ $load = array
+ (
+ "js/jquery-2.1.1{$_type}",
+ "mmenu/src/js/jquery.mmenu.min.all"
+ );
+
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/mmenu/src/css/jquery.mmenu.all.css");
+
+ break;
+
+ case 'treeview':
+ $load = array
+ (
+ "js/jquery-2.1.1{$_type}",
+ "treeview/jstree{$_type}"
+ );
+
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/treeview/themes/default/style.min.css");
+
+ break;
+
+ case 'numberformat':
+ $load = array
+ (
+ "js/jquery-2.1.1{$_type}",
+ "number-format/jquery.number{$_type}"
+ );
+
+ break;
+ case 'layout':
+ $load = array
+ (
+ "js/jquery-2.1.1{$_type}",
+ "js/jquery-ui-1.11.1{$_type}",
+ 'layout'=>
array("jquery.layout{$_type}", "plugins/jquery.layout.state")
+ );
+ break;
+
+ default:
+ $err = "Unsupported jQuery widget '%1' supplied
to phpgwapi_jquery::load_widget()";
+ trigger_error(lang($err, $widget),
E_USER_WARNING);
+ return '';
+ }
+ foreach ($load as $key => $scripts)
+ {
+
+ $package = 'jquery';
+
+ if(!$key == intval($key))
+ {
+ $package = $key;
}
- foreach ( $load as $script )
+ if(!is_array($scripts))
{
- $test =
$GLOBALS['phpgw']->js->validate_file('jquery', $script);
+ $scripts = array($scripts);
+ }
- if ( !$test )
+ foreach($scripts as $script)
+ {
+ $test =
$GLOBALS['phpgw']->js->validate_file($package, $script);
+ if (!$test)
{
$err = "Unable to load jQuery script
'%1' when attempting to load widget: '%2'";
trigger_error(lang($err, $script,
$widget), E_USER_WARNING);
return '';
}
}
- return "phpgroupware.{$widget}" . ++self::$counter;
}
+ return "phpgroupware.{$widget}" . ++self::$counter;
+ }
+ public static function formvalidator_generate($modules = array(),
$form_id = 'form', $errorMessagePosition_id = '')
+ {
+ // keep track of number of times loaded per pageload
+ static $times_loaded = 0;
+
+ self::load_widget('validator');
+ $modules_js = '"' . implode(',', $modules) . '"';
+
+ if($errorMessagePosition_id)
+ {
+ $errorMessagePosition =
"$('#{$errorMessagePosition_id}')";
+ }
+ else
+ {
+ $errorMessagePosition = "'top'";
+ }
+
+ $translation = '';
+ if(!$times_loaded)//first time only
+ {
+ //TODO: add translations
+ $translation = <<<JS
+
+ var validateLanguage = {
+ errorTitle : 'Form submission failed!',
+ requiredFields : 'You have not answered all
required fields',
+ badTime : 'You have not given a correct time',
+ badEmail : 'You have not given a correct
e-mail address',
+ badTelephone : 'You have not given a correct
phone number',
+ badSecurityAnswer : 'You have not given a
correct answer to the security question',
+ badDate : 'You have not given a correct date',
+ lengthBadStart : 'You must give an answer
between ',
+ lengthBadEnd : ' characters',
+ lengthTooLongStart : 'You have given an answer
longer than ',
+ lengthTooShortStart : 'You have given an
answer shorter than ',
+ notConfirmed : 'Values could not be confirmed',
+ badDomain : 'Incorrect domain value',
+ badUrl : 'The answer you gave was not a
correct URL',
+ badCustomVal : 'You gave an incorrect answer',
+ badInt : 'The answer you gave was not a
correct number',
+ badSecurityNumber : 'Your social security
number was incorrect',
+ badUKVatAnswer : 'Incorrect UK VAT Number',
+ badStrength : 'The password isn\'t strong
enough',
+ badNumberOfSelectedOptionsStart : 'You have to
choose at least ',
+ badNumberOfSelectedOptionsEnd : ' answers',
+ badAlphaNumeric : 'The answer you gave must
contain only alphanumeric characters ',
+ badAlphaNumericExtra: ' and ',
+ wrongFileSize : 'The file you are trying to
upload is too large',
+ wrongFileType : 'The file you are trying to
upload is of wrong type',
+ groupCheckedRangeStart : 'Please choose
between ',
+ groupCheckedTooFewStart : 'Please choose at
least ',
+ groupCheckedTooManyStart : 'Please choose a
maximum of ',
+ groupCheckedEnd : ' item(s)'
+ };
+JS;
+ }
+
+ $js = <<<JS
+ {$translation}
+ $(document).ready(function ()
+ {
+ $.validate({
+ modules : {$modules_js},
+ form: '#{$form_id}',
+ validateOnBlur : false,
+ scrollToTopOnError : false,
+ errorMessagePosition :
{$errorMessagePosition},
+ language : validateLanguage
+ });
+ });
+JS;
+ $GLOBALS['phpgw']->js->add_code('', $js);
+ $times_loaded ++;
}
+
+ /**
+ * Add the events required for tabs to work
+ *
+ * @param array $tabs
+ * @param string $selection active tab
+ * @param string $tab_set indentificator of tabset
+ * @return string HTML definition of the tabs
+ */
+ public static function tabview_generate($tabs, $selection, $tab_set =
'tab-content')
+ {
+ self::load_widget('tabview');
+ $output = <<<HTML
+ <ul>
+HTML;
+ $disabled = array();
+ $tab_map = array();
+ $i = 0;
+ foreach ($tabs as $id => $tab) {
+ $tab_map[$id] = $i;
+
+ $label = $tab['label'];
+ $_function = '';
+ if (isset($tab['function'])) {
+ $_function = " onclick=\"javascript:
{$tab['function']};\"";
+ }
+
+ //Set disabled tabs
+ //if (empty($tab['link']) && empty($tab['function'])) {
+ if ($tab['disable'] == 1) {
+ $disabled[] = $i;
+ }
+
+ if($tab['link'] && !preg_match('/(^#)/i', $tab['link']))
+ {
+ $_function = " onclick=\"javascript:
window.location = '{$tab['link']}';\"";
+ $tab['link'] = "#{$id}";
+ }
+
+
+ $output .= <<<HTML
+ <li><a
href="{$tab['link']}"{$_function}>{$label}</a></li>
+HTML;
+
+ $i++;
+ }
+ $selected = in_array($selection, $tab_map) ?
(int)$tab_map[$selection] : 0;
+
+ $disabled_js = '[' . implode(',', $disabled) . ']';
+
+ $output .= <<<HTML
+ </ul>
+HTML;
+ $js = <<<JS
+ $(document).ready(function ()
+ {
+ if(typeof(JqueryPortico.inlineTablesDefined) ==
'undefined' || JqueryPortico.inlineTablesDefined == 0)
+ {
+ JqueryPortico.render_tabs();
+ }
+ });
+
+ JqueryPortico.render_tabs = function ()
+ {
+ $('#{$tab_set}').responsiveTabs({
+ startCollapsed: 'accordion',
+ collapsible: 'accordion',
+ rotate: false,
+ disabled: {$disabled_js},
+ startCollapsed: 'accordion',
+ collapsible: 'accordion',
+ setHash: true,
+ activate: function(e, tab) {
+ $('.info').html('Tab <strong>'
+ tab.id + '</strong> activated!');
+ }
+
+ });
+
+ $('#{$tab_set}').responsiveTabs('activate',
{$selected});
+
+ };
+JS;
+ $GLOBALS['phpgw']->js->add_code('', $js);
+ return $output;
+ }
+
+ public static function init_ckeditor($target)
+ {
+ self::load_widget('core');
+ $GLOBALS['phpgw']->js->validate_file('ckeditor', 'ckeditor');
+ $GLOBALS['phpgw']->js->validate_file('ckeditor',
'adapters/jquery');
+ $userlang =
isset($GLOBALS['phpgw_info']['server']['default_lang']) &&
$GLOBALS['phpgw_info']['server']['default_lang']?
$GLOBALS['phpgw_info']['server']['default_lang'] : 'en';
+ if (
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['lang']) )
+ {
+ $userlang =
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+ }
+
+
+ $js = <<<JS
+
+ $( document ).ready( function() {
+ $( 'textarea#{$target}' ).ckeditor(
+ {
+ uiColor: '#9AB8F3',
+ language: '{$userlang}'
+ }
+ );
+ } );
+JS;
+ $GLOBALS['phpgw']->js->add_code('', $js);
+
+ }
+
+}
\ No newline at end of file
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php 2015-06-30
11:06:41 UTC (rev 13540)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php 2015-07-01
08:12:51 UTC (rev 13541)
@@ -302,9 +302,10 @@
}
}
- public function add_code($namespace, $code)
+ public function add_code($namespace, $code, $end_of_page =
false)
{
- $GLOBALS['phpgw_info']['flags']['java_script'] .= "\n"
+ $key = $end_of_page ? 'java_script_end' : 'java_script';
+ $GLOBALS['phpgw_info']['flags'][$key] .= "\n"
. '<script type="text/javascript">' ."\n"
. '//<[CDATA[' ."\n"
. $code ."\n"
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2015-06-30 11:06:41 UTC (rev 13540)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.uicommon_jquery.inc.php
2015-07-01 08:12:51 UTC (rev 13541)
@@ -31,18 +31,18 @@
//phpgw::import_class('phpgwapi.yui');
+ phpgw::import_class('phpgwapi.jquery');
abstract class phpgwapi_uicommon_jquery
{
const UI_SESSION_FLASH = 'flash_msgs';
protected
- $filesArray;
-
- private
+ $filesArray,
$ui_session_key,
$flash_msgs;
+
public $dateFormat;
public $type_of_user;
@@ -51,6 +51,18 @@
public function __construct($currentapp ='', $yui = '')
{
+ $GLOBALS['phpgw_info']['server']['no_jscombine']=true;
+ // start: to be removed
+ phpgw::import_class('phpgwapi.yui');
+ phpgwapi_yui::load_widget('dragdrop');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('history');
+ phpgwapi_yui::load_widget('paginator');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('calendar');
+ phpgwapi_yui::load_widget('autocomplete');
+ phpgwapi_yui::load_widget('animation');
+ //end: to be removed
$yui = isset($yui) && $yui == 'yui3' ? 'yui3' : 'yahoo';
$currentapp = $currentapp ? $currentapp :
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -65,9 +77,13 @@
if($yui == 'yui3')
{
self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
- self::add_javascript('phpgwapi', $yui,
'common.js');
}
+ self::add_javascript('phpgwapi', $yui, 'common.js');
+
+ phpgwapi_jquery::load_widget('core');
+ self::add_javascript('phpgwapi', "jquery", 'common.js');
+
$this->url_prefix = str_replace('_', '.',
get_class($this));
$this->dateFormat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
@@ -76,6 +92,32 @@
$this->locations = & $GLOBALS['phpgw']->locations;
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($currentapp);
+
+ self::add_javascript('phpgwapi', 'DataTables',
'media/js/jquery.dataTables.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'extensions/Responsive/js/dataTables.responsive.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'extensions/ColVis/js/dataTables.colVis.min.js');
+ self::add_javascript('phpgwapi', 'DataTables',
'extensions/TableTools/js/dataTables.tableTools.js');
+ self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
+ self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
+
+
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/media/css/jquery.dataTables.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/Responsive/css/dataTables.responsive.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colVis.min.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/ColVis/css/dataTables.colvis.jqueryui.css');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/DataTables/extensions/TableTools/css/dataTables.tableTools.css');
+
+ //pop up script
+ self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+
+ if(phpgw::get_var('nonavbar'))
+ {
+ // $GLOBALS['phpgw_info']['flags']['nonavbar'] =
true;
+ $GLOBALS['phpgw_info']['flags']['noframework']
= true;
+ //
$GLOBALS['phpgw_info']['flags']['headonly']=true;
+ }
+
}
private function get_ui_session_key()
@@ -83,7 +125,7 @@
return $this->ui_session_key;
}
- private function restore_flash_msgs()
+ protected function restore_flash_msgs()
{
if (($flash_msgs =
$this->session_get(self::UI_SESSION_FLASH)))
{
@@ -99,23 +141,23 @@
return false;
}
- private function store_flash_msgs()
+ protected function store_flash_msgs()
{
return $this->session_set(self::UI_SESSION_FLASH,
$this->flash_msgs);
}
- private function reset_flash_msgs()
+ protected function reset_flash_msgs()
{
$this->flash_msgs = array();
$this->store_flash_msgs();
}
- private function session_set($key, $data)
+ protected function session_set($key, $data)
{
return
phpgwapi_cache::session_set($this->get_ui_session_key(), $key, $data);
}
- private function session_get($key)
+ protected function session_get($key)
{
return
phpgwapi_cache::session_get($this->get_ui_session_key(), $key);
}
@@ -304,7 +346,7 @@
}
public function add_jquery_translation(&$data)
{
-// $this->add_template_file('yui_phpgw_i18n');
+ $this->add_template_file('jquery_phpgw_i18n');
$previous = lang('prev');
$next = lang('next');
$first = lang('first');
@@ -386,7 +428,7 @@
$this->reset_flash_msgs();
- //$this->add_yui_translation($data);
+// $this->add_yui_translation($data);
$this->add_jquery_translation($data);
$data['webserver_url'] =
$GLOBALS['phpgw_info']['server']['webserver_url'];
@@ -397,7 +439,8 @@
}
// Add link key to a result array
- public function _add_links(&$value, $key, $menuaction)
+ // Add link key to a result array
+ public function _add_links(&$value, $key, $data)
{
$unset = 0;
// FIXME: Fugly workaround
@@ -409,8 +452,19 @@
$unset = 1;
}
- $value['link'] = self::link(array('menuaction' =>
$menuaction, 'id' => $value['id']));
+ if(is_array($data))
+ {
+ $link_array = $data;
+ $link_array['id'] = $value['id'];
+ }
+ else
+ {
+ $link_array = array('menuaction' => $data, 'id'
=> $value['id']);
+ }
+
+ $value['link'] = self::link($link_array);
+
// FIXME: Fugly workaround
// I kid you not my friend. There is something very
wonky going on
// in phpgroupware which I cannot figure out.
@@ -448,94 +502,48 @@
}
// Build a jquery result style array
- public function jquery_results($results)
+ public function jquery_results($result=array())
{
- if (!$results)
+ if (!$result)
{
- $results['total_records'] = 0;
- $results['recordsFiltered'] = 0;
- $result['data'] = array();
+ $result['recordsTotal'] = 0;
+ $result['recordsFiltered'] = 0;
+ $result['data'] =
array();
}
- // _debug_array($result);
- return array(
- 'recordsTotal' =>
$results['total_records'],
- 'recordsFiltered' =>
$results['total_records'],
- 'draw' =>
$results['draw'],
- 'data' =>
$results['results']
- );
+
+ $result['recordsTotal'] =
$result['total_records'];
+ $result['recordsFiltered'] =
$result['recordsTotal'];
+ $result['data'] =
(array)$result['results'];
+ unset($result['results']);
+ unset($result['total_records']);
+
+ return $result;
}
- public function use_yui_editor($targets)
+ /**
+ * Initiate rich text editor for selected targets
+ * @param array $targets
+ */
+ public function rich_text_editor($targets)
{
- /*
-
self::add_stylesheet('phpgwapi/js/yahoo/assets/skins/sam/skin.css');
- self::add_javascript('yahoo', 'yahoo/editor',
'simpleeditor-min.js');
- */
if(!is_array($targets))
{
$targets = array($targets);
}
-
- $lang_font_style = lang('Font Style');
- $lang_lists = lang('Lists');
- $lang_insert_item = lang('Insert Item');
- $js = '';
foreach ( $targets as $target )
{
- $js .= <<<SCRIPT
- (function() {
- var Dom = YAHOO.util.Dom,
- Event = YAHOO.util.Event;
+ phpgwapi_jquery::init_ckeditor($target);
+ }
+ }
- var editorConfig = {
- toolbar:
- {buttons: [
- { group: 'textstyle',
label: '{$lang_font_style}',
- buttons: [
- { type:
'push', label: 'Fet CTRL + SHIFT + B', value: 'bold' }
- ]
- },
- { type: 'separator' },
- { group: 'indentlist',
label: '{$lang_lists}',
- buttons: [
- { type:
'push', label: 'Opprett punktliste', value: 'insertunorderedlist' },
- { type:
'push', label: 'Opprett nummerert liste', value: 'insertorderedlist' }
- ]
- },
- { type: 'separator' },
- { group: 'insertitem',
label: '{$lang_insert_item}',
- buttons: [
- { type:
'push', label: 'HTML Lenke CTRL + SHIFT + L', value: 'createlink', disabled:
true },
- { type:
'push', label: 'Sett inn bilde', value: 'insertimage' }
- ]
- },
- { type: 'separator' },
- { group: 'undoredo',
label: 'Angre/Gjenopprett',
- buttons: [
- { type:
'push', label: 'Angre', value: 'undo' },
- { type:
'push', label: 'Gjenopprett', value: 'redo' }
- ]
- }
- ]
- },
- height: '200px',
- width: '700px',
- animate: true,
- dompath: true,
- handleSubmit: true
- };
- var editorWidget = new
YAHOO.widget.Editor('{$target}', editorConfig);
- editorWidget.render();
- })();
-
-SCRIPT;
- }
-
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/editor/assets/skins/sam/editor.css');
- phpgw::import_class('phpgwapi.yui');
- phpgwapi_yui::load_widget('editor');
- $GLOBALS['phpgw']->js->add_event('load', $js);
+ /**
+ * Initiate rich text editor for selected targets
+ * @param array $targets
+ */
+ public function use_yui_editor($targets)
+ {
+ $this->rich_text_editor($targets);
}
public function render($template,$local_variables = array())
@@ -777,15 +785,27 @@
{
if(isset($_SESSION['showall']) &&
!empty($_SESSION['showall']))
{
- $this->bo->unset_show_all_objects();
+ unset($_SESSION['showall']);
}
else
{
- $this->bo->show_all_objects();
+ $_SESSION['showall'] = "1";
}
$this->redirect(array('menuaction' =>
$this->url_prefix.'.index'));
}
+ public function toggle_show_inactive()
+ {
+ if(isset($_SESSION['showall']) &&
!empty($_SESSION['showall']))
+ {
+ unset($_SESSION['showall']);
+ }
+ else
+ {
+ $_SESSION['showall'] = "1";
+ }
+ $this->redirect(array('menuaction' =>
$this->url_prefix.'.index'));
+ }
/*
public function use_yui_editor()
{
Property changes on: branches/Version-1_0-branch/phpgwapi/js/DataTables
___________________________________________________________________
Added: svn:ignore
+ .goutputstream-V87K0X
Modified: branches/Version-1_0-branch/phpgwapi/js/DataTables/bower.json
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/DataTables/bower.json
2015-06-30 11:06:41 UTC (rev 13540)
+++ branches/Version-1_0-branch/phpgwapi/js/DataTables/bower.json
2015-07-01 08:12:51 UTC (rev 13541)
@@ -1,11 +1,28 @@
{
"name": "datatables",
- "version": "1.10.2",
+ "version": "1.10.5",
"main": [
"media/js/jquery.dataTables.js",
- "media/css/jquery.dataTables.css"
+ "media/css/jquery.dataTables.css",
+ "media/images/*.png"
],
"dependencies": {
"jquery": ">=1.7.0"
- }
+ },
+ "license": "MIT",
+ "keywords": [
+ "jquery",
+ "datatables",
+ "table",
+ "javascript",
+ "library"
+ ],
+ "ignore": [
+ "/.*",
+ "examples",
+ "media/unit_testing",
+ "composer.json",
+ "dataTables.jquery.json",
+ "package.json"
+ ]
}
Modified: branches/Version-1_0-branch/phpgwapi/js/DataTables/composer.json
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/DataTables/composer.json
2015-06-30 11:06:41 UTC (rev 13540)
+++ branches/Version-1_0-branch/phpgwapi/js/DataTables/composer.json
2015-07-01 08:12:51 UTC (rev 13541)
@@ -1,6 +1,6 @@
{
"name": "datatables/datatables",
- "version": "1.10.2",
+ "version": "1.10.5",
"description": "DataTables is a plug-in for the jQuery Javascript
library. It is a highly flexible tool, based upon the foundations of
progressive enhancement, which will add advanced interaction controls to any
HTML table.",
"homepage": "http://www.datatables.net/";,
"author": "SpryMedia",
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/dataTables.jquery.json
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/DataTables/dataTables.jquery.json
2015-06-30 11:06:41 UTC (rev 13540)
+++ branches/Version-1_0-branch/phpgwapi/js/DataTables/dataTables.jquery.json
2015-07-01 08:12:51 UTC (rev 13541)
@@ -1,6 +1,6 @@
{
"name": "DataTables",
- "version": "1.10.2",
+ "version": "1.10.5",
"description": "DataTables enhances HTML tables with the ability to
sort, filter and page the data in the table very easily. It provides a
comprehensive API and set of configuration options, allowing you to consume
data from virtually any data source.",
"homepage": "http://datatables.net/";,
"docs": "http://datatables.net/";,
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/bootstrap.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/bootstrap.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/bootstrap.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1.0, maximum-scale=2.0">
<title>FixedColumns example - Bootstrap</title>
- <link rel="stylesheet" type="text/css"
href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css"
href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css"
href="../../Plugins/integration/bootstrap/3/dataTables.bootstrap.css">
<link rel="stylesheet" type="text/css"
href="../../../examples/resources/syntax/shCore.css">
<link rel="stylesheet" type="text/css"
href="../../../examples/resources/demo.css">
@@ -25,8 +25,7 @@
<script type="text/javascript" language="javascript"
src="../../../media/js/jquery.js"></script>
<script type="text/javascript" language="javascript"
src="../../../media/js/jquery.dataTables.js"></script>
<script type="text/javascript" language="javascript"
src="../js/dataTables.fixedColumns.js"></script>
- <script type="text/javascript" language="javascript" src=
-
"../../Plugins/integration/bootstrap/3/dataTables.bootstrap.js"></script>
+ <script type="text/javascript" language="javascript"
src="../../Plugins/integration/bootstrap/3/dataTables.bootstrap.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">
@@ -52,18 +51,14 @@
<h1>FixedColumns example <span>Bootstrap</span></h1>
<div class="info">
- <p>When displaying a table which scrolls along
the x-axis, it can sometimes be useful to the end user
- for the left most column to be fixed in place,
if it shows grouping, index or similar information. This
- is basically the same idea as 'freeze columns'
in Excel. This can be achieved with the FixedColumns
- plug-in for DataTables, as shown below.</p>
+ <p>When displaying a table which scrolls along
the x-axis, it can sometimes be useful to the end user for the left most column
to be fixed in place, if it shows
+ grouping, index or similar information. This is
basically the same idea as 'freeze columns' in Excel. This can be achieved with
the FixedColumns plug-in for
+ DataTables, as shown below.</p>
- <p>Note that FixedColumns is suitable only for
use with the scrolling features in <a href=
- "http://datatables.net";>DataTables</a>. If you
want to achieve a similar effect without scrolling
- enabled, please checkout <a
href="http://datatables.net/plug-ins";>FixedHeader</a>, also for
- DataTables.</p>
+ <p>Note that FixedColumns is suitable only for
use with the scrolling features in <a
href="http://datatables.net";>DataTables</a>. If you want to achieve a similar
+ effect without scrolling enabled, please
checkout <a href="http://datatables.net/plug-ins";>FixedHeader</a>, also for
DataTables.</p>
- <p>FixedColumns is initialised using the
constructor <code>new $.fn.dataTable.FixedColumns();</code> -
- shown below.</p>
+ <p>FixedColumns is initialised using the
constructor <code>new $.fn.dataTable.FixedColumns();</code> - shown below.</p>
</div>
<table id="example" class="table table-striped
table-bordered" cellspacing="0" width="100%">
@@ -722,8 +717,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -733,29 +727,24 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.js</a></li>
- <li><a href=
-
"../../Plugins/integration/bootstrap/3/dataTables.bootstrap.js">../../Plugins/integration/bootstrap/3/dataTables.bootstrap.js</a></li>
+ <li><a
href="../../Plugins/integration/bootstrap/3/dataTables.bootstrap.js">../../Plugins/integration/bootstrap/3/dataTables.bootstrap.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>
+ <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 brush: js;">body { font-size: 140%; }
+ <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">body { font-size: 140%; }
/* Ensure that the demo table scrolls */
th, td { white-space: nowrap; }
@@ -765,27 +754,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css</a></li>
- <li><a href=
-
"../../Plugins/integration/bootstrap/3/dataTables.bootstrap.css">../../Plugins/integration/bootstrap/3/dataTables.bootstrap.css</a></li>
+ <li><a
href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css</a></li>
+ <li><a
href="../../Plugins/integration/bootstrap/3/dataTables.bootstrap.css">../../Plugins/integration/bootstrap/3/dataTables.bootstrap.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>
+ <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>
+ <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>
@@ -820,14 +805,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/col_filter.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/col_filter.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/col_filter.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -66,10 +66,8 @@
<h1>FixedColumns example <span>Individual column
filtering</span></h1>
<div class="info">
- <p>This example shows FixedColumns being
configured with individual column filtering abilities. Note
- that the event handler for the filtering is
applied to the <code class="tag" title=
- "HTML tag">input</code> elements before
FixedColumns is initialised, so when FixedColumns clones nodes
- it also copies the event.</p>
+ <p>This example shows FixedColumns being
configured with individual column filtering abilities. Note that the event
handler for the filtering is applied to the
+ <code class="tag" title="HTML tag">input</code>
elements before FixedColumns is initialised, so when FixedColumns clones nodes
it also copies the event.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -742,8 +740,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
// Setup - add a text input to each footer cell
$('#example tfoot th').each( function () {
var title = $('#example thead th').eq( $(this).index() ).text();
@@ -771,27 +768,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -799,26 +792,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -853,14 +843,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/colvis.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/colvis.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/colvis.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -58,18 +58,14 @@
<h1>FixedColumns example <span>ColVis
integration</span></h1>
<div class="info">
- <p>FixedColumns operates with DataTables'
built-in column visibility options (<a href=
-
"//datatables.net/reference/option/columns.visible"><code class="option" title=
- "DataTables initialisation
option">columns.visible<span>DT</span></code></a> and <a href=
-
"//datatables.net/reference/api/column().visible()"><code class="api" title=
- "DataTables API
method">column().visible()<span>DT</span></code></a>), which columns that are
hidden
- not being shown in the fixed columns. This
integration also means that FixedColumns works well with
- <a
href="http://datatables.net/extensions/colvis";>ColVis</a>, with columns that
are dynamically shown
- and hidden updated immediately in the fixed
columns.</p>
+ <p>FixedColumns operates with DataTables'
built-in column visibility options (<a
href="//datatables.net/reference/option/columns.visible"><code class="option"
+ title="DataTables initialisation
option">columns.visible<span>DT</span></code></a> and <a
href="//datatables.net/reference/api/column().visible()"><code class=
+ "api" title="DataTables API
method">column().visible()<span>DT</span></code></a>), which columns that are
hidden not being shown in the fixed columns. This
+ integration also means that FixedColumns works
well with <a href="http://datatables.net/extensions/colvis";>ColVis</a>, with
columns that are dynamically shown and
+ hidden updated immediately in the fixed
columns.</p>
- <p>The example below shows ColVis and
FixedColumns working together. Two columns have been fixed on the
- left hand side of the table to show
FixedColumns ability to work effortlessly with column
- visibility.</p>
+ <p>The example below shows ColVis and
FixedColumns working together. Two columns have been fixed on the left hand
side of the table to show FixedColumns ability to
+ work effortlessly with column visibility.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -728,8 +724,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
dom: "Cfrtip",
scrollY: "300px",
@@ -743,29 +738,24 @@
} );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
- <li><a href=
-
"../../ColVis/js/dataTables.colVis.js">../../ColVis/js/dataTables.colVis.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../ColVis/js/dataTables.colVis.js">../../ColVis/js/dataTables.colVis.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -777,28 +767,24 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
- <li><a href=
-
"../../ColVis/css/dataTables.colVis.css">../../ColVis/css/dataTables.colVis.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../ColVis/css/dataTables.colVis.css">../../ColVis/css/dataTables.colVis.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -833,14 +819,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/css_size.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/css_size.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/css_size.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -53,24 +53,19 @@
<h1>FixedColumns example <span>CSS row
sizing</span></h1>
<div class="info">
- <p>Because of the method FixedColumns uses to
display the fixed columns, an important consideration is
- the alignment of the rows due to different
heights in the individual rows of the table. There are two
- different algorithms in FixedColumns which can
be used, or you can switch off automatic row sizing all
- together. This is controlled through the
<code>heightMatch</code> parameter. If can take the following
- values:</p>
+ <p>Because of the method FixedColumns uses to
display the fixed columns, an important consideration is the alignment of the
rows due to different heights in the
+ individual rows of the table. There are two
different algorithms in FixedColumns which can be used, or you can switch off
automatic row sizing all together. This
+ is controlled through the
<code>heightMatch</code> parameter. If can take the following values:</p>
<ul class="markdown">
- <li><code class="string"
title="String">none</code> - no automatic row height matching is
- performed. CSS can be used in this case
and is useful when speed is of primary importance.</li>
- <li><code class="string"
title="String">semiauto</code> (default) - the height calculation will be
- performed once, and the result cached
to be used again (<code>fnRecalculateHeight</code> can be
- used to force recalculation)</li>
- <li><code class="string"
title="String">auto</code> - height matching is performed on every draw
- (slowest but must accurate)</li>
+ <li><code class="string"
title="String">none</code> - no automatic row height matching is performed. CSS
can be used in this case and is useful when speed is
+ of primary importance.</li>
+ <li><code class="string"
title="String">semiauto</code> (default) - the height calculation will be
performed once, and the result cached to be used again
+ (<code>fnRecalculateHeight</code> can
be used to force recalculation)</li>
+ <li><code class="string"
title="String">auto</code> - height matching is performed on every draw
(slowest but must accurate)</li>
</ul>
- <p>This example shows row height matching
switched off but there is a CSS statement of <code>tr {
- height: 50px }</code> to force all rows to the
same height.</p>
+ <p>This example shows row height matching
switched off but there is a CSS statement of <code>tr { height: 50px }</code>
to force all rows to the same height.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -729,8 +724,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -743,27 +737,23 @@
} );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -773,26 +763,23 @@
tr { height: 50px; }</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -827,14 +814,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -19,12 +19,10 @@
<h1>FixedColumns example <span>FixedColumns
examples</span></h1>
<div class="info">
- <p>When making use of DataTables' x-axis
scrolling feature (<a href=
-
"//datatables.net/reference/option/scrollX"><code class="option" title=
- "DataTables initialisation
option">scrollX<span>DT</span></code></a>), you may wish to fix the left or
- right most columns in place. This extension for
DataTables provides exactly this option (for
- non-scrolling tables, please use the <a
href="//datatables.net/extensions/fixedheader">FixedHeader
- extension</a>, which can fix headers, footers
and columns). Key features include:</p>
+ <p>When making use of DataTables' x-axis
scrolling feature (<a href="//datatables.net/reference/option/scrollX"><code
class="option" title=
+ "DataTables initialisation
option">scrollX<span>DT</span></code></a>), you may wish to fix the left or
right most columns in place. This extension for DataTables
+ provides exactly this option (for non-scrolling
tables, please use the <a
href="//datatables.net/extensions/fixedheader">FixedHeader extension</a>, which
can fix
+ headers, footers and columns). Key features
include:</p>
<ul class="markdown">
<li>Freezes the left most column to the
side of the table</li>
@@ -62,14 +60,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index_column.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index_column.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/index_column.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -81,10 +81,9 @@
<h1>FixedColumns example <span>Index column</span></h1>
<div class="info">
- <p>A typical interaction to want to perform
with a fixed column, is an index column. A method for how
- this can be achieved with FixedColumns is shown
in this example, building on the <a href=
-
"http://datatables.net/examples/api/counter_column";>index column</a> example
for DataTables. Also shown
- in this example is how the fixed column can be
styled with CSS to show it more prominently.</p>
+ <p>A typical interaction to want to perform
with a fixed column, is an index column. A method for how this can be achieved
with FixedColumns is shown in this
+ example, building on the <a
href="http://datatables.net/examples/api/counter_column";>index column</a>
example for DataTables. Also shown in this example is how the
+ fixed column can be styled with CSS to show it
more prominently.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -801,8 +800,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -825,27 +823,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -873,26 +867,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -927,14 +918,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/left_right_columns.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/left_right_columns.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/left_right_columns.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -52,9 +52,8 @@
<h1>FixedColumns example <span>Left and right fixed
columns</span></h1>
<div class="info">
- <p>FixedColumns allows columns to be fixed from
both the left and right hand sides of the table. Fixing
- right hand-side columns is done by using the
<code>rightColumns</code> initialisation parameter, which
- works just the same as <code>leftColumns</code>
does for the left side of the table. This example shows
+ <p>FixedColumns allows columns to be fixed from
both the left and right hand sides of the table. Fixing right hand-side columns
is done by using the
+ <code>rightColumns</code> initialisation
parameter, which works just the same as <code>leftColumns</code> does for the
left side of the table. This example shows
both the left and right columns being fixed in
place.</p>
</div>
@@ -714,8 +713,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -729,27 +727,23 @@
} );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -757,26 +751,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -793,8 +784,7 @@
<div class="toc-group">
<h3><a
href="./index.html">Examples</a></h3>
<ul class="toc active">
- <li class="active"><a
href="./left_right_columns.html">Left and right fixed
- columns</a></li>
+ <li class="active"><a
href="./left_right_columns.html">Left and right fixed columns</a></li>
<li><a
href="./simple.html">Basic initialisation</a></li>
<li><a
href="./two_columns.html">Multiple fixed columns</a></li>
<li><a
href="./right_column.html">Right column only</a></li>
@@ -812,14 +802,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/right_column.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/right_column.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/right_column.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -52,11 +52,9 @@
<h1>FixedColumns example <span>Right column
only</span></h1>
<div class="info">
- <p>FixedColumns has the ability to freeze
columns on both the left and right hand sides of the table.
- By default it will fix the first column on the
left, but using the initialisation parameters
- <code>leftColumns</code> and
<code>rightColumns</code> you can alter this to fix the columns on the
- right as well. This example shows a single
column fixed in place, in this case the right most
- column.</p>
+ <p>FixedColumns has the ability to freeze
columns on both the left and right hand sides of the table. By default it will
fix the first column on the left, but
+ using the initialisation parameters
<code>leftColumns</code> and <code>rightColumns</code> you can alter this to
fix the columns on the right as well. This example
+ shows a single column fixed in place, in this
case the right most column.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -715,8 +713,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -730,27 +727,23 @@
} );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -758,26 +751,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -812,14 +802,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/rowspan.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/rowspan.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/rowspan.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -52,11 +52,9 @@
<h1>FixedColumns example <span>Complex
headers</span></h1>
<div class="info">
- <p>If you are using multiple rows in the table
header, it can be useful to have a rowspanning cell on
- the column(s) you have fixed in place - equally
at other times it can be useful to not and make use of
- the two or more cells per column. FixedColumns
builds on the complex header support in DataTables to
- make this trivial to use in FixedColumns. Just
initialise your FixedColumns instance as you normally
- would!</p>
+ <p>If you are using multiple rows in the table
header, it can be useful to have a rowspanning cell on the column(s) you have
fixed in place - equally at other
+ times it can be useful to not and make use of
the two or more cells per column. FixedColumns builds on the complex header
support in DataTables to make this
+ trivial to use in FixedColumns. Just initialise
your FixedColumns instance as you normally would!</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -556,8 +554,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -567,27 +564,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td {
white-space: nowrap;
padding-left: 40px !important;
@@ -599,26 +592,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -653,14 +643,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/server-side-processing.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/server-side-processing.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/server-side-processing.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -56,12 +56,11 @@
<h1>FixedColumns example <span>Server-side
processing</span></h1>
<div class="info">
- <p>This example shows how FixedColumns can be
used with server-side processing in DataTables to cope
- with very large tables. No special
considerations are required, just initialise FixedColumns as you
- normally would!</p>
+ <p>This example shows how FixedColumns can be
used with server-side processing in DataTables to cope with very large tables.
No special considerations are
+ required, just initialise FixedColumns as you
normally would!</p>
- <p>Note that the table width is constrained in
this example to allow scrolling to occur as the
- server-side processing data set has a limited
number of columns in this demo!</p>
+ <p>Note that the table width is constrained in
this example to allow scrolling to occur as the server-side processing data set
has a limited number of columns in
+ this demo!</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -98,8 +97,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -110,27 +108,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 600px;
@@ -145,26 +139,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -199,14 +190,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/simple.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/simple.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/simple.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -48,18 +48,14 @@
<h1>FixedColumns example <span>Basic
initialisation</span></h1>
<div class="info">
- <p>When displaying a table which scrolls along
the x-axis, it can sometimes be useful to the end user
- for the left most column to be fixed in place,
if it shows grouping, index or similar information. This
- is basically the same idea as 'freeze columns'
in Excel. This can be achieved with the FixedColumns
- plug-in for DataTables, as shown below.</p>
+ <p>When displaying a table which scrolls along
the x-axis, it can sometimes be useful to the end user for the left most column
to be fixed in place, if it shows
+ grouping, index or similar information. This is
basically the same idea as 'freeze columns' in Excel. This can be achieved with
the FixedColumns plug-in for
+ DataTables, as shown below.</p>
- <p>Note that FixedColumns is suitable only for
use with the scrolling features in <a href=
- "http://datatables.net";>DataTables</a>. If you
want to achieve a similar effect without scrolling
- enabled, please checkout <a
href="http://datatables.net/plug-ins";>FixedHeader</a>, also for
- DataTables.</p>
+ <p>Note that FixedColumns is suitable only for
use with the scrolling features in <a
href="http://datatables.net";>DataTables</a>. If you want to achieve a similar
+ effect without scrolling enabled, please
checkout <a href="http://datatables.net/plug-ins";>FixedHeader</a>, also for
DataTables.</p>
- <p>FixedColumns is initialised using the
constructor <code>new $.fn.dataTable.FixedColumns();</code> -
- shown below.</p>
+ <p>FixedColumns is initialised using the
constructor <code>new $.fn.dataTable.FixedColumns();</code> - shown below.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -718,8 +714,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -729,27 +724,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -757,26 +748,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -811,14 +799,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fixed.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fixed.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fixed.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -54,15 +54,13 @@
<h1>FixedColumns example <span>Assigned column
width</span></h1>
<div class="info">
- <p>The columns that are fixed in place by
FixedColumns take their width from the parent DataTable. As
- such, the width of the column can be controlled
using the <a href=
-
"//datatables.net/reference/option/columns.width"><code class="option" title=
- "DataTables initialisation
option">columns.width<span>DT</span></code></a> option.</p>
+ <p>The columns that are fixed in place by
FixedColumns take their width from the parent DataTable. As such, the width of
the column can be controlled using the
+ <a
href="//datatables.net/reference/option/columns.width"><code class="option"
title="DataTables initialisation option">columns.width<span>DT</span></code></a>
+ option.</p>
- <p>This example shows the first column being
set to <code>width: 200px</code> (note that this is not
- pixel perfect in a table, the browser will make
some adjustments!), a width that is reflected in the
- fixed column. Resize the browser window
horizontally and you will be able to see that the fixed column
- retains its width while the scrolling viewport
and the table resize.</p>
+ <p>This example shows the first column being
set to <code>width: 200px</code> (note that this is not pixel perfect in a
table, the browser will make some
+ adjustments!), a width that is reflected in the
fixed column. Resize the browser window horizontally and you will be able to
see that the fixed column retains its
+ width while the scrolling viewport and the
table resize.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -721,8 +719,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').removeAttr('width').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -735,27 +732,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
margin: 0 auto;
@@ -766,26 +759,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -820,14 +810,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fluid.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fluid.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/size_fluid.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -54,16 +54,13 @@
<h1>FixedColumns example <span>Fluid column
width</span></h1>
<div class="info">
- <p>The columns that are fixed in place by
FixedColumns take their width from the parent DataTable. As
- such, the width of the column can be controlled
using the <a href=
-
"//datatables.net/reference/option/columns.width"><code class="option" title=
- "DataTables initialisation
option">columns.width<span>DT</span></code></a> option.</p>
+ <p>The columns that are fixed in place by
FixedColumns take their width from the parent DataTable. As such, the width of
the column can be controlled using the
+ <a
href="//datatables.net/reference/option/columns.width"><code class="option"
title="DataTables initialisation option">columns.width<span>DT</span></code></a>
+ option.</p>
- <p>This example shows the first column being
set to <code>width: 20%</code> (note that this is not
- pixel perfect in a table, the browser will make
some adjustments!), a width that is reflected in the
- fixed column. Resize the browser window
horizontally and you will be able to see that the fixed column
- retains its proportional width (again with a
small margin dictated by the browser) in the resizing
- table.</p>
+ <p>This example shows the first column being
set to <code>width: 20%</code> (note that this is not pixel perfect in a table,
the browser will make some
+ adjustments!), a width that is reflected in the
fixed column. Resize the browser window horizontally and you will be able to
see that the fixed column retains its
+ proportional width (again with a small margin
dictated by the browser) in the resizing table.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -722,8 +719,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -736,27 +732,23 @@
new $.fn.dataTable.FixedColumns( table );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
margin: 0 auto;
@@ -767,26 +759,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -821,14 +810,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/two_columns.html
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/two_columns.html
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/examples/two_columns.html
2015-07-01 08:12:51 UTC (rev 13541)
@@ -50,8 +50,7 @@
<h1>FixedColumns example <span>Multiple fixed
columns</span></h1>
<div class="info">
- <p>FixedColumns allows more than one column to
be frozen into place using the <code>leftColumns</code>
- parameter. The example below shows two columns
fixed.</p>
+ <p>FixedColumns allows more than one column to
be frozen into place using the <code>leftColumns</code> parameter. The example
below shows two columns fixed.</p>
</div>
<table id="example" class="stripe row-border
order-column" cellspacing="0" width="100%">
@@ -710,8 +709,7 @@
<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
brush: js;">$(document).ready(function() {
+ <p>The Javascript shown below is used
to initialise the table shown in this example:</p><code class="multiline
language-js">$(document).ready(function() {
var table = $('#example').DataTable( {
scrollY: "300px",
scrollX: true,
@@ -723,27 +721,23 @@
} );
} );</code>
- <p>In addition to the above code, the
following Javascript library files are loaded for use in this
- example:</p>
+ <p>In addition to the above code, the
following Javascript library files are loaded for use in this example:</p>
<ul>
<li><a
href="../../../media/js/jquery.js">../../../media/js/jquery.js</a></li>
- <li><a href=
-
"../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
+ <li><a
href="../../../media/js/jquery.dataTables.js">../../../media/js/jquery.dataTables.js</a></li>
<li><a
href="../js/dataTables.fixedColumns.js">../js/dataTables.fixedColumns.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>
+ <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 brush: js;">/* Ensure that the demo table scrolls */
+ <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">/* Ensure that the demo table
scrolls */
th, td { white-space: nowrap; }
div.dataTables_wrapper {
width: 800px;
@@ -751,26 +745,23 @@
}</code>
</div>
- <p>The following CSS library files are
loaded for use in this example to provide the styling of the
- table:</p>
+ <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=
-
"../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
+ <li><a
href="../../../media/css/jquery.dataTables.css">../../../media/css/jquery.dataTables.css</a></li>
<li><a
href="../css/dataTables.fixedColumns.css">../css/dataTables.fixedColumns.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>
+ <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>
+ <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>
@@ -805,14 +796,11 @@
</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/extras";>extras</a> and
- <a
href="http://www.datatables.net/plug-ins";>plug-ins</a> which extend the
capabilities of
- DataTables.</p>
+ <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/extras";>extras</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-2014<br>
+ <p class="copyright">DataTables
designed and created by <a href="http://www.sprymedia.co.uk";>SpryMedia Ltd</a>
© 2007-2015<br>
DataTables is licensed under the <a
href="http://www.datatables.net/mit";>MIT license</a>.</p>
</div>
</div>
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.js
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.js
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.js
2015-07-01 08:12:51 UTC (rev 13541)
@@ -1,11 +1,11 @@
-/*! FixedColumns 3.0.2
+/*! FixedColumns 3.0.3
* ©2010-2014 SpryMedia Ltd - datatables.net/license
*/
/**
* @summary FixedColumns
* @description Freeze columns in place on a scrolling DataTable
- * @version 3.0.2
+ * @version 3.0.3
* @file dataTables.fixedColumns.js
* @author SpryMedia Ltd (www.sprymedia.co.uk)
* @contact www.sprymedia.co.uk/contact
@@ -62,7 +62,7 @@
var that = this;
/* Sanity check - you just know it will happen */
- if ( ! this instanceof FixedColumns )
+ if ( ! ( this instanceof FixedColumns ) )
{
alert( "FixedColumns warning: FixedColumns must be initialised
with the 'new' keyword." );
return;
@@ -75,8 +75,10 @@
// Use the DataTables Hungarian notation mapping method, if it exists to
// provide forwards compatibility for camel case variables
- if ( $.fn.dataTable.camelToHungarian ) {
- $.fn.dataTable.camelToHungarian( FixedColumns.defaults, init );
+ var camelToHungarian = $.fn.dataTable.camelToHungarian;
+ if ( camelToHungarian ) {
+ camelToHungarian( FixedColumns.defaults, FixedColumns.defaults,
true );
+ camelToHungarian( FixedColumns.defaults, init );
}
// v1.10 allows the settings object to be got form a number of sources
@@ -746,6 +748,18 @@
iLeftWidth = this.s.iLeftWidth,
iRightWidth = this.s.iRightWidth,
iRight;
+ var scrollbarAdjust = function ( node, width ) {
+ if ( ! oOverflow.bar ) {
+ // If there is no scrollbar (Macs) we need to
hide the auto scrollbar
+ node.style.width = (width+20)+"px";
+ node.style.paddingRight = "20px";
+ node.style.boxSizing = "border-box";
+ }
+ else {
+ // Otherwise just overflow by the scrollbar
+ node.style.width = (width+oOverflow.bar)+"px";
+ }
+ };
// When x scrolling - don't paint the fixed columns over the x
scrollbar
if ( oOverflow.x )
@@ -764,7 +778,7 @@
oGrid.left.foot.style.top = (oOverflow.x ?
oOverflow.bar : 0)+"px"; // shift footer for scrollbar
}
- oGrid.left.liner.style.width =
(iLeftWidth+oOverflow.bar)+"px";
+ scrollbarAdjust( oGrid.left.liner, iLeftWidth );
oGrid.left.liner.style.height = iBodyHeight+"px";
}
@@ -784,7 +798,7 @@
oGrid.right.foot.style.top = (oOverflow.x ?
oOverflow.bar : 0)+"px";
}
- oGrid.right.liner.style.width =
(iRightWidth+oOverflow.bar)+"px";
+ scrollbarAdjust( oGrid.right.liner, iRightWidth );
oGrid.right.liner.style.height = iBodyHeight+"px";
oGrid.right.headBlock.style.display = oOverflow.y ?
'block' : 'none';
@@ -1089,9 +1103,10 @@
n.removeAttribute('id');
var i = that.s.dt.oFeatures.bServerSide===false
?
that.s.dt.aiDisplay[
that.s.dt._iDisplayStart+z ] : z;
+ var aTds = $(this).children('td, th');
+
for ( iIndex=0 ; iIndex<aiColumns.length ;
iIndex++ )
{
- var aTds = that.s.dt.aoData[i].anCells
|| that.s.dt.oApi._fnGetTdNodes( that.s.dt, i );
iColumn = aiColumns[iIndex];
if ( aTds.length > 0 )
@@ -1352,7 +1367,7 @@
* @default See code
* @static
*/
-FixedColumns.version = "3.0.2";
+FixedColumns.version = "3.0.3";
Modified:
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
===================================================================
---
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
2015-06-30 11:06:41 UTC (rev 13540)
+++
branches/Version-1_0-branch/phpgwapi/js/DataTables/extensions/FixedColumns/js/dataTables.fixedColumns.min.js
2015-07-01 08:12:51 UTC (rev 13541)
@@ -1,30 +1,30 @@
/*!
- FixedColumns 3.0.2
+ FixedColumns 3.0.3
©2010-2014 SpryMedia Ltd - datatables.net/license
*/
-(function(q,r){var o=function(d){var k=function(a,b){var c=this;if(!this
instanceof k)alert("FixedColumns warning: FixedColumns must be initialised with
the 'new' keyword.");else{"undefined"==typeof
b&&(b={});d.fn.dataTable.camelToHungarian&&d.fn.dataTable.camelToHungarian(k.defaults,b);var
g=d.fn.dataTable.Api?(new
d.fn.dataTable.Api(a)).settings()[0]:a.fnSettings();this.s={dt:g,iTableColumns:g.aoColumns.length,aiOuterWidths:[],aiInnerWidths:[]};this.dom={scroller:null,header:null,body:null,footer:null,
-grid:{wrapper:null,dt:null,left:{wrapper:null,head:null,body:null,foot:null},right:{wrapper:null,head:null,body:null,foot:null}},clone:{left:{header:null,body:null,footer:null},right:{header:null,body:null,footer:null}}};g._oFixedColumns=this;g._bInitComplete?this._fnConstruct(b):g.oApi._fnCallbackReg(g,"aoInitComplete",function(){c._fnConstruct(b)},"FixedColumns")}};k.prototype={fnUpdate:function(){this._fnDraw(!0)},fnRedrawLayout:function(){this._fnColCalc();this._fnGridLayout();this.fnUpdate()},
-fnRecalculateHeight:function(a){delete
a._DTTC_iHeight;a.style.height="auto"},fnSetRowHeight:function(a,b){a.style.height=b+"px"},fnGetPosition:function(a){var
b=this.s.dt.oInstance;if(d(a).parents(".DTFC_Cloned").length){if("tr"===a.nodeName.toLowerCase())return
a=d(a).index(),b.fnGetPosition(d("tr",this.s.dt.nTBody)[a]);var
c=d(a).index(),a=d(a.parentNode).index();return[b.fnGetPosition(d("tr",this.s.dt.nTBody)[a]),c,b.oApi._fnVisibleToColumnIndex(this.s.dt,c)]}return
b.fnGetPosition(a)},_fnConstruct:function(a){var b=
-this;if("function"!=typeof
this.s.dt.oInstance.fnVersionCheck||!0!==this.s.dt.oInstance.fnVersionCheck("1.8.0"))alert("FixedColumns
"+k.VERSION+" required DataTables 1.8.0 or later. Please upgrade your
DataTables installation");else
if(""===this.s.dt.oScroll.sX)this.s.dt.oInstance.oApi._fnLog(this.s.dt,1,"FixedColumns
is not needed (no x-scrolling in DataTables enabled), so no action will be
taken. Use 'FixedHeader' for column fixing when scrolling is not
enabled");else{this.s=d.extend(!0,this.s,
-k.defaults,a);a=this.s.dt.oClasses;this.dom.grid.dt=d(this.s.dt.nTable).parents("div."+a.sScrollWrapper)[0];this.dom.scroller=d("div."+a.sScrollBody,this.dom.grid.dt)[0];this._fnColCalc();this._fnGridSetup();var
c;d(this.dom.scroller).on("mouseover.DTFC
touchstart.DTFC",function(){c="main"}).on("scroll.DTFC",function(){if("main"===c&&(0<b.s.iLeftColumns&&(b.dom.grid.left.liner.scrollTop=b.dom.scroller.scrollTop),0<b.s.iRightColumns))b.dom.grid.right.liner.scrollTop=b.dom.scroller.scrollTop});var
g=
-"onwheel"in
r.createElement("div")?"wheel.DTFC":"mousewheel.DTFC";if(0<b.s.iLeftColumns)d(b.dom.grid.left.liner).on("mouseover.DTFC
touchstart.DTFC",function(){c="left"}).on("scroll.DTFC",function(){"left"===c&&(b.dom.scroller.scrollTop=b.dom.grid.left.liner.scrollTop,0<b.s.iRightColumns&&(b.dom.grid.right.liner.scrollTop=b.dom.grid.left.liner.scrollTop))}).on(g,function(a){b.dom.scroller.scrollLeft-="wheel"===a.type?-a.originalEvent.deltaX:a.originalEvent.wheelDeltaX});if(0<b.s.iRightColumns)d(b.dom.grid.right.liner).on("mouseover.DTFC
touchstart.DTFC",
-function(){c="right"}).on("scroll.DTFC",function(){"right"===c&&(b.dom.scroller.scrollTop=b.dom.grid.right.liner.scrollTop,0<b.s.iLeftColumns&&(b.dom.grid.left.liner.scrollTop=b.dom.grid.right.liner.scrollTop))}).on(g,function(a){b.dom.scroller.scrollLeft-="wheel"===a.type?-a.originalEvent.deltaX:a.originalEvent.wheelDeltaX});d(q).on("resize.DTFC",function(){b._fnGridLayout.call(b)});var
f=!0,e=d(this.s.dt.nTable);e.on("draw.dt.DTFC",function(){b._fnDraw.call(b,f);f=!1}).on("column-sizing.dt.DTFC",
-function(){b._fnColCalc();b._fnGridLayout(b)}).on("column-visibility.dt.DTFC",function(){b._fnColCalc();b._fnGridLayout(b);b._fnDraw(!0)}).on("destroy.dt.DTFC",function(){e.off("column-sizing.dt.DTFC
destroy.dt.DTFC draw.dt.DTFC");d(b.dom.scroller).off("scroll.DTFC
mouseover.DTFC");d(q).off("resize.DTFC");d(b.dom.grid.left.liner).off("scroll.DTFC
mouseover.DTFC
"+g);d(b.dom.grid.left.wrapper).remove();d(b.dom.grid.right.liner).off("scroll.DTFC
mouseover.DTFC "+g);d(b.dom.grid.right.wrapper).remove()});
-this._fnGridLayout();this.s.dt.oInstance.fnDraw(!1)}},_fnColCalc:function(){var
a=this,b=0,c=0;this.s.aiInnerWidths=[];this.s.aiOuterWidths=[];d.each(this.s.dt.aoColumns,function(g,f){var
e=d(f.nTh),h;if(e.filter(":visible").length){var
i=e.outerWidth();0===a.s.aiOuterWidths.length&&(h=d(a.s.dt.nTable).css("border-left-width"),i+="string"===typeof
h?1:parseInt(h,10));a.s.aiOuterWidths.length===a.s.dt.aoColumns.length-1&&(h=d(a.s.dt.nTable).css("border-right-width"),i+="string"===typeof
h?1:parseInt(h,
-10));a.s.aiOuterWidths.push(i);a.s.aiInnerWidths.push(e.width());g<a.s.iLeftColumns&&(b+=i);a.s.iTableColumns-a.s.iRightColumns<=g&&(c+=i)}else
a.s.aiInnerWidths.push(0),a.s.aiOuterWidths.push(0)});this.s.iLeftWidth=b;this.s.iRightWidth=c},_fnGridSetup:function(){var
a=this._fnDTOverflow(),b;this.dom.body=this.s.dt.nTable;this.dom.header=this.s.dt.nTHead.parentNode;this.dom.header.parentNode.parentNode.style.position="relative";var
c=d('<div class="DTFC_ScrollWrapper" style="position:relative;
clear:both;"><div class="DTFC_LeftWrapper" style="position:absolute; top:0;
left:0;"><div class="DTFC_LeftHeadWrapper" style="position:relative; top:0;
left:0; overflow:hidden;"></div><div class="DTFC_LeftBodyWrapper"
style="position:relative; top:0; left:0; overflow:hidden;"><div
class="DTFC_LeftBodyLiner" style="position:relative; top:0; left:0;
overflow-y:scroll;"></div></div><div class="DTFC_LeftFootWrapper"
style="position:relative; top:0; left:0; overflow:hidden;"></div></div><div
class="DTFC_RightWrapper" style="position:absolute; top:0; left:0;"><div
class="DTFC_RightHeadWrapper" style="position:relative; top:0; left:0;"><div
class="DTFC_RightHeadBlocker DTFC_Blocker" style="position:absolute; top:0;
bottom:0;"></div></div><div class="DTFC_RightBodyWrapper"
style="position:relative; top:0; left:0; overflow:hidden;"><div
class="DTFC_RightBodyLiner" style="position:relative; top:0; left:0;
overflow-y:scroll;"></div></div><div class="DTFC_RightFootWrapper"
style="position:relative; top:0; left:0;"><div class="DTFC_RightFootBlocker
DTFC_Blocker" style="position:absolute; top:0;
bottom:0;"></div></div></div></div>')[0],
-g=c.childNodes[0],f=c.childNodes[1];this.dom.grid.dt.parentNode.insertBefore(c,this.dom.grid.dt);c.appendChild(this.dom.grid.dt);this.dom.grid.wrapper=c;0<this.s.iLeftColumns&&(this.dom.grid.left.wrapper=g,this.dom.grid.left.head=g.childNodes[0],this.dom.grid.left.body=g.childNodes[1],this.dom.grid.left.liner=d("div.DTFC_LeftBodyLiner",c)[0],c.appendChild(g));0<this.s.iRightColumns&&(this.dom.grid.right.wrapper=f,this.dom.grid.right.head=f.childNodes[0],this.dom.grid.right.body=f.childNodes[1],this.dom.grid.right.liner=
-d("div.DTFC_RightBodyLiner",c)[0],b=d("div.DTFC_RightHeadBlocker",c)[0],b.style.width=a.bar+"px",b.style.right=-a.bar+"px",this.dom.grid.right.headBlock=b,b=d("div.DTFC_RightFootBlocker",c)[0],b.style.width=a.bar+"px",b.style.right=-a.bar+"px",this.dom.grid.right.footBlock=b,c.appendChild(f));if(this.s.dt.nTFoot&&(this.dom.footer=this.s.dt.nTFoot.parentNode,0<this.s.iLeftColumns&&(this.dom.grid.left.foot=g.childNodes[2]),0<this.s.iRightColumns))this.dom.grid.right.foot=f.childNodes[2]},_fnGridLayout:function(){var
a=
-this.dom.grid,b=d(a.wrapper).width(),c=d(this.s.dt.nTable.parentNode).outerHeight(),g=d(this.s.dt.nTable.parentNode.parentNode).outerHeight(),f=this._fnDTOverflow(),e=this.s.iLeftWidth,h=this.s.iRightWidth;f.x&&(c-=f.bar);a.wrapper.style.height=g+"px";0<this.s.iLeftColumns&&(a.left.wrapper.style.width=e+"px",a.left.wrapper.style.height="1px",a.left.body.style.height=c+"px",a.left.foot&&(a.left.foot.style.top=(f.x?f.bar:0)+"px"),a.left.liner.style.width=e+f.bar+"px",a.left.liner.style.height=c+"px");
-0<this.s.iRightColumns&&(b-=h,f.y&&(b-=f.bar),a.right.wrapper.style.width=h+"px",a.right.wrapper.style.left=b+"px",a.right.wrapper.style.height="1px",a.right.body.style.height=c+"px",a.right.foot&&(a.right.foot.style.top=(f.x?f.bar:0)+"px"),a.right.liner.style.width=h+f.bar+"px",a.right.liner.style.height=c+"px",a.right.headBlock.style.display=f.y?"block":"none",a.right.footBlock.style.display=f.y?"block":"none")},_fnDTOverflow:function(){var
a=this.s.dt.nTable,b=a.parentNode,c={x:!1,y:!1,bar:this.s.dt.oScroll.iBarWidth};
-a.offsetWidth>b.clientWidth&&(c.x=!0);a.offsetHeight>b.clientHeight&&(c.y=!0);return
c},_fnDraw:function(a){this._fnGridLayout();this._fnCloneLeft(a);this._fnCloneRight(a);null!==this.s.fnDrawCallback&&this.s.fnDrawCallback.call(this,this.dom.clone.left,this.dom.clone.right);d(this).trigger("draw.dtfc",{leftClone:this.dom.clone.left,rightClone:this.dom.clone.right})},_fnCloneRight:function(a){if(!(0>=this.s.iRightColumns)){var
b,c=[];for(b=this.s.iTableColumns-this.s.iRightColumns;b<this.s.iTableColumns;b++)this.s.dt.aoColumns[b].bVisible&&
-c.push(b);this._fnClone(this.dom.clone.right,this.dom.grid.right,c,a)}},_fnCloneLeft:function(a){if(!(0>=this.s.iLeftColumns)){var
b,c=[];for(b=0;b<this.s.iLeftColumns;b++)this.s.dt.aoColumns[b].bVisible&&c.push(b);this._fnClone(this.dom.clone.left,this.dom.grid.left,c,a)}},_fnCopyLayout:function(a,b){for(var
c=[],g=[],f=[],e=0,h=a.length;e<h;e++){var
i=[];i.nTr=d(a[e].nTr).clone(!0,!0)[0];for(var
j=0,n=this.s.iTableColumns;j<n;j++)if(-1!==d.inArray(j,b)){var
l=d.inArray(a[e][j].cell,f);-1===l?(l=
-d(a[e][j].cell).clone(!0,!0)[0],g.push(l),f.push(a[e][j].cell),i.push({cell:l,unique:a[e][j].unique})):i.push({cell:g[l],unique:a[e][j].unique})}c.push(i)}return
c},_fnClone:function(a,b,c,g){var
f=this,e,h,i,j,n,l,k,m,p;if(g){null!==a.header&&a.header.parentNode.removeChild(a.header);a.header=d(this.dom.header).clone(!0,!0)[0];a.header.className+="
DTFC_Cloned";a.header.style.width="100%";b.head.appendChild(a.header);m=this._fnCopyLayout(this.s.dt.aoHeader,c);j=d(">thead",a.header);j.empty();e=0;
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13541] Merge 13508:13540 from trunk,
Sigurd Nes <=