From ff46ccae8b1aa124fffaa87c86abf6e24012a979 Mon Sep 17 00:00:00 2001 From: rac2030 Date: Tue, 28 Feb 2017 04:36:18 +0100 Subject: [PATCH] fixed, reworked and simplyfied and added example content in markdown --- archetypes/article.md | 5 - archetypes/default.md | 1 + exampleSite/content/{article => }/about.md | 4 +- exampleSite/content/contact.md | 25 ++ exampleSite/content/elements.md | 250 ++++++++++++++++ exampleSite/content/formspree.md | 40 +++ exampleSite/content/{article => }/intro.md | 4 +- exampleSite/content/{article => }/work.md | 4 +- .../{article => _default}/onepagestyle.html | 0 layouts/index.html | 271 ------------------ layouts/partials/footer.html | 1 - layouts/partials/header.html | 2 + layouts/shortcodes/gmaps.html | 1 + layouts/shortcodes/socialLinks.html | 5 + layouts/sitemap.xml | 8 + 15 files changed, 335 insertions(+), 286 deletions(-) delete mode 100644 archetypes/article.md rename exampleSite/content/{article => }/about.md (82%) create mode 100644 exampleSite/content/contact.md create mode 100644 exampleSite/content/elements.md create mode 100644 exampleSite/content/formspree.md rename exampleSite/content/{article => }/intro.md (91%) rename exampleSite/content/{article => }/work.md (87%) rename layouts/{article => _default}/onepagestyle.html (100%) create mode 100644 layouts/shortcodes/gmaps.html create mode 100644 layouts/shortcodes/socialLinks.html create mode 100644 layouts/sitemap.xml diff --git a/archetypes/article.md b/archetypes/article.md deleted file mode 100644 index 17a8ced..0000000 --- a/archetypes/article.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -id = "" -weight = 0 -menu = "main" -+++ diff --git a/archetypes/default.md b/archetypes/default.md index ac36e06..fb596f9 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,2 +1,3 @@ +++ +id = "" +++ diff --git a/exampleSite/content/article/about.md b/exampleSite/content/about.md similarity index 82% rename from exampleSite/content/article/about.md rename to exampleSite/content/about.md index 34219b3..de3d163 100644 --- a/exampleSite/content/article/about.md +++ b/exampleSite/content/about.md @@ -1,9 +1,7 @@ +++ title = "About" id = "about" -weight = 20 -menu = "main" +++ - +{{< figure class="image main" src="/img/pic03.jpg" >}} Lorem ipsum dolor sit amet, consectetur et adipiscing elit. Praesent eleifend dignissim arcu, at eleifend sapien imperdiet ac. Aliquam erat volutpat. Praesent urna nisi, fringila lorem et vehicula lacinia quam. Integer sollicitudin mauris nec lorem luctus ultrices. Aliquam libero et malesuada fames ac ante ipsum primis in faucibus. Cras viverra ligula sit amet ex mollis mattis lorem ipsum dolor sit amet. diff --git a/exampleSite/content/contact.md b/exampleSite/content/contact.md new file mode 100644 index 0000000..8a0bbe8 --- /dev/null +++ b/exampleSite/content/contact.md @@ -0,0 +1,25 @@ ++++ +title = "Contact" +id = "contact" ++++ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +{{< socialLinks >}} \ No newline at end of file diff --git a/exampleSite/content/elements.md b/exampleSite/content/elements.md new file mode 100644 index 0000000..c72648d --- /dev/null +++ b/exampleSite/content/elements.md @@ -0,0 +1,250 @@ ++++ +title = "Elements" +id = "elements" ++++ + +

Hugo shortcodes in theme

+ +{‌{< socialLinks >}} will get into {{< socialLinks >}} configured in config.toml. + +{‌{< gmaps pb="\" >}} will get a google map +{{< gmaps pb="!1m18!1m12!1m3!1d86456.59681285016!2d8.466675323953403!3d47.377433669132884!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47900b9749bea219%3A0xe66e8df1e71fdc03!2zWsO8cmljaA!5e0!3m2!1sde!2sch!4v1488248947910" >}} + +To get the pb parameter value, search the desired place on google maps and click the share button and copy/paste the pb parameter out of the iframe code. + +

Text

+ +This is **bold** and this is __strong__. This is *italic* and this is _emphasized_. +This is superscript text and this is subscript text. +This is underlined and this is code: for (;;) { ... }. +Finally, [this is a link to a markdown cheatsheet](https://beegit.com/markdown-cheat-sheet). + +> Not all markdown syntax is allowed but you can mix most html tags into the markdown text. + +--- +## Heading Level 2 +### Heading Level 3 +#### Heading Level 4 +##### Heading Level 5 +###### Heading Level 6 +--- + +#### Blockquote +> Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan faucibus. Vestibulum ante ipsum primis in faucibus lorem ipsum dolor sit amet nullam adipiscing eu felis. + +#### Preformatted + + i = 0; + + while (!deck.isInOrder()) { + print 'Iteration ' + i; + deck.shuffle(); + i++; + } + + print 'It took ' + i + ' iterations to sort the deck.'; + +

Lists

+ +#### Unordered +* Dolor pulvinar etiam. +* Sagittis adipiscing. +* Felis enim feugiat. + +#### Ordered +1. Dolor pulvinar etiam. +2. Etiam vel felis viverra. +3. Felis enim feugiat. +4. Dolor pulvinar etiam. +5. Etiam vel felis lorem. +6. Felis enim et feugiat. + +#### Icons + + + +#### Actions + + + +

Table

+#### Default + +| Tables | Are | Cool | +| ------------- |:-------------:| -----:| +| col 3 is | right-aligned | $1600 | +| col 2 is | centered | $12 | +| zebra stripes | are neat | $1 | + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
+
+ +

Alternate

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
+
+ + + +

Buttons

+ + + + + + + +

Form

+
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ diff --git a/exampleSite/content/formspree.md b/exampleSite/content/formspree.md new file mode 100644 index 0000000..ad5b52a --- /dev/null +++ b/exampleSite/content/formspree.md @@ -0,0 +1,40 @@ ++++ +title = "Formspree" +id = "formspree" ++++ + +
+
+ +
+
+ +
+
+ +
+ + + + +
+Thank you for your message + + + + +{{< socialLinks >}} diff --git a/exampleSite/content/article/intro.md b/exampleSite/content/intro.md similarity index 91% rename from exampleSite/content/article/intro.md rename to exampleSite/content/intro.md index 7a08dc2..8e4bac8 100644 --- a/exampleSite/content/article/intro.md +++ b/exampleSite/content/intro.md @@ -1,11 +1,9 @@ +++ title = "Intro" id = "intro" -weight = 0 -menu = "main" +++ - +{{< figure class="image main" src="/img/pic01.jpg" >}} Aenean ornare velit lacus, ac varius enim ullamcorper eu. Proin aliquam facilisis ante interdum congue. Integer mollis, nisl amet convallis, porttitor magna ullamcorper, amet egestas mauris. Ut magna finibus nisi nec lacinia. Nam maximus erat id euismod egestas. By the way, check out my [awesome work](#work). Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis dapibus rutrum facilisis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam tristique libero eu nibh porttitor fermentum. Nullam venenatis erat id vehicula viverra. Nunc ultrices eros ut ultricies condimentum. Mauris risus lacus, blandit sit amet venenatis non, bibendum vitae dolor. Nunc lorem mauris, fringilla in aliquam at, euismod in lectus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lorem sit amet elit placerat maximus. Pellentesque aliquam maximus risus, vel sed vehicula. diff --git a/exampleSite/content/article/work.md b/exampleSite/content/work.md similarity index 87% rename from exampleSite/content/article/work.md rename to exampleSite/content/work.md index b2b21dd..cd66a88 100644 --- a/exampleSite/content/article/work.md +++ b/exampleSite/content/work.md @@ -1,11 +1,9 @@ +++ title = "Work" id = "work" -weight = 10 -menu = "main" +++ - +{{< figure class="image main" src="/img/pic02.jpg" >}} Adipiscing magna sed dolor elit. Praesent eleifend dignissim arcu, at eleifend sapien imperdiet ac. Aliquam erat volutpat. Praesent urna nisi, fringila lorem et vehicula lacinia quam. Integer sollicitudin mauris nec lorem luctus ultrices. Nullam et orci eu lorem consequat tincidunt vivamus et sagittis libero. Mauris aliquet magna magna sed nunc rhoncus pharetra. Pellentesque condimentum sem. In efficitur ligula tate urna. Maecenas laoreet massa vel lacinia pellentesque lorem ipsum dolor. Nullam et orci eu lorem consequat tincidunt. Vivamus et sagittis libero. Mauris aliquet magna magna sed nunc rhoncus amet feugiat tempus. diff --git a/layouts/article/onepagestyle.html b/layouts/_default/onepagestyle.html similarity index 100% rename from layouts/article/onepagestyle.html rename to layouts/_default/onepagestyle.html diff --git a/layouts/index.html b/layouts/index.html index c538f95..05ea6d9 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -28,277 +28,6 @@ {{ range .Data.Pages }} {{ .Render "onepagestyle"}} {{ end }} - - -
-

Contact

-
-
- - -
-
- - -
-
- - -
-
    -
    • -
    • -
-
- -
- - -
-

Elements

- -
-

Text

-

This is bold and this is strong. This is italic and this is emphasized. - This is superscript text and this is subscript text. - This is underlined and this is code: for (;;) { ... }. Finally, this is a link.

-
-

Heading Level 2

-

Heading Level 3

-

Heading Level 4

-
Heading Level 5
-
Heading Level 6
-
-

Blockquote

-
Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan faucibus. Vestibulum ante ipsum primis in faucibus lorem ipsum dolor sit amet nullam adipiscing eu felis.
-

Preformatted

- 
i = 0;
-
-while (!deck.isInOrder()) {
-    print 'Iteration ' + i;
-    deck.shuffle();
-    i++;
-}
-
-print 'It took ' + i + ' iterations to sort the deck.';
-
- -
-

Lists

- -

Unordered

-
    -
  • Dolor pulvinar etiam.
    • -
  • Sagittis adipiscing.
    • -
  • Felis enim feugiat.
    • -
- -

Alternate

-
    -
  • Dolor pulvinar etiam.
    • -
  • Sagittis adipiscing.
    • -
  • Felis enim feugiat.
    • -
- -

Ordered

-
    -
  1. Dolor pulvinar etiam.
    2. -
  2. Etiam vel felis viverra.
    3. -
  3. Felis enim feugiat.
    4. -
  4. Dolor pulvinar etiam.
    5. -
  5. Etiam vel felis lorem.
    6. -
  6. Felis enim et feugiat.
    7. -
-

Icons

- - -

Actions

- - -
- -
-

Table

-

Default

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
-
- -

Alternate

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionPrice
Item OneAnte turpis integer aliquet porttitor.29.99
Item TwoVis ac commodo adipiscing arcu aliquet.19.99
Item Three Morbi faucibus arcu accumsan lorem.29.99
Item FourVitae integer tempus condimentum.19.99
Item FiveAnte turpis integer aliquet porttitor.29.99
100.00
-
-
- -
-

Buttons

- - - -
    -
  • Disabled
    • -
  • Disabled
    • -
-
- -
-

Form

-
-
- - -
-
- - -
-
- -
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
    -
    • -
    • -
-
-
- -
- {{ partial "footer.html" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 6e521b8..d6705a1 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -9,7 +9,6 @@
- diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f2f6656..3eed835 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -13,4 +13,6 @@ + + \ No newline at end of file diff --git a/layouts/shortcodes/gmaps.html b/layouts/shortcodes/gmaps.html new file mode 100644 index 0000000..8eacd62 --- /dev/null +++ b/layouts/shortcodes/gmaps.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/layouts/shortcodes/socialLinks.html b/layouts/shortcodes/socialLinks.html new file mode 100644 index 0000000..a4077e5 --- /dev/null +++ b/layouts/shortcodes/socialLinks.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/layouts/sitemap.xml b/layouts/sitemap.xml new file mode 100644 index 0000000..de6d2e3 --- /dev/null +++ b/layouts/sitemap.xml @@ -0,0 +1,8 @@ + +{{ $baseURL := .Site.BaseURL }} + {{ range sort .Site.Menus.main }} + + {{ $baseURL }}{{ .URL }} + + {{ end }} +