Browse Source

updated video and live templates, syndicates, contact info

Harlan Iverson 7 years ago
parent
commit
04af5965e6

+ 16 - 11
ispooge.com-v2/app/resources/templates/md/pages/index.md

@@ -3,17 +3,21 @@
  :layout :index
  :page-index 0}
 
-Welcome to iSpooge :) 
 
-Tune in on [iSpooge Live](live.html) 
-or [Periscope](https://pscp.tv/iSpoogeDaily)
-or [Facebook Live](https://www.facebook.com/ispooge/)
-or [YouTube Live](https://www.youtube.com/channel/UCUMn9G0yzhQWXiRTOmPLXOg)
-or [Twitch](https://twitch.tv/iSpoogeDaily).
+#### Tune in
 
-Updates on [Twitter](https://twitter.com/ispoogedaily) or below.
+* on [iSpooge Live](live.html) 
+* or [Twitch](https://twitch.tv/iSpoogeDaily)
+* or [YouTube Live](https://www.youtube.com/channel/UCUMn9G0yzhQWXiRTOmPLXOg)
+* or sometimes [Facebook Live](https://www.facebook.com/ispooge/)
+* or rarely [Periscope](https://pscp.tv/iSpoogeDaily).
 
-Drop me a line to come on the show: social at this domain.com or (four one f1ve).93 seven.7four67
+
+#### Updates on
+* [Gab.ai](https://gab.ai/ispooge)
+* or [SteemIt](https://steemit.com/@ispooge)
+* or [Twitter](https://twitter.com/ispoogedaily)
+* or below.
 
 #### Programming
 
@@ -29,11 +33,12 @@ See our [calendar](https://calendar.google.com/calendar?cid=ZnZyYTk0bjlvdGlzcGs1
 
 
 
+## Contact
 
 
+Drop me a line to come on the show: 
 
-## Contact
-
-* social @t ispooge d0t com or (four one f1ve).93 seven.7four67
+* social at this domain com
+* or (four one f1ve).93 seven.7four67
 
 hola hola hola

+ 13 - 0
ispooge.com-v2/app/resources/templates/md/pages/live.md

@@ -5,3 +5,16 @@
  :video-url "https://ispooge.com/hls/ispoogedaily/index.m3u8"
  :video-description "iSpooge.com"
  }
+
+
+## Problems with stream?
+
+We don't have adaptive rate playback for live streams yet. Bug me...
+
+Until then, try our syndicates:
+
+* [Twitch](https://twitch.tv/iSpoogeDaily).
+* or [YouTube Live](https://www.youtube.com/channel/UCUMn9G0yzhQWXiRTOmPLXOg)
+* sometimes [Facebook Live](https://www.facebook.com/ispooge/)
+* rarely [Periscope](https://pscp.tv/iSpoogeDaily)
+

+ 2 - 27
ispooge.com-v2/app/resources/templates/themes/ispooge/html/live-event.html

@@ -2,19 +2,8 @@
 {%block subtitle %}: {{post.title}}{% endblock %}
 
 {% block head %}
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@ispoogedaily">
-<meta name="twitter:creator" content="@harlanji">
 
-<meta property="og:url" content="{{site-url}}{{uri}}">
-<meta property="og:title" content="{{post.title}}">
-<meta property="og:description" content="VIDEO - {{post.title}}.">
-<meta property="og:image" content="{{site-url}}{{post.video-thumbnail-url}}">
-
-<link rel="stylesheet" href="/assets/videojs/video-js.css">
-<script src="/assets/videojs/video.js"></script>
-<script src="/assets/videojs/videojs-contrib-hls.js"></script>
-<script src="/assets/videojs/videojs-media-session.js"></script>
+  {% include "/html/partials/video-head.html" %}
 
 {% endblock %}
 
@@ -28,22 +17,8 @@
 
 
 
-<video id="video-player" width="640" height="360" class="video-js vjs-default-skin" 
-controls poster="{{post.video-thumbnail-url}}" data-setyp='{"controls": "true", "loop": "false", "autoplay": "false", "preload": "false"}'>
-  <source src="{{post.video-url}}" type="application/x-mpegURL">
-  </source>
-  <p class="vjs-no-js">The browser doesn't seem to support our video player... new browsers should.</p>
-</video>
-
-<script>
-var player = videojs('video-player');
+    {% include "/html/partials/video-player.html" %}
 
-							player.ready(function() {
-							
-							   player.mediaSession();
-});
-//player.play();
-</script>
 
     {{post.content|safe}}
 

+ 2 - 13
ispooge.com-v2/app/resources/templates/themes/ispooge/html/live.html

@@ -1,5 +1,5 @@
 {% extends "/html/base.html" %}
-{%block subtitle %}: {{page.title}}{% endblock %}
+{%block subtitle %}: Live{% endblock %}
 
 
 {% block head %}
@@ -31,20 +31,9 @@ var player = videojs('video-player');
 //player.play();
 </script>
 
-    {{page.content|safe}}
 
+    {{page.content|safe}}
 
 
-    <div id="prev-next">
-        {% if page.prev %}
-        <a href="{{page.prev.uri}}">&laquo; {{page.prev.title}}</a>
-        {% endif %}
-        {% if all page.prev page.next %}
-        ||
-        {% endif %}
-        {% if page.next %}
-        <a href="{{page.next.uri}}">{{page.next.title}} &raquo;</a>
-        {% endif %}
-    </div>
 </div>
 {% endblock %}

+ 8 - 0
ispooge.com-v2/app/resources/templates/themes/ispooge/html/partials/post-pagination.html

@@ -0,0 +1,8 @@
+<div id="prev-next">
+    {% if post.prev %}
+    <a href="{{post.prev.uri}}">&laquo; {{post.prev.title}}</a>
+    {% endif %}
+    {% if post.next %}
+    <a class="right" href="{{post.next.uri}}">{{post.next.title}} &raquo;</a>
+    {% endif %}
+</div>

+ 18 - 0
ispooge.com-v2/app/resources/templates/themes/ispooge/html/partials/video-head.html

@@ -0,0 +1,18 @@
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:site" content="@ispoogedaily">
+<meta name="twitter:creator" content="@harlanji">
+
+<meta property="og:url" content="{{site-url}}{{uri}}">
+<meta property="og:title" content="{{post.title}}">
+<meta property="og:description" content="VIDEO - {{post.title}}.">
+
+{% if post.video-thumbnail-url %}
+<meta property="og:image" content="{{site-url}}{{post.video-thumbnail-url}}">
+{% endif %}
+
+{% if post.video-url %}
+<link rel="stylesheet" href="/assets/videojs/video-js.css">
+<script src="/assets/videojs/video.js"></script>
+<script src="/assets/videojs/videojs-contrib-hls.js"></script>
+<script src="/assets/videojs/videojs-media-session.js"></script>
+{% endif %}

+ 49 - 0
ispooge.com-v2/app/resources/templates/themes/ispooge/html/partials/video-player.html

@@ -0,0 +1,49 @@
+
+{% if post.video-url %}
+<video id="video-player" width="640" height="360" class="video-js vjs-default-skin" 
+  controls poster="{{post.video-thumbnail-url}}" data-setyp='{"controls": "true", "loop": "false", "autoplay": "false", "preload": "false"}'>
+    <source src="{{post.video-url}}" type="application/x-mpegURL">
+    </source>
+    <p class="vjs-no-js">The browser doesn't seem to support our video player... new browsers should.</p>
+  </video>
+  
+  <script>
+  var player = videojs('video-player');
+  
+  							player.ready(function() {
+  							
+  							   player.mediaSession();
+  });
+  //player.play();
+  </script>
+
+{% else %}
+
+Twitch: {{post.video-twitch-channel}}
+
+  {% if post.video-twitch-channel %}
+  
+  
+      <!-- Add a placeholder for the Twitch embed -->
+      <div id="twitch-embed"></div>
+
+      <!-- Load the Twitch embed script -->
+      <script src="https://embed.twitch.tv/embed/v1.js"></script>
+
+      <!-- Create a Twitch.Embed object that will render within the "twitch-embed" root element. -->
+      <script type="text/javascript">
+        new Twitch.Embed("twitch-embed", {
+          width: 640,
+          height: 500, // 360 + 180 (chat) - 40
+          channel: "{{ post.video-twitch-channel }}"
+        });
+      </script>
+  {% else %}
+    {% if page.video-yt-id %}
+     <div>
+       <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/{{post.video-yt-id}}?rel=0&amp;showinfo=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>     
+     </div>
+    {% endif %}
+
+  {% endif %}
+{% endif %}

+ 2 - 8
ispooge.com-v2/app/resources/templates/themes/ispooge/html/post.html

@@ -3,14 +3,8 @@
 {% block content %}
 <div id="post">
     {% include "/html/post-content.html" %}
-    <div id="prev-next">
-        {% if post.prev %}
-        <a href="{{post.prev.uri}}">&laquo; {{post.prev.title}}</a>
-        {% endif %}
-        {% if post.next %}
-        <a class="right" href="{{post.next.uri}}">{{post.next.title}} &raquo;</a>
-        {% endif %}
-    </div>
+
+    {% include "/html/partials/post-pagination.html" %}
 
     {% if disqus-shortname %}
     <div id="disqus_thread"></div>

+ 3 - 39
ispooge.com-v2/app/resources/templates/themes/ispooge/html/video.html

@@ -2,19 +2,9 @@
 {%block subtitle %}: {{post.title}}{% endblock %}
 
 {% block head %}
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@ispoogedaily">
-<meta name="twitter:creator" content="@harlanji">
 
-<meta property="og:url" content="{{site-url}}{{uri}}">
-<meta property="og:title" content="{{post.title}}">
-<meta property="og:description" content="VIDEO - {{post.title}}.">
-<meta property="og:image" content="{{site-url}}{{post.video-thumbnail-url}}">
+{% include "/html/partials/video-head.html" %}
 
-<link rel="stylesheet" href="/assets/videojs/video-js.css">
-<script src="/assets/videojs/video.js"></script>
-<script src="/assets/videojs/videojs-contrib-hls.js"></script>
-<script src="/assets/videojs/videojs-media-session.js"></script>
 
 {% endblock %}
 
@@ -26,36 +16,10 @@
         <h2>{{post.title}}</h2>
     </div>
 
-
-
-<video id="video-player" width="640" height="360" class="video-js vjs-default-skin" 
-controls poster="{{post.video-thumbnail-url}}" data-setyp='{"controls": "true", "loop": "false", "autoplay": "false", "preload": "false"}'>
-  <source src="{{post.video-url}}" type="application/x-mpegURL">
-  </source>
-  <p class="vjs-no-js">The browser doesn't seem to support our video player... new browsers should.</p>
-</video>
-
-<script>
-var player = videojs('video-player');
-
-							player.ready(function() {
-							
-							   player.mediaSession();
-});
-//player.play();
-</script>
+    {% include "/html/partials/video-player.html" %}
 
     {{post.content|safe}}
 
-
-
-    <div id="prev-next">
-        {% if post.prev %}
-        <a href="{{post.prev.uri}}">&laquo; {{post.prev.title}}</a>
-        {% endif %}
-        {% if post.next %}
-        <a class="right" href="{{post.next.uri}}">{{post.next.title}} &raquo;</a>
-        {% endif %}
-    </div>
+    {% include "/html/partials/post-pagination.html" %}
 </div>
 {% endblock %}