front end redesign as a single commit

.gitignore

@@ -31,5 +31,9 @@
 ######################
 .DS_Store*
 ehthumbs.db
-Icon?
-Thumbs.db
+Thumbs.db
+
+# Eclipse #
+###########
+*.project
+*.pydevproject

README.textile

@@ -22,6 +22,12 @@ h3. Simple Commands
 
 * paver clean - Deletes artifacts that the app creates that you don't need.
 
+h2. LESS
+
+The CSS files are compiled from LESS to ease in development. Use a program such as http://wearekiss.com/simpless that automatically compiles
+the LESS files into CSS. Just drag static/css into SimpLESS, and whenever you edit and save a LESS file, the CSS will be compiled! Make sure 
+"minify" is enabled in order to minimize the final CSS file size.
+
 h2. Testing
 
 Testing is implemented using a combination of unittest2 and the Google App Engine testbed framework. Test coverage is a work in progress, and focuses on maintaining datafeed integrity in the face of optimizations and changes to FIRST's data formats.

admin_main.py

@@ -1,14 +1,6 @@
 #!/usr/bin/env python
 import os
 
-from google.appengine.dist import use_library
-use_library('django', '1.2')
-from django.conf import settings
-try:
-    settings.configure(INSTALLED_APPS=('stub',))
-except Exception, e:
-    pass
-
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp import util
 

api_main.py

@@ -1,14 +1,6 @@
 #!/usr/bin/env python
 import os
 
-from google.appengine.dist import use_library
-use_library('django', '1.2')
-from django.conf import settings
-try:
-    settings.configure(INSTALLED_APPS=('stub',))
-except Exception, e:
-    pass
-
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp import util
 

app.yaml

@@ -1,12 +1,17 @@
 application: tbatv-dev
 version: 1
-runtime: python
+runtime: python27
 api_version: 1
+threadsafe: no
 
 builtins:
 - appstats: on
 - remote_api: on
 
+libraries:
+- name: django
+  version: "1.2"
+
 handlers:
 - url: /css
   static_dir: static/css
@@ -22,7 +27,9 @@ handlers:
 - url: /robots.txt
   static_files: static/robots.txt
   upload: static/robots.txt
-
+- url: /apple-touch-icon.png
+  static_files: static/apple-touch-icon.png
+  upload: static/apple-touch-icon.png
 
 - url: /tasks/.*
   script: cron_main.py
@@ -35,3 +42,5 @@ handlers:
 - url: .*
   script: main.py
 
+skip_files:
+- ^(.*/)?.*\.less.*

controllers/admin/admin_event_controller.py

@@ -19,7 +19,7 @@ def get(self):
             "events": events,
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/events/list.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/event_list.html')
         self.response.out.write(template.render(path, template_values))
         
 class AdminEventDetail(webapp.RequestHandler):
@@ -33,7 +33,7 @@ def get(self, event_key):
             "event": event,
         }
 
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/events/details.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/event_details.html')
         self.response.out.write(template.render(path, template_values))
         
 class AdminEventEdit(webapp.RequestHandler):
@@ -47,7 +47,7 @@ def get(self, event_key):
             "event": event
         }
 
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/events/edit.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/event_edit.html')
         self.response.out.write(template.render(path, template_values))
     
     def post(self, event_key):

controllers/admin/admin_main_controller.py

@@ -19,5 +19,5 @@ def get(self):
 
 class AdminDebugHandler(webapp.RequestHandler):
     def get(self):
-        path = os.path.join(os.path.dirname(__file__), '../../templates/main/debug.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/debug.html')
         self.response.out.write(template.render(path, {}))

controllers/admin/admin_match_controller.py

@@ -15,7 +15,7 @@ class AdminMatchCleanup(webapp.RequestHandler):
     Used to clean up 2011 Matches, where we had dupes of "2011new_qm1" and "2011newton_qm1".
     """
     def get(self):
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/cleanup.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches_cleanup.html')
         self.response.out.write(template.render(path, {}))
     
     def post(self):
@@ -34,7 +34,7 @@ def post(self):
             "tried_delete": True
         }
 
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/cleanup.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches_cleanup.html')
         self.response.out.write(template.render(path, template_values))
 
 class AdminMatchDashboard(webapp.RequestHandler):
@@ -48,7 +48,7 @@ def get(self):
             "match_count": match_count
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/dashboard.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/match_dashboard.html')
         self.response.out.write(template.render(path, template_values))
         
 
@@ -63,15 +63,15 @@ def get(self, match_key):
             "match": match
         }
 
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/details.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/match_details.html')
         self.response.out.write(template.render(path, template_values))
         
 class AdminMatchAddVideos(webapp.RequestHandler):
     """
     Add a lot of youtube_videos to Matches at once.
     """
     def get(self):
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/videosadd.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/match_videosadd.html')
         self.response.out.write(template.render(path, {}))
         
     def post(self):
@@ -99,7 +99,7 @@ def post(self):
             "results": results,
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/videosadd.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/match_videosadd.html')
         self.response.out.write(template.render(path, template_values))
 
 class AdminMatchEdit(webapp.RequestHandler):
@@ -113,7 +113,7 @@ def get(self, match_key):
             "match": match
         }
 
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/matches/edit.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/match_edit.html')
         self.response.out.write(template.render(path, template_values))
     
     def post(self, match_key):        

controllers/admin/admin_memcache_controller.py

@@ -14,7 +14,7 @@ def get(self):
             "memcache_stats": memcache.get_stats(),
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/memcache/index.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/memcache_index.html')
         self.response.out.write(template.render(path, template_values))
         
 # Memcache flush result.
@@ -34,6 +34,6 @@ def get(self):
             'flushed' : flushed,
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/memcache/flush.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/memcache_flush.html')
         self.response.out.write(template.render(path, template_values))
 

controllers/admin/admin_team_controller.py

@@ -15,7 +15,7 @@ def get(self):
             "teams": teams,
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/teams/list.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/team_list.html')
         self.response.out.write(template.render(path, template_values))
         
 # The view of a single Team.
@@ -28,6 +28,6 @@ def get(self, team_number):
             'team' : team,
         }
         
-        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/teams/details.html')
+        path = os.path.join(os.path.dirname(__file__), '../../templates/admin/team_details.html')
         self.response.out.write(template.render(path, template_values))
 

controllers/event_controller.py

@@ -38,7 +38,7 @@ def get(self, year=None):
                 "events": events,
             }
         
-            path = os.path.join(os.path.dirname(__file__), '../templates/events/list.html')
+            path = os.path.join(os.path.dirname(__file__), '../templates/event_list.html')
             html = template.render(path, template_values)
             memcache.set(memcache_key, html, 3600)
         
@@ -60,18 +60,26 @@ def get(self, event_key):
             team_keys = [EventTeam.team.get_value_for_datastore(event_team).name() for event_team in event.teams.fetch(500)]
             teams = Team.get_by_key_name(team_keys)
             teams = TeamHelper.sortTeams(teams)
+
+            num_teams = len(teams)
+            middle_value = num_teams/2
+            if num_teams%2 != 0:
+                middle_value += 1
+            teams_a, teams_b = teams[:middle_value], teams[middle_value:]
             
             oprs = sorted(zip(event.oprs,event.opr_teams), reverse=True) # sort by OPR
             oprs = oprs[:14] # get the top 15 OPRs
         
             template_values = {
                 "event": event,
                 "matches": matches,
-                "teams": teams,
+                "teams_a": teams_a,
+                "teams_b": teams_b,
+                "num_teams": num_teams,
                 "oprs": oprs,
             }
                 
-            path = os.path.join(os.path.dirname(__file__), '../templates/events/details.html')
+            path = os.path.join(os.path.dirname(__file__), '../templates/event_details.html')
             html = template.render(path, template_values)
             memcache.set(memcache_key, html, 300)
         

controllers/main_controller.py

@@ -13,7 +13,7 @@ def render_static(page):
     html = memcache.get(memcache_key)
     
     if html is None:
-        path = os.path.join(os.path.dirname(__file__), "../templates/main/%s.html" % page)
+        path = os.path.join(os.path.dirname(__file__), "../templates/%s.html" % page)
         html = template.render(path, {})
         memcache.set(memcache_key, html, 86400)
     
@@ -37,7 +37,7 @@ def get(self):
                 "upcoming_events": upcoming_events,
             }
             
-            path = os.path.join(os.path.dirname(__file__), '../templates/main/index.html')
+            path = os.path.join(os.path.dirname(__file__), '../templates/index.html')
             html = template.render(path, template_values)
             memcache.set(memcache_key, html, 86400)
         

controllers/match_controller.py

@@ -39,7 +39,7 @@ def get(self, key_name):
                 return None
             
             match.unpack_json()
-            
+
             tbavideo = None
             if len(match.tba_videos) > 0:
                 tbavideo = TBAVideoHelper(match)
@@ -49,7 +49,7 @@ def get(self, key_name):
                 "tbavideo": tbavideo,
             }
             
-            path = os.path.join(os.path.dirname(__file__), '../templates/matches/details.html')
+            path = os.path.join(os.path.dirname(__file__), '../templates/match_details.html')
             html = template.render(path, template_values)
             memcache.add(memcache_key, html, 600)
         

controllers/team_controller.py

@@ -19,12 +19,20 @@ def get(self):
         
         if html is None:
             teams = Team.all().order('team_number').fetch(10000)        
-        
+
+            num_teams = len(teams)
+            middle_value = num_teams/2
+            if num_teams%2 != 0:
+                middle_value += 1
+            teams_a, teams_b = teams[:middle_value], teams[middle_value:]
+
             template_values = {
-                "teams": teams,
+                "teams_a": teams_a,
+                "teams_b": teams_b,
+                "num_teams": num_teams,
             }
         
-            path = os.path.join(os.path.dirname(__file__), '../templates/teams/list.html')
+            path = os.path.join(os.path.dirname(__file__), '../templates/team_list.html')
             html = template.render(path, template_values)
             memcache.set(memcache_key, html, 3600)
         
@@ -104,7 +112,7 @@ def get(self, team_number, year=None):
                                 "years": years,
                                 "year_wlt": year_wlt }
             
-            path = os.path.join(os.path.dirname(__file__), '../templates/teams/details.html')
+            path = os.path.join(os.path.dirname(__file__), '../templates/team_details.html')
             html = template.render(path, template_values)
             memcache.set(memcache_key, html, 300)
         

cron_main.py

@@ -2,14 +2,6 @@
 
 import os
 
-from google.appengine.dist import use_library
-use_library('django', '1.2')
-from django.conf import settings
-try:
-    settings.configure(INSTALLED_APPS=('stub',))
-except Exception, e:
-    pass
-
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp import util
 

main.py

@@ -3,15 +3,6 @@
 
 import os
 
-from google.appengine.dist import use_library
-use_library('django', '1.2')
-from django.conf import settings
-try:
-    settings.configure(INSTALLED_APPS=('stub',))
-except Exception, e:
-    pass
-
-
 from google.appengine.ext import webapp
 from google.appengine.ext.webapp import template, util
 

models.py

@@ -105,7 +105,7 @@ class Match(db.Model):
     
     COMP_LEVELS = ["qm", "ef", "qf", "sf", "f"]
     COMP_LEVELS_VERBOSE = {
-        "qm": "Qualifications",
+        "qm": "Quals",
         "ef": "Eighths",
         "qf": "Quarters",
         "sf": "Semis",