@caweb/template 1.0.13 → 1.0.15

package/content/index.html

@@ -13,9 +13,9 @@
             <h3>How to's</h3>
             <ul>
                 <li>Add more pages, you can create additional HTML files in the <span class="text-danger">/content/pages/</span> directory. Each file will be rendered as a separate page in your project.</li>
-                <li>Use media on your pages, you can place your media files in the <span class="text-danger">/content/media/</span> directory. You can then reference these files in your HTML pages.</li>
-                <li>Change the favicon, you can place your favicon file in the <span class="text-danger">/content/media/</span> directory. File name must be <span class="text-danger">favicon.ico</span>.</li>
-                <li>Change the logo, you can place your logo file in the <span class="text-danger">/content/media/</span> directory. File name must be <span class="text-danger">logo.png</span>.</li>
+                <li>Use media on your pages, you can place your media files in the <span class="text-danger">/media/</span> directory. You can then reference these files in your HTML pages.</li>
+                <li>Change the favicon, you can place your favicon file in the <span class="text-danger">/media/</span> directory. File name must be <span class="text-danger">favicon.ico</span>.</li>
+                <li>Change the logo, you can place your logo file in the <span class="text-danger">/media/</span> directory. File name must be <span class="text-danger">logo.png</span>.</li>
                 <li>For more information on how to, visit our <a href="/how-to/index.html">How To's</a> page.</li>
             </ul>
             

package/media/head.html

@@ -0,0 +1,59 @@
+{{#if scheme }}
+<link rel="preconnect" href="https://fonts.googleapis.com" />
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+
+<!-- Icon Font Library -->
+<link rel="stylesheet" href="/node_modules/@caweb/icon-library/build/font-only.css" />
+
+<!-- Template Scheme CSS -->
+<link rel="stylesheet" href="/node_modules/@caweb/framework/build/{{ scheme }}.css" />
+
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="100x100"
+  href="/media/apple-touch-icon-precomposed.png" />
+<link rel="icon" sizes="192x192" href="/media/apple-touch-icon-192x192.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="180x180"
+  href="/media/apple-touch-icon-180x180.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="152x152"
+  href="/media/apple-touch-icon-152x152.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="144x144"
+  href="/media/apple-touch-icon-144x144.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="120x120"
+  href="/media/apple-touch-icon-120x120.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="114x114"
+  href="/media/apple-touch-icon-114x114.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="72x72"
+  href="/media/apple-touch-icon-72x72.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  href="/media/apple-touch-icon-57x57.png" />
+<link rel="shortcut icon" href="/media/apple-touch-icon-57x57.png" />
+<link rel="apple-touch-icon" href="/media/apple-touch-icon.png" />
+{{/if}}
+      
+{{#if meta }}
+{{#each meta }}
+  <meta name="{{ @key }}" content="{{ this }}" />
+{{/each}}
+{{/if}}
+
+{{#if assets }}
+{{#each assets }}
+{{#if (endsWith this ".css") }}
+  <link rel="stylesheet" href="{{ this }}" />
+{{/if}}
+{{/each}}
+{{/if}}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@caweb/template",
-    "version": "1.0.13",
+    "version": "1.0.15",
     "author": "CAWebPublishing",
     "description": "CAWebPublishing Template",
     "license": "ISC",
@@ -47,10 +47,10 @@
         "serve:trinity": "set NODE_OPTIONS='--template ./patterns/default.html --search-template ./patterns/search.html --scheme trinity' && npm run serve"
     },
     "devDependencies": {
-        "@caweb/framework": "^1.9.2",
-        "@caweb/icon-library": "^1.1.6"
+        "@caweb/framework": "^1.9.8",
+        "@caweb/icon-library": "^1.1.7"
     },
     "dependencies": {
-        "@caweb/webpack": "^1.6.2"
+        "@caweb/webpack": "^1.6.6"
     }
 }

package/patterns/404.html

@@ -0,0 +1,32 @@
+<div class="container">
+  <div class="row">
+    <div class="col">
+      <h1>We're sorry, that link didn't work.</h1>
+
+      <p class="lead">To find what you need, you can:</p>
+
+
+    <ul>
+      <li>
+        Browse our
+        <a href="index.html">homepage</a>
+      </li>
+      <li>Double check the link</li>
+      <li>
+        Use our
+        <a href="serp.html?q=">search</a>
+      </li>
+    </ul>
+    <p>
+      Did you get here from a link on our website?
+      <a href="contact.html">Let us know</a>
+      so we can fix it.
+    </p>
+
+    <p class="fs-7">Error: Page not found (404)</p>
+  </div>
+</div>
+</main>
+  </div>
+</div>
+

package/patterns/default.html

@@ -2,29 +2,7 @@
 <html lang="en">
   <head>
     <title>{{ title }}</title>
-    {{#if scheme }}
-      <!-- Icon Font Library -->
-      <link rel="stylesheet" href="node_modules/@caweb/icon-library/build/font-only.css" />
-
-      <!-- Template Scheme CSS -->
-      <link rel="stylesheet" href="node_modules/@caweb/framework/build/{{ scheme }}.css" />
-    {{/if}}
-
-
-    {{#if meta }}
-    {{#each meta }}
-      <meta name="{{ @key }}" content="{{ this }}" />
-    {{/each}}
-    {{/if}}
-
-    {{#if assets }}
-    {{#each assets }}
-    {{#if (endsWith this ".css") }}
-      <link rel="stylesheet" href="{{ this }}" />
-    {{/if}}
-    {{/each}}
-    {{/if}}
-
+    {{> head }}
   </head>
   
   <body>

package/patterns/{search.html → serp.html}

@@ -2,28 +2,7 @@
 <html lang="en">
   <head>
     <title>{{ title }}</title>
-    {{#if scheme }}
-      <!-- Icon Font Library -->
-      <link rel="stylesheet" href="node_modules/@caweb/icon-library/build/font-only.css" />
-
-      <!-- Template Scheme CSS -->
-      <link rel="stylesheet" href="node_modules/@caweb/framework/build/{{ scheme }}.css" />
-    {{/if}}
-
-
-    {{#if meta }}
-    {{#each meta }}
-      <meta name="{{ @key }}" content="{{ this }}" />
-    {{/each}}
-    {{/if}}
-
-    {{#if assets }}
-    {{#each assets }}
-    {{#if (endsWith this ".css") }}
-    <link rel="stylesheet" href="{{ this }}" />
-    {{/if}}
-    {{/each}}
-    {{/if}}
+    {{> head}}
   </head>
   <body class="page-template-searchpage">
       {{> header  }}

package/semantics/branding.html

@@ -9,10 +9,8 @@
         </div>
         {{/if}}
         {{#if google.search  }}
-        {{#ifCond 'search' '!==' htmlWebpackPlugin.options.templateParameters.template }}
-
+        {{#ifCond 'serp.html' '!==' (replace htmlWebpackPlugin.options.template '.*(serp.html)$' '$1' ) }}
             {{> searchForm }}
-                
         {{/ifCond}}
         {{/if}}
         <button class="mobile-control toggle-menu ca-gov-icon-menu fs-2" data-bs-toggle="collapse" data-bs-target=".mobile-controlled" aria-expanded="false" aria-controls="mobile-controls" aria-label="Open the navigation menu">

package/semantics/head.html

@@ -0,0 +1,63 @@
+{{#if scheme }}
+<link rel="preconnect" href="https://fonts.googleapis.com" />
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+
+<!-- Icon Font Library -->
+<link rel="stylesheet" href="/node_modules/@caweb/icon-library/build/font-only.css" />
+
+<!-- Template Scheme CSS -->
+<link rel="stylesheet" href="/node_modules/@caweb/framework/build/{{ scheme }}.css" />
+
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="100x100"
+  href="/media/apple-touch-icon-precomposed.png" />
+<link rel="icon" sizes="192x192" href="/media/apple-touch-icon-192x192.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="180x180"
+  href="/media/apple-touch-icon-180x180.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="152x152"
+  href="/media/apple-touch-icon-152x152.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="144x144"
+  href="/media/apple-touch-icon-144x144.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="120x120"
+  href="/media/apple-touch-icon-120x120.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="114x114"
+  href="/media/apple-touch-icon-114x114.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  sizes="72x72"
+  href="/media/apple-touch-icon-72x72.png" />
+<link
+  rel="apple-touch-icon-precomposed"
+  href="/media/apple-touch-icon-57x57.png" />
+<link rel="shortcut icon" href="/media/apple-touch-icon-57x57.png" />
+<link rel="apple-touch-icon" href="/media/apple-touch-icon.png" />
+{{/if}}
+      
+{{#if meta }}
+{{#each meta }}
+  <meta name="{{ @key }}" content="{{ this }}" />
+{{/each}}
+{{/if}}
+
+{{#if assets }}
+{{#each assets }}
+{{#if (endsWith this ".css") }}
+  <link rel="stylesheet" href="{{ this }}" />
+{{/if}}
+{{/each}}
+{{/if}}
+
+{{#if google.search }}
+  <script async src="https://cse.google.com/cse.js?cx={{ google.search }}"></script>
+{{/if}}