Merge branch 'sorting'

Jimfile

@@ -0,0 +1,26 @@
+// bundled_path: _attachments/javascripts/bundled.js
+// compressed_path: _attachments/javascripts/compressed.js
+// vendor_dir: _attachments/javascripts/vendor
+
+/ start adding your requirements below:
+
+json2
+sha1
+jquery 1.4.2
+jquery.couch 0.11
+jquery.form 2.40
+jquery.easing
+jquery.ui.core 1.8rc3.custom
+jquery.ui.widget 1.8rc3.custom
+jquery.ui.mouse 1.8rc3.custom
+jquery.ui.sortable 1.8rc3.custom
+jquery.tabby
+jquery.swipe
+prettify
+showdown
+sammy 0.5.1
+sammy.storage 0.5.1
+sammy.template 0.5.1
+sammy.nested_params 0.5.1
+sammy.form
+sammy.title

_attachments/index.html

@@ -12,8 +12,12 @@
     <a href="#/" class="logo"><img src="images/swinger_icon_tiny.png" alt="Swinger" /></a>
     <a href="#/new">New</a>
     <span class="sep">&nbsp;</span>
-    <a href="#" rel="display" class="preso-link">Play</a>
-    <a href="#" rel="export" class="preso-link">Export</a>
+    <div class="preso-links">
+      <span class="preso-name title" class="preso-link"></span>
+      <a href="#" rel="display" class="preso-link">Play</a>
+      <a href="#" rel="edit" class="preso-link">Edit</a>
+      <a href="#" rel="export" class="preso-link">Export</a>
+    </div>
   </div>
   <div class="user-nav">
     <div class="logged-in" style="display:none;">
@@ -24,30 +28,22 @@
       <a href="#/login">Login or Signup</a>
     </div>
   </div>
+  <div class="clear"></div>
+  <div id="inline-notification" class="notification" style="display:none;"><div class="message">&nbsp;</div><button>x</button></div>
   <div id="container">
 
   </div>
   <div id="footer">
     Swinger was created by <a href="http://www.quirkey.com">Aaron Quint</a> 
     and is powered by <a href="http://code.quirkey.com/sammy">Sammy.js</a>, 
     <a href="http://couchdb.apache.org">CouchDB</a> and
-    <a href="http://github.com/couchapp/couchapp">Couchapp</a>.
+    <a href="http://github.com/couchapp/couchapp">Couchapp</a>. 
+    It's 100% <a href="http://github.com/quirkey/swinger">Open Source</a>.
   </div>
   <div id="modal-loader" class="modal" style="display:none;"><img src="images/loader-large-black.gif" alt="Loading" /></div>
-  <div id="modal-notification" class"modal" style="display:none;"><div class="message">&nbsp;</div><br /><button>Close</button></div>
+  <div id="modal-notification" class="modal" style="display:none;"><div class="message">&nbsp;</div><br /><button>Close</button></div>
 
-  <script src="/_utils/script/json2.js" type="text/javascript" charset="utf-8"></script>
-  <script src="/_utils/script/sha1.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/jquery-1.4.1.js" type="text/javascript" charset="utf-8"></script>
-  <script src="/_utils/script/jquery.couch.js?0.9.0" type="text/javascript" charset="utf-8"></script>
-  <script src="/_utils/script/jquery.form.js" type="text/javascript" charset="utf-8"></script>
-  <script src="vendor/couchapp/jquery.couchapp.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/showdown/showdown.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/shjs/sh_main.min.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/jquery.easing.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/sammy.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/plugins/sammy.template.js" type="text/javascript" charset="utf-8"></script>
-  <script src="javascripts/plugins/sammy.nested_params.js" type="text/javascript" charset="utf-8"></script>
+  <script src="javascripts/compressed.js" type="text/javascript" charset="utf-8"></script>
   <script src="javascripts/app.js" type="text/javascript" charset="utf-8"></script>
 </body>
 </html>