Skip to content

Commit

Permalink
refactored app name;
Browse files Browse the repository at this point in the history
implemented network visualization;
fixed map coloring;
  • Loading branch information
fccoelho committed Dec 2, 2012
1 parent 58c2f25 commit 81c4140
Show file tree
Hide file tree
Showing 683 changed files with 507 additions and 125 deletions.
6 changes: 3 additions & 3 deletions admin/users.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
import webapp2
from boilerplate import models
from boilerplate import forms
from boilerplate.handlers import BaseHandler
from epigrass import models
from epigrass import forms
from epigrass.handlers import BaseHandler
from google.appengine.datastore.datastore_query import Cursor
from google.appengine.ext import ndb
from google.appengine.api import users
Expand Down
20 changes: 10 additions & 10 deletions app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ handlers:
static_files: static/\1
upload: static/(robots\.txt|humans\.txt|crossdomain\.xml)

- url: /boilerplate/css
- url: /epigrass/css
mime_type: text/css
static_dir: boilerplate/static/css
static_dir: epigrass/static/css

- url: /boilerplate/js
- url: /epigrass/js
mime_type: text/javascript
static_dir: boilerplate/static/js
static_dir: epigrass/static/js

- url: /boilerplate/img/(.*\.(gif|png|jpg))
static_files: boilerplate/static/img/\1
upload: boilerplate/static/img/(.*\.(gif|png|jpg))
- url: /epigrass/img/(.*\.(gif|png|jpg))
static_files: epigrass/static/img/\1
upload: epigrass/static/img/(.*\.(gif|png|jpg))

- url: /css
mime_type: text/css
Expand Down Expand Up @@ -89,10 +89,10 @@ libraries:
error_handlers:
# Only errors with error_code, don't put a default error here
- error_code: over_quota
file: boilerplate/templates/errors/over_quota.html
file: epigrass/templates/errors/over_quota.html

- error_code: dos_api_denial
file: boilerplate/templates/errors/dos_api_denial.html
file: epigrass/templates/errors/dos_api_denial.html

- error_code: timeout
file: boilerplate/templates/errors/timeout.html
file: epigrass/templates/errors/timeout.html
28 changes: 0 additions & 28 deletions boilerplate/templates/sim_view.html

This file was deleted.

2 changes: 1 addition & 1 deletion config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

"""
This configuration file loads environment's specific config settings for the application.
It takes precedence over the config located in the boilerplate package.
It takes precedence over the config located in the epigrass package.
"""

if "SERVER_SOFTWARE" in os.environ:
Expand Down
4 changes: 2 additions & 2 deletions config/localhost.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
'webapp2_extras.sessions' : {'secret_key': '_PUT_KEY_HERE_YOUR_SECRET_KEY_'},

# webapp2 authentication
'webapp2_extras.auth' : {'user_model': 'boilerplate.models.User',
'webapp2_extras.auth' : {'user_model': 'epigrass.models.User',
'cookie_name': 'session_name'},

# jinja2 templates
'webapp2_extras.jinja2' : {'template_path': ['templates','boilerplate/templates', 'admin/templates'],
'webapp2_extras.jinja2' : {'template_path': ['templates','epigrass/templates', 'admin/templates'],
'environment_args': {'extensions': ['jinja2.ext.i18n']}},

# application name
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions boilerplate/config.py → epigrass/config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#coding:utf8
"""
This is the boilerplate default configuration file.
This is the epigrass default configuration file.
Changes and additions to settings should be done in the config module
located in the application root rather than this config.
"""
Expand All @@ -12,11 +12,11 @@
'webapp2_extras.sessions' : {'secret_key': '_PUT_KEY_HERE_YOUR_SECRET_KEY_'},

# webapp2 authentication
'webapp2_extras.auth' : {'user_model': 'boilerplate.models.User',
'webapp2_extras.auth' : {'user_model': 'epigrass.models.User',
'cookie_name': 'session_name'},

# jinja2 templates
'webapp2_extras.jinja2' : {'template_path': ['templates','boilerplate/templates', 'admin/templates'],
'webapp2_extras.jinja2' : {'template_path': ['templates','epigrass/templates', 'admin/templates'],
'environment_args': {'extensions': ['jinja2.ext.i18n']}},

# application name
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 81c4140

Please sign in to comment.