Skip to content

Commit 6c5949a

Browse files
author
Konstantin Dinev
authored
Merge branch 'vNext' into kdinev-patch-2
2 parents adbe8ae + 007839e commit 6c5949a

16 files changed

Lines changed: 111 additions & 173 deletions

‎src/app/layouts/accordion/accordion-sample-1/accordion-sample-1.component.html‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@
33
<igx-accordion #accordion [singleBranchExpand]="singleBranchExpand">
44
<igx-expansion-panel>
55
<igx-expansion-panel-header>
6-
<igx-expansion-panel-title>What has changed about subscription and pricing model?
6+
<igx-expansion-panel-title>
7+
What has changed about subscription and pricing model?
78
</igx-expansion-panel-title>
89
</igx-expansion-panel-header>
910
<igx-expansion-panel-body>
10-
<div class="body-container">
11-
We have moved to a subscription-based pricing model for all our developer tools. This makes it easier
12-
for you to manage your license subscriptions and allows us to provide a better level of service for you.
11+
We have moved to a subscription-based pricing model for all our developer tools. This makes it easier
12+
for you to manage your license subscriptions and allows us to provide a better level of service for you.
1313

14-
We updated our pricing and packages to provide you with flexible options and the best value. This
15-
includes <a href="https://www.infragistics.com/products/ignite-ui">Ignite UI </a>(formerly Ignite UI for
16-
JavaScript) which includes all of our JavaScript framework
17-
components for web development, including: Angular, ASP.NET (Core and MVC), Blazor, JQuery, React and
18-
Web Components), as well as Infragistics Professional, Infragistics Ultimate, our Ultimate UI products.
14+
We updated our pricing and packages to provide you with flexible options and the best value. This
15+
includes <a href="https://www.infragistics.com/products/ignite-ui">Ignite UI </a>(formerly Ignite UI for
16+
JavaScript) which includes all of our JavaScript framework
17+
components for web development, including: Angular, ASP.NET (Core and MVC), Blazor, JQuery, React and
18+
Web Components), as well as Infragistics Professional, Infragistics Ultimate, our Ultimate UI products.
1919

20-
We also offer multi-year subscriptions options with a built-in discount, so you can see the value up
21-
front. With these updates we are confident that we are providing the best platforms and the best price.
22-
</div>
20+
We also offer multi-year subscriptions options with a built-in discount, so you can see the value up
21+
front. With these updates we are confident that we are providing the best platforms and the best price.
2322
</igx-expansion-panel-body>
2423
</igx-expansion-panel>
2524
<igx-expansion-panel>
@@ -50,42 +49,37 @@
5049
for Ignite UI?</igx-expansion-panel-title>
5150
</igx-expansion-panel-header>
5251
<igx-expansion-panel-body>
53-
<div class="body-container">
54-
For Ignite UI customers, we are moving away from NPM for licensed packages. The current NPM packages
55-
will be replaced with packages that include a “Trial Version” watermark. Licensed packages for Ignite UI
56-
will be available from our cloud hosted ProGet server.
52+
For Ignite UI customers, we are moving away from NPM for licensed packages. The current NPM packages
53+
will be replaced with packages that include a “Trial Version” watermark. Licensed packages for Ignite UI
54+
will be available from our cloud hosted ProGet server.
5755

58-
For more information, please refer to this article:
56+
For more information, please refer to this article:
5957

60-
<a
61-
href="https://www.infragistics.com/products/ignite-ui-angular/angular/components/general/ignite-ui-licensing">Moving
62-
from Trial to Licensed Ignite UI NPM Packages</a>
63-
</div>
58+
<a
59+
href="https://www.infragistics.com/products/ignite-ui-angular/angular/components/general/ignite-ui-licensing">Moving
60+
from Trial to Licensed Ignite UI NPM Packages
61+
</a>
6462
</igx-expansion-panel-body>
6563
</igx-expansion-panel>
6664
<igx-expansion-panel>
6765
<igx-expansion-panel-header>
6866
<igx-expansion-panel-title>What happens if I don’t renew my subscription?</igx-expansion-panel-title>
6967
</igx-expansion-panel-header>
7068
<igx-expansion-panel-body>
71-
<div class="body-container">
72-
Any unlicensed or trial versions of Ignite UI for Angular, React and Web Components will now include
73-
this watermark.
74-
</div>
69+
Any unlicensed or trial versions of Ignite UI for Angular, React and Web Components will now include
70+
this watermark.
7571
</igx-expansion-panel-body>
7672
</igx-expansion-panel>
7773
<igx-expansion-panel>
7874
<igx-expansion-panel-header>
79-
<igx-expansion-panel-title>If I don’t renew my subscription will I still have access to previous
80-
versions of
81-
Infragistics products?</igx-expansion-panel-title>
75+
<igx-expansion-panel-title>If I don’t renew my subscription will
76+
I still have access to previous versions of Infragistics products?
77+
</igx-expansion-panel-title>
8278
</igx-expansion-panel-header>
8379
<igx-expansion-panel-body>
84-
<div class="body-container">
85-
Any version of Infragistics software which you have downloaded can continue to be used perpetually.
86-
Access to download any new or previous versions through our customer portal and package feeds will
87-
require maintaining an active subscription by continuing to renew it.
88-
</div>
80+
Any version of Infragistics software which you have downloaded can continue to be used perpetually.
81+
Access to download any new or previous versions through our customer portal and package feeds will
82+
require maintaining an active subscription by continuing to renew it.
8983
</igx-expansion-panel-body>
9084
</igx-expansion-panel>
9185
</igx-accordion>

‎src/app/layouts/accordion/accordion-sample-1/accordion-sample-1.component.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ $ep-sample-border: 1px solid rgba(174, 174, 174, 0.25);
66
margin: 8px;
77
}
88

9-
.body-container {
10-
padding: 16px;
11-
}
12-
139
igx-switch {
1410
padding: 16px;
1511
}

‎src/app/layouts/accordion/accordion-sample-2/accordion-sample-2.component.html‎

Lines changed: 57 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,17 @@
99
</igx-expansion-panel-title>
1010
</igx-expansion-panel-header>
1111
<igx-expansion-panel-body>
12-
<div class="body-container">
13-
We have moved to a subscription-based pricing model for all our developer tools. This makes it easier
14-
for you to manage your license subscriptions and allows us to provide a better level of service for you.
12+
We have moved to a subscription-based pricing model for all our developer tools. This makes it easier
13+
for you to manage your license subscriptions and allows us to provide a better level of service for you.
1514

16-
We updated our pricing and packages to provide you with flexible options and the best value. This
17-
includes <a href="https://www.infragistics.com/products/ignite-ui">Ignite UI </a>(formerly Ignite UI for
18-
JavaScript) which includes all of our JavaScript framework
19-
components for web development, including: Angular, ASP.NET (Core and MVC), Blazor, JQuery, React and
20-
Web Components), as well as Infragistics Professional, Infragistics Ultimate, our Ultimate UI products.
15+
We updated our pricing and packages to provide you with flexible options and the best value. This
16+
includes <a href="https://www.infragistics.com/products/ignite-ui">Ignite UI </a>(formerly Ignite UI for
17+
JavaScript) which includes all of our JavaScript framework
18+
components for web development, including: Angular, ASP.NET (Core and MVC), Blazor, JQuery, React and
19+
Web Components), as well as Infragistics Professional, Infragistics Ultimate, our Ultimate UI products.
2120

22-
We also offer multi-year subscriptions options with a built-in discount, so you can see the value up
23-
front. With these updates we are confident that we are providing the best platforms and the best price.
24-
</div>
21+
We also offer multi-year subscriptions options with a built-in discount, so you can see the value up
22+
front. With these updates we are confident that we are providing the best platforms and the best price.
2523
</igx-expansion-panel-body>
2624
</igx-expansion-panel>
2725
<igx-expansion-panel>
@@ -31,20 +29,18 @@
3129
</igx-expansion-panel-title>
3230
</igx-expansion-panel-header>
3331
<igx-expansion-panel-body>
34-
<div class="body-container">
35-
The license updates will impact all new and current customers using Ignite UI, Infragistics Professional
36-
and Infragistics Ultimate. Specifically, we have also made updates to our product and packaging for
37-
Ignite UI for JavaScript, Ignite UI for Angular, Ignite UI for React and Ignite UI for Web components.
38-
For more information, please refer to this blog:
32+
The license updates will impact all new and current customers using Ignite UI, Infragistics Professional
33+
and Infragistics Ultimate. Specifically, we have also made updates to our product and packaging for
34+
Ignite UI for JavaScript, Ignite UI for Angular, Ignite UI for React and Ignite UI for Web components.
35+
For more information, please refer to this blog:
3936

40-
<a
41-
href="https://www.infragistics.com/community/blogs/b/jason_beres/posts/announcement-changes-to-ignite-ui-product-packaging">Announcement:
42-
Changes to Ignite UI Product & Packaging</a>
37+
<a
38+
href="https://www.infragistics.com/community/blogs/b/jason_beres/posts/announcement-changes-to-ignite-ui-product-packaging">Announcement:
39+
Changes to Ignite UI Product & Packaging</a>
4340

44-
The pricing has been updated for all products and packages. So, all new or additional licenses will be
45-
sold based on our new pricing and packages. All existing license agreements will be honored and renewed
46-
based upon the current agreement.
47-
</div>
41+
The pricing has been updated for all products and packages. So, all new or additional licenses will be
42+
sold based on our new pricing and packages. All existing license agreements will be honored and renewed
43+
based upon the current agreement.
4844
</igx-expansion-panel-body>
4945
</igx-expansion-panel>
5046
<igx-expansion-panel>
@@ -54,17 +50,15 @@
5450
</igx-expansion-panel-title>
5551
</igx-expansion-panel-header>
5652
<igx-expansion-panel-body>
57-
<div class="body-container">
58-
For Ignite UI customers, we are moving away from NPM for licensed packages. The current NPM packages
59-
will be replaced with packages that include a “Trial Version” watermark. Licensed packages for Ignite UI
60-
will be available from our cloud hosted ProGet server.
53+
For Ignite UI customers, we are moving away from NPM for licensed packages. The current NPM packages
54+
will be replaced with packages that include a “Trial Version” watermark. Licensed packages for Ignite UI
55+
will be available from our cloud hosted ProGet server.
6156

62-
For more information, please refer to this article:
57+
For more information, please refer to this article:
6358

64-
<a
65-
href="https://www.infragistics.com/products/ignite-ui-angular/angular/components/general/ignite-ui-licensing">Moving
66-
from Trial to Licensed Ignite UI NPM Packages</a>
67-
</div>
59+
<a
60+
href="https://www.infragistics.com/products/ignite-ui-angular/angular/components/general/ignite-ui-licensing">Moving
61+
from Trial to Licensed Ignite UI NPM Packages</a>
6862
</igx-expansion-panel-body>
6963
</igx-expansion-panel>
7064
<igx-expansion-panel>
@@ -82,11 +76,9 @@
8276
</igx-expansion-panel-title>
8377
</igx-expansion-panel-header>
8478
<igx-expansion-panel-body>
85-
<div class="body-container">
86-
Any unlicensed or trial versions of Ignite UI for Angular, React and Web Components will now
87-
include
88-
this watermark.
89-
</div>
79+
Any unlicensed or trial versions of Ignite UI for Angular, React and Web Components will now
80+
include
81+
this watermark.
9082
</igx-expansion-panel-body>
9183
</igx-expansion-panel>
9284
<igx-expansion-panel>
@@ -97,13 +89,11 @@
9789
</igx-expansion-panel-title>
9890
</igx-expansion-panel-header>
9991
<igx-expansion-panel-body>
100-
<div class="body-container">
101-
Any version of Infragistics software which you have downloaded can continue to be used
102-
perpetually.
103-
Access to download any new or previous versions through our customer portal and package
104-
feeds will
105-
require maintaining an active subscription by continuing to renew it.
106-
</div>
92+
Any version of Infragistics software which you have downloaded can continue to be used
93+
perpetually.
94+
Access to download any new or previous versions through our customer portal and package
95+
feeds will
96+
require maintaining an active subscription by continuing to renew it.
10797
</igx-expansion-panel-body>
10898
</igx-expansion-panel>
10999
<igx-expansion-panel>
@@ -114,15 +104,13 @@
114104
</igx-expansion-panel-title>
115105
</igx-expansion-panel-header>
116106
<igx-expansion-panel-body>
117-
<div class="body-container">
118-
Any new subscriptions purchased online, via our eCommerce system, will renew automatically.
119-
Subscription
120-
renewal can be canceled, at any time, before the next automatic renewal date. Subscriptions
121-
purchased
122-
directly from Infragistics or Infragistics’ partners are subject to the renewal terms that
123-
were agreed
124-
upon as part of that purchase.
125-
</div>
107+
Any new subscriptions purchased online, via our eCommerce system, will renew automatically.
108+
Subscription
109+
renewal can be canceled, at any time, before the next automatic renewal date. Subscriptions
110+
purchased
111+
directly from Infragistics or Infragistics’ partners are subject to the renewal terms that
112+
were agreed
113+
upon as part of that purchase.
126114
</igx-expansion-panel-body>
127115
</igx-expansion-panel>
128116
</igx-accordion>
@@ -135,12 +123,10 @@
135123
</igx-expansion-panel-title>
136124
</igx-expansion-panel-header>
137125
<igx-expansion-panel-body>
138-
<div class="body-container">
139-
The Infragistics Ultimate license is tied to the user, and not the computer. That means you’re welcome
140-
to install and use Ignite UI, Infragistics Professional, and Infragistics Ultimate on any computer you
141-
use. However, if we notice a large number of activations using the same license, we may contact you to
142-
verify this behavior.
143-
</div>
126+
The Infragistics Ultimate license is tied to the user, and not the computer. That means you’re welcome
127+
to install and use Ignite UI, Infragistics Professional, and Infragistics Ultimate on any computer you
128+
use. However, if we notice a large number of activations using the same license, we may contact you to
129+
verify this behavior.
144130
</igx-expansion-panel-body>
145131
</igx-expansion-panel>
146132
<igx-expansion-panel>
@@ -152,21 +138,19 @@
152138
</igx-expansion-panel-title>
153139
</igx-expansion-panel-header>
154140
<igx-expansion-panel-body>
155-
<div class="body-container">
156-
Yes! If you have tried a previous version in the past, and used up your 30-day trial, you can try the
157-
next major version for another 30 days! You can do this in the following two ways:
141+
Yes! If you have tried a previous version in the past, and used up your 30-day trial, you can try the
142+
next major version for another 30 days! You can do this in the following two ways:
158143

159-
<ul>
160-
<li>If you have days remaining in your 30-day trial period for the current version (e.g., the
161-
Version 15.1 Volume Release), use the Check for Update option inside the Platform Installer or
162-
your account. You will be able to start a fresh trial for the next major version (e.g., 20.1
163-
Volume Release)</li>
164-
<li>If you have used up the 30-day trial for the previous major version (e.g., the 19.2 Volume
165-
Release), simply download and install Infragistics Ultimate from our <a
166-
href="https://www.infragistics.com/products/ultimate">website</a> (This will also allow you
167-
to start a new trial.)</li>
168-
</ul>
169-
</div>
144+
<ul>
145+
<li>If you have days remaining in your 30-day trial period for the current version (e.g., the
146+
Version 15.1 Volume Release), use the Check for Update option inside the Platform Installer or
147+
your account. You will be able to start a fresh trial for the next major version (e.g., 20.1
148+
Volume Release)</li>
149+
<li>If you have used up the 30-day trial for the previous major version (e.g., the 19.2 Volume
150+
Release), simply download and install Infragistics Ultimate from our <a
151+
href="https://www.infragistics.com/products/ultimate">website</a> (This will also allow you
152+
to start a new trial.)</li>
153+
</ul>
170154
</igx-expansion-panel-body>
171155
</igx-expansion-panel>
172156
</igx-accordion>

0 commit comments

Comments
 (0)