Skip to content

Commit 069ef7e

Browse files
committedAug 21, 2014
Start using bower
1 parent fe7a78b commit 069ef7e

31 files changed

+47
-29111
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ local_settings.py
77
*.py[co]
88
.sw[opn]
99
doc/_build
10+
components

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "courseflow/static/font-awesome"]
2-
path = courseflow/static/font-awesome
3-
url = https://github.com/FortAwesome/Font-Awesome.git

‎README.rst

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@ CourseFlow currently works with Python 2.7. (This is because `dulwich
2626
<https://www.samba.org/~jelmer/dulwich/>`_, a dependency, does not yet support
2727
Python 3.)
2828

29+
Install `bower <http://bower.io/>`_ and its dependencies, as described on its
30+
web page.
31+
2932
(Optional) Make a virtualenv to install to::
3033

3134
virtualenv --system-site-packages my-courseflow-env
3235
source my-courseflow-env/bin/activate
3336

3437
To install, clone the repository::
3538

36-
git clone --recursive git://github.com/inducer/courseflow
39+
git clone git://github.com/inducer/courseflow
3740

3841
Enter the courseflow directory::
3942

@@ -53,6 +56,10 @@ Initialize the database::
5356
python manage.py migrate
5457
python manage.py createsuperuser --username=$(whoami)
5558

59+
Retrieve static (JS/CSS) dependencies::
60+
61+
python manage.py bower install
62+
5663
Run the server::
5764

5865
python manage.py runserver

‎TODO

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ Ideas
2222

2323
- Custom matcher classes
2424

25-
- Name X question
25+
- Name X out of Y question
2626
- Multi text question
2727
- Multi MC question
28+
- Code question
2829

2930
- Improve access-denied error for time-based rule on flow
30-
- Make MC (multiple-choice) jumble optional
3131

3232
Rejected ideas
3333
==============

‎courseflow/settings.py

+21-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
# Do not change this file. All these settings can be overridden in
1212
# local_settings.py.
1313

14-
from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS
14+
from django.conf.global_settings import (
15+
TEMPLATE_CONTEXT_PROCESSORS, STATICFILES_FINDERS)
1516

1617
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
1718
import os
@@ -42,6 +43,7 @@
4243
"crispy_forms",
4344
"json_field",
4445
"bootstrap3_datetime",
46+
"djangobower",
4547
)
4648

4749
MIDDLEWARE_CLASSES = (
@@ -71,6 +73,24 @@
7173
)
7274
)
7375

76+
77+
# {{{ bower packages
78+
79+
BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, "components")
80+
81+
STATICFILES_FINDERS = STATICFILES_FINDERS + (
82+
"djangobower.finders.BowerFinder",
83+
)
84+
85+
BOWER_INSTALLED_APPS = (
86+
"bootstrap#3.2.0",
87+
"fontawesome",
88+
"video-js",
89+
)
90+
91+
92+
# }}}
93+
7494
ROOT_URLCONF = 'courseflow.urls'
7595

7696
WSGI_APPLICATION = 'courseflow.wsgi.application'

0 commit comments

Comments
 (0)
Please sign in to comment.