Merge remote-tracking branch 'origin/master'

README.md

@@ -8,7 +8,7 @@ jQuery.sheet
 
 the ajax spreadsheet
 
-[Demo](http://visop-dev.com/jQuery.sheet/jquery.sheet.html)
+[Demo](http://spreadsheets.github.io/jQuery.sheet/)
 
 [3.1 Documentation](http://visop-dev.com/doc/js3/index.html)
 

build

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 #compile parsers
-cd parser/formula
-node ../../../jison/ports/php/php.js formula.jison
-cd ../../
+#cd parser/formula
+#node ../../../jison/ports/php/php.js formula.jison
+#cd ../../
 
 # directories of the JS files
 JS_IN_DIR='./Sheet'

index.html

@@ -29,6 +29,7 @@
 		    </div>
 		    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 			    <ul class="nav navbar-nav">
+                    <li><a href="https://github.com/Spreadsheets/jQuery.sheet/releases">Download</a></li>
 				    <li><a href="http://visop-dev.com/contact+us">Support</a></li>
 				    <li><a href="http://www.VisOp-Dev.com">Sponsor</a></li>
 				    <li><a href="https://github.com/Spreadsheets/jQuery.sheet/">Code</a></li>
@@ -126,10 +127,10 @@
     <!-- Main jumbotron for a primary marketing message or call to action -->
     <div class="jumbotron">
 	    <div class="container">
-		    <h1>jQuery.sheet</h1>
+		    <h1>jQuery.sheet (beta)</h1>
 		    <p>Easy & Wicked Fast spreadsheets for the web...  Finally!</p>
 		    <div id="sheet" class="jQuerySheet" style="height: 450px;"></div>
-		    <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more &raquo;</a></p>
+		    <p><a class="btn btn-primary btn-lg" href="https://github.com/Spreadsheets/jQuery.sheet/wiki/jQuery.sheet,-a-different-approach" role="button">Learn more &raquo;</a></p>
 	    </div>
     </div>
 
@@ -233,6 +234,9 @@ <h2>Enterprise Ready</h2>
 <!--Zero Clipboard-->
 <script src="bower_components/zeroclipboard/dist/ZeroClipboard.min.js"></script>
 <!--/Zero Clipboard-->
+<!--Bootstrap-->
+<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<!--/Bootstrap-->
 
 <script>
 	var jS;