From 27e1f96bba499132675df3e5ad17326d751144cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 12 Aug 2014 11:46:58 +0200 Subject: [PATCH 1/1] adding editor as a submodule --- .gitmodules | 3 +++ apps/build/management/commands/build.py | 4 ++-- apps/wiki/static/wiki/editor | 1 + apps/wiki/templates/wiki/bootstrap.html | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 160000 apps/wiki/static/wiki/editor diff --git a/.gitmodules b/.gitmodules index 004f6f37..ab1e93c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lib/librarian"] path = lib/librarian url = git://git.nowoczesnapolska.org.pl/librarian.git +[submodule "apps/wiki/static/wiki/editor"] + path = apps/wiki/static/wiki/editor + url = git://git.nowoczesnapolska.org.pl/fnpeditor.git diff --git a/apps/build/management/commands/build.py b/apps/build/management/commands/build.py index 416893d4..8fca3208 100644 --- a/apps/build/management/commands/build.py +++ b/apps/build/management/commands/build.py @@ -25,7 +25,7 @@ class Command(BaseCommand): def handle(self, **options): wiki_base_dir = os.path.join(os.getcwd(), 'apps', 'wiki', 'static', 'wiki') - rng_base_dir = os.path.join(wiki_base_dir, 'rng') + rng_base_dir = os.path.join(wiki_base_dir, 'editor') build_dir = os.path.join(wiki_base_dir, 'build') self.stdout.write('Installing editor dependencies') @@ -40,4 +40,4 @@ class Command(BaseCommand): os.environ['PATH'] = '%s:%s' % (options['node_bin_path'], os.environ['PATH']) call(['./node_modules/.bin/grunt', 'build', '--output-dir=%s' % build_dir], cwd = rng_base_dir) - call_command('collectstatic', interactive = False, ignore_patterns = ['rng']) + call_command('collectstatic', interactive = False, ignore_patterns = ['editor']) diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor new file mode 160000 index 00000000..b7d1baeb --- /dev/null +++ b/apps/wiki/static/wiki/editor @@ -0,0 +1 @@ +Subproject commit b7d1baeb57e59c30907d272eea8053ab74a8cfbd diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html index 159a4f4e..5ed9a39c 100644 --- a/apps/wiki/templates/wiki/bootstrap.html +++ b/apps/wiki/templates/wiki/bootstrap.html @@ -9,10 +9,10 @@ {% if DEBUG %} - + - - + + {% else %} -- 2.20.1