From ddbe3c7426a551420bb6ead09984333e956b3a58 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 17 Feb 2016 12:32:12 +0100
Subject: make always preload images before rendering the page a display
 setting

---
 view/tpl/head.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl/head.tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 8a007232e..322273193 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -28,6 +28,7 @@
 	var justifiedGalleryActive = false;
 	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
 	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
+	var preloadImages = {{$preload_images}};
 
 </script>
 
-- 
cgit v1.2.3


From d5db25808a0847e09ee3735faeac3552c722e0ae Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 7 Mar 2016 15:03:53 -0800
Subject: Facebook scraper "OpenGraph" support; modules will need to set the
 required fields (type, image, url) as well as any desired optional or type
 specific fields. We will set the title during pagebuild.

---
 view/tpl/head.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/head.tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 322273193..93ee9af2a 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -2,7 +2,7 @@
 <base href="{{$baseurl}}/" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
 <meta name="generator" content="{{$generator}}" />
-
+{{$metas}}
 <!--[if IE]>
 <script src="{{$baseurl}}/library/html5.js"></script>
 <![endif]-->
-- 
cgit v1.2.3


From cf4dc2caa82c9d03ac667feed5f5671510e0e00a Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 8 Mar 2016 16:21:35 -0800
Subject: move "generator" to HttpMeta

---
 view/tpl/head.tpl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'view/tpl/head.tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 93ee9af2a..ba883c1f0 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,7 +1,6 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
-<meta name="generator" content="{{$generator}}" />
 {{$metas}}
 <!--[if IE]>
 <script src="{{$baseurl}}/library/html5.js"></script>
-- 
cgit v1.2.3


From 0269825bc09c2e41a46992cc0bb6415a1e39e0c7 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 10 Apr 2016 21:56:16 -0700
Subject: localise the opensearch link

---
 view/tpl/head.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/head.tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index ba883c1f0..ab229eaf7 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -16,7 +16,7 @@
 <link rel="search"
          href="{{$baseurl}}/opensearch" 
          type="application/opensearchdescription+xml" 
-         title="Search in the Hubzilla" />
+         title="{{$osearch}}" />
 
 
 <script>
-- 
cgit v1.2.3


From 91cc36514306e827c126ceed6c17486c85f5544c Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 12 Apr 2016 22:55:26 -0700
Subject: reverse the logic of the jsenabled setting so that sessions without
 js are performance penalised instead of regular sessions.

---
 view/tpl/head.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl/head.tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index ab229eaf7..7984723b3 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,6 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
+<noscript><meta http-equiv="refresh" content="0; url=nojs.php&redir={{$query}}"></noscript>
 {{$metas}}
 <!--[if IE]>
 <script src="{{$baseurl}}/library/html5.js"></script>
-- 
cgit v1.2.3


From 9a0b61e4afed94727679eee966afb76e1add2beb Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 13 Apr 2016 16:31:06 -0700
Subject: refactor the js detection into a checkjs class which is only enabled
 on demand (currently only the channel and display pages). Will probably
 require a bit more work to hide/disable the cover photo when js is disabled.
 Have not actually tested without js to discover any other potential page
 issues. Have only confirmed that the detection class works and redirects to
 set a jsdisabled cookie and reload the page with that cookie+variable set if
 called from the channel page.

---
 view/tpl/head.tpl | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'view/tpl/head.tpl')

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 7984723b3..9fcdf1735 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,27 +1,17 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
-<noscript><meta http-equiv="refresh" content="0; url=nojs.php&redir={{$query}}"></noscript>
 {{$metas}}
 <!--[if IE]>
 <script src="{{$baseurl}}/library/html5.js"></script>
 <![endif]-->
 
 {{$head_css}}
-
 {{$js_strings}}
-
 {{$head_js}}
-
 <link rel="shortcut icon" href="{{$icon}}" />
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="{{$osearch}}" />
-
-
+<link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" title="{{$osearch}}" />
 <script>
-
 	var updateInterval = {{$update_interval}};
 	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
 	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
@@ -29,7 +19,6 @@
 	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
 	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
 	var preloadImages = {{$preload_images}};
-
 </script>
 
 
-- 
cgit v1.2.3