Browse files

updated jquery, added like button and +1 button, changed loading of e…

…xternal javascript, updated comment on login to be about debug console
  • Loading branch information...
1 parent 268a3bc commit aac25f09da0a6badaf8129e487b61c73c0449da3 @matthewfl committed Aug 6, 2011
Showing with 7 additions and 10 deletions.
  1. +1 −1 Bespin/control.js
  2. +6 −9 static/index.html
View
2 Bespin/control.js
@@ -468,7 +468,7 @@ exports.logoutCommand = function (args, request) {
exports.loginCommand = function (args,request) {
if(userName !== null) return exports.logoutCommand();
request.done();
- $.facebox('<div id="login" class="bespin"><p>Install the new Jsapp npm command (npm install jsapp), JsApp now supports coffee script, just add the suffix .coffee to any file</p><form action="/newUser" method="post" type="input">User:<input id="userName" name="userName" type="input" style="color:#000; width:90%;"/><br>Password:<input id="password" name="password" type="password" style="color:#000; width: 90%; "/><div id="moreUser" style="display:none;">Password Again:<input id="password2" name="password2" type="password" style="color: #000; width:90%" /><br>Email:<input id="userEmail" name="userEmail" type="input" style="color: #000; width:90%" /><br><a href="https://groups.google.com/group/jsapp-us" target="_blank">Join the mailing list</a></div><br><input value="login" type="button" id="loginButton" style="width:40%; display: inline;" /><input value="new user" type="submit" id="newUserButton" style="width:40%; display:inline;"/></form></div>');
+ $.facebox('<div id="login" class="bespin"><p>Live debug console now opens when testing applications, try it out now by pressing Ctrl-b.</p><form action="/newUser" method="post" type="input">User:<input id="userName" name="userName" type="input" style="color:#000; width:90%;"/><br>Password:<input id="password" name="password" type="password" style="color:#000; width: 90%; "/><div id="moreUser" style="display:none;">Password Again:<input id="password2" name="password2" type="password" style="color: #000; width:90%" /><br>Email:<input id="userEmail" name="userEmail" type="input" style="color: #000; width:90%" /><br><a href="https://groups.google.com/group/jsapp-us" target="_blank">Join the mailing list</a></div><br><input value="login" type="button" id="loginButton" style="width:40%; display: inline;" /><input value="new user" type="submit" id="newUserButton" style="width:40%; display:inline;"/></form></div>');
setTimeout('$("#userName").focus();', 30);
$("#userName,#password").keypress(function (e) {
if(e.keyCode == '13') {
View
15 static/index.html
@@ -8,7 +8,7 @@
#editor { margin: 0; padding: 0; width: 65%; height: 100%; overflow: hidden;}
#entro { margin: 0; padding:0 width:32%; height: 100%; overflow: auto; position: absolute; top: 0px; left: 66% }
</style>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script>
(function () {
function check () {
@@ -66,7 +66,7 @@
<body>
<div id="editor" class="bespin" data-bespinoptions='{ "settings": { "tabstop": 2, "maxConsoleHeight": 150 }, "syntax": "js", "stealFocus": true }'>{CODE}</div>
<div id="entro">
-<h2>Welcome to JsApp.US <a href="http://twitter.com/share" class="twitter-share-button" data-url="http://jsapp.us" data-text="JSApp.US: quick way to try #nodejs and host web based node application" data-count="none" data-related="matthewfl">Tweet</a></h2>
+<h2>Welcome to JsApp.US </h2><a href="http://twitter.com/share" class="twitter-share-button" data-url="http://jsapp.us" data-text="JSApp.US: quick way to try #nodejs and host web based node application" data-count="horizontal" data-related="matthewfl">Tweet</a> <iframe src="http://www.facebook.com/plugins/like.php?app_id=195846027142636&amp;href=https%3A%2F%2Fwww.facebook.com%2Fpages%2FJsApp%2F155238484554394&amp;send=false&amp;layout=button_count&amp;width=80&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:80px; height:21px;" allowTransparency="true"></iframe> <g:plusone></g:plusone></h2>
<p>JsApp.US is a hosting platform for <a href="http://nodejs.org">node.js</a> applications. It is setup to be a platform to coddle to quick, weekend hack like projects.</p>
<p>To get started you can run the test command from the bottom command line or press Control-b.</p>
<br>
@@ -101,13 +101,10 @@
<br><a href="https://groups.google.com/group/jsapp-us" target="_blank">Mailing list</a>
<br><a href="http://matthewfl.com/category/jsapp-us" target="_blank">Blog</a>
</div>
-<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-<script type="text/javascript">
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+<script>
+ $.getScript('http://platform.twitter.com/widgets.js');
+ $.getScript('https://ssl.google-analytics.com/ga.js');
+ $.getScript('https://apis.google.com/js/plusone.js');
</script>
</body>
</html>

0 comments on commit aac25f0

Please sign in to comment.