zz

wa-lang · Jun 18, 2024 · 9f9a0a7 · 9f9a0a7
1 parent b434f8f
commit 9f9a0a7
Show file tree

Hide file tree

Showing 45 changed files with 19 additions and 19 deletions.
diff --git a/pkg/render/_static/static/book/.keep b/pkg/render/_static/static/book/.keep
diff --git a/.../_static/FontAwesome/css/font-awesome.css → ...c/mnbook/FontAwesome/css/font-awesome.css b/.../_static/FontAwesome/css/font-awesome.css → ...c/mnbook/FontAwesome/css/font-awesome.css
diff --git a/..._static/FontAwesome/fonts/FontAwesome.ttf → .../mnbook/FontAwesome/fonts/FontAwesome.ttf b/..._static/FontAwesome/fonts/FontAwesome.ttf → .../mnbook/FontAwesome/fonts/FontAwesome.ttf
diff --git a/...FontAwesome/fonts/fontawesome-webfont.eot → ...FontAwesome/fonts/fontawesome-webfont.eot b/...FontAwesome/fonts/fontawesome-webfont.eot → ...FontAwesome/fonts/fontawesome-webfont.eot
diff --git a/...FontAwesome/fonts/fontawesome-webfont.svg → ...FontAwesome/fonts/fontawesome-webfont.svg b/...FontAwesome/fonts/fontawesome-webfont.svg → ...FontAwesome/fonts/fontawesome-webfont.svg
diff --git a/...FontAwesome/fonts/fontawesome-webfont.ttf → ...FontAwesome/fonts/fontawesome-webfont.ttf b/...FontAwesome/fonts/fontawesome-webfont.ttf → ...FontAwesome/fonts/fontawesome-webfont.ttf
diff --git a/...ontAwesome/fonts/fontawesome-webfont.woff → ...ontAwesome/fonts/fontawesome-webfont.woff b/...ontAwesome/fonts/fontawesome-webfont.woff → ...ontAwesome/fonts/fontawesome-webfont.woff
diff --git a/...ntAwesome/fonts/fontawesome-webfont.woff2 → ...ntAwesome/fonts/fontawesome-webfont.woff2 b/...ntAwesome/fonts/fontawesome-webfont.woff2 → ...ntAwesome/fonts/fontawesome-webfont.woff2
diff --git a/pkg/render/_static/ayu-highlight.css → ...r/_static/static/mnbook/ayu-highlight.css b/pkg/render/_static/ayu-highlight.css → ...r/_static/static/mnbook/ayu-highlight.css
diff --git a/pkg/render/_static/book.js → pkg/render/_static/static/mnbook/book.js b/pkg/render/_static/book.js → pkg/render/_static/static/mnbook/book.js
diff --git a/pkg/render/_static/clipboard.min.js → ...er/_static/static/mnbook/clipboard.min.js b/pkg/render/_static/clipboard.min.js → ...er/_static/static/mnbook/clipboard.min.js
diff --git a/pkg/render/_static/cover-example.svg → ...r/_static/static/mnbook/cover-example.svg b/pkg/render/_static/cover-example.svg → ...r/_static/static/mnbook/cover-example.svg
diff --git a/pkg/render/_static/css/chrome.css → ...nder/_static/static/mnbook/css/chrome.css b/pkg/render/_static/css/chrome.css → ...nder/_static/static/mnbook/css/chrome.css
diff --git a/pkg/render/_static/css/general.css → ...der/_static/static/mnbook/css/general.css b/pkg/render/_static/css/general.css → ...der/_static/static/mnbook/css/general.css
diff --git a/pkg/render/_static/css/print.css → ...ender/_static/static/mnbook/css/print.css b/pkg/render/_static/css/print.css → ...ender/_static/static/mnbook/css/print.css
diff --git a/pkg/render/_static/css/variables.css → ...r/_static/static/mnbook/css/variables.css b/pkg/render/_static/css/variables.css → ...r/_static/static/mnbook/css/variables.css
diff --git a/...ender/_static/fonts/OPEN-SANS-LICENSE.txt → ...static/mnbook/fonts/OPEN-SANS-LICENSE.txt b/...ender/_static/fonts/OPEN-SANS-LICENSE.txt → ...static/mnbook/fonts/OPEN-SANS-LICENSE.txt
diff --git a/..._static/fonts/SOURCE-CODE-PRO-LICENSE.txt → .../mnbook/fonts/SOURCE-CODE-PRO-LICENSE.txt b/..._static/fonts/SOURCE-CODE-PRO-LICENSE.txt → .../mnbook/fonts/SOURCE-CODE-PRO-LICENSE.txt
diff --git a/pkg/render/_static/fonts/fonts.css → ...der/_static/static/mnbook/fonts/fonts.css b/pkg/render/_static/fonts/fonts.css → ...der/_static/static/mnbook/fonts/fonts.css
diff --git a/...onts/open-sans-v17-all-charsets-300.woff2 → ...onts/open-sans-v17-all-charsets-300.woff2 b/...onts/open-sans-v17-all-charsets-300.woff2 → ...onts/open-sans-v17-all-charsets-300.woff2
diff --git a/...pen-sans-v17-all-charsets-300italic.woff2 → ...pen-sans-v17-all-charsets-300italic.woff2 b/...pen-sans-v17-all-charsets-300italic.woff2 → ...pen-sans-v17-all-charsets-300italic.woff2
diff --git a/...onts/open-sans-v17-all-charsets-600.woff2 → ...onts/open-sans-v17-all-charsets-600.woff2 b/...onts/open-sans-v17-all-charsets-600.woff2 → ...onts/open-sans-v17-all-charsets-600.woff2
diff --git a/...pen-sans-v17-all-charsets-600italic.woff2 → ...pen-sans-v17-all-charsets-600italic.woff2 b/...pen-sans-v17-all-charsets-600italic.woff2 → ...pen-sans-v17-all-charsets-600italic.woff2
diff --git a/...onts/open-sans-v17-all-charsets-700.woff2 → ...onts/open-sans-v17-all-charsets-700.woff2 b/...onts/open-sans-v17-all-charsets-700.woff2 → ...onts/open-sans-v17-all-charsets-700.woff2
diff --git a/...pen-sans-v17-all-charsets-700italic.woff2 → ...pen-sans-v17-all-charsets-700italic.woff2 b/...pen-sans-v17-all-charsets-700italic.woff2 → ...pen-sans-v17-all-charsets-700italic.woff2
diff --git a/...onts/open-sans-v17-all-charsets-800.woff2 → ...onts/open-sans-v17-all-charsets-800.woff2 b/...onts/open-sans-v17-all-charsets-800.woff2 → ...onts/open-sans-v17-all-charsets-800.woff2
diff --git a/...pen-sans-v17-all-charsets-800italic.woff2 → ...pen-sans-v17-all-charsets-800italic.woff2 b/...pen-sans-v17-all-charsets-800italic.woff2 → ...pen-sans-v17-all-charsets-800italic.woff2
diff --git a/...s/open-sans-v17-all-charsets-italic.woff2 → ...s/open-sans-v17-all-charsets-italic.woff2 b/...s/open-sans-v17-all-charsets-italic.woff2 → ...s/open-sans-v17-all-charsets-italic.woff2
diff --git a/.../open-sans-v17-all-charsets-regular.woff2 → .../open-sans-v17-all-charsets-regular.woff2 b/.../open-sans-v17-all-charsets-regular.woff2 → .../open-sans-v17-all-charsets-regular.woff2
diff --git a/...ource-code-pro-v11-all-charsets-500.woff2 → ...ource-code-pro-v11-all-charsets-500.woff2 b/...ource-code-pro-v11-all-charsets-500.woff2 → ...ource-code-pro-v11-all-charsets-500.woff2
diff --git a/pkg/render/_static/highlight.css → ...ender/_static/static/mnbook/highlight.css b/pkg/render/_static/highlight.css → ...ender/_static/static/mnbook/highlight.css
diff --git a/pkg/render/_static/highlight.js → ...render/_static/static/mnbook/highlight.js b/pkg/render/_static/highlight.js → ...render/_static/static/mnbook/highlight.js
diff --git a/pkg/render/_static/mark.min.js → pkg/render/_static/static/mnbook/mark.min.js b/pkg/render/_static/mark.min.js → pkg/render/_static/static/mnbook/mark.min.js
diff --git a/pkg/render/_static/tomorrow-night.css → .../_static/static/mnbook/tomorrow-night.css b/pkg/render/_static/tomorrow-night.css → .../_static/static/mnbook/tomorrow-night.css
diff --git a/pkg/render/_static/static/talk/font.css → pkg/render/_static/static/present/font.css b/pkg/render/_static/static/talk/font.css → pkg/render/_static/static/present/font.css
diff --git a/pkg/render/_static/static/talk/jquery-ui.js → ...ender/_static/static/present/jquery-ui.js b/pkg/render/_static/static/talk/jquery-ui.js → ...ender/_static/static/present/jquery-ui.js
diff --git a/pkg/render/_static/static/talk/jquery.js → pkg/render/_static/static/present/jquery.js b/pkg/render/_static/static/talk/jquery.js → pkg/render/_static/static/present/jquery.js
diff --git a/pkg/render/_static/static/talk/notes.css → pkg/render/_static/static/present/notes.css b/pkg/render/_static/static/talk/notes.css → pkg/render/_static/static/present/notes.css
diff --git a/pkg/render/_static/static/talk/notes.js → pkg/render/_static/static/present/notes.js b/pkg/render/_static/static/talk/notes.js → pkg/render/_static/static/present/notes.js
diff --git a/pkg/render/_static/static/talk/slides.js → pkg/render/_static/static/present/slides.js b/pkg/render/_static/static/talk/slides.js → pkg/render/_static/static/present/slides.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-var PERMANENT_URL_PREFIX = './static/talk/';
+var PERMANENT_URL_PREFIX = './static/present/';
 
 var SLIDE_CLASSES = ['far-past', 'past', 'current', 'next', 'far-next'];
 

diff --git a/pkg/render/_static/static/talk/styles.css → pkg/render/_static/static/present/styles.css b/pkg/render/_static/static/talk/styles.css → pkg/render/_static/static/present/styles.css
diff --git a/pkg/render/page.go b/pkg/render/page.go
@@ -24,8 +24,8 @@ import (
 //go:embed tmpl/page.html
 var tmplPage string
 
-//go:embed tmpl/talk.html
-var tmplTalk string
+//go:embed tmpl/present.html
+var tmplPresent string
 
 //go:embed tmpl/action.tmpl
 var tmplAction string

diff --git a/pkg/render/slide.go b/pkg/render/slide.go
@@ -39,7 +39,7 @@ func (p *BookRendor) renderTalkPages(path string) error {
 		return err
 	}
 
-	t := template.Must(present.Template().Parse(tmplTalk))
+	t := template.Must(present.Template().Parse(tmplPresent))
 	t = template.Must(t.Parse(tmplAction))
 
 	var buf bytes.Buffer

diff --git a/pkg/render/tmpl/page.html b/pkg/render/tmpl/page.html
@@ -12,17 +12,17 @@
 
         <link rel="icon" href="{{$page.Root}}/favicon.svg">
         <link rel="shortcut icon" href="{{$page.Root}}/favicon.png">
-        <link rel="stylesheet" href="{{$page.Root}}/css/variables.css">
-        <link rel="stylesheet" href="{{$page.Root}}/css/general.css">
-        <link rel="stylesheet" href="{{$page.Root}}/css/chrome.css">
-        <link rel="stylesheet" href="{{$page.Root}}/css/print.css" media="print">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/css/variables.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/css/general.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/css/chrome.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/css/print.css" media="print">
         <!-- Fonts -->
-        <link rel="stylesheet" href="{{$page.Root}}/FontAwesome/css/font-awesome.css">
-        <link rel="stylesheet" href="{{$page.Root}}/fonts/fonts.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/FontAwesome/css/font-awesome.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/fonts/fonts.css">
         <!-- Highlight.js Stylesheets -->
-        <link rel="stylesheet" href="{{$page.Root}}/highlight.css">
-        <link rel="stylesheet" href="{{$page.Root}}/tomorrow-night.css">
-        <link rel="stylesheet" href="{{$page.Root}}/ayu-highlight.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/highlight.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/tomorrow-night.css">
+        <link rel="stylesheet" href="{{$page.Root}}/static/mnbook/ayu-highlight.css">
 
         <!-- Custom theme stylesheets -->
     </head>
@@ -162,10 +162,10 @@ <h1 class="menu-title"><a href="{{$page.Root}}/index.html">{{$page.Book.Title}}<
         <script type="text/javascript">
             window.playground_copyable = true;
         </script>
-        <script src="{{$page.Root}}/mark.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{$page.Root}}/clipboard.min.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{$page.Root}}/highlight.js" type="text/javascript" charset="utf-8"></script>
-        <script src="{{$page.Root}}/book.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{$page.Root}}/static/mnbook/mark.min.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{$page.Root}}/static/mnbook/clipboard.min.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{$page.Root}}/static/mnbook/highlight.js" type="text/javascript" charset="utf-8"></script>
+        <script src="{{$page.Root}}/static/mnbook/book.js" type="text/javascript" charset="utf-8"></script>
 
         <!-- Custom JS scripts -->
     </body>

diff --git a/pkg/render/tmpl/talk.html → pkg/render/tmpl/present.html b/pkg/render/tmpl/talk.html → pkg/render/tmpl/present.html
@@ -9,14 +9,14 @@
     <script>
       var notesEnabled = {{.NotesEnabled}};
     </script>
-    <script src='./static/talk/slides.js'></script>
+    <script src='./static/present/slides.js'></script>
 
     {{if .NotesEnabled}}
     <script>
       var sections = {{.Sections}};
       var titleNotes = {{.TitleNotes}}
     </script>
-    <script src='./static/talk/notes.js'></script>
+    <script src='./static/present/notes.js'></script>
     {{end}}
   </head>