8000 Merge remote-tracking branch 'wenzhixin/master' · coderabsolute/bootstrap-table@ae27a53 · GitHub
[go: up one dir, main page]
Skip to content

Commit ae27a53

Browse files
djhvscfdjhvscf
committed
Merge remote-tracking branch 'wenzhixin/master'
2 parents efd3f11 + f9b5807 commit ae27a53

File tree

183 files changed

+6654
-2384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+6654
-2384
lines changed

‎dist/bootstrap-table-all.js

Lines changed: 1457 additions & 541 deletions
Large diffs are not rendered by default.

‎dist/bootstrap-table-all.min.js

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bootstrap-table-locale-all.js

Lines changed: 186 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,50 @@
3939

4040
})(jQuery);
4141

42+
/**
43+
* Bootstrap Table Catalan translation
44+
* Author: Marc Pina<iwalkalone69@gmail.com>
45+
*/
46+
(function ($) {
47+
'use strict';
48+
49+
$.fn.bootstrapTable.locales['ca-ES'] = {
50+
formatLoadingMessage: function () {
51+
return 'Si us plau esperi...';
52+
},
53+
formatRecordsPerPage: function (pageNumber) {
54+
return pageNumber + ' resultats per pàgina';
55+
},
56+
formatShowingRows: function (pageFrom, pageTo, totalRows) {
57+
return 'Mostrant de ' + pageFrom + ' fins ' + pageTo + ' - total ' + totalRows + ' resultats';
58+
},
59+
formatSearch: function () {
60+
return 'Buscar';
61+
},
62+
formatNoMatches: function () {
63+
return 'No s\'han trobat resultats';
64+
},
65+
formatPaginationSwitch: function () {
66+
return 'Amagar/Mostrar paginació';
67+
},
68+
formatRefresh: function () {
69+
return 'Refrescar';
70+
},
71+
formatToggle: function () {
72+
return 'Amagar/Mostrar';
73+
},
74+
formatColumns: function () {
75+
return 'Columnes';
76+
},
77+
formatAllRows: function () {
78+
return 'Tots';
79+
}
80+
};
81+
82+
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['ca-ES']);
83+
84+
})(jQuery);
85+
4286
/**
4387
* Bootstrap C2EE Table Czech translation
4488
* Author: Lukas Kral (monarcha@seznam.cz)
@@ -303,6 +347,50 @@
303347

304348
})(jQuery);
305349

350+
/**
351+
* Bootstrap Table Spanish Spain translation
352+
* Author: Marc Pina<iwalkalone69@gmail.com>
353+
*/
354+
(function ($) {
355+
'use strict';
356+
357+
$.fn.bootstrapTable.locales['es-ES'] = {
358+
formatLoadingMessage: function () {
359+
return 'Por favor espere...';
360+
},
361+
formatRecordsPerPage: function (pageNumber) {
362+
return pageNumber + ' resultados por página';
363+
},
364+
formatShowingRows: function (pageFrom, pageTo, totalRows) {
365+
return 'Mostrando desde ' + pageFrom + ' hasta ' + pageTo + ' - En total ' + totalRows + ' resultados';
366+
},
367+
formatSearch: function () {
368+
return 'Buscar';
369+
},
370+
formatNoMatches: function () {
371+
return 'No se encontraron resultados';
372+
},
373+
formatPaginationSwitch: function () {
374+
return 'Ocultar/Mostrar paginación';
375+
},
376+
formatRefresh: function () {
377+
return 'Refrescar';
378+
},
379+
formatToggle: function () {
380+
return 'Ocultar/Mostrar';
381+
},
382+
formatColumns: function () {
383+
return 'Columnas';
384+
},
385+
formatAllRows: function () {
386+
return 'Todos';
387+
}
388+
};
389+
390+
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-ES']);
391+
392+
})(jQuery);
393+
306394
/**
307395
* Bootstrap Table Spanish (México) translation (Obtenido de traducción de Argentina)
308396
* Author: Felix Vera (felix.vera@gmail.com)
@@ -416,6 +504,49 @@
416504

417505
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-SP']);
418506

507+
})(jQuery);
508+
/**
509+
* Bootstrap Table Persian translation
510+
* Author: MJ Vakili <mjv.1989@Gmail.com>
511+
*/
512+
(function ($) {
513+
'use strict';
514+
515+
$.fn.bootstrapTable.locales['fa-IR'] = {
516+
formatLoadingMessage: function () {
517+
return 'در حال بارگذاری, لطفا صبر کنید...';
518+
},
519+
formatRecordsPerPage: function (pageNumber) {
520+
return pageNumber + ' رکورد در صفحه';
521+
},
522+
formatShowingRows: function (pageFrom, pageTo, totalRows) {
523+
return 'نمایش ' + pageFrom + ' تا ' + pageTo + ' از ' + totalRows + ' ردیف';
524+
},
525+
formatSearch: function () {
526+
return 'جستجو';
527+
},
528+
formatNoMatches: function () {
529+
return 'رکوردی یافت نشد.';
530+
},
531+
formatPaginationSwitch: function () {
532+
return 'نمایش/مخفی صفحه بندی';
533+
},
534+
formatRefresh: function () {
535+
return 'به روز رسانی';
536+
},
537+
formatToggle: function () {
538+
return 'تغییر نمایش';
539+
},
540+
formatColumns: function () {
541+
return 'سطر ها';
542+
},
543+
formatAllRows: function () {
544+
return 'همه';
545+
}
546+
};
547+
548+
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fa-IR']);
549+
419550
})(jQuery);
420551
/**
421552
* Bootstrap Table French (Belgium) translation
@@ -488,6 +619,51 @@
488619

489620
})(jQuery);
490621

622+
/**
623+
* Bootstrap Table Croatian translation
624+
* Author: Petra Štrbenac (petra.strbenac@gmail.com)
625+
* Author: Petra Štrbenac (petra.strbenac@gmail.com)
626+
*/
627+
(function ($) {
628+
'use strict';
629+
630+
$.fn.bootstrapTable.locales['hr-HR'] = {
631+
formatLoadingMessage: function () {
632+
return 'Molimo pričekajte ...';
633+
},
634+
formatRecordsPerPage: function (pageNumber) {
635+
return pageNumber + ' broj zapisa po stranici';
636+
},
637+
formatShowingRows: function (pageFrom, pageTo, totalRows) {
638+
return 'Prikazujem ' + pageFrom + '. - ' + pageTo + '. od ukupnog broja zapisa ' + totalRows;
639+
},
640+
formatSearch: function () {
641+
return 'Pretraži';
642+
},
643+
formatNoMatches: function () {
644+
return 'Nije pronađen niti jedan zapis';
645+
},
646+
formatPaginationSwitch: function () {
647+
return 'Prikaži/sakrij stranice';
648+
},
649+
formatRefresh: function () {
650+
return 'Osvježi';
651+
},
652+
formatToggle: function () {
653+
return 'Promijeni prikaz';
654+
},
655+
formatColumns: function () {
656+
return 'Kolone';
657+
},
658+
formatAllRows: function () {
659+
return 'Sve';
660+
}
661+
};
662+
663+
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['hr-HR']);
664+
665+
})(jQuery);
666+
491667
/**
492668
* Bootstrap Table Hungarian translation
493669
* Author: Nagy Gergely <info@nagygergely.eu>
@@ -511,14 +687,20 @@
511687
formatNoMatches: function () {
512688
return 'Nincs találat';
513689
},
690+
formatPaginationSwitch: function () {
691+
return 'Lapozó elrejtése/megjelenítése';
692+
},
514693
formatRefresh: function () {
515694
return 'Frissítés';
516695
},
517696
formatToggle: function () {
518-
return 'Váltás';
697+
return 'Összecsuk/Kinyit';
519698
},
520699
formatColumns: function () {
521700
return 'Oszlopok';
701+
},
702+
formatAllRows: function () {
703+
return 'Összes';
522704
}
523705
};
524706

@@ -1123,6 +1305,9 @@
11231305
},
11241306
formatColumns: function () {
11251307
return 'Sütunlar';
1308+
},
1309+
formatAllRows: function () {
1310+
return 'Tüm Satırlar';
11261311
}
11271312
};
11281313

‎dist/bootstrap-table-locale-all.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bootstrap-table.css

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,7 @@
4040

4141
.fixed-table-footer,
4242
.fixed-table-header {
43-
height: 37px; /*cellHeight*/
4443
overflow: hidden;
45-
border-radius: 4px 4px 0 0;
46-
-webkit-border-radius: 4px 4px 0 0;
47-
-moz-border-radius: 4px 4px 0 0;
48-
}
49-
50-
.fixed-table-header {
51-
border-bottom: 1px solid #dddddd;
5244
}
5345

5446
.fixed-table-footer {
@@ -79,7 +71,8 @@
7971
-moz-border-radius-topleft: 4px;
8072
}
8173

82-
.fixed-table-container thead th .th-inner {
74+
.fixed-table-container thead th .th-inner,
75+
.fixed-table-container tbody td .th-inner {
8376
padding: 8px;
8477
line-height: 24px;
8578
vertical-align: top;
@@ -90,12 +83,23 @@
9083

9184
.fixed-table-container thead th .sortable {
9285
cursor: pointer;
93-
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC');
9486
background-position: right;
9587
background-repeat: no-repeat;
9688
padding-right: 30px;
9789
}
9890

91+
.fixed-table-container thead th .both {
92+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC');
93+
}
94+
95+
.fixed-table-container thead th .asc {
96+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==');
97+
}
98+
99+
.fixed-table-container thead th .desc {
100+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII= ');
101+
}
102+
99103
.fixed-table-container th.detail {
100104
width: 30px;
101105
}
@@ -254,7 +258,7 @@
254258

255259
.bootstrap-table .table > thead > tr > th {
256260
vertical-align: bottom;
257-
border-bottom: 2px solid #ddd;
261+
border-bottom: 1px solid #ddd;
258262
}
259263

260264
/* support bootstrap 3 */
@@ -263,6 +267,15 @@
263267
margin: 0;
264268
}
265269

270+
.bootstrap-table .fixed-table-footer tbody > tr > td {
271+
padding: 0 !important;
272+
}
273+
274+
.bootstrap-table .fixed-table-footer .table {
275+
border-bottom: none;
276+
border-radius: 0;
277+
}
278+
266279
.pull-right .dropdown-menu {
267280
right: 0;
268281
left: auto;

0 commit comments

Comments
 (0)
0