Browse Source

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

pull/795/head
Joe Germuska 10 years ago
parent
commit
aac0b3ba17
  1. 2
      build/css/themes/dark.css
  2. 2
      build/css/themes/font/AbrilFatface-Average.css
  3. 2
      build/css/themes/font/Arvo-PTSans.css
  4. 2
      build/css/themes/font/Bevan-PotanoSans.css
  5. 2
      build/css/themes/font/BreeSerif-OpenSans.css
  6. 2
      build/css/themes/font/DroidSerif-DroidSans.css
  7. 2
      build/css/themes/font/Georgia-Helvetica.css
  8. 2
      build/css/themes/font/Lekton-Molengo.css
  9. 2
      build/css/themes/font/Lora-Istok.css
  10. 2
      build/css/themes/font/Merriweather-NewsCycle.css
  11. 2
      build/css/themes/font/NewsCycle-Merriweather.css
  12. 2
      build/css/themes/font/NixieOne-Ledger.css
  13. 2
      build/css/themes/font/PT.css
  14. 2
      build/css/themes/font/PTSerif-PTSans.css
  15. 2
      build/css/themes/font/Pacifico-Arimo.css
  16. 2
      build/css/themes/font/PlayfairDisplay-Muli.css
  17. 2
      build/css/themes/font/PoiretOne-Molengo.css
  18. 2
      build/css/themes/font/Rancho-Gudea.css
  19. 2
      build/css/themes/font/SansitaOne-Kameron.css
  20. 2
      build/css/timeline.css
  21. 4
      build/embed/index.html
  22. 2
      build/js/locale/af.js
  23. 2
      build/js/locale/ar.js
  24. 2
      build/js/locale/be.js
  25. 4
      build/js/locale/bg.js
  26. 2
      build/js/locale/ca.js
  27. 2
      build/js/locale/cz.js
  28. 2
      build/js/locale/da.js
  29. 2
      build/js/locale/de.js
  30. 2
      build/js/locale/el.js
  31. 2
      build/js/locale/en-24hr.js
  32. 2
      build/js/locale/en-week.js
  33. 2
      build/js/locale/en.js
  34. 2
      build/js/locale/eo.js
  35. 2
      build/js/locale/es.js
  36. 2
      build/js/locale/et.js
  37. 2
      build/js/locale/eu.js
  38. 2
      build/js/locale/fa.js
  39. 2
      build/js/locale/fi.js
  40. 2
      build/js/locale/fo.js
  41. 2
      build/js/locale/fr.js
  42. 2
      build/js/locale/fy.js
  43. 2
      build/js/locale/ga.js
  44. 2
      build/js/locale/gl.js
  45. 2
      build/js/locale/he.js
  46. 2
      build/js/locale/hi.js
  47. 2
      build/js/locale/hr.js
  48. 2
      build/js/locale/hu.js
  49. 2
      build/js/locale/hy.js
  50. 2
      build/js/locale/id.js
  51. 2
      build/js/locale/is.js
  52. 2
      build/js/locale/it.js
  53. 2
      build/js/locale/iw.js
  54. 2
      build/js/locale/ja.js
  55. 2
      build/js/locale/ka.js
  56. 2
      build/js/locale/ko.js
  57. 2
      build/js/locale/lb.js
  58. 2
      build/js/locale/lt.js
  59. 2
      build/js/locale/lv.js
  60. 2
      build/js/locale/ms.js
  61. 2
      build/js/locale/ne.js
  62. 2
      build/js/locale/nl.js
  63. 2
      build/js/locale/no.js
  64. 2
      build/js/locale/pl.js
  65. 2
      build/js/locale/pt-br.js
  66. 2
      build/js/locale/pt.js
  67. 2
      build/js/locale/rm.js
  68. 2
      build/js/locale/ro.js
  69. 2
      build/js/locale/ru.js
  70. 2
      build/js/locale/si.js
  71. 2
      build/js/locale/sk.js
  72. 2
      build/js/locale/sl.js
  73. 2
      build/js/locale/sr-cy.js
  74. 2
      build/js/locale/sr.js
  75. 2
      build/js/locale/sv.js
  76. 2
      build/js/locale/ta.js
  77. 2
      build/js/locale/te.js
  78. 2
      build/js/locale/th.js
  79. 2
      build/js/locale/tl.js
  80. 2
      build/js/locale/tr.js
  81. 2
      build/js/locale/uk.js
  82. 4
      build/js/locale/zh-cn.js
  83. 2
      build/js/locale/zh-tw.js
  84. 2
      build/js/storyjs-embed-cdn.js
  85. 2
      build/js/storyjs-embed-generator.js
  86. 2
      build/js/storyjs-embed.js
  87. 10
      build/js/timeline-min.js
  88. 9
      build/js/timeline.js
  89. 20
      config.json
  90. 4
      source/embed/index.html
  91. 2
      source/js/Core/Media/VMM.ExternalAPI.js
  92. 2
      source/js/Core/Media/VMM.MediaElement.js
  93. 30
      website/app.py
  94. 2
      website/static/welcome/welcome.json
  95. 2
      website/templates/_demo.html
  96. 2
      website/templates/_description.html
  97. 2
      website/templates/_make.html
  98. 10
      website/templates/base.html
  99. 2
      website/templates/examples/houston/index.html
  100. 2
      website/templates/examples/republican/index.html
  101. Some files were not shown because too many files have changed in this diff Show More

2
build/css/themes/dark.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/AbrilFatface-Average.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Arvo-PTSans.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Bevan-PotanoSans.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/BreeSerif-OpenSans.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/DroidSerif-DroidSans.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Georgia-Helvetica.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Lekton-Molengo.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Lora-Istok.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Merriweather-NewsCycle.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/NewsCycle-Merriweather.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/NixieOne-Ledger.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/PT.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/PTSerif-PTSans.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Pacifico-Arimo.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/PlayfairDisplay-Muli.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/PoiretOne-Molengo.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/Rancho-Gudea.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/themes/font/SansitaOne-Kameron.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/css/timeline.css

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

4
build/embed/index.html

@ -33,7 +33,6 @@
<!-- HTML5 shim, for IE6-8 support of HTML elements--><!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
</head>
</html>
<body>
<!-- BEGIN Timeline Embed -->
<div id="timeline-embed"></div>
@ -43,9 +42,10 @@
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 = "http://cdn.knightlab.com/libs/timeline/latest/";
var embed_path = "//cdn.knightlab.com/libs/timeline/latest/";
}
</script>
<script type="text/javascript" src="../js/storyjs-embed-cdn.js?v214"></script>
<!-- END Timeline Embed-->
</body>
</html>

2
build/js/locale/af.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ar.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/be.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

4
build/js/locale/bg.js

@ -1,9 +1,9 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS
This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
if(typeof VMM!="undefined"){VMM.Language={lang:"bg",api:{wikipedia:"bg"},date:{month:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],month_abbr:["Ян.","Фев.","Март","Апр.","Май","Юни","Юли","Авг.","Септ.","Окт.","Ноем.","Дек."],day:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"],day_abbr:["Нед.","Пон.","Вт.","Ср.","Четв.","Пет.","Съб."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",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",full_long_small_date:"h:MM TT'<br/><small>d mmm yyyy'</small>'"},messages:{loading_timeline:"Зареждане... ",return_to_title:"В началото",expand_timeline:"Разширяване",contract_timeline:"Свиване",wikipedia:"От Уикипедия, свободната енциклопедия",loading_content:"Съдържанието се зарежда",loading:"Зарежда се",swipe_nav:"Swipe to Navigate"}}}
if(typeof VMM!="undefined"){VMM.Language={lang:"bg",api:{wikipedia:"bg"},date:{month:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],month_abbr:["Ян.","Фев.","Март","Апр.","Май","Юни","Юли","Авг.","Септ.","Окт.","Ноем.","Дек."],day:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"],day_abbr:["Нед.","Пон.","Вт.","Ср.","Четв.","Пет.","Съб."]},dateformats:{year:"yyyy",month_short:"mmm",month:"mmmm yyyy",full_short:"d mmm",full:"d mmmm yyyy",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",full_long_small_date:"h:MM TT'<br/><small>d mmm yyyy'</small>'"},messages:{loading_timeline:"Зареждане... ",return_to_title:"В началото",expand_timeline:"Разширяване",contract_timeline:"Свиване",wikipedia:"От Уикипедия, свободната енциклопедия",loading_content:"Съдържанието се зарежда",loading:"Зарежда се",swipe_nav:"Сменяйте с плъзгане настрани"}}}

2
build/js/locale/ca.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/cz.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/da.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/de.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/el.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/en-24hr.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/en-week.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/en.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/eo.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/es.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/et.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/eu.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/fa.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/fi.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/fo.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/fr.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/fy.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ga.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/gl.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/he.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/hi.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/hr.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/hu.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/hy.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/id.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/is.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/it.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/iw.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ja.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ka.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ko.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/lb.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/lt.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/lv.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ms.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ne.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/nl.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/no.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/pl.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/pt-br.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/pt.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/rm.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ro.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ru.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/si.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/sk.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/sl.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/sr-cy.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/sr.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/sv.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/ta.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/te.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/th.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/tl.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/tr.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/locale/uk.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

4
build/js/locale/zh-cn.js

@ -1,9 +1,9 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS
This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
if(typeof VMM!="undefined"){VMM.Language={lang:"zh-cn",api:{wikipedia:"zh"},date:{month:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],month_abbr:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],day:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],day_abbr:["周日","周一","周二","周三","周四","周五","周六"]},dateformats:{year:"yyyy年",month_short:"mmm",month:"yyyy年 mmmm",full_short:"mmm d日",full:"yyyy年mmmmd日",time_short:"HH:MM:ss",time_no_seconds_short:"HH:MM",time_no_seconds_small_date:"HH:MM'<br/><small>'yyyy年mmmmd日'</small>'",full_long:"dddd',' yyyy年mmmd日'um' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' yyyy年mmmd日'</small>'"},messages:{loading_timeline:"加载时间线... ",return_to_title:"回到开头",expand_timeline:"伸展时间",contract_timeline:"缩短时间",wikipedia:"来自维基百科,自由的百科全书",loading_content:"正在加载内容",loading:"加载中",swipe_nav:"Swipe to Navigate"}}}
if(typeof VMM!="undefined"){VMM.Language={lang:"zh-cn",api:{wikipedia:"zh"},date:{month:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],month_abbr:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],day:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],day_abbr:["周日","周一","周二","周三","周四","周五","周六"]},dateformats:{year:"yyyy年",month_short:"mmm",month:"yyyy年 mmmm",full_short:"mmm d日",full:"yyyy年mmmm d日",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:"dddd',' yyyy年 mmm d日'um' HH:MM",full_long_small_date:"HH:MM'<br/><small>'dddd',' yyyy年 mmm d日'</small>'"},messages:{loading_timeline:"加载时间线... ",return_to_title:"回到开头",expand_timeline:"伸展时间",contract_timeline:"缩短时间",wikipedia:"来自维基百科,自由的百科全书",loading_content:"正在加载内容",loading:"加载中",swipe_nav:"Swipe to Navigate"}}}

2
build/js/locale/zh-tw.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/storyjs-embed-cdn.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/storyjs-embed-generator.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

2
build/js/storyjs-embed.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS

10
build/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

9
build/js/timeline.js

@ -1,5 +1,5 @@
/*
TimelineJS - ver. 2.35.6 - 2015-03-25
TimelineJS - ver. 2.36.0 - 2015-05-12
Copyright (c) 2012-2013 Northwestern University
a project of the Northwestern University Knight Lab, originally created by Zach Wise
https://github.com/NUKnightLab/TimelineJS
@ -4323,7 +4323,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
// VIDEO
// TODO: NEED TO ADD ASYNC SCRIPT TO TIMELINE FLOW
VMM.attachElement("#" + m.uid, "<iframe frameborder='0' width='100%' height='100%' src='" + video_url + "'></iframe><script async src='http://platform.vine.co/static/scripts/embed.js' charset='utf-8'></script>");
VMM.attachElement("#" + m.uid, "<iframe frameborder='0' width='100%' height='100%' src='" + video_url + "'></iframe><script async src='https://platform.vine.co/static/scripts/embed.js' charset='utf-8'></script>");
},
@ -4542,7 +4542,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
VMM.ExternalAPI.vimeo.get(m);
// DAILYMOTION
} else if (m.type == "dailymotion") {
mediaElem = "<div class='media-shadow'><iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='http://www.dailymotion.com/embed/video/" + m.id + "'></iframe></div>";
mediaElem = "<div class='media-shadow'><iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='//www.dailymotion.com/embed/video/" + m.id + "'></iframe></div>";
// VINE
} else if (m.type == "vine") {
mediaElem = "<div class='media-shadow media-frame video vine' id='" + m.uid + "'>" + loading_messege + "</div>";
@ -4760,7 +4760,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.id = wiki_id.replace(" ", "%20");
media.lang = d.split("//")[1].split(".wikipedia")[0];
success = true;
} else if (d.indexOf('http://') == 0) {
} else if (d.indexOf('http://') == 0 || d.indexOf('https://') == 0) {
media.type = "website";
media.id = d;
success = true;
@ -4785,6 +4785,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
}
}
/* **********************************************
Begin VMM.TextElement.js
********************************************** */

20
config.json

@ -176,7 +176,23 @@
// - run usemin on all html in build/website
// - sync build/website with bucket
"deploy": {
"stg": {"bucket": "timeline.knilab.com", "usemin_context": {"cdn": "dev"}},
"prd": {"bucket": "timeline.knightlab.com", "usemin_context": {"cdn": "latest"}}
"stg": {
"bucket": "timeline.knilab.com",
"usemin_context": {
"cdn": "dev"
},
"deploy_context": {
"generator_embed_path": "//cdn.knightlab.com/libs/timeline/dev/embed/index.html"
}
},
"prd": {
"bucket": "timeline.knightlab.com",
"usemin_context": {
"cdn": "latest"
},
"deploy_context": {
"generator_embed_path": "//cdn.knightlab.com/libs/timeline/latest/embed/index.html"
}
}
}
}

4
source/embed/index.html

@ -33,7 +33,6 @@
<!-- HTML5 shim, for IE6-8 support of HTML elements--><!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
</head>
</html>
<body>
<!-- BEGIN Timeline Embed -->
<div id="timeline-embed"></div>
@ -43,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 = "http://cdn.knightlab.com/libs/timeline/latest/";
var embed_path = "//cdn.knightlab.com/libs/timeline/latest/";
}
</script>
<!-- build:js ../js/storyjs-embed-cdn.js?v214 -->
@ -54,3 +53,4 @@
<!-- endbuild -->
<!-- END Timeline Embed-->
</body>
</html>

2
source/js/Core/Media/VMM.ExternalAPI.js

@ -1566,7 +1566,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
// VIDEO
// TODO: NEED TO ADD ASYNC SCRIPT TO TIMELINE FLOW
VMM.attachElement("#" + m.uid, "<iframe frameborder='0' width='100%' height='100%' src='" + video_url + "'></iframe><script async src='http://platform.vine.co/static/scripts/embed.js' charset='utf-8'></script>");
VMM.attachElement("#" + m.uid, "<iframe frameborder='0' width='100%' height='100%' src='" + video_url + "'></iframe><script async src='https://platform.vine.co/static/scripts/embed.js' charset='utf-8'></script>");
},

2
source/js/Core/Media/VMM.MediaElement.js

@ -145,7 +145,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
VMM.ExternalAPI.vimeo.get(m);
// DAILYMOTION
} else if (m.type == "dailymotion") {
mediaElem = "<div class='media-shadow'><iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='http://www.dailymotion.com/embed/video/" + m.id + "'></iframe></div>";
mediaElem = "<div class='media-shadow'><iframe class='media-frame video dailymotion' autostart='false' frameborder='0' width='100%' height='100%' src='//www.dailymotion.com/embed/video/" + m.id + "'></iframe></div>";
// VINE
} else if (m.type == "vine") {
mediaElem = "<div class='media-shadow media-frame video vine' id='" + m.uid + "'>" + loading_messege + "</div>";

30
website/app.py

@ -74,13 +74,35 @@ def catch_source(path):
@app.route('/')
@app.route('/<path:path>')
def catch_all(path='index.html'):
def catch_all(path='index.html', context=None):
"""Catch-all function which serves every URL."""
context = context or {}
if not os.path.splitext(path)[1]:
path = os.path.join(path, 'index.html')
return render_template(path)
return render_template(path, **context)
if __name__ == "__main__":
app.run(host='0.0.0.0', port=5000, debug=True)
import getopt
ssl_context = None
port = 5000
try:
opts, args = getopt.getopt(sys.argv[1:], "sp:", ["port="])
for opt, arg in opts:
if opt == '-s':
ssl_context = (
os.path.join(site_dir, 'website.crt'),
os.path.join(site_dir, 'website.key'))
elif opt in ('-p', '--port'):
port = int(arg)
else:
print 'Usage: app.py [-s]'
sys.exit(1)
except getopt.GetoptError:
print 'Usage: app.py [-s] [-p port]'
sys.exit(1)
app.run(host='0.0.0.0', port=5000, debug=True, ssl_context=ssl_context)

2
website/static/welcome/welcome.json

@ -7,7 +7,7 @@
"startDate":"1888",
"text": "<p>TimelineJS is an open-source tool that enables you to build visually-rich interactive timelines and is available in 40 languages.</p><p>You're looking at an example of one right now.</p><p>Click on the arrow to the right to learn more.</p>",
"asset": {
"media":"http://2.bp.blogspot.com/-dxJbW0CG8Zs/TmkoMA5-cPI/AAAAAAAAAqw/fQpsz9GpFdo/s1600/voyage-dans-la-lune-1902-02-g.jpg",
"media":"//2.bp.blogspot.com/-dxJbW0CG8Zs/TmkoMA5-cPI/AAAAAAAAAqw/fQpsz9GpFdo/s1600/voyage-dans-la-lune-1902-02-g.jpg",
"credit":"",
"caption":""
},

2
website/templates/_demo.html

@ -14,7 +14,7 @@
font: 'NewsCycle-Merriweather',
};
</script>
<!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
<!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
<script type="application/javascript">
var embed_path = "/build/"
</script>

2
website/templates/_description.html

@ -20,7 +20,7 @@
<p>Get updates, tips and news by email. No Spam.</p>
<!-- MailChimp Signup Form-->
<div id="mc_embed_signup">
<form id="mc-embedded-subscribe-form" action="http://northwestern.us2.list-manage.com/subscribe/post?u=ccc3ef81b4c3c762eb7a7d2b4&amp;id=ff5b6c54e5" method="post" name="mc-embedded-subscribe-form" target="_blank" class="validate form-inline"><span class="mc-field-group">
<form id="mc-embedded-subscribe-form" action="//northwestern.us2.list-manage.com/subscribe/post?u=ccc3ef81b4c3c762eb7a7d2b4&amp;id=ff5b6c54e5" method="post" name="mc-embedded-subscribe-form" target="_blank" class="validate form-inline"><span class="mc-field-group">
<input id="mce-EMAIL" type="email" value="" name="EMAIL" placeholder="Email" class="input-large required email"></span><span class="mc-field-group">
<button id="mc-embedded-subscribe" type="submit" value="Subscribe" name="subscribe" class="btn">Subscribe</button>
<div id="mce-responses" class="clear">

2
website/templates/_make.html

@ -231,7 +231,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='http://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='//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>

10
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="http://cdn.knightlab.com/libs/blueline/latest/assets/logos/favicon.ico">
<link rel="shortcut icon" href="//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="http://cdn.knightlab.com/libs/blueline/latest/css/blueline.min.css">
<link rel="stylesheet" href="//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="http://cdn.knightlab.com/libs/blueline/latest/js/blueline.min.js"></script>
<script src="//cdn.knightlab.com/libs/blueline/latest/js/blueline.min.js"></script>
<!-- Override -->
<script type="text/javascript">
var generator_embed_path = "http://cdn.knightlab.com/libs/timeline/latest/embed/index.html";
var generator_embed_path = "{{ generator_embed_path }}";
</script>
<!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed-generator.js -->
<!-- build:js //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>

2
website/templates/examples/houston/index.html

@ -41,7 +41,7 @@
font: 'Bevan-PotanoSans'
}
</script>
<!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
<!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
<script type="application/javascript">
var embed_path = "/build/"
</script>

2
website/templates/examples/republican/index.html

@ -41,7 +41,7 @@
font: 'PT'
}
</script>
<!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
<!-- build:js //cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
<script type="application/javascript">
var embed_path = "/build/"
</script>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save