From 113fbe98b9a0f8c438d3b1f1597b199f075a862f Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Fri, 3 Apr 2015 18:41:44 +0200 Subject: [PATCH 1/3] find . -type f -exec sed -i s/James/Haldis/g {} \; --- README.md | 4 ++-- app/admin.py | 2 +- app/templates/about.html | 2 +- app/templates/home.html | 2 +- app/templates/layout.html | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9b3f709..2455575 100644 --- a/README.md +++ b/README.md @@ -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! diff --git a/app/admin.py b/app/admin.py index 47629ab..9dfb62a 100644 --- a/app/admin.py +++ b/app/admin.py @@ -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)) diff --git a/app/templates/about.html b/app/templates/about.html index 130501f..8e6e333 100644 --- a/app/templates/about.html +++ b/app/templates/about.html @@ -3,5 +3,5 @@ {% block container %}

About

-

This is James' about page. Doesn't he look good? Oh stop, you're making him blush.

+

This is Haldis' about page. Doesn't he look good? Oh stop, you're making him blush.

{% endblock %} diff --git a/app/templates/home.html b/app/templates/home.html index 0f2e9da..315ccea 100644 --- a/app/templates/home.html +++ b/app/templates/home.html @@ -6,7 +6,7 @@ {% block container %}
-

Hi, I'm James

+

Hi, I'm Haldis

What would you like to eat, sir?

diff --git a/app/templates/layout.html b/app/templates/layout.html index 2eaf910..e8eeb6e 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -13,7 +13,7 @@ {% set active_page = active_page|default('index') -%} {% block title %} - James - {{ active_page|capitalize }} + Haldis - {{ active_page|capitalize }} {% endblock %} {% block styles %} @@ -72,8 +72,8 @@
Made with ❤ by Zeus WPI
-
Star
-
© {{ ""|year }}
+
Star
+
© {{ ""|year }}
{%- endblock %} From e3daf80ff6cb300d47b3db1af7fda82d89b34ade Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Fri, 3 Apr 2015 18:51:19 +0200 Subject: [PATCH 2/3] lower case james --- app/app.py | 2 +- app/config.example.py | 4 ++-- app/{james.py => haldis.py} | 0 app/passenger_wsgi.py | 2 +- app/templates/layout.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename app/{james.py => haldis.py} (100%) diff --git a/app/app.py b/app/app.py index 484265a..b62b8bd 100644 --- a/app/app.py +++ b/app/app.py @@ -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') diff --git a/app/config.example.py b/app/config.example.py index faa8067..eaaebfd 100644 --- a/app/config.example.py +++ b/app/config.example.py @@ -1,10 +1,10 @@ # config class Configuration(object): - SQLALCHEMY_DATABASE_URI = 'sqlite:///james.db' + SQLALCHEMY_DATABASE_URI = 'sqlite:///haldis.db' DEBUG = True SECRET_KEY = '' SLACK_WEBHOOK = '' - LOGFILE = 'james.log' + LOGFILE = 'haldis.log' ZEUS_KEY = '' ZEUS_SECRET = '' diff --git a/app/james.py b/app/haldis.py similarity index 100% rename from app/james.py rename to app/haldis.py diff --git a/app/passenger_wsgi.py b/app/passenger_wsgi.py index dce231e..e8520f7 100644 --- a/app/passenger_wsgi.py +++ b/app/passenger_wsgi.py @@ -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 diff --git a/app/templates/layout.html b/app/templates/layout.html index e8eeb6e..3639b97 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -72,7 +72,7 @@
Made with ❤ by Zeus WPI
-
Star
+
Star
© {{ ""|year }}
From 7a82ad13cdeb9f0658c74bd0ec7314bd915a5cec Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Fri, 3 Apr 2015 19:11:07 +0200 Subject: [PATCH 3/3] #stopJAMES2k15 --- app/templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/layout.html b/app/templates/layout.html index 3639b97..c30c12f 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -37,7 +37,7 @@ - JAMES + HALDIS