Browse Source

Fix remaining cli issues

nsITobin 3 months ago
parent
commit
b768f94363

+ 0 - 0
base/skin/fonts/DejaVuSans/dejavu-sans-webfont.eot → base/skin/fonts/DejaVu-Sans/dejavu-sans-webfont.eot


+ 0 - 0
base/skin/fonts/DejaVuSans/dejavu-sans-webfont.svg → base/skin/fonts/DejaVu-Sans/dejavu-sans-webfont.svg


+ 0 - 0
base/skin/fonts/DejaVuSans/dejavu-sans-webfont.ttf → base/skin/fonts/DejaVu-Sans/dejavu-sans-webfont.ttf


+ 0 - 0
base/skin/fonts/DejaVuSans/dejavu-sans-webfont.woff → base/skin/fonts/DejaVu-Sans/dejavu-sans-webfont.woff


+ 0 - 0
base/skin/fonts/DejaVuSans/dejavu-sans-webfont.woff2 → base/skin/fonts/DejaVu-Sans/dejavu-sans-webfont.woff2


+ 0 - 24
base/skin/fonts/dejavu-sans-mono.css

@@ -1,24 +0,0 @@
-@font-face {
-    font-family: 'DejaVu Sans Mono';
-    font-style: normal;
-    font-weight: 400;
-    src: local('DejaVu Sans Mono'), url('https://fonts.cdnfonts.com/s/108/DejaVuSansMono.woff') format('woff');
-}
-@font-face {
-    font-family: 'DejaVu Sans Mono';
-    font-style: italic;
-    font-weight: 400;
-    src: local('DejaVu Sans Mono'), url('https://fonts.cdnfonts.com/s/108/DejaVuSansMono-Oblique.woff') format('woff');
-}
-@font-face {
-    font-family: 'DejaVu Sans Mono';
-    font-style: normal;
-    font-weight: 700;
-    src: local('DejaVu Sans Mono'), url('https://fonts.cdnfonts.com/s/108/DejaVuSansMono-Bold.woff') format('woff');
-}
-@font-face {
-    font-family: 'DejaVu Sans Mono';
-    font-style: italic;
-    font-weight: 700;
-    src: local('DejaVu Sans Mono'), url('https://fonts.cdnfonts.com/s/108/DejaVuSansMono-BoldOblique.woff') format('woff');
-}

+ 8 - 7
base/skin/fonts/dejavu-sans.css

@@ -1,9 +1,10 @@
 @font-face {
-    font-family: 'DejaVu Sans';
-    src: url('./DejaVuSans/dejavu-sans-webfont.eot'); /* IE9 Compat Modes */
-    src: url('./DejaVuSans/dejavu-sans-webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
-         url('./DejaVuSans/dejavu-sans-webfont.woff2') format('woff2'), /* Super Modern Browsers */
-         url('./DejaVuSans/dejavu-sans-webfont.woff') format('woff'), /* Pretty Modern Browsers */
-         url('./DejaVuSans/dejavu-sans-webfont.ttf') format('truetype'), /* Safari, Android, iOS */
-         url('./DejaVuSans/dejavu-sans-webfont.svg#dejavu_sansregular') format('svg'); /* Legacy iOS */
+  font-family: 'DejaVu Sans';
+  src: url('./DejaVu-Sans/dejavu-sans-webfont.eot'); /* IE9 Compat Modes */
+  src: url('./DejaVu-Sans/dejavu-sans-webfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('./DejaVu-Sans/dejavu-sans-webfont.woff2') format('woff2'), /* Super Modern Browsers */
+       url('./DejaVu-Sans/dejavu-sans-webfont.woff') format('woff'), /* Pretty Modern Browsers */
+       url('./DejaVu-Sans/dejavu-sans-webfont.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('./DejaVu-Sans/dejavu-sans-webfont.svg#dejavu_sansregular') format('svg'); /* Legacy iOS */
+  text-rendering: optimizeLegibility;
 }

+ 8 - 0
components/site/content/static-page/index.mtz

@@ -0,0 +1,8 @@
+---
+title: Static page
+heading: Heading Text
+tagline: cow
+type: html
+---
+<h2>Static Page Content</h2>
+<p>content</p>

+ 1 - 0
index.php

@@ -1,3 +1,4 @@
+#!/bin/php
 <?php /****************************************************************************************************************
 * PHP Code is filmed before a live studio audience.
 **********************************************************************************************************************/

+ 1 - 1
modules/nsGenerateContent.php

@@ -55,7 +55,7 @@ class nsGenerateContent {
     }
 
     $contentFilename = 'index.mtz';
-    $contentFilepath = $this->contentPath . $requestURI . $contentFilename;
+    $contentFilepath = gBuildPath($this->contentPath, $requestURI, $contentFilename);
 
     if (!file_exists($contentFilepath)) {
       gNotFound('Content could not be loaded.');