Permalink
Browse files

Merged changes

  • Loading branch information...
2 parents 80616c5 + 9c0be0a commit 9c6a42c8a5a7729c9abccd220e440a73a8e49c97 @floreskul committed Apr 26, 2012
Showing with 6,395 additions and 17 deletions.
  1. +6 −1 .gitignore
  2. +14 −16 index.html
  3. +101 −0 index.xml
  4. +1,431 −0 js/backbone.js
  5. +8 −0 js/coffee-script.js
  6. +269 −0 js/index.js
  7. +3,356 −0 js/jade.js
  8. +151 −0 js/jath.js
  9. +1,059 −0 js/underscore.js
View
@@ -1 +1,6 @@
-*.DS_Store
+*.DS_Store
+*.swp
+*.coffee
+/nave
+/Makefile
+/.vimproject
View
@@ -12,6 +12,11 @@
NotifierjsConfig.position = ["top", "right"];
</script>
+ <script type="text/javascript" src="js/coffee-script.js"></script>
+ <script type="text/javascript" src="js/underscore.js"></script>
+ <script type="text/javascript" src="js/backbone.js"></script>
+ <script type="text/javascript" src="js/jath.js"></script>
+ <script type="text/javascript" src="js/jade.js"></script>
<script src="js/fotorama.js"></script>
<script>
function startMusicByYearRange(startYear, endYear) {
@@ -42,24 +47,11 @@
player = models.player;
currentPlaylist = new models.Playlist();
- // // search and play song
+ // search and play song
startMusicByYearRange(1900, 1910);
- // image gallery initialization
- $('#my-fotorama').fotorama({
- data: [
- {img: 'http://www.rijksmuseum.nl/images/aria/sk/z/sk-c-5', thumb: 'http://www.rijksmuseum.nl/images/aria/sk/org/sk-c-5.org?aria/maxwidth_288', caption: 'One'},
- {img: 'http://www.rijksmuseum.nl/images/aria/rp/org/rp-p-ob-697.org?aria/maxwidth_288', thumb: 'http://www.rijksmuseum.nl/images/aria/rp/org/rp-p-ob-697.org?aria/maxwidth_288'},
- {img: 'http://www.rijksmuseum.nl/images/aria/rp/org/rp-p-ob-268.org?aria/maxwidth_288', thumb: 'http://www.rijksmuseum.nl/images/aria/rp/org/rp-p-ob-268.org?aria/maxwidth_288'}
- ],
- arrows: true,
- // width: '100%',
- height: 610
- // fullscreen: true
- // autoplay: 5000
- // fullscreenIcon: true
- });
+ // initialize notifier
window.NotifierjsConfig.container.css(window.NotifierjsConfig.position[0], "40px");
window.NotifierjsConfig.container.css(window.NotifierjsConfig.position[1], "20px");
@@ -77,10 +69,16 @@
});
</script>
+ <script type="text/javascript" src="js/index.js"></script>
+ <script id="record" type="text/template">
+.record
+ a(href=model.get('url'))
+ img(src=model.get('url100'))
+ </script>
</head>
<body>
<div style="width:100%;text-align: center;">
<div id="my-fotorama" style="display: inline-block;"></div>
</div>
</body>
-</html>
+</html>
View
101 index.xml

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 9c6a42c

Please sign in to comment.