From e10466d808e9c5389d60f0c43a318ef4ac4b50c7 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Thu, 11 Nov 2010 07:17:00 +0200
Subject: [PATCH] Commit last changes.

---
 scribeengine/controllers/media.py       | 2 ++
 scribeengine/templates/media/index.mako | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scribeengine/controllers/media.py b/scribeengine/controllers/media.py
index 134d373..ae50db1 100644
--- a/scribeengine/controllers/media.py
+++ b/scribeengine/controllers/media.py
@@ -42,6 +42,7 @@ class MediaController(BaseController):
 
     def __before__(self):
         BaseController.__before__(self)
+        self._add_javascript(u'tinymce/tiny_mce_popup.js')
         self._add_javascript(u'ScribeEngine.Media.js')
 
     def _get_directories(self, parent=None, tree=[]):
@@ -70,6 +71,7 @@ class MediaController(BaseController):
             break
 
     def index(self):
+        log.debug(request.params)
         self._add_javascript(u'jstree/jquery.jstree.js')
         directories = []
         path = os.path.join(config[u'paths.media'], u'user%s' % c.current_user.id)
diff --git a/scribeengine/templates/media/index.mako b/scribeengine/templates/media/index.mako
index a0beb7f..43a9cda 100644
--- a/scribeengine/templates/media/index.mako
+++ b/scribeengine/templates/media/index.mako
@@ -14,6 +14,7 @@
     body { margin: 0; padding: 0; font-family: Arial, sans-serif; }
     img { border: 0; }
     input[type=button] { background: #f0f0f0 url(/images/media-button.png) top left repeat-x; border: 1px solid #ccc; color: #000; height: 24px; }
+    span.separator { border-left: 1px solid #ccc; height: 24px; margin: 0 5px; overflow: hidden; width: 1px; }
     #directory-tree { border-right: 1px solid #999; border-bottom: 1px solid #999; height: 370px; float: left; padding-right: 4px; width: 195px; }
     #file-list { border-bottom: 1px solid #999; height: 370px; padding-left: 4px; float: left; width: 396px; }
     #button-bar { clear: both; height: 30px; line-height: 30px; }
@@ -42,8 +43,9 @@
         </ul>
     </div>
     <div id="button-bar">
-        <input type="button" id="new-directory" value="New Directory"/>
         <input type="button" id="file-select" value="Select"/>
+        <span class="separator"></span>
+        <input type="button" id="new-directory" value="New Directory"/>
     </div>
     <script type="text/javascript">
     ScribeEngine.Widgets.tree("#directory-tree", ${c.directories | n}, ScribeEngine.Media.getFiles);