commit recent changes from the welcome system

in prep for retiring svn forever

Author: novas0x2a

badge/completed/.keep

@@ -11,7 +11,7 @@
       "font_path" : "./configuration/fonts/",
       "remove_accents" : true,
       "color" : [255, 255, 255],
-      "design" : ["background","sponsor","shdh_number","first_name","last_name","tags"]
+      "design" : ["background","shdh_number","first_name","last_name","tags","sponsor"]
    },
    "background" : {
       "file" : "./configuration/background.png",
@@ -20,8 +20,8 @@
    },
    "sponsor" : {
       "file" : "./configuration/sponsor.png",
-      "x" : 390,
-      "y" : 344
+      "x" : 420,
+      "y" : 324
    },
    "shdh_number" : {
       "height" : 110,
@@ -59,4 +59,4 @@
       "x" : 10,
       "y" : 305
    }
-}
+}

badge/configuration/1x1.png

@@ -0,0 +1 @@
+1x1.png

badge/configuration/print_badge.config.json

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #
 # Copyright (c) 2008, 2009 Adam Marshall Smith
 #

badge/configuration/sponsor.png

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+import pprint
+import pickle
+
+cards = pickle.load(file('rolodex.dat', 'r+b'))
+pprint.pprint(cards)

badge/configuration/sponsor.png

@@ -1,2 +1,10 @@
-#!/bin/sh
-python core.py data/rolodex.dat $*
+#!/bin/bash
+ 
+# Pop off the exe name
+shift 1
+
+if [[ $# -eq 1 ]]; then
+	python core.py data/rolodex.dat $1
+else
+	python core.py $*
+fi

consumers/twitter_consumer.py

@@ -66,7 +66,7 @@
 	border:none;
 }
 .buttonSubmitHovered {background-position:left bottom;}
-.buttonImg {vertical-align:bottom;}
+.buttonImg {vertical-align:bottom; border: 0px;}
 </style>
 <script type="text/javascript" src="prototype.js"></script>
 <script type="text/javascript" src="effects.js"></script>
@@ -235,7 +235,8 @@
     event_submitEmail: function(event) {
         Event.stop(event);
         var email = $F('email');
-        if (email.match(/^[0-9a-zA-Z][-_\.0-9a-zA-Z+]*[0-9a-zA-Z]+@([0-9a-zA-Z]+[-_\.0-9a-zA-Z]*[0-9a-zA-Z]+)+\.[a-zA-Z]{2,6}$/)) {
+	email = email.strip();
+        if (email.length > 1) {
             this.key = email;
             new Ajax.Request(this.BASE_PATH+'prefill'+this.PATH_SEPERATOR+this.key, {
                 method: 'get',
@@ -293,10 +294,10 @@
     <form id="email_form" action="#" style="display: none;">
         <div class="pane">
             <div>
-                <label for="email">Email:</label><br />
-                <img src="images/input_left.gif" alt="" /><input type="text" id="email" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" />
+                <label for="email">Unique ID (Email?):</label><br />
+                <nobr><img src="images/input_left.gif" alt="" /><input type="text" id="email" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" /></nobr>
             </div>
-            <div><img src="images/button_left.jpg" alt="" class="buttonImg"/><input type="submit" value="Get this party started!" class="buttonSubmit"/><img src="images/button_right.jpg" alt="" class="buttonImg"/>
+            <div><nobr><img src="images/button_left.jpg" alt="" class="buttonImg"/><input type="submit" value="Get this party started!" class="buttonSubmit"/><img src="images/button_right.jpg" alt="" class="buttonImg"/></nobr>
             </div>
         </div>
     </form>
@@ -307,25 +308,25 @@
                     <td>
                       <div>
                         <label for="first_name">First:</label><br />
-                        <img src="images/input_left.gif" alt="" /><input type="text" id="first_name" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" />
+                        <nobr><img src="images/input_left.gif" alt="" /><input type="text" id="first_name" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" /></nobr>
                       </div>
                     </td>
                     <td>&nbsp;</td>
                     <td>
                       <div>
                         <label for="last_name">Last:</label><br />
-                        <img src="images/input_left.gif" alt="" /><input type="text" id="last_name" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" />
+                        <nobr><img src="images/input_left.gif" alt="" /><input type="text" id="last_name" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" /></nobr>
                       </div>
                     </td>
                 </tr>
             </table>
             <div>
-                <label for="tags">Tags:</label><br />
-                <img src="images/input_left.gif" alt="" /><input type="text" id="tags" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" />
+                <label for="tags">Tags / Interests:</label><br />
+                <nobr><img src="images/input_left.gif" alt="" /><input type="text" id="tags" value="" class="textinput" autocomplete="off" /><img src="images/input_right.gif" alt="" /></nobr>
             </div>
             <div>
-              <img src="images/button_left.jpg" alt="" class="buttonImg"/><input type="button" value="&lt;&lt; Oops!" onclick="WelcomeSystem.startOver();" class="buttonSubmit"/><img src="images/button_right.jpg" alt="" class="buttonImg"/>
-              <img src="images/button_left.jpg" alt="" class="buttonImg"/><input type="submit" value="Finish this up!" class="buttonSubmit"/><img src="images/button_right.jpg" alt="" class="buttonImg"/>
+              <nobr><img src="images/button_left.jpg" alt="" class="buttonImg"/><input type="button" value="&lt;&lt; Oops!" onclick="WelcomeSystem.startOver();" class="buttonSubmit"/><img src="images/button_right.jpg" alt="" class="buttonImg"/></nobr>
+              <nobr><img src="images/button_left.jpg" alt="" class="buttonImg"/><input type="submit" value="Finish this up!" class="buttonSubmit"/><img src="images/button_right.jpg" alt="" class="buttonImg"/></nobr>
             </div>
         </div>
     </form>