Skip to content

Commit bca38b3

Browse files
andreihoncharukandreihoncharuk
committed
Merge branch 'master' of https://github.com/thingsboard/thingsboard.github.io into pages/professional
2 parents 3e9a631 + b892646 commit bca38b3

Some content is hidden

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

42 files changed

+935
-47
lines changed

‎Gemfile.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ GEM
1919
faraday (0.15.4)
2020
multipart-post (>= 1.2, < 3)
2121
ffi (1.9.25)
22+
ffi (1.9.25-x64-mingw32)
2223
forwardable-extended (2.6.0)
2324
gemoji (2.1.0)
2425
html-pipeline (2.9.1)
@@ -79,6 +80,8 @@ GEM
7980
multipart-post (2.0.0)
8081
nokogiri (1.10.8)
8182
mini_portile2 (~> 2.4.0)
83+
nokogiri (1.10.8-x64-mingw32)
84+
mini_portile2 (~> 2.4.0)
8285
octokit (4.13.0)
8386
sawyer (~> 0.8.0, >= 0.5.3)
8487
pathutil (0.16.2)
@@ -103,6 +106,7 @@ GEM
103106

104107
PLATFORMS
105108
ruby
109+
x64-mingw32
106110

107111
DEPENDENCIES
108112
activesupport (= 4.2.7)
@@ -125,4 +129,4 @@ DEPENDENCIES
125129
rouge (= 1.11.1)
126130

127131
BUNDLED WITH
128-
2.0.1
132+
2.1.4

‎_data/docs-home.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ toc:
327327
new: true
328328
section:
329329
- title: What is ThingsBoard Cloud?
330-
path: /products/paas/
330+
path: /products/paas/what-is-thingsboard-cloud/
331331
- title: Subscriptions
332332
path: /products/paas/subscription/
333333
- title: Plan and billing

‎_layouts/thingsboard-paas.html

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<!Doctype html>
2+
<html id="thingsboard-paas">
3+
4+
{% include head-header.html %}
5+
<!-- HERO -->
6+
<section id="hero" class="light-text"
7+
data-vide-bg="mp4: https://s3-us-west-1.amazonaws.com/tb-videos/pe-cover.mp4,
8+
webm: https://s3-us-west-1.amazonaws.com/tb-videos/pe-cover.webm,
9+
ogv: https://s3-us-west-1.amazonaws.com/tb-videos/pe-cover.ogv,
10+
poster: /video/pe-cover.jpg"
11+
data-vide-options="bgColor: #000000, loop: true, muted: true, posterType: jpg">
12+
<div class="video-cover"></div>
13+
<div id="hero-content">
14+
<h1 class="header-animation paas-title">ThingsBoard Cloud</h1>
15+
<div class="header-animation">
16+
<a href="/pricing/" class="button try-paas">Try it now</a>
17+
</div>
18+
<div class="paas-arrow">
19+
<a href="#intro"><i class="fa fa-chevron-down fa-2x" aria-hidden="true"></i></a>
20+
</div>
21+
</div>
22+
</section>
23+
24+
<section id="encyclopedia">
25+
<div id="paasContent" class="noToc">
26+
{{ content }}
27+
</div>
28+
</section>
29+
30+
{% include footer.html %}
31+
32+
<script type="text/javascript">
33+
jqueryDefer(function () {
34+
vis(function() {
35+
if (vis()) {
36+
slideUp();
37+
}
38+
});
39+
$('#hero-content > .paas-arrow > a').click(function(event) {
40+
event.preventDefault();
41+
var target = $('#encyclopedia');
42+
$('html, body').animate({
43+
scrollTop: target.offset().top - 60 //header height
44+
}, 1000, "easeOutCirc");
45+
});
46+
47+
});
48+
49+
inViewportDefer(function() {
50+
$("#hero-content").inViewport(function(px){
51+
if($(this).height()-px >= 60) {
52+
$(this).addClass("arrow-hidden");
53+
} else {
54+
$(this).removeClass("arrow-hidden");
55+
}
56+
});
57+
});
58+
59+
function slideUp() {
60+
var headAnimations = $('#hero-content').find('.header-animation');
61+
for (var i=0;i<headAnimations.length;i++) {
62+
reinsert($(headAnimations[i]));
63+
}
64+
}
65+
66+
function reinsert(el) {
67+
var newone = el.clone(true);
68+
el.before(newone);
69+
el.remove();
70+
}
71+
72+
</script>
73+
74+
</body>
75+
</html>

‎_sass/_base.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ iframe
11151115
height: 400px
11161116
padding: 20px 0
11171117

1118-
#peContent
1118+
#peContent, #paasContent
11191119
position: relative
11201120
width: 100%
11211121
margin: auto

‎css/styles.sass

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@
3333
@import "../_scss/tooltips"
3434
@import "../careers/careers"
3535
@import "../partners/distyle"
36+
@import "../products/paas/thingsboard-paas"

‎docs/user-guide/contribution/widgets-development-before-3.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ title: Widgets Development Guide Before 3.0
1414
This is a widget development guide for the ThingsBoard version before the ThingsBoard 3.0 version.
1515
In case if you are using the ThingsBoard 3.0+ version, you can refer to the next link for the [Widget Development ThingsBoard 3.0+ version](/docs/user-guide/contribution/widgets-development/) guide.
1616

17-
**ThingsBoard widgets** are additional UI modules that can be easily integrated into any [IoT Dashboards](/docs/user-guide/ui/dashboards/) and provide end-user functions such as data visualization, remote device control, alarms management and displaying static custom html content.
17+
**ThingsBoard widgets** are additional UI modules that can be easily integrated into any [IoT Dashboards](/docs/user-guide/dashboards/) and provide end-user functions such as data visualization, remote device control, alarms management and displaying static custom html content.
1818
According to the provided features each widget definition represents specific [Widget Type](/docs/user-guide/ui/widget-library/#widget-types).
1919

2020
## Creating new widget definition
@@ -902,4 +902,4 @@ Browser debugger (if enabled) will automatically pause code execution at the deb
902902
903903
## Next steps
904904
905-
{% assign currentGuide = "Contribution" %}{% include templates/guides-banner.md %}
905+
{% assign currentGuide = "Contribution" %}{% include templates/guides-banner.md %}

‎docs/user-guide/contribution/widgets-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ title: Widgets Development Guide
1111

1212
## Introduction
1313

14-
**ThingsBoard widgets** are additional UI modules that easily integrate into any [IoT Dashboard](/docs/user-guide/ui/dashboards/). They provide end-user functions such as data visualization, remote device control, alarms management and display of static custom html content.
14+
**ThingsBoard widgets** are additional UI modules that easily integrate into any [IoT Dashboard](/docs/user-guide/dashboards/). They provide end-user functions such as data visualization, remote device control, alarms management and display of static custom html content.
1515
According to the provided features, each widget definition represents a specific [Widget Type](/docs/user-guide/ui/widget-library/#widget-types).
1616

1717
## Creating new widget definition

‎docs/user-guide/dashboards.md

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,22 @@ assignees:
44
- ashvayka
55
title: Working with IoT dashboards
66
description: IoT dashboards using ThingsBoard
7+
dash-title:
8+
0:
9+
image: /images/user-guide/dashboards/dash-title.png
10+
711
editMode:
812
0:
913
image: /images/user-guide/dashboards/edit-mode1-src.png
1014
1:
1115
image: /images/user-guide/dashboards/edit-mode2-src.png
1216

17+
toolbar-review:
18+
0:
19+
image: /images/user-guide/dashboards/toolbar-not-editmode.png
20+
1:
21+
image: /images/user-guide/dashboards/toolbar-editmode.png
22+
1323
aliases:
1424
0:
1525
image: /images/user-guide/dashboards/alias1-src.png
@@ -236,18 +246,22 @@ For faster learning and a better understanding of this guide, first, you have to
236246

237247
ThingsBoard provides the ability to create and manage Dashboards.
238248

239-
You can have unlimited number of Dashboards. Each Dashboard may contain plenty of widgets.
249+
Each Dashboard may contain plenty of widgets.
240250
Dashboards display data from many entities: devices, assets, etc. Dashboards can be assigned to Customers.
241251

242252
This guide covers main concepts and various configuration settings.
243253

244254
## Dashboard overview
245255

246-
Before starting working with a dashboard, get acquainted with its appearance and understand which features are responsible for what actions.
256+
Before starting working with a dashboard, get familiar with its appearance and understand which features are responsible for what actions.
247257

248258
### Title
249259

250260
Editable dashboard title appears in the top-left corner of the dashboard. Dashboard Title displays in the application breadcrumbs to simplify the navigation.
261+
You can change and adjust a Title in the [settings of the dashboard](/docs/user-guide/dashboards/#title-of-the-dashboard)
262+
263+
{% include images-gallery.html imageCollection="dash-title" %}
264+
251265

252266
### Edit mode
253267

@@ -269,6 +283,8 @@ Dashboard toolbar allows you to manage
269283
Some of these icons (stats, layout, settings) are visible only in the "edit" mode. All other icons are visible in both "view" and "edit" mode.
270284
You can hide these icons or configure the toolbar to be minimized by default using [settings](/docs/user-guide/dashboards/#settings).
271285

286+
{% include images-gallery.html imageCollection="toolbar-review" %}
287+
272288
### Entity Aliases
273289

274290
Entity Aliases determine which entities (devices, assets, etc) you would like to display on the dashboard.
@@ -326,6 +342,8 @@ Widgets are the building blocks of your dashboard. There are 5 types of widgets:
326342
* **Alarm** widgets allow you to display [alarms](/docs/user-guide/alarms/);
327343
* **Static** widgets are designed to display static data. For example, floor plan or static company information.
328344

345+
More about widget types you can learn [here](docs/user-guide/ui/widget-library/).
346+
329347
#### Adding widget to the dashboard
330348

331349
To add a widget to the dashboard, you should:
@@ -344,7 +362,7 @@ Therefore, the "Add widget" dialog contains four tabs to define a widget. Note t
344362
You may leave all other configuration tabs with the default values in most of the cases.
345363
We will discuss each of those tabs below.
346364

347-
##### Widget data settings
365+
##### 1. Widget data settings
348366

349367
Widget data settings allow you to add one or multiple data sources.
350368
A Data source is a combination of [entity alias](/docs/user-guide/dashboards/#entity-aliases), optional [filter](/docs/user-guide/dashboards/#entity-filters), and list of data keys.
@@ -373,7 +391,7 @@ In such case, you can still add a key to the data source, and the widget will st
373391
Besides the data keys, time series widget allows you to select the [time window](/docs/user-guide/dashboards/#time-window).
374392
Also, alarm widget allows you to select both [time window](/docs/user-guide/dashboards/#time-window) and [alarm filter](/docs/user-guide/dashboards/#alarm-filter).
375393

376-
##### Data keys
394+
##### 2. Data keys
377395

378396
Data key defines time series, attribute or entity field that you would like to use in the widget.
379397
Data key definition consists of type (time series, attribute of entity field) and the actual key.
@@ -389,15 +407,15 @@ List of entity fields depends on the entity type and may extend in the future:
389407
* **User** has the following fields: created time, first name, last name, email and additional info.
390408
* **Customer** has the following fields: create time, entity type, email, title, country, state, city, address, zip code, phone, additional info.
391409

392-
##### Basic Data keys settings
410+
###### 2.1. Basic Data keys settings
393411

394412
Coming soon...
395413

396-
##### Advanced Data keys settings
414+
###### 2.2. Advanced Data keys settings
397415

398416
Coming soon...
399417

400-
##### Widget time window
418+
##### 3. Widget time window
401419

402420
A widget time window defines a time interval and aggregation function that should be used to fetch the time series or alarm data.
403421
By default, every widget uses the main [time window](/docs/user-guide/dashboards/#time-window) determined in the dashboard's [toolbar](/docs/user-guide/dashboards/#toolbar).
@@ -408,7 +426,7 @@ You can also hide the time window selection for a specific widget from the user
408426

409427
Learn more about time window configuration [here](/docs/user-guide/dashboards/#time-window).
410428

411-
##### Alarm filter
429+
##### 4. Alarm filter
412430

413431
In addition to the time window configuration, alarm widgets allow you to filter [alarms](/docs/user-guide/alarms/) based on [status](/docs/user-guide/alarms/#lifecycle), [severity](/docs/user-guide/alarms/#severity), and [type](/docs/user-guide/alarms/#type).
414432
You can choose a combination of alarm statuses and severity. You may also define specific alarm types as well as enable search of [propagated](/docs/user-guide/alarms/#propagation) alarms.
@@ -424,7 +442,7 @@ You should see a similar widget (note that you should send/simulate some data to
424442

425443
Let's use the basic widget settings to customize the widget. We will demonstrate how each setting affects the widget.
426444

427-
##### Widget Title
445+
##### 1. Widget Title
428446

429447
You can input custom widget title, tooltip and title style. You may also add an icon to the title and control icon color and size. See configuration and the corresponding result below.
430448

@@ -447,7 +465,7 @@ All those settings are enabled by default.
447465

448466
{: .copy-code}
449467

450-
##### Widget Style
468+
##### 2. Widget Style
451469

452470
You can customize personal style for the widget using CSS properties. This style will be applied to the main div element of the widget. You can also change the background color, text color, padding, and margin.
453471
See the configuration and the corresponding result below.
@@ -467,7 +485,7 @@ Widget style from the screen above:
467485
```
468486
{: .copy-code}
469487

470-
##### Legend settings
488+
##### 3. Legend settings
471489

472490
For chart widgets, the “Display legend” option is enabled by default. The legend is used to display the min/max/average/total values.
473491
Other widgets have this option disabled.
@@ -482,7 +500,7 @@ See configuration and the corresponding result below:
482500

483501
{% include images-gallery.html imageCollection="basic-settings-legend" %}
484502

485-
##### Mobile mode settings
503+
##### 4. Mobile mode settings
486504

487505
Mobile Mode settings consist of two options:
488506
- Order - set to an integer, specifies the priority of the order of displaying widgets in mobile mode (note that in mobile mode all widgets are displayed in one vertical column).
@@ -492,14 +510,14 @@ For example, with a value of 5, the widget height will be 350px. (70 * 5)
492510
If no value is specified, its original height will be used.
493511

494512

495-
##### Other settings
513+
##### 5. Other settings
496514

497515
You can choose which symbol to display next to the value and the number of digits after the floating-point number.
498516
These settings are useful if you want to apply the same settings for all axis.
499517
For example, if you are showing temperature readings for multiple devices, you can add '°C' or '°F' symbol.
500518
However, if you are displaying both temperature and humidity, you have to configure these data keys separately using data key settings.
501519

502-
##### Advanced widget settings
520+
##### 6. Advanced widget settings
503521

504522
Advanced widget settings are specific to widget implementation. Those settings allow you to fine tune the widget. For example, “Timeseries - Flot” widget allows you to configure line style, width, enable comparison with the previous time interval and use entity attributes in the legend.
505523

@@ -509,7 +527,9 @@ Coming soon...
509527

510528
##### Widget actions
511529

512-
Coming soon...
530+
Each type of widget has its own actions. They are similar and serve the same purpose - to help you quickly switch from the created widget to certain detailed information about its devices.
531+
532+
You can read more about the action widget in the [article dedicated to it](/docs/user-guide/ui/widget-actions/).
513533

514534
## Time window
515535

@@ -613,15 +633,15 @@ If you tick this option, all the widgets on the Dashboard will fill in verticall
613633

614634
#### Background
615635

616-
##### Background color
636+
##### 1. Background color
617637

618638
The Background color option allows you to customize the color that you'd like to be on the Dashboard's background.
619639
To alter it, click on the colored circle, and with sliders choose the needed color and wished transparency. Then, press "Save" to apply changes.
620640
After saving, you can see the customized background.
621641

622642
{% include images-gallery.html imageCollection="background-settings" %}
623643

624-
##### Background image
644+
##### 2. Background image
625645

626646
This option allows setting the picture as a background. To do this, you should drop an image in the appropriate field, or upload it from a folder on your computer.
627647
Once you select it, an image preview will appear on the left of the Settings window.

‎docs/user-guide/rbac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ description:
2424
ThingsBoard Community Edition (TB CE) supports a straight-forward security model with three main roles: System administrator, Tenant administrator, and Customer user.
2525
A system administrator is able to manage tenants, while a tenant administrator manages devices, dashboards, customers, and other entities that belong to a particular tenant.
2626
Customer user is able to view dashboards and control devices that are assigned to a specific customer.
27-
TB CE functionality is sufficient for a lot of simple use cases, especially building real-time [end-user dashboards](/docs/user-guide/ui/dashboards/).
27+
TB CE functionality is sufficient for a lot of simple use cases, especially building real-time [end-user dashboards](/docs/user-guide/dashboards/).
2828

2929
ThingsBoard Professional Edition (TB PE) brings much more flexibility in terms of user, customer, and role management.
3030
It is designed to cover use cases for businesses and enterprises with multiple user groups that have different permissions but may interact with the same devices and assets.

‎docs/user-guide/ui/widget-library.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description: ThingsBoard Dashboard Widgets Library
1212

1313
## Introduction
1414

15-
All [IoT Dashboards](/docs/user-guide/ui/dashboards/) are constructed using **ThingsBoard widgets** that are defined in Widget Library.
15+
All [IoT Dashboards](/docs/user-guide/dashboards/) are constructed using **ThingsBoard widgets** that are defined in Widget Library.
1616
Each widget provides end-user functions such as data visualization, remote device control, alarms management and displaying static custom html content.
1717

1818
## Widget Types

‎docs/user-guide/visualization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Or you may modify the dashboard via script when a new device is assigned to a cu
2121
You can find useful links to get started below:
2222

2323
- [Getting started guide](/docs/getting-started-guides/helloworld/) - covers basic steps to create a dashboard.
24-
- [IoT Dashboards](/docs/user-guide/ui/dashboards/) - contains tutorials about basic IoT dashboard operations.
24+
- [IoT Dashboards](/docs/user-guide/dashboards/) - contains tutorials about basic IoT dashboard operations.
2525
- [Samples](/docs/samples/) - contains several examples that include both client-side applications and corresponding data visualization.
2626
- [Widget Library](/docs/user-guide/ui/widget-library/) - contains an overview of dashboard widget bundles:
2727
- **Digital** and **analog** gauges for the latest real-time values visualization;
2828
- Highly customizable Bar and Line **charts** for visualization of historical and sliding-window data points;
2929
- **Map widgets** for tracking movement and the latest positions of IoT devices on Google or OpenStreet maps;
3030
- **GPIO** control widgets that allow sending GPIO toggle commands to devices;
31-
- **Card** widgets to enhance your dashboards with flexible HTML labels based on static content or latest telemetry values from IoT devices.
31+
- **Card** widgets to enhance your dashboards with flexible HTML labels based on static content or latest telemetry values from IoT devices.

0 commit comments

Comments
 (0)