Merge pull request #34 from Donvittorio/master

find . -type f -exec sed -i s/James/Haldis/g {} \;
This commit is contained in:
Feliciaan De Palmenaer 2015-04-03 20:30:03 +02:00
commit 7436bd37e6
9 changed files with 13 additions and 13 deletions

View file

@ -1,7 +1,7 @@
James
Haldis
=======
James is your friendly neighbourhood servant. He exists so lazy fucks like you and me don't need to keep tabs of who is ordering what from where.
Haldis is your friendly neighbourhood servant. He exists so lazy fucks like you and me don't need to keep tabs of who is ordering what from where.
Start an order and let people add items with a simple mouse-click!
No more calculating prices and making lists!
Be lazier today!

View file

@ -27,7 +27,7 @@ class LocationAdminModel(ModelBaseView):
form_columns = ('name', 'address', 'website')
admin = Admin(app, name='James', url='/admin', template_mode='bootstrap3')
admin = Admin(app, name='Haldis', url='/admin', template_mode='bootstrap3')
admin.add_view(UserAdminModel(User, db.session))

View file

@ -28,7 +28,7 @@ class PrefixFix(object):
if not app.debug:
app.wsgi_app = PrefixFix(app.wsgi_app, '/james')
app.wsgi_app = PrefixFix(app.wsgi_app, '/haldis')
timedFileHandler = TimedRotatingFileHandler(app.config['LOGFILE'], when='midnight', backupCount=100)
timedFileHandler.setLevel(logging.DEBUG)
logger = logging.getLogger('werkzeug')

View file

@ -1,10 +1,10 @@
# config
class Configuration(object):
SQLALCHEMY_DATABASE_URI = 'sqlite:///james.db'
SQLALCHEMY_DATABASE_URI = 'sqlite:///haldis.db'
DEBUG = True
SECRET_KEY = '<change>'
SLACK_WEBHOOK = '<add url>'
LOGFILE = 'james.log'
LOGFILE = 'haldis.log'
ZEUS_KEY = ''
ZEUS_SECRET = ''

View file

@ -9,4 +9,4 @@ if sys.executable != INTERP:
sys.path.append(os.getcwd())
from james import app as application
from haldis import app as application

View file

@ -3,5 +3,5 @@
{% block container %}
<h1>About</h1>
<p>This is James' about page. Doesn't he look good? Oh stop, you're making him blush.</p>
<p>This is Haldis' about page. Doesn't he look good? Oh stop, you're making him blush.</p>
{% endblock %}

View file

@ -6,7 +6,7 @@
{% block container %}
<div class="row">
<div class="jumbotron">
<h2>Hi, I'm James</h2>
<h2>Hi, I'm Haldis</h2>
<h3>What would you like to eat, sir?</h3>
</div>
</div>

View file

@ -13,7 +13,7 @@
{% set active_page = active_page|default('index') -%}
{% block title %}
James - {{ active_page|capitalize }}
Haldis - {{ active_page|capitalize }}
{% endblock %}
{% block styles %}
@ -37,7 +37,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ url_for('home') }}">JAMES</a>
<a class="navbar-brand" href="{{ url_for('home') }}">HALDIS</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
@ -72,8 +72,8 @@
<hr>
<div class="container">
<div class="pull-right">Made with ❤ by <a href="http://zeus.ugent.be">Zeus WPI</a></div>
<div class="pull-left"><a class="github-button" href="https://github.com/ZeusWPI/james" data-icon="octicon-star" data-style="mega" data-count-href="/ZeusWPI/James/stargazers" data-count-api="/repos/ZeusWPI/James#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star ZeusWPI/James on GitHub">Star</a></div>
<div class="text-center"><a href="http://github.com/ZeusWPI/James">© {{ ""|year }}</a></div>
<div class="pull-left"><a class="github-button" href="https://github.com/ZeusWPI/haldis" data-icon="octicon-star" data-style="mega" data-count-href="/ZeusWPI/Haldis/stargazers" data-count-api="/repos/ZeusWPI/Haldis#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star ZeusWPI/Haldis on GitHub">Star</a></div>
<div class="text-center"><a href="http://github.com/ZeusWPI/Haldis">© {{ ""|year }}</a></div>
</div>
</footer>
{%- endblock %}