{static => assets}/css|js/staticman.css|js

1. Preparation pour i18n
2. Suppression du dialogue « modal » d'Edouardo Bourças

2 files changed, 22 insertions, 29 deletions

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 4112a34..7235d83 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,12 +5,14 @@
   {{- with .Resources.Match "images/gallery/*.*" -}}
     <link rel="stylesheet" href="/css/baguetteBox.min.css" />
   {{- end }}
-    {{ $pygmcss := resources.Get "css/pygments.css" }}
-    {{ $pygments := $pygmcss | resources.Minify }}
-    <link rel="stylesheet" href="{{ $pygments.Permalink }}" />
-    {{- if .Site.Params.staticman -}}
-      <link rel="stylesheet" href="{{ "css/staticman.css" | relURL }}" />
-    {{- end -}}
+  {{ $pygmcss := resources.Get "css/pygments.css" }}
+  {{ $pygments := $pygmcss | resources.Minify }}
+  <link rel="stylesheet" href="{{ $pygments.Permalink }}" />
+  {{- if .Site.Params.staticman -}}
+    {{ $smcss := resources.Get "css/staticman.css" }}
+    {{ $staticman := $smcss | resources.Minify }}
+    <link rel="stylesheet" href="{{ $staticman.Permalink }}" />
+  {{- end -}}
 {{- end -}}
 {{- define "title" -}}
   {{ .Title }} – {{ .Site.Title }}
@@ -28,14 +30,14 @@
           </h1>
           <div class="meta">
           {{ range .Params.categories }}
-		        <a class="categories" href="{{ "/categories/" | relLangURL }}{{ . | urlize }}">
-		          {{- . -}}
-		        </a>
-		        {{- end -}}
-		        {{ range .Params.tags }}
-		        <a class="tags" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">
-		          {{- . -}}
-		        </a>
+            <a class="categories" href="{{ "/categories/" | relLangURL }}{{ . | urlize }}">
+              {{- . -}}
+            </a>
+            {{- end -}}
+            {{ range .Params.tags }}
+            <a class="tags" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">
+              {{- . -}}
+            </a>
           {{- end -}}
           </div>
         </header>
@@ -66,7 +68,8 @@
       {{ end }}
       {{ if .Site.Params.staticman }}
         <script src="{{ "js/jquery.min.js" | relURL }}"></script>
-        <script src="{{ "js/staticman.js" | relURL }}"></script>
+        {{ $smjs := resources.Get "js/staticman.js" }}
+        <script src="{{ $smjs.RelPermalink }}"></script>
         {{ partial "staticman-comments.html" . }}
       {{ end }}
       {{ if .Site.Params.comments }}
@@ -74,7 +77,7 @@
         src="{{ .Site.Params.isso_server }}/js/embed.min.js"
         async >
       </script>
-      <section id="isso-thread"></section> 
+      <section id="isso-thread"></section>
       {{ end }}
       {{ end }}
       {{- define "scripts" -}}
diff --git a/layouts/partials/staticman-comments.html b/layouts/partials/staticman-comments.html
index 411da53..03f5dd5 100644
--- a/layouts/partials/staticman-comments.html
+++ b/layouts/partials/staticman-comments.html
@@ -30,7 +30,7 @@
             <a href="#{{ ._id }}" title="Permalink to this comment"><time datetime="{{ dateFormat "02 Jan 06 15:04 +01:00" .date }}">{{ dateFormat "02/01/2006 15:04" .date }}</time></a>
           </h4>
           <div class="comment-content"><p>{{ .comment | markdownify }}</p></div>
-          <a class="btn" href="#comment-form" title="{{ ._id }}">{{ i18n "replyToMsg" }}</a>
+          <a class="reply-btn" href="#comment-form" title="{{ ._id }}">{{ i18n "replyToMsg" }}</a>
         </article>
 
         {{ range $comments }}
@@ -43,11 +43,11 @@
                 {{- else -}}
                 <span class="comment-author">{{ .name }}</span>
                 {{- end -}}
-                &nbsp;↷&nbsp;<a href="#{{ .replyID }}">{{ .replyName }}</a>
+                <a href="#{{ .replyID }}" class="reply-target">{{ .replyName }}</a>
                 <a href="#{{ ._id }}" title="Permalink to this comment"><time datetime="{{ dateFormat "02 Jan 06 15:04 +01:00" .date }}">{{ dateFormat "02/01/2006 15:04" .date }}</time></a>
               </h4>
               <div class="comment-content"><p>{{ .comment | markdownify }}</p></div>
-              <a class="btn" href="#comment-form" title="{{ .replyThread }}">{{ i18n "replyToMsg" }}</a>
+              <a class="reply-btn" href="#comment-form" title="{{ .replyThread }}">{{ i18n "replyToMsg" }}</a>
             </article>
           {{ end }}
         {{ end }}
@@ -94,13 +94,3 @@
   <input type="reset" value="Reset" class="button">
 </form>
 </section>
-
-<article class="modal">
-  <div class="title">
-    <h2 class="js-modal-title"></h2>
-  </div>
-  <div class="js-modal-text"></div>
-  <div>
-    <button class="js-close-modal">Close</button>
-  </div>
-</article>