Permalink
Browse files

fixed a bug and style

  • Loading branch information...
mdipierro committed Apr 30, 2016
1 parent 8a302ff commit 1010fc51a62ee088a26ad1da41cd29051c38528d
Showing with 5 additions and 6 deletions.
  1. +1 −0 models/db.py
  2. +1 −4 models/messages.py
  3. +2 −1 modules/ballot.py
  4. +1 −1 static/css/stupid.css
View
@@ -16,6 +16,7 @@
DEVELOPMENT = myconf.take('app.development').lower()=='true'
AS_SERVICE = myconf.take('app.as_service').lower()=='true'
DEBUG_MODE = myconf.take('app.debug_mode').lower()=='true'
SCHEME = True if DEVELOPMENT else 'https'
if not request.env.web2py_runtime_gae:
## if NOT running on Google App Engine use SQLite or other DB
View
@@ -77,10 +77,7 @@ def meta_send(*args, **kwargs):
def meta_send2(to,message,reply_to,subject,sender=None):
import smtplib
if sender == myconf.take('smtp.sender'):
mail.settings.server = myconf.take('smtp.server')
mail.settings.login = myconf.take('smtp.login')
fromaddr = sender or mail.settings.sender
fromaddr = mail.settings.sender
msg = "From: %s\r\nTo: %s\r\nSubject: %s\r\nReply-to: %s\r\n\r\n%s" \
% (fromaddr, to, subject, reply_to, message)
try:
View
@@ -10,7 +10,8 @@
have_ast=False
regex_field = re.compile('{{(\w+)(\:\w+)?\!?}}')
regex_email = re.compile('''^((?!\.)(?:[-a-z0-9!\#$%&'*+/=?^_`{|}~]|(?<!\.)\.)+(?<!\.)@(?:localhost|(?:[a-z0-9](?:[-\w]*[a-z0-9])?\.)+[a-z]{2,}))$''', re.IGNORECASE)
regex_email = re.compile('[^\s<>"\',;]+\@[^\s<>"\',;]+',re.IGNORECASE)
def uuid():
return str(uuid4()).replace('-','').upper()
View
@@ -68,7 +68,7 @@ header, main, footer {display:block; with:100%} /* IE fix */
input:not([type]), input:not([type=checkbox]):not([type=radio]):not([type=button]):not([type=submit]), [type=file]:before {outline:none; padding:0.5em 1em; margin:0.5px; border-bottom:1px solid #ddd; width:100%}
textarea {width:100%; border:1px solid #ddd; padding:4px 8px; outline:none; outline:none}
select {-webkit-appearance:none; outline:none; padding:0.5em 1em; border-radius:0; margin:0.5px; border-bottom:1px solid #ddd; width:100%;background-color:transparent}
input, textarea, select, button {font-size:12px}
input, textarea, select, button, .btn {font-size:12px}
input:not([type]):hover, input:not([type=checkbox]):not([type=radio]):not([type=button]):not([type=submit]):hover, select:hover, textarea:hover {background-color:#fbf6d9; transition:background-color 1s ease}
input:invalid, input.error {background:#cc1f00;color:white}

0 comments on commit 1010fc5

Please sign in to comment.