all repos — pakuauk @ 966aea2ba4e583ffd56c71ff83dc1866ccc284c7 

finalized v0.1
Peter Molnar hello@petermolnar.eu
Sun, 09 Jun 2019 12:03:07 +0100
commit

966aea2ba4e583ffd56c71ff83dc1866ccc284c7

parent

55c26f627f8e9b63a20274dadbb2e79d98826ea7

11 files changed, 84 insertions(+), 29 deletions(-)

jump to
M index.php → index.php 
@@ -126,9 +126,8 @@ public function meta() {
         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 @@ $meta['datePublished'] = date("c", $stat['ctime']);
         $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 @@ <div>
                 <h3>Contact</h3>
                 <ul>
                     <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>
                 </ul>
             </div>

@@ -294,7 +294,7 @@ <svg width="48" height="48"><use xlink:href="#icon-instagram" /></svg>
                             </a>
                         </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>
                             </a>
                         </li>
M org.json → org.json 
@@ -13,7 +13,7 @@ "contactPoint" : [
         {
             "@type" : "ContactPoint",
             "telephone" : "+441223852904",
-            "contactType" : "customer service",
+            "contactType" : "Customer Service",
             "areaServed" : "Cambridgeshire",
             "email": "cambridge@pakuauk.com"
         }
M page/about-us.json → page/about-us.json 
@@ -3,7 +3,14 @@ "@context": "http://schema.org",
     "@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"
+    ]
 }
M page/contact.html → page/contact.html 
@@ -31,10 +31,10 @@ </li>
 
             <li>
                 <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>
                         <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>
                 </figure>
             </li>
M page/contact.json → 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"
+    ]
 }
M page/index.json → page/index.json 
@@ -3,7 +3,14 @@ "@context": "http://schema.org",
     "@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"
+    ]
 }
M page/the-school.json → page/the-school.json 
@@ -3,7 +3,14 @@ "@context": "http://schema.org",
     "@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"
+    ]
 }
M page/timetable.html → page/timetable.html 
@@ -4,11 +4,12 @@ <section>
     <article>
         <div class="frameholder">
             <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"
                 marginheight="0"
                 marginwidth="0"
-                style="width:100%; height:20em"
+                width="800"
+                height="600"
             >
             </iframe>
         </div>
M page/timetable.json → 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"
+    ]
 }
M site.json → site.json 
@@ -5,11 +5,13 @@ "headline": "Pa-Kua School UK",
     "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 &amp; 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"
     ]
 }
M style.css → style.css 
@@ -74,7 +74,17 @@ }
 
 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 @@
   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 @@ .hero p {
     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;
   }