Moved media around, modified the editor template and removed .egg-info

jazzband · Jul 28, 2009 · 0d32def · 0d32def
1 parent d03c2f2
commit 0d32def
Show file tree

Hide file tree

Showing 34 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ pip-log.txt
 media/js/*.r*.js
 media/css/*.r*.css
 *DS_Store
+*.egg-info
diff --git a/categories/media/css/images/title.gif → ...ies/media/categories/css/images/title.gif b/categories/media/css/images/title.gif → ...ies/media/categories/css/images/title.gif
diff --git a/categories/media/css/jquery.alerts.css → ...es/media/categories/css/jquery.alerts.css b/categories/media/css/jquery.alerts.css → ...es/media/categories/css/jquery.alerts.css
diff --git a/categories/media/css/jquery.treeTable.css → ...media/categories/css/jquery.treeTable.css b/categories/media/css/jquery.treeTable.css → ...media/categories/css/jquery.treeTable.css
diff --git a/categories/media/css/layout.css → categories/media/categories/css/layout.css b/categories/media/css/layout.css → categories/media/categories/css/layout.css
diff --git a/categories/media/helper.js → categories/media/categories/helper.js b/categories/media/helper.js → categories/media/categories/helper.js
diff --git a/categories/media/img/arrow_down.gif → ...ories/media/categories/img/arrow_down.gif b/categories/media/img/arrow_down.gif → ...ories/media/categories/img/arrow_down.gif
diff --git a/categories/media/img/arrow_right.gif → ...ries/media/categories/img/arrow_right.gif b/categories/media/img/arrow_right.gif → ...ries/media/categories/img/arrow_right.gif
diff --git a/categories/media/img/circle.gif → categories/media/categories/img/circle.gif b/categories/media/img/circle.gif → categories/media/categories/img/circle.gif
diff --git a/categories/media/img/cut.png → categories/media/categories/img/cut.png b/categories/media/img/cut.png → categories/media/categories/img/cut.png
diff --git a/categories/media/img/default-bg.gif → ...ories/media/categories/img/default-bg.gif b/categories/media/img/default-bg.gif → ...ories/media/categories/img/default-bg.gif
diff --git a/categories/media/img/door.png → categories/media/categories/img/door.png b/categories/media/img/door.png → categories/media/categories/img/door.png
diff --git a/categories/media/img/help.gif → categories/media/categories/img/help.gif b/categories/media/img/help.gif → categories/media/categories/img/help.gif
diff --git a/categories/media/img/icon_deletelink.gif → .../media/categories/img/icon_deletelink.gif b/categories/media/img/icon_deletelink.gif → .../media/categories/img/icon_deletelink.gif
diff --git a/categories/media/img/icon_move.gif → ...gories/media/categories/img/icon_move.gif b/categories/media/img/icon_move.gif → ...gories/media/categories/img/icon_move.gif
diff --git a/categories/media/img/important.gif → ...gories/media/categories/img/important.gif b/categories/media/img/important.gif → ...gories/media/categories/img/important.gif
diff --git a/categories/media/img/info.gif → categories/media/categories/img/info.gif b/categories/media/img/info.gif → categories/media/categories/img/info.gif
diff --git a/categories/media/img/nav-bg.gif → categories/media/categories/img/nav-bg.gif b/categories/media/img/nav-bg.gif → categories/media/categories/img/nav-bg.gif
diff --git a/categories/media/img/page_white_copy.png → .../media/categories/img/page_white_copy.png b/categories/media/img/page_white_copy.png → .../media/categories/img/page_white_copy.png
diff --git a/categories/media/img/page_white_delete.png → ...edia/categories/img/page_white_delete.png b/categories/media/img/page_white_delete.png → ...edia/categories/img/page_white_delete.png
diff --git a/categories/media/img/page_white_edit.png → .../media/categories/img/page_white_edit.png b/categories/media/img/page_white_edit.png → .../media/categories/img/page_white_edit.png
diff --git a/categories/media/img/page_white_paste.png → ...media/categories/img/page_white_paste.png b/categories/media/img/page_white_paste.png → ...media/categories/img/page_white_paste.png
diff --git a/categories/media/img/title.gif → categories/media/categories/img/title.gif b/categories/media/img/title.gif → categories/media/categories/img/title.gif
diff --git a/...gories/media/img/toggle-collapse-dark.png → ...a/categories/img/toggle-collapse-dark.png b/...gories/media/img/toggle-collapse-dark.png → ...a/categories/img/toggle-collapse-dark.png
diff --git a/...ories/media/img/toggle-collapse-light.png → .../categories/img/toggle-collapse-light.png b/...ories/media/img/toggle-collapse-light.png → .../categories/img/toggle-collapse-light.png
diff --git a/categories/media/img/toggle-expand-dark.png → ...dia/categories/img/toggle-expand-dark.png b/categories/media/img/toggle-expand-dark.png → ...dia/categories/img/toggle-expand-dark.png
diff --git a/categories/media/img/toggle-expand-light.png → ...ia/categories/img/toggle-expand-light.png b/categories/media/img/toggle-expand-light.png → ...ia/categories/img/toggle-expand-light.png
diff --git a/categories/media/jquery.alerts.css → ...gories/media/categories/jquery.alerts.css b/categories/media/jquery.alerts.css → ...gories/media/categories/jquery.alerts.css
diff --git a/categories/media/jquery.alerts.js → categories/media/categories/jquery.alerts.js b/categories/media/jquery.alerts.js → categories/media/categories/jquery.alerts.js
diff --git a/categories/media/jquery.json-1.3.js → ...ories/media/categories/jquery.json-1.3.js b/categories/media/jquery.json-1.3.js → ...ories/media/categories/jquery.json-1.3.js
diff --git a/categories/media/jquery.livequery.js → ...ries/media/categories/jquery.livequery.js b/categories/media/jquery.livequery.js → ...ries/media/categories/jquery.livequery.js
diff --git a/categories/media/jquery.treeTable.js → ...ries/media/categories/jquery.treeTable.js b/categories/media/jquery.treeTable.js → ...ries/media/categories/jquery.treeTable.js
diff --git a/categories/media/listener.js → categories/media/categories/listener.js b/categories/media/listener.js → categories/media/categories/listener.js
diff --git a/categories/templates/admin/editor/editor.html b/categories/templates/admin/editor/editor.html
@@ -9,20 +9,20 @@
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
 
-<script type="text/javascript" src="{{ FEINCMS_ADMIN_MEDIA }}jquery.livequery.js"></script>
-<script type="text/javascript" src="{{ FEINCMS_ADMIN_MEDIA }}jquery.alerts.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}jquery.livequery.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}jquery.alerts.js"></script>
 
-<script type="text/javascript" src="{{ FEINCMS_ADMIN_MEDIA }}helper.js"></script>
-<script type="text/javascript" src="{{ FEINCMS_ADMIN_MEDIA }}listener.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}helper.js"></script>
+<script type="text/javascript" src="{{ MEDIA_URL }}listener.js"></script>
 
 <script type="text/javascript">
     var contentblock_init_handlers = [];
 </script>
 
-{% for inc in object.feincms_item_editor_includes.head %}{% include inc %}{% endfor %}
+{% for inc in object.item_editor_includes.head %}{% include inc %}{% endfor %}
 
 <script type="text/javascript">
-    {% include "admin/feincms/_messages.html" %}
+    {% include "admin/editor/_messages.html" %}
 
     function init_contentblocks() {
         for(var k in contentblock_init_handlers)