From 9e9e2b54af7fde3b5cc25e7ab8d00eb19d43febb Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:07:40 +0200 Subject: [PATCH 01/16] Add more text --- plugins.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins.html b/plugins.html index 09726f31..c464531c 100644 --- a/plugins.html +++ b/plugins.html @@ -4,7 +4,7 @@ title: Plugins permalink: /plugins ---
-

Plugins Repository

+

InvenTree Plugin Repository

{% for plugin in site.plugins %} {% include plugin_card.html plugin=plugin %} {% endfor %} From 6b3a4a6fa9ce786873d9b4750e513779cd97ea18 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:30:59 +0200 Subject: [PATCH 02/16] make feature text more similar --- _data/for_business.yml | 4 ++-- _data/for_edu.yml | 6 +++--- _data/for_maker.yml | 2 +- _includes/block/features.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_data/for_business.yml b/_data/for_business.yml index 414d5fdf..8b2819db 100644 --- a/_data/for_business.yml +++ b/_data/for_business.yml @@ -8,7 +8,7 @@ text: | features: - title: lorem ipsum title subtitle: lorem ipsum subtitle - description: | + text: | lorem ipsum - lorem ipsum @@ -20,5 +20,5 @@ features: - title: lorem ipsum title subtitle: lorem ipsum subtitle - description: lorem ipsum description + text: lorem ipsum description link: https://example.com/ diff --git a/_data/for_edu.yml b/_data/for_edu.yml index 63c8bddf..a4a33c16 100644 --- a/_data/for_edu.yml +++ b/_data/for_edu.yml @@ -8,10 +8,10 @@ text: | features: - title: Open Source - Open Knowledge subtitle: Stay independed of big vendors - description: Free software of big vendors helps the budget. But how about your students?
Don’t teach tools – teach process and competence. InvenTree is MIT licensed and free forever.
Also, we are open to contribution from all ages! - link: https://example.com/ + text: Free software of big vendors helps the budget. But how about your students? + extend: Don’t teach tools – teach process and competence. InvenTree is MIT licensed and free forever.
Also, we are open to contribution from all ages! - title: lorem ipsum title subtitle: lorem ipsum subtitle - description: lorem ipsum description + text: lorem ipsum description link: https://example.com/ diff --git a/_data/for_maker.yml b/_data/for_maker.yml index dee91c1d..928bf1cc 100644 --- a/_data/for_maker.yml +++ b/_data/for_maker.yml @@ -8,5 +8,5 @@ text: | features: - title: lorem ipsum title subtitle: lorem ipsum subtitle - description: lorem ipsum description + text: lorem ipsum description link: https://example.com/ diff --git a/_includes/block/features.html b/_includes/block/features.html index f0884145..19cf2150 100644 --- a/_includes/block/features.html +++ b/_includes/block/features.html @@ -21,7 +21,7 @@

{{ item.subtitle }}

{{ item.title }}

-

{{ item.description }} +

{{ item.text }} {% if include.extend and item.extend %}

{{ item.extend }}{% endif %}

Learn More {% include fnc/learn_more.html %} From 1d07f93b37ef051cee38974e713af09f7ea989b5 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:31:13 +0200 Subject: [PATCH 03/16] only show link if present --- _includes/block/features.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/block/features.html b/_includes/block/features.html index 19cf2150..d5b0ba3d 100644 --- a/_includes/block/features.html +++ b/_includes/block/features.html @@ -24,7 +24,9 @@

{{ item.text }} {% if include.extend and item.extend %}

{{ item.extend }}{% endif %}

+ {% if item.link %} Learn More {% include fnc/learn_more.html %} + {% endif %}
{% endfor %} From 99bdec86135911295fdf6d22091dfa3d50644bb5 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:31:21 +0200 Subject: [PATCH 04/16] use extend --- _layouts/branche.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/branche.html b/_layouts/branche.html index 732452b9..91a87b08 100644 --- a/_layouts/branche.html +++ b/_layouts/branche.html @@ -5,7 +5,7 @@ layout: default {% include block/hero.html title=site.tagline title_2=page.title_2 image='https://dummyimage.com/860x600' color='with InvenTree' detail='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.' %} {% assign data = site.data[page.data] %} -{% include block/features.html data=data %} +{% include block/features.html data=data extend=true %} {% include block/cta.html cta=site.data.ctas.learn %} {% include block/functions.html data=site.data.functions.general extend=true %} From e03770729dd9763052773c201e71c5d896bff510 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:37:29 +0200 Subject: [PATCH 05/16] rename template --- _layouts/{branche.html => user.html} | 0 use/business.md | 2 +- use/education.md | 2 +- use/maker.md | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename _layouts/{branche.html => user.html} (100%) diff --git a/_layouts/branche.html b/_layouts/user.html similarity index 100% rename from _layouts/branche.html rename to _layouts/user.html diff --git a/use/business.md b/use/business.md index 8224cc75..b3465296 100644 --- a/use/business.md +++ b/use/business.md @@ -1,5 +1,5 @@ --- -layout: branche +layout: user title: For Business title_2: for Business data: for_business diff --git a/use/education.md b/use/education.md index 1c831a21..1c8a66fd 100644 --- a/use/education.md +++ b/use/education.md @@ -1,5 +1,5 @@ --- -layout: branche +layout: user title: For Education title_2: for Education data: for_edu diff --git a/use/maker.md b/use/maker.md index 17040204..1e05e57c 100644 --- a/use/maker.md +++ b/use/maker.md @@ -1,5 +1,5 @@ --- -layout: branche +layout: user title: For Maker title_2: for Maker data: for_maker From 477d13e8a7298ca18602046585228be05ddff6a8 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:38:08 +0200 Subject: [PATCH 06/16] set into text in page --- _layouts/user.html | 2 +- use/maker.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/_layouts/user.html b/_layouts/user.html index 91a87b08..7a94edd1 100644 --- a/_layouts/user.html +++ b/_layouts/user.html @@ -2,7 +2,7 @@ layout: default --- -{% include block/hero.html title=site.tagline title_2=page.title_2 image='https://dummyimage.com/860x600' color='with InvenTree' detail='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.' %} +{% include block/hero.html title=site.tagline title_2=page.title_2 image='https://dummyimage.com/860x600' color='with InvenTree' detail=page.long_text %} {% assign data = site.data[page.data] %} {% include block/features.html data=data extend=true %} diff --git a/use/maker.md b/use/maker.md index 1e05e57c..2eec5e1c 100644 --- a/use/maker.md +++ b/use/maker.md @@ -3,4 +3,7 @@ layout: user title: For Maker title_2: for Maker data: for_maker +long_text: | + lorem ipsum place for + multiline inteligent text --- From 9024915389489b853f072a21edc681c9f8dc67e1 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:39:57 +0200 Subject: [PATCH 07/16] only show detail block if needed --- _includes/block/hero.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/block/hero.html b/_includes/block/hero.html index 02ee4ac8..8bd58f00 100644 --- a/_includes/block/hero.html +++ b/_includes/block/hero.html @@ -9,7 +9,9 @@ {{ include.color }} {% endif %} + {% if include.detail %}

{{ include.detail }}

+ {% endif %}
From 9ccd5ee9a192605ba9c147ec1fdedf714924388a Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:55:24 +0200 Subject: [PATCH 08/16] make buttons configurable --- _includes/block/hero.html | 10 ++++++++-- _layouts/user.html | 9 ++++++++- assets/index.css | 4 ++++ use/maker.md | 3 +++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/_includes/block/hero.html b/_includes/block/hero.html index 8bd58f00..207e1198 100644 --- a/_includes/block/hero.html +++ b/_includes/block/hero.html @@ -12,10 +12,16 @@ {% if include.detail %}

{{ include.detail }}

{% endif %} + {% if include.buttons %}
- - + {% for item in include.buttons %} + + {% endfor %}
+ {% endif %}
{% if include.image %} diff --git a/_layouts/user.html b/_layouts/user.html index 7a94edd1..f161b780 100644 --- a/_layouts/user.html +++ b/_layouts/user.html @@ -2,7 +2,14 @@ layout: default --- -{% include block/hero.html title=site.tagline title_2=page.title_2 image='https://dummyimage.com/860x600' color='with InvenTree' detail=page.long_text %} +{% include block/hero.html + title=site.tagline + title_2=page.title_2 + image='https://dummyimage.com/860x600' + color='with InvenTree' + detail=page.long_text + buttons=page.buttons +%} {% assign data = site.data[page.data] %} {% include block/features.html data=data extend=true %} diff --git a/assets/index.css b/assets/index.css index f1162fb5..8bac2d6d 100644 --- a/assets/index.css +++ b/assets/index.css @@ -32,6 +32,10 @@ layout: empty @apply text-gray-700 bg-gray-100 hover:bg-gray-200 rounded } + .cm-hvr-btn-primary { + @apply text-white bg-secondary hover:bg-primary rounded + } + .cm-gray-1 { @apply text-gray-900 } diff --git a/use/maker.md b/use/maker.md index 2eec5e1c..8acf4049 100644 --- a/use/maker.md +++ b/use/maker.md @@ -6,4 +6,7 @@ data: for_maker long_text: | lorem ipsum place for multiline inteligent text +buttons: + - text: Button + - text: Button1 --- From dd9a94cdb3278a08f60a7d873a64e087d2b1d7b0 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:57:55 +0200 Subject: [PATCH 09/16] fix spacing --- _includes/block/hero.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/_includes/block/hero.html b/_includes/block/hero.html index 207e1198..7b64966c 100644 --- a/_includes/block/hero.html +++ b/_includes/block/hero.html @@ -13,12 +13,9 @@

{{ include.detail }}

{% endif %} {% if include.buttons %} -
+
{% for item in include.buttons %} - + {% endfor %}
{% endif %} From b8ffc98209cc6a1331c1940ffc230e4902d31b18 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 22 Apr 2022 23:58:37 +0200 Subject: [PATCH 10/16] use primary in example --- use/maker.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/use/maker.md b/use/maker.md index 8acf4049..366609a1 100644 --- a/use/maker.md +++ b/use/maker.md @@ -7,6 +7,7 @@ long_text: | lorem ipsum place for multiline inteligent text buttons: - - text: Button - - text: Button1 + - text: lorem ipsum primary + primary: true + - text: lorem ipsum --- From 198c5ec715c6c62a6101d88805d25d98c1a16115 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 00:03:34 +0200 Subject: [PATCH 11/16] add linking possibility --- _includes/block/hero.html | 4 +++- use/maker.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/_includes/block/hero.html b/_includes/block/hero.html index 7b64966c..376bec34 100644 --- a/_includes/block/hero.html +++ b/_includes/block/hero.html @@ -15,7 +15,9 @@ {% if include.buttons %}
{% for item in include.buttons %} - + {% endfor %}
{% endif %} diff --git a/use/maker.md b/use/maker.md index 366609a1..ae72f74c 100644 --- a/use/maker.md +++ b/use/maker.md @@ -9,5 +9,6 @@ long_text: | buttons: - text: lorem ipsum primary primary: true + link: http://example.com - text: lorem ipsum --- From cbb2e2b07f9c6141f7ed11ae04c5323b7de86508 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 00:11:19 +0200 Subject: [PATCH 12/16] make formatting easier to read --- index.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/index.md b/index.md index 83a5e663..eb6a4406 100644 --- a/index.md +++ b/index.md @@ -4,7 +4,13 @@ backLink: false main_page: True --- -{% include block/hero.html title=site.tagline title_2='and more' image='https://dummyimage.com/860x600' color='with InvenTree' detail='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.' %} +{% include block/hero.html + title=site.tagline + title_2='and more' + image='https://dummyimage.com/860x600' + color='with InvenTree' + detail='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.' +%} {% include block/functions.html data=site.data.functions.general %} From 77b46b8f3cb01d8d9042b6f5d5f75763bad56901 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 00:11:35 +0200 Subject: [PATCH 13/16] example for internal link --- use/maker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/use/maker.md b/use/maker.md index ae72f74c..3b7a4aba 100644 --- a/use/maker.md +++ b/use/maker.md @@ -11,4 +11,6 @@ buttons: primary: true link: http://example.com - text: lorem ipsum + link: + internal: plugins.html --- From 612e08f9d6b3a57cabd8082848009a4e40ca2a72 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 00:11:43 +0200 Subject: [PATCH 14/16] update lik --- _data/ctas/end.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/ctas/end.yml b/_data/ctas/end.yml index 267fc8ad..5ae63373 100644 --- a/_data/ctas/end.yml +++ b/_data/ctas/end.yml @@ -1,4 +1,4 @@ text: Ready for a glimpse into the future?
Together we make InvenTree better, faster and more helpfull each day. btn: - text: open the roadmap - link: https://inventree.readthedocs.io/en/latest/upcoming/ + link: https://github.com/inventree/InvenTree/labels/roadmap From 558404d11fcbb97b18af631d50196f4d28445932 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 00:11:57 +0200 Subject: [PATCH 15/16] remove unneeded example --- _data/for_business.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/_data/for_business.yml b/_data/for_business.yml index 8b2819db..272c6ba7 100644 --- a/_data/for_business.yml +++ b/_data/for_business.yml @@ -6,18 +6,6 @@ text: | lorem ipsum text features: - - title: lorem ipsum title - subtitle: lorem ipsum subtitle - text: | - lorem ipsum - - - lorem ipsum - - lorem ipsum - - lorem ipsum - - lorem ipsum - link: https://example.com/ - - title: lorem ipsum title subtitle: lorem ipsum subtitle text: lorem ipsum description From 18cbb42ed2c66d2f14a16d39f85eab1bedf13c86 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 23 Apr 2022 00:12:12 +0200 Subject: [PATCH 16/16] use internal link parser --- _includes/block/hero.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/block/hero.html b/_includes/block/hero.html index 376bec34..73fe0f05 100644 --- a/_includes/block/hero.html +++ b/_includes/block/hero.html @@ -16,7 +16,7 @@
{% for item in include.buttons %} {% endfor %}