Changeset:
33ecc193d37d
https://sourceforge.net/p/mrbs/hg-code/ci/33ecc193d37da012bc80c410191357044ac92c24
Author:
Campbell Morrison <[email protected]>
Date:
Fri Oct 02 17:38:45 2015 +0100
Log message:
Merge with datatables_update
diffstat:
web/css/mrbs.css.php | 225 +-
web/edit_users.php | 4 +-
web/jquery/datatables/css/ColReorder.css | 21 -
web/jquery/datatables/css/ColVis.css | 76 -
web/jquery/datatables/css/ColVisAlt.css | 104 -
web/jquery/datatables/css/buttons.dataTables.css | 297 +
web/jquery/datatables/css/buttons.dataTables.min.css | 1 +
web/jquery/datatables/css/colReorder.dataTables.css | 10 +
web/jquery/datatables/css/colReorder.dataTables.min.css | 1 +
web/jquery/datatables/css/fixedColumns.dataTables.css | 18 +
web/jquery/datatables/css/fixedColumns.dataTables.min.css | 1 +
web/jquery/datatables/css/jquery.dataTables.css | 450 +
web/jquery/datatables/css/jquery.dataTables.min.css | 1 +
web/jquery/datatables/css/mrbs-page.css | 19 -
web/jquery/datatables/css/mrbs-table.css | 571 -
web/jquery/datatables/images/back_disabled.jpg | Bin
web/jquery/datatables/images/back_disabled.png | Bin
web/jquery/datatables/images/back_enabled.jpg | Bin
web/jquery/datatables/images/back_enabled.png | Bin
web/jquery/datatables/images/back_enabled_hover.png | Bin
web/jquery/datatables/images/button.png | Bin
web/jquery/datatables/images/forward_disabled.png | Bin
web/jquery/datatables/images/forward_enabled.png | Bin
web/jquery/datatables/images/forward_enabled_hover.png | Bin
web/jquery/datatables/images/sort_asc.png | Bin
web/jquery/datatables/images/sort_asc_disabled.png | Bin
web/jquery/datatables/images/sort_both.png | Bin
web/jquery/datatables/images/sort_desc.png | Bin
web/jquery/datatables/images/sort_desc_disabled.png | Bin
web/jquery/datatables/js/ColReorder.min.js | 34 -
web/jquery/datatables/js/ColVis.min.js | 33 -
web/jquery/datatables/js/ColVis.mrbs.min.js | 33 -
web/jquery/datatables/js/FixedColumns.min.js | 39 -
web/jquery/datatables/js/FixedColumns.mrbs.js | 1207 -
web/jquery/datatables/js/buttons.colVis.js | 149 +
web/jquery/datatables/js/buttons.colVis.min.js | 4 +
web/jquery/datatables/js/dataTables.buttons.js | 1497 +
web/jquery/datatables/js/dataTables.buttons.min.js | 32 +
web/jquery/datatables/js/dataTables.colReorder.js | 1254 +
web/jquery/datatables/js/dataTables.colReorder.min.js | 25 +
web/jquery/datatables/js/dataTables.fixedColumns.js | 1414 +
web/jquery/datatables/js/dataTables.fixedColumns.min.js | 30 +
web/jquery/datatables/js/jquery.dataTables.js | 15129 ++++++++++++
web/jquery/datatables/js/jquery.dataTables.min.js | 316 +-
web/jquery/datatables/language/Afrikaans.lang | 30 +
web/jquery/datatables/language/Albanian.lang | 30 +
web/jquery/datatables/language/Arabic.lang | 24 +
web/jquery/datatables/language/Armenian.lang | 30 +
web/jquery/datatables/language/Azerbaijan.lang | 30 +
web/jquery/datatables/language/Bangla.lang | 24 +
web/jquery/datatables/language/Basque.lang | 31 +
web/jquery/datatables/language/Belarusian.lang | 27 +
web/jquery/datatables/language/Bulgarian.lang | 24 +
web/jquery/datatables/language/Catalan.lang | 24 +
web/jquery/datatables/language/Chinese-traditional.lang | 24 +
web/jquery/datatables/language/Chinese.lang | 31 +
web/jquery/datatables/language/Croatian.lang | 30 +
web/jquery/datatables/language/Czech.lang | 30 +
web/jquery/datatables/language/Danish.lang | 24 +
web/jquery/datatables/language/Dutch.lang | 26 +
web/jquery/datatables/language/English.lang | 30 +
web/jquery/datatables/language/Estonian.lang | 23 +
web/jquery/datatables/language/Filipino.lang | 24 +
web/jquery/datatables/language/Finnish.lang | 24 +
web/jquery/datatables/language/French.lang | 29 +
web/jquery/datatables/language/Galician.lang | 31 +
web/jquery/datatables/language/Georgian.lang | 23 +
web/jquery/datatables/language/German.lang | 30 +
web/jquery/datatables/language/Greek.lang | 35 +
web/jquery/datatables/language/Gujarati.lang | 30 +
web/jquery/datatables/language/Hebrew.lang | 24 +
web/jquery/datatables/language/Hindi.lang | 24 +
web/jquery/datatables/language/Hungarian.lang | 30 +
web/jquery/datatables/language/Icelandic.lang | 30 +
web/jquery/datatables/language/Indonesian.lang | 24 +
web/jquery/datatables/language/Irish.lang | 24 +
web/jquery/datatables/language/Italian.lang | 30 +
web/jquery/datatables/language/Japanese.lang | 30 +
web/jquery/datatables/language/Korean.lang | 30 +
web/jquery/datatables/language/Kyrgyz.lang | 23 +
web/jquery/datatables/language/Latvian.lang | 29 +
web/jquery/datatables/language/Lithuanian.lang | 30 +
web/jquery/datatables/language/Macedonian.lang | 26 +
web/jquery/datatables/language/Malay.lang | 30 +
web/jquery/datatables/language/Mongolian.lang | 30 +
web/jquery/datatables/language/Nepali.lang | 31 +
web/jquery/datatables/language/Norwegian.lang | 24 +
web/jquery/datatables/language/Persian.lang | 24 +
web/jquery/datatables/language/Polish.lang | 31 +
web/jquery/datatables/language/Portuguese-Brasil.lang | 30 +
web/jquery/datatables/language/Portuguese.lang | 24 +
web/jquery/datatables/language/Romanian.lang | 24 +
web/jquery/datatables/language/Russian.lang | 30 +
web/jquery/datatables/language/Serbian.lang | 24 +
web/jquery/datatables/language/Sinhala.lang | 30 +
web/jquery/datatables/language/Slovak.lang | 30 +
web/jquery/datatables/language/Slovenian.lang | 30 +
web/jquery/datatables/language/Spanish.lang | 31 +
web/jquery/datatables/language/Swahili.lang | 30 +
web/jquery/datatables/language/Swedish.lang | 30 +
web/jquery/datatables/language/Tamil.lang | 30 +
web/jquery/datatables/language/Thai.lang | 24 +
web/jquery/datatables/language/Turkish.lang | 24 +
web/jquery/datatables/language/Ukranian.lang | 28 +
web/jquery/datatables/language/Urdu.lang | 24 +
web/jquery/datatables/language/Uzbek.lang | 29 +
web/jquery/datatables/language/Vietnamese.lang | 24 +
web/jquery/datatables/language/Welsh.lang | 30 +
web/jquery/datatables/language/ar.txt | 17 -
web/jquery/datatables/language/bg.txt | 17 -
web/jquery/datatables/language/ca.txt | 17 -
web/jquery/datatables/language/cs.txt | 17 -
web/jquery/datatables/language/da.txt | 17 -
web/jquery/datatables/language/de.txt | 17 -
web/jquery/datatables/language/el.txt | 17 -
web/jquery/datatables/language/en.txt | 17 -
web/jquery/datatables/language/es.txt | 17 -
web/jquery/datatables/language/et.txt | 16 -
web/jquery/datatables/language/fa.txt | 17 -
web/jquery/datatables/language/fi.txt | 17 -
web/jquery/datatables/language/fr.txt | 17 -
web/jquery/datatables/language/gd-ie.txt | 17 -
web/jquery/datatables/language/he.txt | 17 -
web/jquery/datatables/language/hi.txt | 17 -
web/jquery/datatables/language/hr.txt | 17 -
web/jquery/datatables/language/hu.txt | 17 -
web/jquery/datatables/language/id.txt | 17 -
web/jquery/datatables/language/it.txt | 17 -
web/jquery/datatables/language/ka.txt | 16 -
web/jquery/datatables/language/lt.txt | 17 -
web/jquery/datatables/language/lv.txt | 17 -
web/jquery/datatables/language/nb.txt | 17 -
web/jquery/datatables/language/nl.txt | 17 -
web/jquery/datatables/language/nn.txt | 17 -
web/jquery/datatables/language/no.txt | 17 -
web/jquery/datatables/language/pl.txt | 17 -
web/jquery/datatables/language/pt-br.txt | 17 -
web/jquery/datatables/language/pt-pt.txt | 17 -
web/jquery/datatables/language/pt.txt | 17 -
web/jquery/datatables/language/ro.txt | 17 -
web/jquery/datatables/language/ru.txt | 17 -
web/jquery/datatables/language/sk.txt | 17 -
web/jquery/datatables/language/sl.txt | 17 -
web/jquery/datatables/language/sr.txt | 17 -
web/jquery/datatables/language/sv.txt | 17 -
web/jquery/datatables/language/th.txt | 17 -
web/jquery/datatables/language/tr.txt | 17 -
web/jquery/datatables/language/uk.txt | 17 -
web/jquery/datatables/language/ur.txt | 17 -
web/jquery/datatables/language/vi.txt | 17 -
web/jquery/datatables/language/zh.txt | 17 -
web/js.inc | 43 +-
web/js/admin.js.php | 21 +-
web/js/datatables.js.php | 264 +-
web/js/edit_users.js.php | 10 +-
web/js/pending.js.php | 119 +-
web/js/report.js.php | 262 +-
web/js/search.js.php | 10 +-
web/language.inc | 93 +-
web/pending.php | 7 +-
web/report.php | 16 +-
web/search.php | 4 +-
web/style.inc | 13 +-
163 files changed, 22871 insertions(+), 3483 deletions(-)
diffs (truncated from 27444 to 300 lines):
diff -r 7f979bf31abd -r 33ecc193d37d web/css/mrbs.css.php
--- a/web/css/mrbs.css.php Fri Oct 02 11:59:16 2015 +0100
+++ b/web/css/mrbs.css.php Fri Oct 02 17:38:45 2015 +0100
@@ -21,19 +21,26 @@
/* ------------ GENERAL -----------------------------*/
-body {font-size: small;
- margin: 0;
- padding: 0;
- color: <?php echo $standard_font_color ?>;
- font-family: <?php echo $standard_font_family ?>;
- background-color: <?php echo $body_background_color ?>}
+body {
+ font-size: small;
+ margin: 0;
+ padding: 0;
+ color: <?php echo $standard_font_color ?>;
+ font-family: <?php echo $standard_font_family ?>;
+ background-color: <?php echo $body_background_color ?>;
+}
.current {color: <?php echo $highlight_font_color ?>}
/* used to highlight the current item */
.error {color: <?php echo $highlight_font_color ?>; font-weight: bold}
/* for error messages */
.warning {color: <?php echo $highlight_font_color ?>}
/* for warning messages */
.note {font-style: italic}
-div#contents, div.trailer {padding: 0 2em}
+div#contents, div.trailer {
+ float: left;
+ width: 100%;
+ box-sizing: border-box;
+ padding: 0 2em;
+}
h1 {font-size: x-large; clear: both}
h2 {font-size: large; clear: both}
@@ -62,19 +69,103 @@
border: 1px solid <?php echo $admin_table_border_color ?>}
fieldset fieldset {position: relative; clear: left; width: 100%; padding: 0;
border: 0; margin: 0} /* inner fieldsets are invisible */
fieldset fieldset legend {font-size: 0} /* for IE: even if there is no
legend text, IE allocates space */
-
-table.admin_table {border-spacing: 0px; border-collapse: collapse;
border-color: <?php echo $admin_table_border_color ?>; border-style: solid;
- border-top-width: 0; border-right-width: 1px; border-bottom-width: 1px;
border-left-width: 0}
-.admin_table th, .admin_table td {vertical-align: middle; text-align: left;
- padding: 0.1em 8px 0.1em 8px;
- border-top-width: 0; border-right-width: 0; border-bottom-width: 0;
border-left-width: 1px; border-style: solid;}
-.admin_table th {color: <?php echo $admin_table_header_font_color ?>;
- background-color: <?php echo $admin_table_header_back_color ?>}
-.admin_table td, .admin_table th {border-color: <?php echo
$admin_table_border_color ?>}
-.admin_table th:first-child {border-left-color: <?php echo
$admin_table_header_back_color ?>}
-.admin_table td.action {text-align: center}
-.admin_table td.action div {display: inline-block}
-.admin_table td.action div div {display: table-cell}
+
+<?php
+// DataTables don't work well with border-collapse: collapse and scrollX:
100%. In fact they
+// don't work well either with a border round the table. So we put the left
and right borders
+// on the table cells.
+?>
+
+
+table.admin_table {
+ border-collapse: separate;
+ border-spacing: 0;
+ border-color: <?php echo $admin_table_border_color ?>;
+}
+
+.admin_table th, .admin_table td,
+table.dataTable thead th, table.dataTable thead td,
+table.dataTable tbody th, table.dataTable tbody td {
+ box-sizing: border-box;
+ vertical-align: middle;
+ text-align: left;
+ padding: 0.1em 0.6em;
+ border-style: solid;
+ border-width: 0 1px 0 0;
+}
+
+.admin_table th:first-child, .admin_table td:first-child,
+table.dataTable thead th:first-child, table.dataTable thead td:first-child {
+ border-left-width: 1px;
+}
+
+.admin_table td, .admin_table th,
+table.dataTable thead th, table.dataTable thead td {
+ border-color: <?php echo $admin_table_border_color ?>;
+}
+
+.admin_table th:first-child,
+table.dataTable thead th:first-child, table.dataTable thead td:first-child {
+ border-left-color: <?php echo $admin_table_header_back_color ?>
+}
+
+.admin_table th:last-child {
+ border-right-color: <?php echo $admin_table_header_back_color ?>
+}
+
+.admin_table.DTFC_Cloned th:last-child {
+ border-right-color: <?php echo $admin_table_border_color ?>
+}
+
+.admin_table th,
+table.dataTable thead .sorting,
+table.dataTable thead .sorting_asc,
+table.dataTable thead .sorting_desc {
+ color: <?php echo $admin_table_header_font_color ?>;
+ background-color: <?php echo $admin_table_header_back_color ?>
+}
+
+.admin_table td.action {
+ text-align: center
+}
+
+.admin_table td.action div {
+ display: inline-block
+}
+
+.admin_table td.action div div {
+ display: table-cell
+}
+
+table.display {
+ width: 100%;
+}
+
+table.display tbody tr:nth-child(2n) {
+ background-color: white;
+}
+
+table.display tbody tr:nth-child(2n+1) {
+ background-color: #E2E4FF;
+}
+
+table.display th, table.display td {
+ height: 2em;
+ white-space: nowrap;
+ overflow: hidden;
+}
+
+table.display th {
+ padding: 3px 24px 3px 8px;
+}
+
+table.display span {
+ display: none;
+}
+
+table.display span.normal {
+ display: inline;
+}
select.room_area_select {margin-right: 0.5em}
@@ -829,11 +920,27 @@
td.mincals_week_number { opacity: 0.5; font-size: 60%; }
/* ------------ PENDING.PHP ------------------*/
-#pending_list form {display: inline-block}
-#pending_list td.table_container, #pending_list td.sub_table {padding: 0;
border: 0; margin: 0}
-#pending_list .control {padding-left: 0; padding-right: 0; text-align: center;
- color: <?php echo $standard_font_color ?>}
-.js #pending_list td.control {background-color: <?php echo
$pending_control_color ?>}
+#pending_list form {
+ display: inline-block;
+}
+
+#pending_list td.table_container, #pending_list td.sub_table {
+ padding: 0;
+ border: 0;
+ margin: 0;
+}
+
+#pending_list .control {
+ padding-left: 0;
+ padding-right: 0;
+ text-align: center;
+ color: <?php echo $standard_font_color ?>;
+}
+
+.js #pending_list td.control {
+ background-color: <?php echo $pending_control_color ?>;
+}
+
#pending_list td:first-child {width: 1.2em}
#pending_list #pending_table td.sub_table {width: auto}
table.admin_table.sub {border-right-width: 0}
@@ -914,8 +1021,13 @@
#approve_buttons td#note form {width: 100%}
#approve_buttons td#note textarea {width: 100%; height: 6em}
+
/*-------------DataTables-------------------------*/
-div.datatable_container {float: left; width: 100%; padding: 2em 0}
+
+div.datatable_container {
+ float: left;
+ width: 100%;
+}
div.ColVis_collection {
float: left;
@@ -927,6 +1039,15 @@
clear: left;
}
+.dataTables_wrapper .dataTables_length {
+ clear: both;
+}
+
+.dataTables_wrapper .dataTables_filter {
+ clear: right;
+ margin-bottom: 1em;
+}
+
span.ColVis_radio {
display: block;
float: left;
@@ -939,6 +1060,58 @@
white-space: nowrap;
}
+table.dataTable.display tbody tr.odd {
+ background-color: #E2E4FF;
+}
+
+table.dataTable.display tbody tr.even {
+ background-color: white;
+}
+
+table.dataTable.display tbody tr.odd > .sorting_1,
+table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 {
+ background-color: #D3D6FF;
+}
+
+table.dataTable.display tbody tr.odd > .sorting_2,
+table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 {
+ background-color: #DADCFF;
+}
+
+table.dataTable.display tbody tr.odd > .sorting_3,
+table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 {
+ background-color: #E0E2FF;
+}
+
+table.dataTable.display tbody tr.even > .sorting_1,
+table.dataTable.order-column.stripe tbody tr.even > .sorting_1 {
+ background-color: #EAEBFF;
+}
+
+table.dataTable.display tbody tr.even > .sorting_2,
+table.dataTable.order-column.stripe tbody tr.even > .sorting_2 {
+ background-color: #F2F3FF;
+}
+
+table.dataTable.display tbody tr.even > .sorting_3,
+table.dataTable.order-column.stripe tbody tr.even > .sorting_3 {
+ background-color: #F9F9FF;
+}
+
+.dataTables_wrapper.no-footer .dataTables_scrollBody {
+ border-bottom-width: 0;
+}
+
+div.dt-buttons {
+ float: right;
+ margin-bottom: 0.4em;
+}
+
+a.dt-button {
+ margin-right: 0;
+}
+
+
/* ------------ jQuery UI additions -------------*/
.ui-autocomplete {
diff -r 7f979bf31abd -r 33ecc193d37d web/edit_users.php
--- a/web/edit_users.php Fri Oct 02 11:59:16 2015 +0100
+++ b/web/edit_users.php Fri Oct 02 17:38:45 2015 +0100
@@ -871,11 +871,11 @@
if (!in_array($fieldname, $ignore_columns))
{
$heading = get_loc_field_name($tbl_users, $fieldname);
- // We give some columns an stype data value so that the JavaScript
knows how to sort them
+ // We give some columns a type data value so that the JavaScript knows
how to sort them
switch ($fieldname)
{
case 'level':
- $heading = '<span class="normal" data-stype="title-numeric">' .
$heading . '</span>';
+ $heading = '<span class="normal" data-type="title-numeric">' .
$heading . '</span>';
break;
default:
break;
diff -r 7f979bf31abd -r 33ecc193d37d web/jquery/datatables/css/ColReorder.css
--- a/web/jquery/datatables/css/ColReorder.css Fri Oct 02 11:59:16 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
- * Namespace DTCR - "DataTables ColReorder" plug-in
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
