Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-07-27 13:34:37 +04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into dev-daterangepicker

Browse Source
This commit is contained in:
Paweł Kuna
2019-12-27 13:49:49 +01:00
committed by GitHub
parent 30661ca918 62fd5ab8a9
commit 495567935b
130 changed files with 563 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/_includes/cards/table-users.html
+76
View File
@@ -0,0 +1,76 @@
<div class="card">
<div class="table-responsive">
<table class="table table-hover table-outline table-vcenter text-nowrap card-table">
<thead>
<tr>
<th colspan="2">User</th>
<th>Usage</th>
<th class="text-center">Payment</th>
<th>Activity</th>
<th class="text-center">Satisfaction</th>
<th class="text-center"><i class="icon-settings"></i></th>
</tr>
</thead>
<tbody>
{% for person in site.data.people limit: 8 offset: 50 %}
{% assign percentage = forloop.index | random_number %}
{% assign time_offset = forloop.index | random_number: 0, 800 %}
{% assign register_offset = forloop.index | random_number: 0, 8000000 %}
{% assign percentage_color = percentage | number_color %}
<tr>
<td class="text-center w-1p">
{% include ui/avatar.html person-id=person.id %}
</td>
<td>
<div>{{ person.full_name }}</div>
<div class="small text-muted">
Registered: {{ site.time | date: "%s" | minus: register_offset | date: '%b %-d, %Y' }}
</div>
</td>
<td>
<div class="clearfix">
<div class="float-left">
<strong>{{ percentage }}%</strong>
</div>
<div class="float-right">
<small class="text-muted">Jun 11, 2015 - Jul 10, 2015</small>
</div>
</div>
{% include ui/progress.html value=percentage size="sm" color=percentage_color %}
</td>
<td class="text-center">
{% capture payment %}
{%- cycle 'visa', 'googlewallet', 'mastercard', 'shopify', 'ebay', 'paypal' -%}
{% endcapture %}
{% include ui/payment.html payment=payment %}
</td>
<td>
<div class="small text-muted">Last login</div>
<div>{{ site.time | date: "%s" | minus: time_offset | to_pretty_time }}</div>
</td>
<td class="text-center">
{% assign percentage = forloop.index | random_number: 0, 100 %}
<!-- <div class="mx-auto" data-value="{{ circle-percentage | divide: 100 }}"-->
<!-- data-thickness="3" data-color="blue">-->
<!-- <div class="chart-circle-value">{{ percentage }}%</div>-->
<!-- </div>-->
{% include ui/sparkline.html percentage=percentage type="pie" %}
</td>
<td class="text-center">
<div class="dropdown">
<a class="btn-icon mx-2" data-toggle="dropdown">
{% include_cached ui/icon.html icon="more-vertical" %}
</a>
{% include ui/dropdown-menu.html %}
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
pages/_includes/layout/css.html
+1
View File
@@ -12,3 +12,4 @@
<!-- Tabler Plugins -->
<link href="{{ site.base }}/{% if jekyll.environment == 'development' %}tmp-{% endif %}dist/css/tabler-flags{% if jekyll.environment == 'production' %}.min{% endif %}.css?{{ site.time | date: '%s' }}" rel="stylesheet"/>
<link href="{{ site.base }}/{% if jekyll.environment == 'development' %}tmp-{% endif %}dist/css/tabler-payments{% if jekyll.environment == 'production' %}.min{% endif %}.css?{{ site.time | date: '%s' }}" rel="stylesheet" />
pages/_includes/layout/homepage.html
+4 -8
View File
@@ -63,16 +63,12 @@
<div class="col-sm-6 col-xl-3">
{% include cards/small-stats.html color="yellow" chart-type="pie" chart-data="22/100" color="yellow" count="132" subtitle="Comments" description="16 waiting" %}
</div>
</div>
<div class="row row-deck">
{% for article in site.data.articles limit: 3 offset: 4 %}
<div class="col-lg">
{% include cards/blog-single.html article=article type="image" %}
</div>
{% endfor %}
<div class="col-12">
{% include cards/invoices.html %}
</div>
<div class="col-12">
{% include cards/table-users.html %}
</div>
</div>
pages/_includes/layout/menu-aside.html
+25 -5
View File
@@ -5,7 +5,7 @@
{% for level-1 in site.data.menu %}
<li class="sidebar-nav-item">
<a{% unless level-1[1].children %} href="{{ site.base }}/{{ level-1[1].url }}"{% endunless %} class="sidebar-nav-link{% if level-1[0] == current-page[0] and current-page.size == 1 %} active{% endif %}" {% if level-1[1].children %}data-toggle="collapse" data-target="#sidebar-menu-{{ level-1[0] }}"{% if level-1[0] == current-page[0] %} aria-expanded="true"{% endif %}{% endif %}>
<a {% unless level-1[1].children %}href="{{ site.base }}/{{ level-1[1].url }}"{% endunless %} class="sidebar-nav-link{% if level-1[0] == current-page[0] and current-page.size == 1 %} active{% endif %}" {% if level-1[1].children %}data-toggle="collapse" data-target="#sidebar-menu-{{ level-1[0] }}"{% if level-1[0] == current-page[0] %} aria-expanded="true"{% endif %}{% endif %}>
{% if level-1[1].icon %}
{% assign icon = level-1[1].icon %}
{% include ui/icon.html icon=icon class="nav-icon" %}
@@ -19,22 +19,42 @@
{% include ui/badge.html text=badge color=badge-color %}
{% endif %}
{% if level-1[1].children %}
<span class="sidebar-nav-arrow"></span>
{% endif %}
{% if level-1[1].children %}
<span class="sidebar-nav-arrow"></span>
{% endif %}
</a>
{% if level-1[1].children %}
<ul class="sidebar-subnav collapse{% if level-1[0] == current-page[0] %} show{% endif %}" id="sidebar-menu-{{ level-1[0] }}">
{% for level-2 in level-1[1].children %}
<li class="sidebar-nav-item">
<a href="{{ site.base }}/{{ level-2[1].url }}" class="sidebar-nav-link{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] and current-page.size == 2 %} active{% endif %}">
<a {% unless level-2[1].children %} href="{{ site.base }}/{{ level-2[1].url }}"{% endunless %} class="sidebar-nav-link{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] and current-page.size == 2 %} active{% endif %}" {% if level-2[1].children %}data-toggle="collapse" data-target="#sidebar-menu-{{ level-2[0] }}"{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] %} aria-expanded="true"{% endif %}{% endif %}>
<span>{{ level-2[1].title }}</span>
{% if level-2[1].badge %}
{% assign badge = level-2[1].badge %}
{% include ui/badge.html text=badge color="green" %}
{% endif %}
{% if level-2[1].children %}
<span class="sidebar-nav-arrow"></span>
{% endif %}
</a>
{% if level-2[1].children %}
<ul class="sidebar-subnav collapse{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] %} show{% endif %}" id="sidebar-menu-{{ level-2[0] }}">
{% for level-3 in level-2[1].children %}
<li class="sidebar-nav-item">
<a href="{{ site.base }}/{{ level-3[1].url }}" class="sidebar-nav-link{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] and level-3[0] == current-page[2] and current-page.size == 3 %} active{% endif %}">
<span>{{ level-3[1].title }}</span>
{% if level-3[1].badge %}
{% assign badge = level-3[1].badge %}
{% include ui/badge.html text=badge color="green" %}
{% endif %}
</a>
</li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
pages/_includes/ui/payment.html
+1
View File
@@ -0,0 +1 @@
<span class="payment payment-{{ include.payment | default: 'visa'}}{% if include.class %} {{ include.class }}{% endif %}{% if include.['size'] %} payment-size-{{include.size}}{% endif %}"></span>
pages/_includes/ui/sparkline.html
+9 -4
View File
@@ -2,6 +2,11 @@
{% assign id = 0 | random_id %}
{% assign color = include.color | default: 'blue' %}
{% assign data = include.data %}
{% if include.percentage %}
{% assign data = include.percentage | append: "/100" %}
{% endif %}
{% append_lib peity %}
<div class="chart-sparkline{% if type == 'pie' %} chart-sparkline-square{% endif %}{% if include.wide %} chart-sparkline-wide{% endif %}" id="sparkline-{{ id }}"></div>
@@ -9,15 +14,15 @@
{% capture_global scripts %}
<script>
document.addEventListener("DOMContentLoaded", function () {
$().peity && $('#sparkline-{{ id }}').text("{{ include.data }}").peity("{{ type | default: 'bar' }}", {
$().peity && $('#sparkline-{{ id }}').text("{{ data }}").peity("{{ type | default: 'bar' }}", {
width: {% if type == 'pie' %}40{% else %}64{% endif %},
height: 40,
stroke: "{{ color | tabler_color }}",
strokeWidth: 2,
fill: {% if type == 'pie' %}["{{ color | default: 'blue' | tabler_color }}", "{{ 'border-color' | tabler_color }}"]{% elsif type == 'bar' %}["{{ color | tabler_color }}"]{% else %}"transparent"{% endif %},
fill: {% if type == 'pie' %}["{{ color | default: 'blue' | tabler_color }}", "{{ 'gray-200' | tabler_color }}"]{% elsif type == 'bar' %}["{{ color | tabler_color }}"]{% else %}"transparent"{% endif %},
padding: .2,
innerRadius: 16,
innerRadius: 17,
});
});
</script>
{% endcapture_global %}
{% endcapture_global %}