adding editor as a submodule

diff --git a/.gitmodules b/.gitmodules
index 004f6f3..ab1e93c 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/librarian"]
        path = lib/librarian
        url = git://git.nowoczesnapolska.org.pl/librarian.git
 [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 416893d..8fca320 100644 (file)
--- 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')
 
     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')
         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)
 
             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 (submodule)
index 0000000..b7d1bae
--- /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 159a4f4..5ed9a39 100644 (file)
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -9,10 +9,10 @@
         <script src="http://cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js" type="text/javascript" charset="utf-8"></script>
         
         {% if DEBUG %}
         <script src="http://cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js" type="text/javascript" charset="utf-8"></script>
         
         {% if DEBUG %}

-            <link rel="stylesheet/less" type="text/css" href="{% static 'wiki/rng/src/editor/styles/main.less' %}"/>
+            <link rel="stylesheet/less" type="text/css" href="{% static 'wiki/editor/src/editor/styles/main.less' %}"/>

             <script type="text/javascript">less = {relativeUrls: true};</script>
             <script type="text/javascript">less = {relativeUrls: true};</script>

-            <script src="{% static 'wiki/rng/libs/less-1.3.3.min.js' %}"></script>
-            <script src="{% static 'wiki/rng/libs/require.js' %}" data-main="{% static 'wiki/rng/src/editor/entrypoint.js' %}" ></script>
+            <script src="{% static 'wiki/editor/libs/less-1.3.3.min.js' %}"></script>
+            <script src="{% static 'wiki/editor/libs/require.js' %}" data-main="{% static 'wiki/editor/src/editor/entrypoint.js' %}" ></script>

         {% else %}
             <link href="{% static 'wiki/build/rng.css' %}" rel="stylesheet">
             <script src="{% static 'wiki/build/rng.js' %}"></script>
         {% else %}
             <link href="{% static 'wiki/build/rng.css' %}" rel="stylesheet">
             <script src="{% static 'wiki/build/rng.js' %}"></script>