From 135fe821e12b78a8c8ca344ae7906682786c93fb Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Sat, 7 Jan 2012 03:36:12 +0100 Subject: [PATCH] Work on the register UI --- .gitignore | 1 + main/admin.py | 6 +- main/forms.py | 18 +++ main/models.py | 20 ++- main/urls.py | 5 +- main/views.py | 13 ++ static/gaute/images/product.png | Bin 0 -> 3786 bytes static/gaute/images/unknown.png | Bin 0 -> 4800 bytes static/gaute/sass/screen.scss | 63 +++++++++ static/gaute/stylesheets/ie.css | 24 ---- static/gaute/stylesheets/print.css | 14 -- static/gaute/stylesheets/screen.css | 198 ++++++++++++++-------------- static/js/register.js | 26 ++++ templates/base.html | 4 +- templates/register.html | 62 ++++++--- urls.py | 3 + 16 files changed, 290 insertions(+), 167 deletions(-) create mode 100644 main/forms.py create mode 100644 static/gaute/images/product.png create mode 100644 static/gaute/images/unknown.png create mode 100644 static/js/register.js diff --git a/.gitignore b/.gitignore index dafd420..6858258 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ settings.py dev.db static/gaute/.sass-cache +uploads diff --git a/main/admin.py b/main/admin.py index a8b7e14..5733701 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,7 +1,11 @@ from django.contrib import admin -from bbs.main.models import Product +from bbs.main.models import * class ProductAdmin(admin.ModelAdmin): pass admin.site.register(Product, ProductAdmin) +admin.site.register(Order) +admin.site.register(OrderLine) +admin.site.register(Transaction) +admin.site.register(UserProfile) diff --git a/main/forms.py b/main/forms.py new file mode 100644 index 0000000..425d128 --- /dev/null +++ b/main/forms.py @@ -0,0 +1,18 @@ +from django import forms + +from models import * + +class OrderForm(forms.Form): + pass + +class OrderLineForm(forms.ModelForm): + #product = forms.CharField(required=True, widget=forms.HiddenInput) + #amount = forms.IntegerField(required=True) + class Meta: + model = OrderLine + fields = ('amount','product') + widgets = { + 'product': forms.HiddenInput(), + 'amount': forms.TextInput(attrs={'size': '2'}), + } + # TODO : Validation diff --git a/main/models.py b/main/models.py index 1fc627e..9dfbd5f 100755 --- a/main/models.py +++ b/main/models.py @@ -14,9 +14,9 @@ class Product(models.Model): description = models.CharField(max_length=256, blank=True) volume_liter = models.FloatField(null=True) alcohol_percent = models.FloatField(null=True) - image = models.ImageField(upload_to='uploads', blank=True) - active = models.BooleanField(default=True) + image = models.ImageField(upload_to='products', blank=True) customer_support = models.CharField(max_length=32, blank=True) + active = models.BooleanField(default=True) created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) @@ -25,12 +25,18 @@ class Order(models.Model): order_sum = models.FloatField(db_column='sum') created = models.DateTimeField(auto_now_add=True) + def __unicode__(self): + return "{0}: {1} kr".format(self.user, self.order_sum) + class OrderLine(models.Model): order = models.ForeignKey(Order) product = models.ForeignKey(Product) amount = models.IntegerField() unit_price = models.FloatField() + def __unicode__(self): + return "{1} {0} ({2} kr per)".format(self.product, self.amount, self.unit_price) + class Meta: unique_together = ('order', 'product') @@ -39,13 +45,19 @@ class Transaction(models.Model): amount = models.FloatField() created = models.DateTimeField(auto_now_add=True) + def __unicode__(self): + return "{0}: {1}: {2}".format(self.id, self.user, self.amount) + class UserProfile(models.Model): user = models.ForeignKey(User, unique=True) balance = models.FloatField(default=0.0) - image = models.ImageField(upload_to='uploads', blank=True) + image = models.ImageField(upload_to='users', blank=True) + + def __unicode__(self): + return "{0}".format(self.user) # Create a new UserProfile object when we create a new User. -@receiver(post_save, sender=User) +@receiver(post_save, sender=User, dispatch_uid='randomz') def create_user_profile(sender, instance, created, **kwargs): if created: UserProfile.objects.create(user=instance) diff --git a/main/urls.py b/main/urls.py index 9b4dc37..b508f71 100644 --- a/main/urls.py +++ b/main/urls.py @@ -1,6 +1,5 @@ from django.conf.urls.defaults import patterns, include, url -urlpatterns = patterns('', - url(r'^$', 'bbs.main.views.home', name='home'), - url(r'^register/$', 'bbs.main.views.register', name='register'), +urlpatterns = patterns('bbs.main.views', + url(r'^register/$', 'register', name='register'), ) diff --git a/main/views.py b/main/views.py index fcc3ecb..2439b32 100755 --- a/main/views.py +++ b/main/views.py @@ -6,9 +6,12 @@ from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext +from django.forms.formsets import formset_factory from models import * +from forms import * + def home(request): if request.method == "POST": form = AuthenticationForm(data=request.POST) @@ -25,8 +28,18 @@ def home(request): @login_required def register(request): + if request.method == "POST": + # TODO: Form processing is not working at all + form = OrderLineForm(data=request.POST) + if form.is_valid(): + form.save() + return HttpResponseRedirect( reverse('bbs.main.views.register') ) products = Product.objects.all() users = User.objects.all() + # Formset for orderlines + # FIXME: Like this? + #OrderLineFormSet = formset_factory(OrderLineForm, extra=products.count()) + #formset = OrderLineFormSet() return render_to_response('register.html', locals(), context_instance=RequestContext(request)) def logout(request): diff --git a/static/gaute/images/product.png b/static/gaute/images/product.png new file mode 100644 index 0000000000000000000000000000000000000000..5cba7f35d8678f8c14e10b30f3562a6621f603e8 GIT binary patch literal 3786 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 A@&Et; literal 0 HcmV?d00001 diff --git a/static/gaute/images/unknown.png b/static/gaute/images/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..c0e33c76ff3c87a89fae9fe1a3861474c5ea8149 GIT binary patch literal 4800 zcmV;x5KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000N;Nkl=NgHRIHfh)*Qp8GWX{AjOft9G_rP4l9 zJ_S;F=>r8G&{p(mg^(7BsJy^Kk${3)6dnStR;t>htwd>eLo1+4rIMsX3X0=68PC|B zuX`^KO^WLzZS0IoOmn3BU`swe_jmvI%(-V~1kO2LWg~dSZ5zNgfLGk4T7M`A!kXVd zFR7kBefkrg=l!HmD7@*quF}-h1WnTf#u#kd=J|XcnxB27GBUz~j$xIL zYOey7f4Y(1r_*UEkw^@eN~L36U0o!VN(qDzP)b251tA2YD1s0I%d#*zImz?+d^Qvc zedhf6^AGB^AR7j-mh+8*OQ+L{uIqmfhr`_m4jdqkk!U9awgzLIsjIA2J z@58bz%+Jq5*L9({w^yZJNU>F7>k%*8;Bx1U*zgKInS_{N;w?O5@YqfMbO;lCQba!_r*4v*OFsQW?)MN4h5DJBk>bf4Olw`G|SS%u$Ov=${^o<}cdzEUCDkmS**+A2@ zZ$%;zl`*y{Ka4RnH#bYJ>wXu&J3&Ht20)OL2LR9WJ{<~$0`Vz|A{@s#9CQ)HIsY$! zpihOq@3*Y1;AYKrU2x7LTdER#p<_vsgM=!}veZxj2q97st6%P~VGcv5PMs16AO21>8W>qR!T3TA7l%BkC<3_Qbu}Loj0Oy=l+a9BoQqK9m>mA!m zQGg%_UutSyX{p9fQ@cD)S zFfcIiwjc<<-m_isF-qz0bGh7~ zZr{G0edz%D`}@^+JpK*O^G-UB(;JCI#CSX|CX-1)*L5r`EFhD~AgHd8qA1w0V+UGV zT3}fg78e(>w6w%>xtt)&a#7Q?KT}HIUtC=L;Le>pylw!F9Xqz)_x&GRmi1O5k&xQj z+DJSehad>>eINOJ9t#T#aNS^Acq@$+MNtrqMxpCEH0?>t(XuS$ayg#OW~pu4C0*Bl zB?!X1moHyl3=F{WgyT4?0uCBL<#*w5 z7^$;Z!yuGdhIy*bhB$LS>?Ay0bot>S1@)U(6 zy|fhz(jQ|Cp65Z5B#5Gjcsz~=4<6XDSnTsRZ{EDM3P5{%dt8>~$^QQS=DE2!Fvg&& zDz<{v3eP$+zS%^W}o`Fc1U4%@a3&N)O;tU2)ooiH~8w7knC%Q6H(5RM)_ z`pL1evHMQ}B$G*15QIa^%?JQb?(d1B*w6}~ls;9l<2aBc387F(Sz2299Dw`f3iy<& zst#jJS!qhFBoIPKLn?rC4%@b$KA|d#A}FPhBuOe13U2~ zhzclg$*;sDNfI2#>8#8FZzzf)KhHs!an7;) zu0r#@d-r&`0=imTTOrHxmJB@T#hIR-R&U+9MFaqQ0qpMX?*4-B`zHbL@;}{b?-f>- z<>jBto&gq?Kl8N!Qc8Jyd;6Ei$H%F#>|if|kNuyiT>|jJ1SV|1Ir@s*Hh^sa+W=l| a`_BM~1pq};&C1090000 body.bp p code { *white-space: normal; } -/* line 60, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp .container { text-align: left; } -/* line 62, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp sup { vertical-align: text-top; } -/* line 64, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp sub { vertical-align: text-bottom; } -/* line 66, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp hr { margin: -8px auto 11px; } -/* line 68, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp img { -ms-interpolation-mode: bicubic; } -/* line 70, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp fieldset { padding-top: 0; } -/* line 72, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp legend { margin-top: -0.2em; margin-bottom: 1em; margin-left: -0.5em; } -/* line 76, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp fieldset, body.bp #IE8#HACK { padding-top: 1.4em; } -/* line 77, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp legend, body.bp #IE8#HACK { margin-top: 0; margin-bottom: 0; } -/* line 78, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp textarea { overflow: auto; } -/* line 80, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp label { position: relative; top: -0.25em; } -/* line 84, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.text { margin: 0.5em 0; background-color: white; border: 1px solid #bbbbbb; } -/* line 88, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.text:focus { border: 1px solid #666666; } -/* line 90, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.title { margin: 0.5em 0; background-color: white; border: 1px solid #bbbbbb; } -/* line 94, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.title:focus { border: 1px solid #666666; } -/* line 96, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.checkbox { position: relative; top: 0.25em; } -/* line 99, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.radio { position: relative; top: 0.25em; } -/* line 102, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp input.button { position: relative; top: 0.25em; } -/* line 105, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp textarea { margin: 0.5em 0; } -/* line 107, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp select { margin: 0.5em 0; } -/* line 109, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_ie.scss */ body.bp button { position: relative; top: 0.25em; diff --git a/static/gaute/stylesheets/print.css b/static/gaute/stylesheets/print.css index bc2d385..7ff228d 100644 --- a/static/gaute/stylesheets/print.css +++ b/static/gaute/stylesheets/print.css @@ -1,4 +1,3 @@ -/* line 4, ../sass/print.scss */ body.bp { line-height: 1.5; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; @@ -6,11 +5,9 @@ body.bp { background: none; font-size: 10pt; } -/* line 45, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp .container { background: none; } -/* line 47, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp hr { background: #cccccc; color: #cccccc; @@ -20,54 +17,43 @@ body.bp hr { padding: 0; border: none; } -/* line 55, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp hr.space { background: white; color: white; } -/* line 58, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp h1, body.bp h2, body.bp h3, body.bp h4, body.bp h5, body.bp h6 { font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; } -/* line 60, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp code { font-size: 0.9em; font-family: "andale mono", "lucida console", monospace; } -/* line 65, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp a img { border: none; } -/* line 68, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp a:link, body.bp a:visited { background: transparent; font-weight: 700; text-decoration: underline; } -/* line 72, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp p img.top { margin-top: 0; } -/* line 74, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp blockquote { margin: 1.5em; padding: 1em; font-style: italic; font-size: 0.9em; } -/* line 79, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp .small { font-size: 0.9em; } -/* line 81, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp .large { font-size: 1.1em; } -/* line 83, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp .quiet { color: #999999; } -/* line 85, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ body.bp .hide { display: none; } diff --git a/static/gaute/stylesheets/screen.css b/static/gaute/stylesheets/screen.css index 89110fc..bdba543 100644 --- a/static/gaute/stylesheets/screen.css +++ b/static/gaute/stylesheets/screen.css @@ -1,11 +1,9 @@ -/* line 4, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ html { margin: 0; padding: 0; border: 0; } -/* line 18, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ .bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, blockquote, q, th, td, caption, table, div, span, object, iframe, p, pre, a, abbr, acronym, address, @@ -23,21 +21,17 @@ caption, tbody, tfoot, thead, tr { vertical-align: baseline; } -/* line 20, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } -/* line 21, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ blockquote, q { quotes: "" ""; } -/* line 67, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ blockquote:before, blockquote:after, q:before, q:after { content: ""; } -/* line 22, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ th, td, caption { float: none !important; text-align: left; @@ -45,261 +39,207 @@ th, td, caption { vertical-align: middle; } -/* line 23, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ table { border-collapse: separate; border-spacing: 0; vertical-align: middle; } -/* line 24, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss */ a img { border: none; } -/* line 9, ../sass/partials/_page.scss */ body.bp { line-height: 1.5; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; color: #333333; font-size: 75%; } -/* line 51, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h1, body.bp h2, body.bp h3, body.bp h4, body.bp h5, body.bp h6 { font-weight: normal; color: #222222; } -/* line 52, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h1 img, body.bp h2 img, body.bp h3 img, body.bp h4 img, body.bp h5 img, body.bp h6 img { margin: 0; } -/* line 53, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h1 { font-size: 3em; line-height: 1; margin-bottom: 0.50em; } -/* line 54, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h2 { font-size: 2em; margin-bottom: 0.75em; } -/* line 55, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1.00em; } -/* line 56, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; } -/* line 57, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.50em; } -/* line 58, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp h6 { font-size: 1em; font-weight: bold; } -/* line 59, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp p { margin: 0 0 1.5em; } -/* line 60, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp p .left { display: inline; float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } -/* line 61, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp p .right { display: inline; float: right; margin: 1.5em 0 1.5em 1.5em; padding: 0; } -/* line 62, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp a { text-decoration: underline; color: #0066cc; } -/* line 18, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */ body.bp a:visited { color: #004c99; } -/* line 21, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */ body.bp a:focus { color: #0099ff; } -/* line 24, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */ body.bp a:hover { color: #0099ff; } -/* line 27, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/compass/stylesheets/compass/typography/links/_link-colors.scss */ body.bp a:active { color: #bf00ff; } -/* line 63, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp blockquote { margin: 1.5em; color: #666666; font-style: italic; } -/* line 64, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp strong, body.bp dfn { font-weight: bold; } -/* line 65, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp em, body.bp dfn { font-style: italic; } -/* line 66, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp sup, body.bp sub { line-height: 0; } -/* line 67, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp abbr, body.bp acronym { border-bottom: 1px dotted #666666; } -/* line 68, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp address { margin: 0 0 1.5em; font-style: italic; } -/* line 69, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp del { color: #666666; } -/* line 70, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp pre { margin: 1.5em 0; white-space: pre; } -/* line 71, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp pre, body.bp code, body.bp tt { font: 1em "andale mono", "lucida console", monospace; line-height: 1.5; } -/* line 72, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp li ul, body.bp li ol { margin: 0; } -/* line 73, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp ul, body.bp ol { margin: 0 1.5em 1.5em 0; padding-left: 1.5em; } -/* line 74, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp ul { list-style-type: disc; } -/* line 75, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp ol { list-style-type: decimal; } -/* line 76, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp dl { margin: 0 0 1.5em 0; } -/* line 77, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp dl dt { font-weight: bold; } -/* line 78, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp dd { margin-left: 1.5em; } -/* line 79, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp table { margin-bottom: 1.4em; width: 100%; } -/* line 80, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp th { font-weight: bold; } -/* line 81, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp thead th { background: #c3d9ff; } -/* line 82, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp th, body.bp td, body.bp caption { padding: 4px 10px 4px 5px; } -/* line 85, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp table.striped tr:nth-child(even) td, body.bp table tr.even td { background: #e5ecf9; } -/* line 86, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp tfoot { font-style: italic; } -/* line 87, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp caption { background: #eeeeee; } -/* line 88, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp .quiet { color: #666666; } -/* line 89, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_typography.scss */ body.bp .loud { color: #111111; } -/* line 9, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .clear { clear: both; } -/* line 12, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .nowrap { white-space: nowrap; } -/* line 16, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .clearfix { overflow: hidden; *zoom: 1; } -/* line 18, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .small { font-size: 0.8em; margin-bottom: 1.875em; line-height: 1.875em; } -/* line 22, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .large { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; } -/* line 26, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .first { margin-left: 0; padding-left: 0; } -/* line 29, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .last { margin-right: 0; padding-right: 0; } -/* line 32, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .top { margin-top: 0; padding-top: 0; } -/* line 35, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_utilities.scss */ body.bp .bottom { margin-bottom: 0; padding-bottom: 0; } -/* line 25, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_debug.scss */ body.bp .showgrid { background-image: -webkit-gradient(linear, 50% 100%, 50% 0%, color-stop(5%, rgba(0, 0, 0, 0.5)), color-stop(5%, rgba(0, 0, 0, 0))), -webkit-gradient(linear, 0% 50%, 960 50%, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(0%, rgba(100, 100, 225, 0.25)), color-stop(3.125%, rgba(100, 100, 225, 0.25)), color-stop(3.125%, rgba(0, 0, 0, 0)), color-stop(4.167%, rgba(0, 0, 0, 0)), color-stop(4.167%, rgba(100, 100, 225, 0.25)), color-stop(7.292%, rgba(100, 100, 225, 0.25)), color-stop(7.292%, rgba(0, 0, 0, 0)), color-stop(8.333%, rgba(0, 0, 0, 0)), color-stop(8.333%, rgba(100, 100, 225, 0.25)), color-stop(11.458%, rgba(100, 100, 225, 0.25)), color-stop(11.458%, rgba(0, 0, 0, 0)), color-stop(12.5%, rgba(0, 0, 0, 0)), color-stop(12.5%, rgba(100, 100, 225, 0.25)), color-stop(15.625%, rgba(100, 100, 225, 0.25)), color-stop(15.625%, rgba(0, 0, 0, 0)), color-stop(16.667%, rgba(0, 0, 0, 0)), color-stop(16.667%, rgba(100, 100, 225, 0.25)), color-stop(19.792%, rgba(100, 100, 225, 0.25)), color-stop(19.792%, rgba(0, 0, 0, 0)), color-stop(20.833%, rgba(0, 0, 0, 0)), color-stop(20.833%, rgba(100, 100, 225, 0.25)), color-stop(23.958%, rgba(100, 100, 225, 0.25)), color-stop(23.958%, rgba(0, 0, 0, 0)), color-stop(25%, rgba(0, 0, 0, 0)), color-stop(25%, rgba(100, 100, 225, 0.25)), color-stop(28.125%, rgba(100, 100, 225, 0.25)), color-stop(28.125%, rgba(0, 0, 0, 0)), color-stop(29.167%, rgba(0, 0, 0, 0)), color-stop(29.167%, rgba(100, 100, 225, 0.25)), color-stop(32.292%, rgba(100, 100, 225, 0.25)), color-stop(32.292%, rgba(0, 0, 0, 0)), color-stop(33.333%, rgba(0, 0, 0, 0)), color-stop(33.333%, rgba(100, 100, 225, 0.25)), color-stop(36.458%, rgba(100, 100, 225, 0.25)), color-stop(36.458%, rgba(0, 0, 0, 0)), color-stop(37.5%, rgba(0, 0, 0, 0)), color-stop(37.5%, rgba(100, 100, 225, 0.25)), color-stop(40.625%, rgba(100, 100, 225, 0.25)), color-stop(40.625%, rgba(0, 0, 0, 0)), color-stop(41.667%, rgba(0, 0, 0, 0)), color-stop(41.667%, rgba(100, 100, 225, 0.25)), color-stop(44.792%, rgba(100, 100, 225, 0.25)), color-stop(44.792%, rgba(0, 0, 0, 0)), color-stop(45.833%, rgba(0, 0, 0, 0)), color-stop(45.833%, rgba(100, 100, 225, 0.25)), color-stop(48.958%, rgba(100, 100, 225, 0.25)), color-stop(48.958%, rgba(0, 0, 0, 0)), color-stop(50%, rgba(0, 0, 0, 0)), color-stop(50%, rgba(100, 100, 225, 0.25)), color-stop(53.125%, rgba(100, 100, 225, 0.25)), color-stop(53.125%, rgba(0, 0, 0, 0)), color-stop(54.167%, rgba(0, 0, 0, 0)), color-stop(54.167%, rgba(100, 100, 225, 0.25)), color-stop(57.292%, rgba(100, 100, 225, 0.25)), color-stop(57.292%, rgba(0, 0, 0, 0)), color-stop(58.333%, rgba(0, 0, 0, 0)), color-stop(58.333%, rgba(100, 100, 225, 0.25)), color-stop(61.458%, rgba(100, 100, 225, 0.25)), color-stop(61.458%, rgba(0, 0, 0, 0)), color-stop(62.5%, rgba(0, 0, 0, 0)), color-stop(62.5%, rgba(100, 100, 225, 0.25)), color-stop(65.625%, rgba(100, 100, 225, 0.25)), color-stop(65.625%, rgba(0, 0, 0, 0)), color-stop(66.667%, rgba(0, 0, 0, 0)), color-stop(66.667%, rgba(100, 100, 225, 0.25)), color-stop(69.792%, rgba(100, 100, 225, 0.25)), color-stop(69.792%, rgba(0, 0, 0, 0)), color-stop(70.833%, rgba(0, 0, 0, 0)), color-stop(70.833%, rgba(100, 100, 225, 0.25)), color-stop(73.958%, rgba(100, 100, 225, 0.25)), color-stop(73.958%, rgba(0, 0, 0, 0)), color-stop(75%, rgba(0, 0, 0, 0)), color-stop(75%, rgba(100, 100, 225, 0.25)), color-stop(78.125%, rgba(100, 100, 225, 0.25)), color-stop(78.125%, rgba(0, 0, 0, 0)), color-stop(79.167%, rgba(0, 0, 0, 0)), color-stop(79.167%, rgba(100, 100, 225, 0.25)), color-stop(82.292%, rgba(100, 100, 225, 0.25)), color-stop(82.292%, rgba(0, 0, 0, 0)), color-stop(83.333%, rgba(0, 0, 0, 0)), color-stop(83.333%, rgba(100, 100, 225, 0.25)), color-stop(86.458%, rgba(100, 100, 225, 0.25)), color-stop(86.458%, rgba(0, 0, 0, 0)), color-stop(87.5%, rgba(0, 0, 0, 0)), color-stop(87.5%, rgba(100, 100, 225, 0.25)), color-stop(90.625%, rgba(100, 100, 225, 0.25)), color-stop(90.625%, rgba(0, 0, 0, 0)), color-stop(91.667%, rgba(0, 0, 0, 0)), color-stop(91.667%, rgba(100, 100, 225, 0.25)), color-stop(94.792%, rgba(100, 100, 225, 0.25)), color-stop(94.792%, rgba(0, 0, 0, 0)), color-stop(95.833%, rgba(0, 0, 0, 0)), color-stop(95.833%, rgba(100, 100, 225, 0.25)), color-stop(98.958%, rgba(100, 100, 225, 0.25)), color-stop(98.958%, rgba(0, 0, 0, 0)), color-stop(100%, rgba(0, 0, 0, 0))); background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -webkit-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); @@ -313,89 +253,72 @@ body.bp .showgrid { background-size: 100% 18px, auto; background-position: left top; } -/* line 4, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .feedback, body.bp .error, body.bp .alert, body.bp .notice, body.bp .success, body.bp .info { padding: 0.8em; margin-bottom: 1em; border: 2px solid #dddddd; } -/* line 5, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .error, body.bp .alert { background: #fbe3e4; color: #8a1f11; border-color: #fbc2c4; } -/* line 27, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .error a, body.bp .alert a { color: #8a1f11; } -/* line 7, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .notice { background: #fff6bf; color: #514721; border-color: #ffd324; } -/* line 36, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .notice a { color: #514721; } -/* line 8, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .success { background: #e6efc2; color: #264409; border-color: #c6d880; } -/* line 45, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .success a { color: #264409; } -/* line 9, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .info { background: #d5edf8; color: #205791; border-color: #92cae4; } -/* line 54, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .info a { color: #205791; } -/* line 10, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .hide { display: none; } -/* line 11, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .highlight { background: yellow; } -/* line 12, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .added { background: #006600; color: white; } -/* line 13, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_interaction.scss */ body.bp .removed { background: #990000; color: white; } -/* line 39, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss */ body.bp .box { padding: 1.5em; margin-bottom: 1.5em; background: #e5ecf9; } -/* line 42, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss */ body.bp .border { padding-right: 4px; margin-right: 5px; border-right: 1px solid #dddddd; } -/* line 45, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss */ body.bp .colborder { padding-right: 24px; margin-right: 25px; border-right: 1px solid #dddddd; } -/* line 47, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss */ body.bp hr { background: #dddddd; color: #dddddd; @@ -406,7 +329,6 @@ body.bp hr { margin: 0 0 1.45em; border: none; } -/* line 49, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss */ body.bp hr.space { background: #dddddd; color: #dddddd; @@ -420,116 +342,192 @@ body.bp hr.space { color: white; visibility: hidden; } -/* line 51, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_scaffolding.scss */ body.bp form.inline { line-height: 3; } -/* line 6, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ body.bp form.inline p { margin-bottom: 0; } -/* line 18, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp label { font-weight: bold; } -/* line 19, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp fieldset { padding: 1.4em; margin: 0 0 1.5em 0; } -/* line 20, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp legend { font-weight: bold; font-size: 1.2em; } -/* line 26, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp input.text, form.bp input.title, form.bp input[type=email], form.bp input[type=text], form.bp input[type=password] { margin: 0.5em 0; background-color: white; padding: 5px; } -/* line 27, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp input.title { font-size: 1.5em; } -/* line 29, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp textarea { margin: 0.5em 0; padding: 5px; } -/* line 30, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp select { margin: 0.5em 0; } -/* line 55, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp fieldset { border: 1px solid #cccccc; } -/* line 58, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp input.text, form.bp input.title, form.bp input[type=email], form.bp input[type=text], form.bp input[type=password], form.bp textarea { background-color: #fff; border: 1px solid #bbbbbb; } -/* line 61, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp input.text:focus, form.bp input.title:focus, form.bp input[type=email]:focus, form.bp input[type=text]:focus, form.bp input[type=password]:focus, form.bp textarea:focus { border-color: #666666; } -/* line 65, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp select { background-color: #fff; border-width: 1px; border-style: solid; } -/* line 44, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp input.text, form.bp input.title, form.bp input[type=email], form.bp input[type=text], form.bp input[type=password] { width: 300px; } -/* line 46, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_form.scss */ form.bp textarea { width: 390px; height: 250px; } -/* line 25, ../sass/partials/_two_col.scss */ body.two-col #container { width: 950px; margin: 0 auto; overflow: hidden; *zoom: 1; } -/* line 27, ../sass/partials/_two_col.scss */ body.two-col #header, body.two-col #footer { display: inline; float: left; margin-right: 10px; width: 950px; } -/* line 147, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_grid.scss */ * html body.two-col #header, * html body.two-col #footer { overflow-x: hidden; } -/* line 29, ../sass/partials/_two_col.scss */ body.two-col #sidebar { display: inline; float: left; margin-right: 10px; width: 310px; } -/* line 147, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_grid.scss */ * html body.two-col #sidebar { overflow-x: hidden; } -/* line 33, ../sass/partials/_two_col.scss */ body.two-col #content { display: inline; float: left; margin-right: 0; width: 630px; } -/* line 147, ../../../../../../../var/lib/gems/1.9.1/gems/compass-0.11.6/frameworks/blueprint/stylesheets/blueprint/_grid.scss */ * html body.two-col #content { overflow-x: hidden; } + +body { + background-color: #eeeeee; +} +body #header nav { + margin: 2em; +} +body #header nav ul { + margin: 0; + padding: 0; + border: 0; + overflow: hidden; + *zoom: 1; +} +body #header nav ul li { + list-style-image: none; + list-style-type: none; + margin-left: 0px; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: middle; + *vertical-align: auto; + white-space: nowrap; +} +body #header nav ul li { + *display: inline; +} +body #register #customer ul { + margin: 0; + padding: 0; + border: 0; + overflow: hidden; + *zoom: 1; +} +body #register #customer ul li { + list-style-image: none; + list-style-type: none; + margin-left: 0px; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: middle; + *vertical-align: auto; + white-space: nowrap; +} +body #register #customer ul li { + *display: inline; +} +body #register #customer ul li { + padding: 1em; + text-align: center; + width: 100px; +} +body #register #customer ul li:hover { + background-color: #bbbbbb; +} +body #register #customer ul li.selected { + background-color: #bbbbbb; +} +body #register #products ul { + margin: 0; + padding: 0; + border: 0; + overflow: hidden; + *zoom: 1; +} +body #register #products ul li { + list-style-image: none; + list-style-type: none; + margin-left: 0px; + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: middle; + *vertical-align: auto; + white-space: nowrap; +} +body #register #products ul li { + *display: inline; +} +body #register #products ul li { + padding: 1.5em; + text-align: center; +} +body #register #products ul li:hover { + background-color: #bbbbbb; +} +body input[type=submit] { + padding: 1em; + padding-left: 1.5em; + padding-right: 1.5em; + position: relative; + left: 100px; +} +body section { + margin-bottom: 2em; +} diff --git a/static/js/register.js b/static/js/register.js new file mode 100644 index 0000000..dbbfe01 --- /dev/null +++ b/static/js/register.js @@ -0,0 +1,26 @@ +$(document).ready(function() { + /* Customer selection */ + $("li.customer").click( function() { + /* Enable all buttons */ + $("li.customer").each(function(i) { + $(this).removeClass("selected"); + }); + /* Disable the customer button just clicked */ + $(this).addClass("selected"); + /* Update the form */ + $("input[name=customer]").val($(this).children("span.name").text()); + }); + /* Product amount controls */ + $("li.product").click( function() { + var form_field = $(this).children("input[type=text]"); + var qty = Number(form_field.val()) + 1; + form_field.val(qty); + }); + /* Also reset the hidden customer fields */ + $("input[type=reset]").click( function() { + $("input[name=customer]").val(""); + }); + + /* TODO: keyboard shortcuts */ + +}); diff --git a/templates/base.html b/templates/base.html index 83c7a10..48d3496 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,13 +1,15 @@ - {%block title%}Userinfo{%endblock%} + {%block title%}BBS{%endblock%} + + {%block headinc %} {%endblock%} diff --git a/templates/register.html b/templates/register.html index d67e15b..09f4650 100644 --- a/templates/register.html +++ b/templates/register.html @@ -1,29 +1,51 @@ {% extends "base.html" %} -{%block header%} +{% block header %}

Biceps Bar System

-{%endblock%} + +{% endblock %} -{%block content%} -