From 7f991c4d0c5628d9d670243bc8aa174703880ac7 Mon Sep 17 00:00:00 2001 From: Dawid Harat Date: Thu, 5 Dec 2019 23:34:21 +0100 Subject: [PATCH 1/5] datatables --- pages/_data/menu.yml | 6 +++--- pages/_includes/cards/invoices.html | 25 ++++++++++++++++++++++--- pages/datatables.html | 5 +++++ 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 pages/datatables.html diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index f527075ed..06352e56d 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -18,9 +18,9 @@ base: cards: url: cards.html title: Cards - c: - url: c.html - title: C + datatables: + url: datatables.html + title: Data Tables charts: url: charts.html diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index 689040b24..411d6dc51 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -2,6 +2,24 @@

Invoices

+
+ +
+ Show +
+ +
+ entries +
+ +
+ Serach: +
+ +
+
+ +
@@ -40,8 +58,9 @@ @@ -50,4 +69,4 @@
{{ invoice.price }} - - + + + {% include ui/dropdown-menu.html %}
- + \ No newline at end of file diff --git a/pages/datatables.html b/pages/datatables.html new file mode 100644 index 000000000..ba30fd4ad --- /dev/null +++ b/pages/datatables.html @@ -0,0 +1,5 @@ +--- +title: Data Tables +--- + +{% include cards/invoices.html %} \ No newline at end of file From a17fe3f13f3933d80d619bdd919bf61a1d900fd3 Mon Sep 17 00:00:00 2001 From: Dawid Date: Fri, 6 Dec 2019 17:05:29 +0100 Subject: [PATCH 2/5] right icon --- pages/_includes/cards/invoices.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index 411d6dc51..cfaee63e0 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -33,6 +33,7 @@ Status Price + @@ -64,6 +65,9 @@ {% include ui/dropdown-menu.html %} + + + {% endfor %} From e966b030e7c73e1e7ef93da7b9c468b27aba484a Mon Sep 17 00:00:00 2001 From: Dawid Harat Date: Fri, 6 Dec 2019 19:57:12 +0100 Subject: [PATCH 3/5] datatables with no script --- pages/_includes/cards/invoices.html | 35 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index cfaee63e0..c6cd50056 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -7,7 +7,7 @@
Show
- +
entries
@@ -25,20 +25,20 @@ - No. - Invoice Subject - Client - VAT No. - Created - Status - Price + No. + Invoice Subject + Client + VAT No. + Created + Status + Price - {% for invoice in site.data.invoices limit: 5 %} + {% for invoice in site.data.invoices limit: 8 %} 00{{ forloop.index | plus: 1400 }} @@ -59,18 +59,29 @@ {{ invoice.price }} - + - + {% include ui/dropdown-menu.html %} - + {% endfor %} +
+ +
+

Showing 1 to 8 of 16 entries

+
+ +
+ Previous12Next +
+ +
\ No newline at end of file From 7a181a05e8136b5ab82b58f107d3a156e1549e18 Mon Sep 17 00:00:00 2001 From: Dawid Harat Date: Sat, 7 Dec 2019 22:14:15 +0100 Subject: [PATCH 4/5] datatables scroll fix --- pages/_includes/cards/invoices.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index c6cd50056..33c6f2293 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -2,6 +2,13 @@

Invoices

+
@@ -17,6 +24,7 @@
+
@@ -66,7 +74,7 @@ - + {% endfor %} @@ -78,9 +86,9 @@

Showing 1 to 8 of 16 entries

-
Previous12Next +
From 4ef55215e750bb13183b779b35d260187e7baa2f Mon Sep 17 00:00:00 2001 From: Dawid Harat Date: Sun, 8 Dec 2019 22:03:58 +0100 Subject: [PATCH 5/5] datatables correction --- pages/_includes/cards/invoices.html | 163 +++++++++++++--------------- 1 file changed, 76 insertions(+), 87 deletions(-) diff --git a/pages/_includes/cards/invoices.html b/pages/_includes/cards/invoices.html index 33c6f2293..3b061947b 100644 --- a/pages/_includes/cards/invoices.html +++ b/pages/_includes/cards/invoices.html @@ -1,95 +1,84 @@
-
-

Invoices

-
- -
- -
- Show -
- -
- entries +
+

Invoices

- -
- Serach: -
- +
+ +
+ Show +
+
-
+ entries +
+ +
+ Serach: +
+ +
+
+
- -
-
- - +
+
+ + + + + + + + + + + + + + + + + {% for invoice in site.data.invoices limit: 8 %} - - - - - - - - - - + + + + + + + + + + + - - - - {% for invoice in site.data.invoices limit: 8 %} - - - - - - - - - - - - - - {% endfor %} - -
No. {% include_cached ui/icon.html icon="chevron-up" class="icon-sm text-dark icon-thick" %}Invoice Subject {% include_cached ui/icon.html icon="code" class="icon-sm" %}Client {% include_cached ui/icon.html icon="code" class="icon-sm" %}VAT No. {% include_cached ui/icon.html icon="code" class="icon-sm" %}Created {% include_cached ui/icon.html icon="code" class="icon-sm" %}Status {% include_cached ui/icon.html icon="code" class="icon-sm" %}Price {% include_cached ui/icon.html icon="code" class="icon-sm" %}
No. Invoice Subject Client VAT No. Created Status Price 00{{ forloop.index | plus: 1400 }}{{ invoice.name }} + {% include ui/flag.html flag=invoice.country %} + {{ invoice.client }} + + {{ invoice.vat-no }} + + {{ invoice.date }} + + {{ invoice.status-name }} + {{ invoice.price }} + + + + {% include ui/dropdown-menu.html %} + + + {% include_cached ui/icon.html icon="edit" class="icon-sm float-right" %} +
00{{ forloop.index | plus: 1400 }}{{ invoice.name }} - {% include ui/flag.html flag=invoice.country %} - {{ invoice.client }} - - {{ invoice.vat-no }} - - {{ invoice.date }} - - {{ invoice.status-name }} - {{ invoice.price }} - - - - {% include ui/dropdown-menu.html %} - - - -
-
-
- -
-

Showing 1 to 8 of 16 entries

+ {% endfor %} + +
-
- Previous12Next -
+
+
+

Showing 1 to 8 of 16 entries

+
+
+ Previous12Next +
- -
-
\ No newline at end of file +
\ No newline at end of file