Geysir - version 1.6.0

- Fixes here and there - Languages have been added to Geysir - Koken pillar grid with settings. - And a lot of fixes.
notandigg · Aug 21, 2017 · 941ba2c · 941ba2c
1 parent a80b298
commit 941ba2c
Show file tree

Hide file tree

Showing 89 changed files with 3,738 additions and 2,015 deletions.
diff --git a/album.lens b/album.lens
@@ -1,27 +1,65 @@
+<koken:include file="inc/header.html" />
+<koken:include file="inc/nav.html" />
+
 <koken:load>
-    <koken:include file="inc/header.html" />
-    <koken:include file="inc/nav.html" />
-
-    <div id="top">
-        <div class="container-fluid padding-0 margin-0">
-            <div class="col-lg-12 text-xs-center">
-                <koken:if true="settings.show_header">
-                    <h2 class="m-t-0 text-title">{{ album.title }}</h2>
-                </koken:if>
-                <span class="text-muted">Published: <koken:time relative="true" /></span>
-                <h6 class="text-dark">{{ album.description }}</h6>
-                <p>
-                    <koken:include file="inc/breadcrumbs.html" />
-                </p>
-            </div>
-            <koken:if data="settings.content_grid_layout" equals="masonry">
-                <koken:include file="inc/content/content_masonry_grid.html" />
-            </koken:if>
-            <koken:if data="settings.content_grid_layout" equals="bootstrap">
-                <koken:include file="inc/content/content_bootstrap_grid.html" />
-            </koken:if>
-
-        </div>
+
+  <koken:head>
+    <meta property="og:site_name" content="{{ site.title }}" />
+    <meta property="og:title" content="{{ album.title strip_html=" true " }}" />
+    <meta property="og:description" content="{{ album.summary | album.description strip_html=" true " }}" />
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="{{ album.url }}" />
+    <koken:covers>
+      <koken:shift>
+        <meta property="og:image" content="{{ content.presets.medium_large.url }}" />
+        <meta property="og:image:width" content="{{ content.presets.medium_large.width }}" />
+        <meta property="og:image:height" content="{{ content.presets.medium_large.height }}" />
+      </koken:shift>
+    </koken:covers>
+    <koken:not empty="profile.twitter">
+      <meta name="twitter:card" content="gallery" />
+      <meta name="twitter:site" content="@{{ profile.twitter }}" />
+      <meta name="twitter:creator" content="@{{ profile.twitter }}" />
+      <koken:covers minimum="4" limit="4">
+        <koken:loop>
+          <meta name="twitter:image{{ index }}" content="{{ content.presets.medium_large.cropped.url }}">
+        </koken:loop>
+      </koken:covers>
+    </koken:not>
+  </koken:head>
+
+  <div id="top">
+    <div class="container-grid">
+      <div class="col-lg-12 text-xs-center">
+        <koken:if true="settings.show_header">
+          <h4 class="m-t-0 text-title">{{ album.title }}</h4>
+        </koken:if>
+
+        <koken:if true="settings.show_album_time">
+          <span><i class="fa fa-clock-o"></i> <koken:time relative="true" /></span>
+        </koken:if>
+
+        <koken:if true="settings.show_album_download">
+          <koken:album_download>
+            <p>
+              <i class="fa fa-download"></i>
+              <koken:link title="{{ language.download }}">{{ album_download.title }}</koken:link>
+            </p>
+          </koken:album_download>
+        </koken:if>
+
+        <koken:if true="settings.show_album_description">
+          <p>{{ album.description|album.summary paragraph="true" }}</p>
+        </koken:if>
+
+        <p>
+          <koken:include file="inc/breadcrumbs.html" />
+        </p>
+
+      </div>
+      <koken:include file="inc/content/content_pillar_grid.html" />
+
     </div>
-    <koken:include file="inc/footer.html" />
+  </div>
+  <koken:include file="inc/footer.html" />
 </koken:load>
diff --git a/albums.lens b/albums.lens
@@ -1,20 +1,45 @@
-<koken:load>
     <koken:include file="inc/header.html" />
     <koken:include file="inc/nav.html" />
 
+<koken:load>
+
+	<koken:head>
+		<meta property="og:site_name" content="{{ site.title }}" />
+		<meta property="og:title" content="{{ album.title strip_html="true" }} - " />
+		<meta property="og:description" content="{{ album.summary | album.description strip_html="true" }}" />
+		<meta property="og:type" content="website" />
+		<meta property="og:url" content="{{ album.url }}" />
+		<koken:covers><koken:shift>
+		<meta property="og:image" content="{{ content.presets.medium_large.url }}" />
+		<meta property="og:image:width" content="{{ content.presets.medium_large.width }}" />
+		<meta property="og:image:height" content="{{ content.presets.medium_large.height }}" />
+		</koken:shift></koken:covers>
+		<koken:not empty="profile.twitter">
+			<meta name="twitter:card" content="gallery" />
+			<meta name="twitter:site" content="@{{ profile.twitter }}" />
+			<meta name="twitter:creator" content="@{{ profile.twitter }}" />
+			<koken:covers minimum="4" limit="4">
+				<koken:loop>
+					<meta name="twitter:image{{ index }}" content="{{ content.presets.medium_large.cropped.url }}">
+				</koken:loop>
+			</koken:covers>
+		</koken:not>
+	</koken:head>
+
+</koken:load>
+
     <div id="top">
         <div class="container-fluid">
-
+<koken:load limit="{{ settings.album_count }}" order_by="published_on" order_direction="desc" infinite="true">
             <koken:if true="settings.show_header">
                 <div class="col-lg-12 text-xs-center">
-                    <h2 class="m-t-0 text-title">{{ labels.album.plural }}<sup>{{ count }}</sup></h2>
+                    <h4 class="m-t-0 text-title">{{ language.albums }}<sup>{{ count }}</sup></h4>
                 </div>
             </koken:if>
 
-            <koken:load source="albums" limit="{{ settings.album_count }}" order_by="modified_on" order_direction="desc">
+
                 <koken:include file="inc/album/album-grid.html" />
             </koken:load>
         </div>
     </div>
     <koken:include file="inc/footer.html" />
-</koken:load>
diff --git a/categories.lens b/categories.lens
@@ -5,13 +5,13 @@
         <div class="col-lg-12 text-xs-center m-y-2">
 
             <koken:if true="settings.show_header">
-                <h2 class="m-t-0 text-title"> {{ labels.category.plural }} </h2>
+                <h4 class="m-t-0 text-title"> {{ language.categories }} </h4>
             </koken:if>
             <koken:load limit="30" infinite="true">
                 <koken:categories>
                     <koken:loop>
-                        <koken:link>
-                            <span class="btn btn-xl btn-secondary" style="margin-bottom:2px;"><i class="fa fa-bookmark"></i> {{ category.title }} ({{ category.counts.total }})</span>
+                        <koken:link class="btn btn-sm" style="margin-bottom:2px;">
+                            <i class="fa fa-bookmark"></i> {{ category.title }} ({{ category.counts.total }})
                         </koken:link>
                     </koken:loop>
                 </koken:categories>

diff --git a/category.lens b/category.lens
@@ -6,7 +6,7 @@
             <div class="col-lg-12 text-xs-center">
 
                 <koken:if true="settings.show_header">
-                    <h2 class="m-t-0 text-title">{{ labels.category.singular }}: {{ category.title }}<span><sup>{{ category.counts.total }}</sup></span></h2>
+                    <h4 class="m-t-0 text-title">{{ language.geysir_category_ }}: {{ category.title }}<span><sup>{{ category.counts.total }}</sup></span></h4>
                 </koken:if>
 
                 <div>

diff --git a/content.lens b/content.lens
@@ -1,56 +1,58 @@
-    <koken:include file="inc/header.html" />
-    <koken:include file="inc/nav.html" />
+<koken:include file="inc/header.html" />
+<koken:include file="inc/nav.html" />
 
-    <koken:load>
+<style>
+#content-container img {
+max-height:calc(90vh - 120px);
+}
+</style>
 
-      <koken:head>
-        <meta property="og:site_name" content="{{ site.title }}" />
-        <meta property="og:title" content="{{ site.title }}" />
-        <meta property="og:description" content="{{ site.description strip_html='true' }}" />
-        <meta property="og:type" content="website" />
-        <koken:first>
-        <meta property="og:image" content="{{ content.presets.medium_large.url }}" />
-        <meta property="og:image:width" content="{{ content.presets.medium_large.width }}" />
-        <meta property="og:image:height" content="{{ content.presets.medium_large.height }}" />
-        </koken:first>
-        <meta property="og:url" content="{{ location.site_url }}{{ location.here }}" />
-        <koken:not empty="profile.twitter">
-          <meta name="twitter:card" content="gallery" />
-          <meta name="twitter:site" content="@{{ profile.twitter }}" />
-          <meta name="twitter:creator" content="@{{ profile.twitter }}" />
-          <koken:loop limit="4">
-            <meta name="twitter:image{{ index }}" content="{{ content.presets.medium_large.cropped.url }}">
-          </koken:loop>
-        </koken:not>
-      </koken:head>
-
-    </koken:load>
 <koken:load>
-    <div id="top">
-        <div class="container fadeIn">
 
-            <koken:if true="settings.show_header">
-                <h2 class="m-t-0 text-title text-xs-center">{{ content.title | content.filename.clean  }}</h2>
-            </koken:if>
+  <koken:head>
+    <meta property="og:site_name" content="{{ site.title }}" />
+    <meta property="og:title" content="{{ site.title }}" />
+    <meta property="og:description" content="{{ site.description strip_html='true' }}" />
+    <meta property="og:type" content="website" />
+    <koken:first>
+      <meta property="og:image" content="{{ content.presets.medium_large.url }}" />
+      <meta property="og:image:width" content="{{ content.presets.medium_large.width }}" />
+      <meta property="og:image:height" content="{{ content.presets.medium_large.height }}" />
+    </koken:first>
+    <meta property="og:url" content="{{ location.site_url }}{{ location.here }}" />
+    <koken:not empty="profile.twitter">
+      <meta name="twitter:card" content="gallery" />
+      <meta name="twitter:site" content="@{{ profile.twitter }}" />
+      <meta name="twitter:creator" content="@{{ profile.twitter }}" />
+      <koken:loop limit="4">
+        <meta name="twitter:image{{ index }}" content="{{ content.presets.medium_large.cropped.url }}">
+      </koken:loop>
+    </koken:not>
+  </koken:head>
 
-            <koken:include file="inc/content/content-nav.html" />
-            <div class="col-md-9 col-xs-12">
-                <koken:content_image>
-                    <koken:link lightbox="true">
-                        <koken:img respond_to="width" class="img-rounded center-block m-y-1" lazy="true" fade="true" />
-                    </koken:link>
-                </koken:content_image>
-                <koken:content_video>
-                    <!-- We have a video -->
-                    <koken:video class="img-fluid" />
-                </koken:content_video>
-            </div>
-            <div class="col-md-3 col-xs-12" style="margin-bottom:15px;">
-                <koken:include file="inc/content/content-sidebar.html" />
-            </div>
+</koken:load>
+<koken:load>
+  <div id="top">
+    <div class="container">
+        <koken:include file="inc/content/content-nav.html" />
+        <div class="col-md-9 col-xs-12 text-xs-center" id="content-container">
+          <koken:content_image>
+          <koken:link lightbox="true">
+            <koken:img class="img-rounded text-xs-center m-y-1 m-x-auto" id="content-sizing" lazy="true" fade="true" />
+          </koken:link>
+          </koken:content_image>
+          <koken:content_video>
+            <!-- We have a video -->
+            <koken:video class="img-fluid" />
+          </koken:content_video>
         </div>
-        <koken:if true="settings.show_disqus">
-            <koken:include file="inc/disq.html" />
-        </koken:if>
-        <koken:include file="inc/footer.html" />
+        <div class="col-md-3 col-xs-12" style="margin-bottom:15px;">
+          <koken:include file="inc/content/content-sidebar.html" />
+        </div>
+    </div>
+    <koken:if true="settings.show_disqus">
+      <koken:include file="inc/disq.html" />
+    </koken:if>
 </koken:load>
+
+    <koken:include file="inc/footer.html" />
diff --git a/contents.lens b/contents.lens
@@ -1,22 +1,16 @@
 <koken:include file="inc/header.html" />
 <koken:include file="inc/nav.html" />
 <div id="top">
-
     <koken:if true="settings.show_header">
         <div class="col-lg-12 text-xs-center">
-            <h2 class="m-t-0 text-title">{{ labels.content.plural }}</h2>
+            <h4 class="m-t-0 text-title">{{ language.content }}</h4>
         </div>
     </koken:if>
 
     <koken:load limit="50" infinite="true">
-        <koken:if data="settings.content_grid_layout" equals="masonry">
-            <koken:include file="inc/content/content_masonry_grid.html" />
-        </koken:if>
-        <koken:if data="settings.content_grid_layout" equals="bootstrap">
-            <koken:include file="inc/content/content_bootstrap_grid.html" />
-        </koken:if>
+    <koken:include file="inc/content/content_pillar_grid.html" />
     </koken:load>
+    <koken:include file="inc/loading.html" />
 </div>
-<koken:include file="inc/loading.html" />
 </div>
 <koken:include file="inc/footer.html" />
diff --git a/css/fonts_body/amatic+cC.css b/css/fonts_body/amatic+cC.css
diff --git a/css/fonts_body/open+sans+condensed.css b/css/fonts_body/open+sans+condensed.css
@@ -0,0 +1,4 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300');
+body {
+    font-family: 'Open Sans Condensed', sans-serif;
+}
diff --git a/css/fonts_body/oxygen.css b/css/fonts_body/oxygen.css
@@ -0,0 +1,4 @@
+@import url('https://fonts.googleapis.com/css?family=Oxygen&subset=latin-ext');
+body {
+    font-family: 'Oxygen', sans-serif;
+}
diff --git a/css/fonts_body/shadows+into+light+body.css b/css/fonts_body/shadows+into+light+body.css
diff --git a/css/fonts_site_title/italianno.css b/css/fonts_site_title/italianno.css
@@ -0,0 +1,8 @@
+@import url('https://fonts.googleapis.com/css?family=Italianno');
+.site-logo {
+    font-family: 'Italianno', cursive;
+    -webkit-transition: padding .2s ease-in;
+    -moz-transition: padding .2s ease-in;
+    transition: padding .2s ease-in;
+    text-transform: none;
+}
diff --git a/js/enable_pjax.js → css/fonts_site_title/itallianno.css b/js/enable_pjax.js → css/fonts_site_title/itallianno.css
diff --git a/css/fonts_site_title/kanit.css b/css/fonts_site_title/kanit.css
@@ -1,5 +1,7 @@
 @import url('https://fonts.googleapis.com/css?family=Kanit:100');
-
-.navbar-brand {
+.site-logo {
   font-family: 'Kanit', sans-serif;
+  -webkit-transition: padding .2s ease-in;
+  -moz-transition: padding .2s ease-in;
+  transition: padding .2s ease-in;
 }
diff --git a/css/fonts_site_title/lato.css b/css/fonts_site_title/lato.css
@@ -1,5 +1,5 @@
 @import url('https://fonts.googleapis.com/css?family=Lato');
-.navbar-brand {
+.site-logo {
     font-family: 'Lato', sans-serif;
     -webkit-transition: padding .2s ease-in;
     -moz-transition: padding .2s ease-in;

diff --git a/css/fonts_site_title/lobster.css b/css/fonts_site_title/lobster.css
@@ -1,5 +1,5 @@
 @import url('https://fonts.googleapis.com/css?family=Lobster');
-.navbar-brand {
+.site-logo {
     font-family: 'Lobster', cursive;
     -webkit-transition: padding .2s ease-in;
     -moz-transition: padding .2s ease-in;

diff --git a/css/fonts_site_title/oswald.css b/css/fonts_site_title/oswald.css
@@ -1,5 +1,5 @@
 @import url('https://fonts.googleapis.com/css?family=Oswald');
-.navbar-brand {
+.site-logo {
     font-family: 'Oswald', sans-serif;
     -webkit-transition: padding .2s ease-in;
     -moz-transition: padding .2s ease-in;

diff --git a/css/fonts_site_title/roboto.css b/css/fonts_site_title/roboto.css
@@ -1,5 +1,5 @@
 @import url('https://fonts.googleapis.com/css?family=Roboto');
-.navbar-brand {
+.site-logo {
     font-family: 'Roboto', sans-serif;
     -webkit-transition: padding .2s ease-in;
     -moz-transition: padding .2s ease-in;

diff --git a/css/fonts_site_title/shadows+into+light.css b/css/fonts_site_title/shadows+into+light.css
@@ -1,2 +1,7 @@
 @import url('https://fonts.googleapis.com/css?family=Shadows+Into+Light');
-.navbar-brand {font-family: 'Shadows Into Light', cursive;}
+.site-logo {
+  font-family: 'Shadows Into Light', cursive;
+  -webkit-transition: padding .2s ease-in;
+  -moz-transition: padding .2s ease-in;
+  transition: padding .2s ease-in;
+}
diff --git a/css/fonts_site_title/the+girl+next+door.css b/css/fonts_site_title/the+girl+next+door.css
@@ -0,0 +1,8 @@
+@import url('https://fonts.googleapis.com/css?family=The+Girl+Next+Door');
+.site-logo {
+  font-family: 'The Girl Next Door', cursive;
+  -webkit-transition: padding .2s ease-in;
+  -moz-transition: padding .2s ease-in;
+  transition: padding .2s ease-in;
+  text-transform: none;
+}
diff --git a/css/fonts_site_title/wire+one.css b/css/fonts_site_title/wire+one.css
@@ -0,0 +1,8 @@
+@import url('https://fonts.googleapis.com/css?family=Wire+One');
+.site-logo {
+  font-family: 'Wire One', sans-serif;
+  -webkit-transition: padding .2s ease-in;
+  -moz-transition: padding .2s ease-in;
+  transition: padding .2s ease-in;
+  text-transform: none;
+}