Skip to content

Commit

Permalink
Exorcise tw2.
Browse files Browse the repository at this point in the history
This includes the work to get rid of moksha.wsgi from #384, but additionally gets rid of tw2.
  • Loading branch information
ralphbean committed Apr 5, 2018
1 parent 32dc707 commit 84c1373
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 14 deletions.
1 change: 0 additions & 1 deletion apache/tahrir.ini
Expand Up @@ -5,7 +5,6 @@ port = 80

[pipeline:main]
pipeline =
egg:tw2.core#middleware
pyramid

[app:pyramid]
Expand Down
4 changes: 0 additions & 4 deletions development.ini.example
Expand Up @@ -5,12 +5,8 @@ port = 8000

[pipeline:main]
pipeline =
tw2
pyramid

[filter:tw2]
use = egg:tw2.core#middleware

[app:pyramid]

use = egg:tahrir
Expand Down
4 changes: 0 additions & 4 deletions production.ini
Expand Up @@ -5,12 +5,8 @@ port = 80

[pipeline:main]
pipeline =
tw2
pyramid

[filter:tw2]
use = egg:tw2.core#middleware

[app:pyramid]

use = egg:tahrir
Expand Down
5 changes: 0 additions & 5 deletions tahrir/events.py
Expand Up @@ -10,8 +10,6 @@

from pyramid.settings import asbool

import tw2.jquery

import tahrir.views

from pkg_resources import get_distribution
Expand Down Expand Up @@ -52,6 +50,3 @@ def inject_globals(event):
event['gplus'] = asbool(settings.get('tahrir.social.gplus'))

event['auth_principals'] = effective_principals(request)

# Cause jquery.js to be injected into the page.
tw2.jquery.jquery_js.display()
2 changes: 2 additions & 0 deletions tahrir/static/js/jquery-3.3.1.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tahrir/templates/master.mak
Expand Up @@ -15,6 +15,7 @@ import json
<link rel="stylesheet" media="mobile" href="${request.static_url('%s:static/css/unsemantic-grid-mobile.css' % theme_name)}" />
<link rel="stylesheet" media="screen" href="${request.static_url('%s:static/css/unsemantic-grid-responsive.css' % theme_name)}" />
<link rel="shortcut icon" href="${request.static_url('%s:static/img/favicon.ico' % theme_name)}" />
<script src="${request.static_url('%s:static/js/jquery-3.1.1.min.js' % theme_name)}"></script>
<script src="${request.static_url('%s:static/js/social.js' % theme_name)}"></script>
<script src="${request.static_url('%s:static/js/favico-0.3.4.min.js' % theme_name)}"></script>
<script>
Expand Down

0 comments on commit 84c1373

Please sign in to comment.