change the concept of a "new" form to a form without submissions.

remove old form methods .is_new, .action
amstutzit · Mar 29, 2016 · 66438c2 · 66438c2
1 parent fde8951
commit 66438c2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/formspree/forms/models.py b/formspree/forms/models.py
@@ -282,10 +282,6 @@ def confirm(cls, nonce):
             DB.session.commit()
             return form
 
-    @property
-    def action(self):
-        return url_for('send', email_or_string=self.hashid, _external=True)
-
     @property
     def hashid(self):
         # A unique identifier for the form that maps to its id,
@@ -298,10 +294,6 @@ def hashid(self):
             self._hashid = HASHIDS_CODEC.encode(self.id)
         return self._hashid
 
-    @property
-    def is_new(self):
-        return not self.host
-
 from sqlalchemy.dialects.postgresql import JSON
 from sqlalchemy.ext.mutable import MutableDict
 

diff --git a/formspree/static/css/main.css b/formspree/static/css/main.css
@@ -716,12 +716,12 @@ a.alert-box.success:hover {
     word-break: break-word; }
   .dashboard table.forms td.n-submissions, .dashboard table.emails td.n-submissions {
     min-width: 150px; }
-  .dashboard table.forms tr.verified span[class^="ion-"], .dashboard table.emails tr.verified span[class^="ion-"] {
-    color: #2A735B; }
-  .dashboard table.forms tr.waiting_confirmation span[class^="ion-"], .dashboard table.emails tr.waiting_confirmation span[class^="ion-"] {
-    color: #D87431; }
   .dashboard table.forms tr.new span[class^="ion-"], .dashboard table.emails tr.new span[class^="ion-"] {
     color: #ff1708; }
+  .dashboard table.forms tr.waiting_confirmation span[class^="ion-"], .dashboard table.emails tr.waiting_confirmation span[class^="ion-"] {
+    color: #D87431; }
+  .dashboard table.forms tr.verified span[class^="ion-"], .dashboard table.emails tr.verified span[class^="ion-"] {
+    color: #2A735B; }
   .dashboard table.forms tr.new a:not(*:hover), .dashboard table.emails tr.new a:not(*:hover) {
     display: block;
     border-bottom: 1px dotted;

diff --git a/formspree/static/scss/dashboard.scss b/formspree/static/scss/dashboard.scss
@@ -76,9 +76,10 @@
       }
       td.n-submissions { min-width: 150px; }
 
-      tr.verified span[class^="ion-"] { color: $dark-green }
-      tr.waiting_confirmation span[class^="ion-"] { color: $warning-orange }
       tr.new span[class^="ion-"] { color: $red }
+      tr.waiting_confirmation span[class^="ion-"] { color: $warning-orange }
+      tr.verified span[class^="ion-"] { color: $dark-green }
+
       tr.new a:not(*:hover) {
         display: block;
         border-bottom: 1px dotted;

diff --git a/formspree/templates/forms/list-item.html b/formspree/templates/forms/list-item.html
@@ -1,7 +1,7 @@
-<tr class="{% if form.is_new %}new{% elif form.confirmed %}verified{% elif form.confirm_sent %}waiting_confirmation{% endif %}">
+<tr class="{% if form.counter == 0 %}new{% endif %} {% if form.confirmed %}verified{% elif form.confirm_sent %}waiting_confirmation{% endif %}">
   <td>
     <a href="#form-{{ form.hashid }}" class="no-underline">
-    {% if form.is_new %}
+    {% if not form.host %}
       <span class="tooltip hint--right" data-hint="New form. Place the code generated here in some page and submit it!"><span class="ion-help"></span></span>
     {% elif form.confirmed %}
       <span class="tooltip hint--right" data-hint="Form confirmed"><span class="ion-checkmark-round"></span></span>
@@ -12,7 +12,7 @@
   </td>
   <td>
     <a href="#form-{{ form.hashid }}" class="no-underline">
-    {% if form.is_new %}
+    {% if not form.host %}
       Waiting for a submission
     {% else %}
       {{ form.host }}
@@ -29,7 +29,7 @@
   </td>
   <td class="n-submissions">
     <a href="{{ url_for('form-submissions', hashid=form.hashid) }}" class="no-underline">
-    {% if form.is_new %}
+    {% if form.counter == 0 %}
       <span class="never">never submitted</span>
     {% else %}
       {{ form.counter }} submissions