projects / reveal.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e7c5de2)
refactored folder structure, added /plugins which is initially only used by #57
authorHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 10 Jul 2012 01:00:51 +0000 (21:00 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 10 Jul 2012 01:00:51 +0000 (21:00 -0400)
12 files changed:
README.md patch | blob | history
css/main.css patch | blob | history
index.html patch | blob | history
lib/css/zenburn.css [moved from lib/highlight/zenburn.css with 100% similarity] patch | blob | history
lib/font/league_gothic-webfont.ttf [moved from lib/leaguegothic/league_gothic-webfont.ttf with 100% similarity] patch | blob | history
lib/font/league_gothic_license [moved from lib/leaguegothic/LICENSE with 100% similarity] patch | blob | history
lib/js/classList.js [moved from lib/polyfills/classList.js with 100% similarity] patch | blob | history
lib/js/head.min.js [moved from lib/head/head.min.js with 100% similarity] patch | blob | history
lib/js/highlight.js [moved from lib/highlight/highlight.js with 100% similarity] patch | blob | history
plugin/slidenotes/client.js [moved from lib/slidenotes/client.js with 100% similarity] patch | blob | history
plugin/slidenotes/index.js [moved from lib/slidenotes/index.js with 89% similarity] patch | blob | history
plugin/slidenotes/notes.html [moved from lib/slidenotes/notes.html with 100% similarity] patch | blob | history

diff --git a/README.md b/README.md
index c8cc4a206dc734a7f3de27cd5a2a78a66b71c171..3087facaf2e995e6ef2410ba500ee606d11b900a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ Once Node.js and the dependencies are installed, run the following command from
 
 By default, the slides will be served at [localhost:1947](http://localhost:1947).
 
-You can change the appearance of the speaker notes by editing the file at `lib/slidenotes/notes.html`. 
+You can change the appearance of the speaker notes by editing the file at `plugin/slidenotes/notes.html`.      
 
 ### Known Issues
 
@@ -159,7 +159,7 @@ You can change the appearance of the speaker notes by editing the file at `lib/s
 - API methods for adding or removing all event listeners
 - The 'slidechange' event now includes currentSlide and previousSlide
 - Fixed bug where 'slidechange' was firing twice when history was enabled
-- Changed /lib structure
+- Folder structure updates for scalability (see /lib & /plugin)
 - Slide notes by [rmurphey](https://github.com/rmurphey)
 
 #### 1.3
diff --git a/css/main.css b/css/main.css
index ba33137348217a13dc32abe5c7733b2bb7818965..93d3d203b628a2c9ae2012f8e3896e36f585ac8e 100644 (file)
--- a/css/main.css
+++ b/css/main.css
@@ -12,7 +12,7 @@
 
 @font-face {
        font-family: 'League Gothic';
-       src: url('../lib/leaguegothic/league_gothic-webfont.ttf') format('truetype');
+       src: url('../lib/font/league_gothic-webfont.ttf') format('truetype');
        font-weight: normal;
        font-style: normal;
 }
diff --git a/index.html b/index.html
index 4441cce0f4d80cbd0f3153fb1797fa4b2058c125..d2dfdab99bea8d8a5dbd2cf5532787267a5f025e 100644 (file)
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
                <link rel="stylesheet" href="css/main.css">
                <link rel="stylesheet" href="css/print.css" type="text/css" media="print">
 
-               <link rel="stylesheet" href="lib/highlight/zenburn.css">
+               <link rel="stylesheet" href="lib/css/zenburn.css">
        </head>
        
        <body>
@@ -264,7 +264,7 @@ linkify( 'a' );
                </div>
 
                <!-- Optional libraries for code syntax highlighting and classList support in IE9 -->
-               <script src="lib/head/head.min.js"></script>
+               <script src="lib/js/head.min.js"></script>
 
                <script>
                        // Load the main reveal.js script
@@ -314,14 +314,14 @@ linkify( 'a' );
                        } );
                        
                        // Load third party scripts
-                       head.js( 'lib/highlight/highlight.js', 'lib/polyfills/classList.js', function() {
+                       head.js( 'lib/js/highlight.js', 'lib/js/classList.js', function() {
                                // Fire off syntax highlighting for potential code samples in the slides
                                hljs.initHighlightingOnLoad();
                        } );
 
                        // If we're runnning the notes server we need to include some additional JS
                        if( window.location.host === 'localhost:1947' ) {
-                               head.js( 'socket.io/socket.io.js', 'lib/slidenotes/client.js' );
+                               head.js( 'socket.io/socket.io.js', 'plugin/slidenotes/client.js' );
                        }
                </script>
                
diff --git a/lib/head/head.min.js b/lib/js/head.min.js
similarity index 100%
rename from lib/head/head.min.js
rename to lib/js/head.min.js
diff --git a/lib/slidenotes/index.js b/plugin/slidenotes/index.js
similarity index 89%
rename from lib/slidenotes/index.js
rename to plugin/slidenotes/index.js
index 206996d5ead20d28e7fa293700558ede44ddc7b1..41282a3d97753312c7d002b8f274875fb170afab 100644 (file)
--- a/lib/slidenotes/index.js
+++ b/plugin/slidenotes/index.js
@@ -21,7 +21,7 @@ io.sockets.on('connection', function(socket) {
 });
 
 app.configure(function() {
-       [ 'css', 'assets', 'js', 'lib' ].forEach(function(dir) {
+       [ 'css', 'js', 'plugin', 'lib' ].forEach(function(dir) {
                app.use('/' + dir, staticDir(opts.baseDir + dir));
        });
 });
@@ -32,7 +32,7 @@ app.get("/", function(req, res) {
 
 app.get("/notes/:socketId", function(req, res) {
 
-       fs.readFile(opts.baseDir + 'lib/slidenotes/notes.html', function(err, data) {
+       fs.readFile(opts.baseDir + 'plugin/slidenotes/notes.html', function(err, data) {
                res.send(Mustache.to_html(data.toString(), {
                        socketId : req.params.socketId
                }));
Assorted talks written in reveal.js.