Editor update - editor now builds with its own copy of ace.js

[redakcja.git] / apps / wiki / templates / wiki / bootstrap.html

diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index db1acde..9b78cb7 100644 (file)
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -18,7 +18,6 @@
             </script>
         {% endif %}
         <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
             </script>
         {% endif %}
         <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>

-        <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/editor/src/editor/styles/main.less' %}"/>
         
         {% if DEBUG %}
             <link rel="stylesheet/less" type="text/css" href="{% static 'wiki/editor/src/editor/styles/main.less' %}"/>


@@ -54,13 +53,14 @@
                         },
                         'console': {
                             level: 'debug',
                         },
                         'console': {
                             level: 'debug',

-                            handler: 'console'
+                            handler: 'console',
+                            formatter: 'simple'

                         }
                     },
                     loggers: {
                         '': {
                             level: 'debug',
                         }
                     },
                     loggers: {
                         '': {
                             level: 'debug',

-                            handlers: ['sentry', 'console']
+                            handlers: ['console', 'sentry']

                         }
                     }
                 },
                         }
                     }
                 },


@@ -254,15 +254,41 @@
                 documentSummaryView: {
                     title: '{% trans 'Informations about lesson' %}',
                     properties: [
                 documentSummaryView: {
                     title: '{% trans 'Informations about lesson' %}',
                     properties: [

+                        {name: 'version', label: '{% trans 'Version' %}'},

                         {name: 'stage', label: '{% trans 'Stage' %}'},
                         {name: 'stage', label: '{% trans 'Stage' %}'},

-                        {name: 'assignment', label: '{% trans 'Assignment' %}'}
+                        {name: 'assignment', label: '{% trans 'Assignment' %}'},

                     ]
                 },
                     ]
                 },

+
+                plugins: {
+                    core: {templates: {{serialized_templates|safe}}}
+                },
+
+                toolbar: [
+                    ['core.undo', 'core.redo'],
+                    
+                    [
+                    {actionName: 'core.switchToHeader'},
+                    {actionName: 'core.switchToParagraph'},
+                    'core.toggleBulletList', 'core.toggleEnumList'
+                    ],
+
+                    [
+                        {actionName: 'core.emphasis', actionConfig: {label: 'wyróżnienie'}},
+                        {actionName: 'core.cite', actionConfig: {label: 'cytat'}},
+                        {actionName: 'core.link'}
+                    ],
+                    
+                    ['core.template']
+                ],

                 
                 documentSaveUrl: function(id) { return '/editor/text/' + id + '/'; },
                 documentHistoryUrl: function(id) { return '/editor/history/' + id + '/'},
                 documentDiffUrl: function(id) { return '/editor/diff/' + id + '/'; },
                 documentRestoreUrl: function(id) { return '/editor/revert/' + id + '/'},
                 
                 documentSaveUrl: function(id) { return '/editor/text/' + id + '/'; },
                 documentHistoryUrl: function(id) { return '/editor/history/' + id + '/'},
                 documentDiffUrl: function(id) { return '/editor/diff/' + id + '/'; },
                 documentRestoreUrl: function(id) { return '/editor/revert/' + id + '/'},

+                documentAttachmentUrl: function(attachmentName) {
+                    return '{{MEDIA_URL}}{{IMAGE_DIR}}{{slug}}/' + attachmentName;
+                },

 
                 documentSaveForm: {
                     fields: [
 
                 documentSaveForm: {
                     fields: [


@@ -304,13 +330,11 @@
             {% endif %}
 
             {% autoescape off%}
             {% endif %}
 
             {% autoescape off%}

-            var data = {{serialized_document_data}},
-                templates = {{serialized_templates}}
+            var data = {{serialized_document_data}};

             {%endautoescape%}
 
             var editor_init = function(Editor) {            
                 Editor.setBootstrappedData('data', data);
             {%endautoescape%}
 
             var editor_init = function(Editor) {            
                 Editor.setBootstrappedData('data', data);

-                Editor.setBootstrappedData('documentToolbar', templates);

                 Editor.start(config);
             };
         </script>
                 Editor.start(config);
             };
         </script>