From 1db95713a2c68a4f3aab38a74658ddba66692997 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Mon, 4 Jul 2011 21:25:49 +0530
Subject: [PATCH] fixed silly submit bug

---
 edgware/static/js/files/browse.js     |  3 +-
 edgware/templates/create_article.html | 72 +++++++++++++++++----------
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/edgware/static/js/files/browse.js b/edgware/static/js/files/browse.js
index 658fe26..f658a0f 100644
--- a/edgware/static/js/files/browse.js
+++ b/edgware/static/js/files/browse.js
@@ -205,7 +205,8 @@ function getItemForm(f) {
   var $submit = $('<input />').addClass("submitItem").attr("type", "submit").val("Submit").appendTo($submitP);
   var $submitStatus = $('<span />').addClass("submitStatus").appendTo($submitP);
   $submit.click(function(e) {
-    if (typeof($(this).attr("disabled")) != 'undefined') {
+    if ($(this).attr("disabled")) {
+//      console.log($(this).attr("disabled"));
       return false;
     }
     var url = "/files/editFile/";
diff --git a/edgware/templates/create_article.html b/edgware/templates/create_article.html
index d877be7..48ef3fb 100644
--- a/edgware/templates/create_article.html
+++ b/edgware/templates/create_article.html
@@ -1,6 +1,7 @@
-{% extends 'base.html' %}
+{% extends 'main_base.html' %}
 
-{% block head %}
+{% block extra_head %}
+  <link rel="stylesheet" href="/static/css/files/publish.css" />
   <style type="text/css">
 .templateArticle {
   cursor: pointer;
@@ -43,30 +44,47 @@ $(function() {
   </script>
 {% endblock %}
 
-{% block body %}
-  <div id="articleInstructions">
-    <b>Instructions:</b> Give your article a name and then click on a template (or other article) you would like to use as a starting point for your new article. Have fun!
-  </div>
-  <br /><br />
-  <form id="newArticleForm" action="" method="POST">
-    <label for="article_name">Article Name:</label> <input type="text" id="articleName" name="article_name" /> <br />
-    <input type="hidden" id="articleId" name="article_id" />
-  </form>
-  <div id="templateArticles">
-    <h3>Templates:</h3>
-    {% for t in templates %}
-      <div class="linkContainer">
-        <span class="templateArticle" data-id="{{ t.id }}">{{ t.name }}</span> 
-        <span class="seeLink">[<a href="article_web/{{ t.id }}/" title="See Article" target="_blank">see</a>]</span>
-      </div>
-    {% endfor %}
-    <h3>Other Articles:</h3>
-    {% for o in others %}
-      <div class="linkContainer">
-        <span class="templateArticle" data-id="{{ o.id }}">{{ o.name }}</span> 
-        <span class="seeLink">[<a href="article_web/{{ o.id }}/" title="See Article" target="_blank">see</a>]</span>
-      </div>
-    {% endfor %}
-  </div>
+{% block content %}
+    <div id="publishWrapper">
+        <div id="publishBlockleft">
+    
+        <p>
+Welcome to the publishing area of edgwareroad.org, and to our printing tool.
+To use the tool, you have to be logged in. To test-run the tool, use the login:guest and password:guest.
+        </p> <br/>
+        <p>
+Since the tool uses Html5 and features standard only in newer browsers, please note that the tool will only work in Firefox 3.5+, Google Chrome, and Safari. 
+        </p><br/>
+        <p>
+If you are a participant looking to open a new account, please write to contact@edgwareroad.org.  A basic introduction to its features are found in our first publication, Instructions for Printing, here.
+        </p>
+    </div>
 
+
+    <div id="formWrapper">
+    <div id="articleInstructions">
+      <b>Instructions:</b> Give your article a name and then click on a template (or other article) you would like to use as a starting point for your new article. Have fun!
+    </div>
+    <br /><br />
+    <form id="newArticleForm" action="" method="POST">
+      <label for="article_name">Article Name:</label> <input type="text" id="articleName" name="article_name" /> <br />
+      <input type="hidden" id="articleId" name="article_id" />
+    </form>
+    <div id="templateArticles">
+      <h3>Templates:</h3>
+      {% for t in templates %}
+        <div class="linkContainer">
+          <span class="templateArticle" data-id="{{ t.id }}">{{ t.name }}</span> 
+          <span class="seeLink">[<a href="article_web/{{ t.id }}/" title="See Article" target="_blank">see</a>]</span>
+        </div>
+      {% endfor %}
+      <h3>Other Articles:</h3>
+      {% for o in others %}
+        <div class="linkContainer">
+          <span class="templateArticle" data-id="{{ o.id }}">{{ o.name }}</span> 
+          <span class="seeLink">[<a href="article_web/{{ o.id }}/" title="See Article" target="_blank">see</a>]</span>
+        </div>
+      {% endfor %}
+    </div>
+  </div>
 {% endblock %}