From 966aea2ba4e583ffd56c71ff83dc1866ccc284c7 Mon Sep 17 00:00:00 2001 From: Peter Molnar Date: Sun, 9 Jun 2019 12:03:07 +0100 Subject: [PATCH] finalized v0.1 --- index.php | 10 +++++----- org.json | 2 +- page/about-us.json | 11 +++++++++-- page/contact.html | 4 ++-- page/contact.json | 13 ++++++++++--- page/index.json | 11 +++++++++-- page/the-school.json | 11 +++++++++-- page/timetable.html | 5 +++-- page/timetable.json | 13 ++++++++++--- site.json | 4 +++- style.css | 29 +++++++++++++++++++++++------ 11 files changed, 84 insertions(+), 29 deletions(-) diff --git a/index.php b/index.php index 8df19b8..1c972ae 100644 --- a/index.php +++ b/index.php @@ -126,9 +126,8 @@ class Page { global $org; global $site; - $stat = stat($self->html); - $meta = json_decode(file_get_contents($self->json), TRUE); - print_r($meta); + $stat = stat($this->html); + $meta = json_decode(file_get_contents($this->json), TRUE); $meta['author'] = &$org; $meta['publisher'] = &$org; $meta['dateModified'] = date("c", $stat['mtime']); @@ -136,6 +135,7 @@ class Page { $meta['copyrightYear'] = date("Y", $stat['mtime']); $meta['url'] = ('index' == $maybe) ? $site['url'] : sprintf("%s?%s", $site['url'], $maybe); $meta['@id'] = $meta['url']; + $meta['@type'] = 'Article'; $meta['mainEntityOfPage'] = sprintf("%s#main", $meta['url']); if (!isset($meta['image']) or empty($meta['image'])) { $meta['image'] = $site['image']; @@ -261,7 +261,7 @@ $site['mainEntity'] = &$meta;

Contact

@@ -294,7 +294,7 @@ $site['mainEntity'] = &$meta;
  • - +
    • diff --git a/org.json b/org.json index f1a2162..60012a7 100644 --- a/org.json +++ b/org.json @@ -13,7 +13,7 @@ { "@type" : "ContactPoint", "telephone" : "+441223852904", - "contactType" : "customer service", + "contactType" : "Customer Service", "areaServed" : "Cambridgeshire", "email": "cambridge@pakuauk.com" } diff --git a/page/about-us.json b/page/about-us.json index b1a4855..f7c27e1 100644 --- a/page/about-us.json +++ b/page/about-us.json @@ -3,7 +3,14 @@ "@type": "Article", "inLanguage": "en", "headline": "About Pa-Kua in the United Kingdom", - "name": "about-us", "description": "", - "keywords": ["Martial Art", "Self Defense", "Acrobatics", "Chinese Archery", "Swordfight", "Chinese Weapons"] + "keywords": [ + "Martial Art", + "Self Defense", + "Acrobatics", + "Chinese Archery", + "Swordfight", + "Chinese Weapons", + "Cambridge" + ] } diff --git a/page/contact.html b/page/contact.html index 3d8285a..fce9c85 100644 --- a/page/contact.html +++ b/page/contact.html @@ -31,10 +31,10 @@
  • - +
    WhatsApp - Pa-Kua Open Chat + Pa-Kua UK
    • diff --git a/page/contact.json b/page/contact.json index 0fff07c..85521e7 100644 --- a/page/contact.json +++ b/page/contact.json @@ -2,8 +2,15 @@ "@context": "http://schema.org", "@type": "Article", "inLanguage": "en", - "headline": "", - "name": "", + "headline": "Contact Pa-Kua School UK", "description": "", - "keywords": [] + "keywords": [ + "Martial Art", + "Self Defense", + "Acrobatics", + "Chinese Archery", + "Swordfight", + "Chinese Weapons", + "Cambridge" + ] } diff --git a/page/index.json b/page/index.json index 5a36565..c74fa99 100644 --- a/page/index.json +++ b/page/index.json @@ -3,7 +3,14 @@ "@type": "Article", "inLanguage": "en", "headline": "Pa-Kua School UK", - "name": "index", "description": "", - "keywords": ["Martial Art", "Self Defense", "Acrobatics", "Chinese Archery", "Swordfight", "Chinese Weapons"] + "keywords": [ + "Martial Art", + "Self Defense", + "Acrobatics", + "Chinese Archery", + "Swordfight", + "Chinese Weapons", + "Cambridge" + ] } diff --git a/page/the-school.json b/page/the-school.json index c486cc5..f74be81 100644 --- a/page/the-school.json +++ b/page/the-school.json @@ -3,7 +3,14 @@ "@type": "Article", "inLanguage": "en", "headline": "Pa-Kua International League", - "name": "the-school", "description": "Description of Pa-Kua International League, of it's origins, and it's system.", - "keywords": [] + "keywords": [ + "Martial Art", + "Self Defense", + "Acrobatics", + "Chinese Archery", + "Swordfight", + "Chinese Weapons", + "Cambridge" + ] } diff --git a/page/timetable.html b/page/timetable.html index 02e25b7..faf0aec 100644 --- a/page/timetable.html +++ b/page/timetable.html @@ -4,11 +4,12 @@
    diff --git a/page/timetable.json b/page/timetable.json index 0fff07c..2586579 100644 --- a/page/timetable.json +++ b/page/timetable.json @@ -2,8 +2,15 @@ "@context": "http://schema.org", "@type": "Article", "inLanguage": "en", - "headline": "", - "name": "", + "headline": "Pa-Kua UK timetables, calendars, schedules", "description": "", - "keywords": [] + "keywords": [ + "Martial Art", + "Self Defense", + "Acrobatics", + "Chinese Archery", + "Swordfight", + "Chinese Weapons", + "Cambridge" + ] } diff --git a/site.json b/site.json index f572d1d..510ef89 100644 --- a/site.json +++ b/site.json @@ -5,11 +5,13 @@ "url": "https://pakuauk.com", "name": "pakuauk.com", "image": "https://pakuauk.com/favicon.png", + "description": "Pa-Kua International School in Cambridge and Bedford in the United Kingdom, teaching martial arts & self defense for adults and kids, acrobatics, oriental archery, and edged weapons.", "sameAs": [ "https://facebook.com/PaKuaUK", "https://twitter.com/pakuauk", "https://youtube.com/pakuauk", "https://instagram.com/pakuauk", - "https://www.eventbrite.co.uk/o/pa-kua-international-school-19817765035" + "https://www.eventbrite.co.uk/o/pa-kua-international-school-19817765035", + "https://wa.me/441223852904" ] } diff --git a/style.css b/style.css index d78b88b..9dfde2e 100644 --- a/style.css +++ b/style.css @@ -74,7 +74,17 @@ nav > ul { nav > ul > li { display: inline-block; - padding: 0.3em 0.4em; + padding: 0.3em 0; +} + +nav > ul > li:after { + content: '•'; + margin: 0.4em; +} + +nav > ul > li:last-of-type:after { + content: ''; + margin: 0; } body > header, @@ -107,6 +117,8 @@ body > header a { color: #000; font-weight: bold; font-size: 90%; + text-transform: uppercase; + letter-spacing: 0.03em; } body > header a:hover, @@ -458,6 +470,11 @@ body > header > section > label { h2, h3, h4 { text-align: center; } + + nav > ul > li:after { + content: unset; + margin: 0; + } body > header > section > input ~ label { cursor: pointer; @@ -567,20 +584,20 @@ body > header > section > label { font-size: 3em; } - #mc-embedded-subscribe-form { + .signup { padding: 1em; display: block; } - #mc-embedded-subscribe-form input[type=text], - #mc-embedded-subscribe-form input[type=email], - #mc-embedded-subscribe-form input[type=submit] { + .signup input[type=text], + .signup input[type=email], + .signup input[type=submit] { display: block; width: 80%; margin: 1em auto; } - #mc-embedded-subscribe-form input[type=submit] { + .signup input[type=submit] { width: auto; padding: 1em; }