raoul/old-scribeengine
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Projects 1 Releases Wiki Activity

Commit last changes.

Browse Source
This commit is contained in:
Raoul Snyman 2010-11-11 07:17:00 +02:00
parent 5268a19a48
commit e10466d808
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scribeengine/controllers/media.py
View File

@ -42,6 +42,7 @@ class MediaController(BaseController):
def __before__(self): def __before__(self):
BaseController.__before__(self) BaseController.__before__(self)
self._add_javascript(u'tinymce/tiny_mce_popup.js')
self._add_javascript(u'ScribeEngine.Media.js') self._add_javascript(u'ScribeEngine.Media.js')
def _get_directories(self, parent=None, tree=[]): def _get_directories(self, parent=None, tree=[]):
@ -70,6 +71,7 @@ class MediaController(BaseController):
break break
def index(self): def index(self):
log.debug(request.params)
self._add_javascript(u'jstree/jquery.jstree.js') self._add_javascript(u'jstree/jquery.jstree.js')
directories = [] directories = []
path = os.path.join(config[u'paths.media'], u'user%s' % c.current_user.id) path = os.path.join(config[u'paths.media'], u'user%s' % c.current_user.id)

4
scribeengine/templates/media/index.mako
View File

@ -14,6 +14,7 @@
body { margin: 0; padding: 0; font-family: Arial, sans-serif; } body { margin: 0; padding: 0; font-family: Arial, sans-serif; }
img { border: 0; } 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; } 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; } #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; } #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; } #button-bar { clear: both; height: 30px; line-height: 30px; }
@ -42,8 +43,9 @@
</ul> </ul>
</div> </div>
<div id="button-bar"> <div id="button-bar">
<input type="button" id="new-directory" value="New Directory"/>
<input type="button" id="file-select" value="Select"/> <input type="button" id="file-select" value="Select"/>
<span class="separator"></span>
<input type="button" id="new-directory" value="New Directory"/>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
ScribeEngine.Widgets.tree("#directory-tree", ${c.directories | n}, ScribeEngine.Media.getFiles); ScribeEngine.Widgets.tree("#directory-tree", ${c.directories | n}, ScribeEngine.Media.getFiles);