finalized v0.1

This commit is contained in:
Peter Molnar 2019-06-09 12:03:07 +01:00
parent 55c26f627f
commit 966aea2ba4
11 changed files with 84 additions and 29 deletions

View file

@ -126,9 +126,8 @@ class Page {
global $org; global $org;
global $site; global $site;
$stat = stat($self->html); $stat = stat($this->html);
$meta = json_decode(file_get_contents($self->json), TRUE); $meta = json_decode(file_get_contents($this->json), TRUE);
print_r($meta);
$meta['author'] = &$org; $meta['author'] = &$org;
$meta['publisher'] = &$org; $meta['publisher'] = &$org;
$meta['dateModified'] = date("c", $stat['mtime']); $meta['dateModified'] = date("c", $stat['mtime']);
@ -136,6 +135,7 @@ class Page {
$meta['copyrightYear'] = date("Y", $stat['mtime']); $meta['copyrightYear'] = date("Y", $stat['mtime']);
$meta['url'] = ('index' == $maybe) ? $site['url'] : sprintf("%s?%s", $site['url'], $maybe); $meta['url'] = ('index' == $maybe) ? $site['url'] : sprintf("%s?%s", $site['url'], $maybe);
$meta['@id'] = $meta['url']; $meta['@id'] = $meta['url'];
$meta['@type'] = 'Article';
$meta['mainEntityOfPage'] = sprintf("%s#main", $meta['url']); $meta['mainEntityOfPage'] = sprintf("%s#main", $meta['url']);
if (!isset($meta['image']) or empty($meta['image'])) { if (!isset($meta['image']) or empty($meta['image'])) {
$meta['image'] = $site['image']; $meta['image'] = $site['image'];
@ -261,7 +261,7 @@ $site['mainEntity'] = &$meta;
<h3>Contact</h3> <h3>Contact</h3>
<ul> <ul>
<li><a href="mailto:info@pakuauk.com">info@pakuauk.com</a></li> <li><a href="mailto:info@pakuauk.com">info@pakuauk.com</a></li>
<li><a href="https://chat.whatsapp.com/CmDShQzb0n021LpO0hqEQ6">Pa-Kua on WhatsApp</a></li> <li><a href="https://wa.me/441223852904">Pa-Kua on WhatsApp</a></li>
<li><a href="http://webchat.freenode.net/?channels=%23PaKua">#PaKua @ freenode IRC</a></li> <li><a href="http://webchat.freenode.net/?channels=%23PaKua">#PaKua @ freenode IRC</a></li>
</ul> </ul>
</div> </div>
@ -294,7 +294,7 @@ $site['mainEntity'] = &$meta;
</a> </a>
</li> </li>
<li> <li>
<a href="https://chat.whatsapp.com/CmDShQzb0n021LpO0hqEQ6"> <a href="https://wa.me/441223852904">
<svg width="48" height="48"><use xlink:href="#icon-whatsapp" /></svg> <svg width="48" height="48"><use xlink:href="#icon-whatsapp" /></svg>
</a> </a>
</li> </li>

View file

@ -13,7 +13,7 @@
{ {
"@type" : "ContactPoint", "@type" : "ContactPoint",
"telephone" : "+441223852904", "telephone" : "+441223852904",
"contactType" : "customer service", "contactType" : "Customer Service",
"areaServed" : "Cambridgeshire", "areaServed" : "Cambridgeshire",
"email": "cambridge@pakuauk.com" "email": "cambridge@pakuauk.com"
} }

View file

@ -3,7 +3,14 @@
"@type": "Article", "@type": "Article",
"inLanguage": "en", "inLanguage": "en",
"headline": "About Pa-Kua in the United Kingdom", "headline": "About Pa-Kua in the United Kingdom",
"name": "about-us",
"description": "", "description": "",
"keywords": ["Martial Art", "Self Defense", "Acrobatics", "Chinese Archery", "Swordfight", "Chinese Weapons"] "keywords": [
"Martial Art",
"Self Defense",
"Acrobatics",
"Chinese Archery",
"Swordfight",
"Chinese Weapons",
"Cambridge"
]
} }

View file

@ -31,10 +31,10 @@
<li> <li>
<figure> <figure>
<a href="https://chat.whatsapp.com/CmDShQzb0n021LpO0hqEQ6"><svg width="64" height="64"><use xlink:href="#icon-whatsapp" /></svg></a> <a href="https://wa.me/441223852904"><svg width="64" height="64"><use xlink:href="#icon-whatsapp" /></svg></a>
<figcaption> <figcaption>
<strong>WhatsApp</strong> <strong>WhatsApp</strong>
<span><a href="https://chat.whatsapp.com/CmDShQzb0n021LpO0hqEQ6">Pa-Kua Open Chat</a></span> <span><a href="https://wa.me/441223852904">Pa-Kua UK</a></span>
</figcaption> </figcaption>
</figure> </figure>
</li> </li>

View file

@ -2,8 +2,15 @@
"@context": "http://schema.org", "@context": "http://schema.org",
"@type": "Article", "@type": "Article",
"inLanguage": "en", "inLanguage": "en",
"headline": "", "headline": "Contact Pa-Kua School UK",
"name": "",
"description": "", "description": "",
"keywords": [] "keywords": [
"Martial Art",
"Self Defense",
"Acrobatics",
"Chinese Archery",
"Swordfight",
"Chinese Weapons",
"Cambridge"
]
} }

View file

@ -3,7 +3,14 @@
"@type": "Article", "@type": "Article",
"inLanguage": "en", "inLanguage": "en",
"headline": "Pa-Kua School UK", "headline": "Pa-Kua School UK",
"name": "index",
"description": "", "description": "",
"keywords": ["Martial Art", "Self Defense", "Acrobatics", "Chinese Archery", "Swordfight", "Chinese Weapons"] "keywords": [
"Martial Art",
"Self Defense",
"Acrobatics",
"Chinese Archery",
"Swordfight",
"Chinese Weapons",
"Cambridge"
]
} }

View file

@ -3,7 +3,14 @@
"@type": "Article", "@type": "Article",
"inLanguage": "en", "inLanguage": "en",
"headline": "Pa-Kua International League", "headline": "Pa-Kua International League",
"name": "the-school",
"description": "Description of Pa-Kua International League, of it's origins, and it's system.", "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"
]
} }

View file

@ -4,11 +4,12 @@
<article> <article>
<div class="frameholder"> <div class="frameholder">
<iframe <iframe
src="https://calendar.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showTabs=0&amp;showCalendars=0&amp;mode=AGENDA&amp;height=480&amp;wkst=2&amp;hl=en_GB&amp;bgcolor=%23ffffff&amp;src=dnfoaa35ln0g5c0vnr2sh7r8dg%40group.calendar.google.com&amp;color=%23ba0000&amp;ctz=Europe%2FLondon" src="https://calendar.google.com/calendar/embed?height=600&amp;wkst=2&amp;bgcolor=%23ffffff&amp;ctz=Europe%2FLondon&amp;src=ZG5mb2FhMzVsbjBnNWMwdm5yMnNoN3I4ZGdAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&amp;src=ZGE4OGYwZjBtYmQ3Y2M1OWJnOGkycDNtbzBAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&amp;color=%23D50000&amp;color=%23E4C441&amp;title=Pa-Kua%20UK&amp;showTitle=0&amp;showNav=1&amp;showPrint=0&amp;mode=AGENDA"
frameborder="0" frameborder="0"
marginheight="0" marginheight="0"
marginwidth="0" marginwidth="0"
style="width:100%; height:20em" width="800"
height="600"
> >
</iframe> </iframe>
</div> </div>

View file

@ -2,8 +2,15 @@
"@context": "http://schema.org", "@context": "http://schema.org",
"@type": "Article", "@type": "Article",
"inLanguage": "en", "inLanguage": "en",
"headline": "", "headline": "Pa-Kua UK timetables, calendars, schedules",
"name": "",
"description": "", "description": "",
"keywords": [] "keywords": [
"Martial Art",
"Self Defense",
"Acrobatics",
"Chinese Archery",
"Swordfight",
"Chinese Weapons",
"Cambridge"
]
} }

View file

@ -5,11 +5,13 @@
"url": "https://pakuauk.com", "url": "https://pakuauk.com",
"name": "pakuauk.com", "name": "pakuauk.com",
"image": "https://pakuauk.com/favicon.png", "image": "https://pakuauk.com/favicon.png",
"description": "Pa-Kua International School in Cambridge and Bedford in the United Kingdom, teaching martial arts &amp; self defense for adults and kids, acrobatics, oriental archery, and edged weapons.",
"sameAs": [ "sameAs": [
"https://facebook.com/PaKuaUK", "https://facebook.com/PaKuaUK",
"https://twitter.com/pakuauk", "https://twitter.com/pakuauk",
"https://youtube.com/pakuauk", "https://youtube.com/pakuauk",
"https://instagram.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"
] ]
} }

View file

@ -74,7 +74,17 @@ nav > ul {
nav > ul > li { nav > ul > li {
display: inline-block; 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, body > header,
@ -107,6 +117,8 @@ body > header a {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
font-size: 90%; font-size: 90%;
text-transform: uppercase;
letter-spacing: 0.03em;
} }
body > header a:hover, body > header a:hover,
@ -459,6 +471,11 @@ body > header > section > label {
text-align: center; text-align: center;
} }
nav > ul > li:after {
content: unset;
margin: 0;
}
body > header > section > input ~ label { body > header > section > input ~ label {
cursor: pointer; cursor: pointer;
font-size: 2em; font-size: 2em;
@ -567,20 +584,20 @@ body > header > section > label {
font-size: 3em; font-size: 3em;
} }
#mc-embedded-subscribe-form { .signup {
padding: 1em; padding: 1em;
display: block; display: block;
} }
#mc-embedded-subscribe-form input[type=text], .signup input[type=text],
#mc-embedded-subscribe-form input[type=email], .signup input[type=email],
#mc-embedded-subscribe-form input[type=submit] { .signup input[type=submit] {
display: block; display: block;
width: 80%; width: 80%;
margin: 1em auto; margin: 1em auto;
} }
#mc-embedded-subscribe-form input[type=submit] { .signup input[type=submit] {
width: auto; width: auto;
padding: 1em; padding: 1em;
} }