Merge branch 'master' of github.com:NUKnightLab/TimelineJS

9 years ago · f003788b3f
30 changed files with 40 additions and 40 deletions
--- a/README.markdown
+++ b/README.markdown
@ -65,7 +65,7 @@ Place the embed code where you want the timeline to show in the `<body>` of your
 			js:					'path_to_js/timeline-min.js'	//OPTIONAL PATH TO JS
 		}
 	</script>
-	<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
+	<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
 ```
 ### Using a method (*advanced*)
 You could also initialize a new timeline using the `createStoryJS` method after `storyjs-embed.js` has been loaded
@ -86,7 +86,7 @@ Here's a simple example:
 		<!-- jQuery -->
 		<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 		<!-- BEGIN TimelineJS -->
-		<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
+		<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
 		<script>
 			$(document).ready(function() {
 				createStoryJS({
@ -112,15 +112,15 @@ If for some reason you need more fine-grained control over your timeline, load t

 ```html
 <!-- always load the CSS -->
-<link rel="stylesheet" type="text/css" href="http://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
+<link rel="stylesheet" type="text/css" href="https://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
 <!-- and then one of either -->
-<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/timeline.js"></script>
+<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/timeline.js"></script>
 <!-- or -->
-<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
+<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
 <!-- but no need for both -->
 ```

-If you need to use the files on an HTTPS server, you can change the beginning of the url from `http://cdn.knightlab.com/libs/timeline/` to `https://s3.amazonaws.com/cdn.knightlab.com/libs/timeline/` 
+If you need to use the files on an HTTPS server, you can change the beginning of the url from `https://cdn.knightlab.com/libs/timeline/` to `https://s3.amazonaws.com/cdn.knightlab.com/libs/timeline/` 

 If you need to serve copies of the files from your own server, use the entire contents of the ["/build/" directory](https://github.com/NUKnightLab/TimelineJS/tree/master/build) of our GitHub repository. If you use a local copy of `story-embed.js` it should automatically load the other Timeline resources from your server.
 	
--- a/config.json
+++ b/config.json
@ -182,7 +182,7 @@
                "cdn": "dev"
            },
            "deploy_context": {
-                "generator_embed_path": "//cdn.knightlab.com/libs/timeline/dev/embed/index.html"
+                "generator_embed_path": "https://cdn.knightlab.com/libs/timeline/dev/embed/index.html"
            }                
        },
        "prd": {
@ -191,7 +191,7 @@
                "cdn": "latest"
            },
            "deploy_context": {
-                "generator_embed_path": "//cdn.knightlab.com/libs/timeline/latest/embed/index.html"
+                "generator_embed_path": "https://cdn.knightlab.com/libs/timeline/latest/embed/index.html"
            }                
        }
    }
--- a/source/embed/index.html
+++ b/source/embed/index.html
@ -42,7 +42,7 @@
    if (trim_point > 0) {
      var embed_path = window.location.href.substring(0,trim_point); // supports https access via https://s3.amazonaws.com/cdn.knightlab.com/libs/timeline/latest/embed/index.html 
    } else {
-      var embed_path = "//cdn.knightlab.com/libs/timeline/latest/";
+      var embed_path = "https://cdn.knightlab.com/libs/timeline/latest/";
    }
  </script>
  <!-- build:js ../js/storyjs-embed-cdn.js?v214 -->
--- a/source/js/Core/Language/locale/af.js
+++ b/source/js/Core/Language/locale/af.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
 			full_long: "d mmm',' yyyy 'om' HH:MM",
--- a/source/js/Core/Language/locale/ar.js
+++ b/source/js/Core/Language/locale/ar.js
@ -19,7 +19,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "mmm d",
 			full: "mmmm d',' yyyy",
-			time_short: "h:MM:SS TT",
+			time_short: "h:MM:ss TT",
 			time_no_seconds_short: "h:MM TT",
 			time_no_seconds_small_date: "h:MM TT'<br/><small>'mmmm d',' yyyy'</small>'",
 			full_long: "mmm d',' yyyy 'at' hh:MM TT",
--- a/source/js/Core/Language/locale/bg.js
+++ b/source/js/Core/Language/locale/bg.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "h:MM:SS TT",
+			time_short: "h:MM:ss TT",
 			time_no_seconds_short: "h:MM TT",
 			time_no_seconds_small_date: "h:MM TT'<br/><small>'d mmmm yyyy'</small>'",
 			full_long: "d mmm yyyy 'at' h:MM TT",
--- a/source/js/Core/Language/locale/ca.js
+++ b/source/js/Core/Language/locale/ca.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "'<small>'d mmmm yyyy'</small>' HH:MM",
 			full_long: "dddd',' d mmm yyyy HH:MM",
--- a/source/js/Core/Language/locale/cz.js
+++ b/source/js/Core/Language/locale/cz.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d. mmm ",
 			full: "d. mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d. mmmm yyyy'</small>'",
 			full_long: "dddd d. mmm yyyy 'v' HH:MM",
@ -34,4 +34,4 @@ if(typeof VMM != 'undefined') {
 			loading: "Nahrávám",
 			swipe_nav: "Swipe to Navigate"		}
 	}
-}
+}
--- a/source/js/Core/Language/locale/de.js
+++ b/source/js/Core/Language/locale/de.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d. mmm",
 			full: "d. mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d. mmmm yyyy'</small>'",
 			full_long: "dddd',' d. mmm yyyy 'um' HH:MM",
--- a/source/js/Core/Language/locale/el.js
+++ b/source/js/Core/Language/locale/el.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "mmm d",
 			full: "mmmm d',' yyyy",
-			time_short: "h:MM:SS TT",
+			time_short: "h:MM:ss TT",
 			time_no_seconds_short: "h:MM TT",
 			time_no_seconds_small_date: "h:MM TT'<br/><small>'mmmm d',' yyyy'</small>'",
 			full_long: "mmm d',' yyyy 'at' h:MM TT",
--- a/source/js/Core/Language/locale/eo.js
+++ b/source/js/Core/Language/locale/eo.js
@ -21,7 +21,7 @@ if(typeof VMM != 'undefined') {
 		    month: "mmmm yyyy",
 		    full_short: "d mmm",
 		    full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 		    time_no_seconds_short: "HH:MM",
 		    time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
 		    full_long: "dddd',' d mmm yyyy 'ĉe' HH:MM",
--- a/source/js/Core/Language/locale/es.js
+++ b/source/js/Core/Language/locale/es.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "'<small>'d mmmm yyyy'</small>' HH:MM",
 			full_long: "dddd',' d mmm yyyy HH:MM",
--- a/source/js/Core/Language/locale/eu.js
+++ b/source/js/Core/Language/locale/eu.js
@ -18,7 +18,7 @@ if (typeof VMM != 'undefined') {
 			month: "yyyy'(e)ko' mmmm",
 			full_short: "mmm'-'d",
 			full: "yyyy'(e)ko' mmmm'k' d",
-			time_short: "h:MM:SS TT",
+			time_short: "h:MM:ss TT",
 			time_no_seconds_short: "h:MM TT",
 			time_no_seconds_small_date: "h:MM TT'<br /><small>'yyyy'-'mmm'-'d'</small>",
 			full_long: "yyyy'(e)ko' mmmm'ren' d'(e)an,' hh:MM TT'(r)etan'",
--- a/source/js/Core/Language/locale/fi.js
+++ b/source/js/Core/Language/locale/fi.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d. mmm",
 			full: "d. mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d. mmmm yyyy'</small>'",
 			full_long: "mmm d yyyy 'klo' HH:MM",
--- a/source/js/Core/Language/locale/fo.js
+++ b/source/js/Core/Language/locale/fo.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d'.' mmm",
 			full: "d'.' mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d'.' mmmm yyyy'</small>'",
 			full_long: "d'.' mmmm yyyy 'klokkan' HH:MM",
--- a/source/js/Core/Language/locale/fr.js
+++ b/source/js/Core/Language/locale/fr.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 		    month: "mmmm yyyy",
 		    full_short: "d mmm",
 		    full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 		    time_no_seconds_short: "HH:MM",
 		    time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
 		    full_long: "dddd',' d mmm yyyy 'à' HH:MM",
--- a/source/js/Core/Language/locale/ga.js
+++ b/source/js/Core/Language/locale/ga.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "'<small>'d mmmm yyyy'</small>' HH:MM",
 			full_long: "dddd',' d mmm yyyy HH:MM",
--- a/source/js/Core/Language/locale/gl.js
+++ b/source/js/Core/Language/locale/gl.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
 			full_long: "dddd',' d mmm yyyy 'um' HH:MM",
--- a/source/js/Core/Language/locale/hu.js
+++ b/source/js/Core/Language/locale/hu.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "yyyy. mmmm",
 			full_short: "mmm d.",
 			full: "yyyy. mmmm d.",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM '<br/><small>'yyyy. mmmm d.'</small>'",
 			full_long: "yyyy. mmm d.',' HH:MM",
--- a/source/js/Core/Language/locale/hy.js
+++ b/source/js/Core/Language/locale/hy.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm',' yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "H:MM",
 			time_no_seconds_small_date: "H:MM'<br/><small>'d mmmm',' yyyy'</small>'",
 			full_long: "d mmm',' yyyy 'at' H:MM",
--- a/source/js/Core/Language/locale/id.js
+++ b/source/js/Core/Language/locale/id.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d mmm",
 			full: "d mmmm yyyy",
-			time_short: "HH:MM:SS",
+			time_short: "HH:MM:ss",
 			time_no_seconds_short: "HH:MM",
 			time_no_seconds_small_date: "HH:MM'<br/><small>'d mmmm yyyy'</small>'",
 			full_long: "dddd',' d mmm yyyy 'pukul' HH:MM",
--- a/source/js/Core/Language/locale/is.js
+++ b/source/js/Core/Language/locale/is.js
@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') {
 			month: "mmmm yyyy",
 			full_short: "d'.' mmm",
 			full: "d'.' mmmm yyyy",
-			time_short: "h:MM:SS TT",
+			time_short: "h:MM:ss TT",
 			time_no_seconds_short: "hh:MM TT",
 			time_no_seconds_small_date: "hh:MM TT'<br/><small>'d'.' mmmm  yyyy'</small>'",
 			full_long: "dddd',' d'.' mmm  yyyy 'kl.' hh:MM TT",
--- a/website/templates/_demo.html
+++ b/website/templates/_demo.html
@ -14,7 +14,7 @@
   font:  'NewsCycle-Merriweather',
  };
 </script>
-<!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
+<!-- build:js https://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
 <script type="application/javascript">
    var embed_path = "/build/"
 </script>
--- a/website/templates/_make.html
+++ b/website/templates/_make.html
@ -236,7 +236,7 @@
    <div class="span11">
      <h4>Embed the code into your website</h4>
      <p>Grab the embed code and paste it on your site where you want your TimelineJS to appear (just like a YouTube video).</p>
-      <textarea readonly="readonly" style="width: 100%; height: 160px; min-height: 110px; max-height: 300px; resize: none; font-family: Menlo,Monaco,'Courier New',monospace; font-size: 12px;" id="embed_code"><iframe src='//cdn.knightlab.com/libs/timeline/latest/embed/?source=0Agl_Dv6iEbDadHdKcHlHcTB5bzhvbF9iTWwyMmJHdkE&font=Bevan-PotanoSans&maptype=toner&width=600&height=600' width='600' height='600' frameborder='0'></iframe></textarea><br><br>
+      <textarea readonly="readonly" style="width: 100%; height: 160px; min-height: 110px; max-height: 300px; resize: none; font-family: Menlo,Monaco,'Courier New',monospace; font-size: 12px;" id="embed_code"><iframe src='https://cdn.knightlab.com/libs/timeline/latest/embed/?source=0Agl_Dv6iEbDadHdKcHlHcTB5bzhvbF9iTWwyMmJHdkE&font=Bevan-PotanoSans&maptype=toner&width=600&height=600' width='600' height='600' frameborder='0'></iframe></textarea><br><br>
      <p><a href="#preview-embed" data-scroll="true" id="iframe-preview-button" class="btn btn-primary">Preview</a> 
      <a href="#preview-embed" data-scroll="true" id="preview-embed-link" target="_blank" class="btn">Link to Preview</a></p>
    </div>
--- a/website/templates/_overview.html
+++ b/website/templates/_overview.html
@ -5,7 +5,7 @@
      <h1 class="logo-mark xl">Timeline<span><em>JS</em></span></h1>
      <h2 class="intro">Beautifully crafted timelines that are easy and intuitive to use.</h2>
      <a href="#make" class="btn btn-large btn-success" data-scroll="true">Make a timeline now</a>
-      <p><a id="teaser" href="timeline3.knightlab.com"><span class="new">New!</span> Try the TimelineJS 3 beta <span class="arrow"></span></a></p>
+      <p><a id="teaser" href="http://timeline3.knightlab.com"><span class="new">New!</span> Try the TimelineJS 3 beta <span class="arrow"></span></a></p>
    </hgroup>
  </div>
 </header>
--- a/website/templates/base.html
+++ b/website/templates/base.html
@ -26,9 +26,9 @@
    meta name="viewport" content="initial-scale=1,width=device-width" 
    someone needs to go through Blueline and fix the small viewport CSS details before we can turn this on.
  -->
-	<link rel="shortcut icon" href="//cdn.knightlab.com/libs/blueline/latest/assets/logos/favicon.ico"> 
+	<link rel="shortcut icon" href="https://cdn.knightlab.com/libs/blueline/latest/assets/logos/favicon.ico"> 
    <link href="//cloud.webtype.com/css/d4767ecb-457a-4677-8761-72f890add836.css" rel="stylesheet" type="text/css">
-	<link rel="stylesheet" href="//cdn.knightlab.com/libs/blueline/latest/css/blueline.min.css">
+	<link rel="stylesheet" href="https://cdn.knightlab.com/libs/blueline/latest/css/blueline.min.css">
 	<link rel="stylesheet" type="text/css" href="{{ static_url }}/css/site.css">
  <!-- Google Analytics: don't mess with this stuff -->
  <!-- named tracker notes from https://developers.google.com/analytics/devguides/collection/gajs/ -->
@ -138,13 +138,13 @@

 	{% block scripts %}
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    <script src="//cdn.knightlab.com/libs/blueline/latest/js/blueline.min.js"></script>
+    <script src="https://cdn.knightlab.com/libs/blueline/latest/js/blueline.min.js"></script>

    <!-- Override -->
    <script type="text/javascript">
        var generator_embed_path = "{{ generator_embed_path }}";
    </script>
-    <!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed-generator.js -->
+    <!-- build:js https://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed-generator.js -->
    <script type="text/javascript">
        var generator_embed_path = "/source/embed/index.html";
    </script>
--- a/website/templates/examples/houston/index.html
+++ b/website/templates/examples/houston/index.html
@ -41,7 +41,7 @@
       font:	'Bevan-PotanoSans'
      }
    </script>
-    <!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
+    <!-- build:js https://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
    <script type="application/javascript">
        var embed_path = "/build/"
    </script>
--- a/website/templates/examples/republican/index.html
+++ b/website/templates/examples/republican/index.html
@ -41,7 +41,7 @@
       font:	'PT'
      }
    </script>
-    <!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
+    <!-- build:js https://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
    <script type="application/javascript">
        var embed_path = "/build/"
    </script>
--- a/website/templates/examples/shit-people-say/index.html
+++ b/website/templates/examples/shit-people-say/index.html
@ -41,7 +41,7 @@
       font:	'Pacifico-Arimo'
      }
    </script>
-    <!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
+    <!-- build:js https://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
    <script type="application/javascript">
        var embed_path = "/build/"
    </script>
--- a/website/templates/examples/user-interface/index.html
+++ b/website/templates/examples/user-interface/index.html
@ -41,7 +41,7 @@
       font:	'SansitaOne-Kameron'
      }
    </script>
-    <!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
+    <!-- build:js https://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
    <script type="application/javascript">
        var embed_path = "/build/"
    </script>