Permalink
Browse files

Release 3.5.2

  • Loading branch information...
1 parent 6a44788 commit 3e57e8e4fff8f75bfdf5ccb6f4cbdeba437e60d5 @eyvoro eyvoro committed Apr 6, 2012
View
30 filebrowser/templates/filebrowser/include/filelisting.html
@@ -2,7 +2,7 @@
{% for file in page.object_list %}
<tr class="{% cycle 'row1' 'row2' %}{% if file.filetype == "Folder" %} fb_folder{% endif %}">
-
+
<!-- FILESELECT FOR FILEBROWSEFIELD -->
{% if query.pop == "1" and results_var.select_total %}
<td class="fb_icon">
@@ -14,7 +14,7 @@
{% endif %}
</td>
{% endif %}
-
+
<!-- FILESELECT FOR RTE/TINYMCE -->
{% if query.pop == "2" and results_var.select_total %}
<td class="fb_icon">
@@ -26,7 +26,7 @@
{% endif %}
</td>
{% endif %}
-
+
<!-- FILESELECT FOR CKEDITOR (FORMER "FCKEDITOR") -->
{% if query.pop == "3" and results_var.select_total %}
<td class="fb_icon">
@@ -38,19 +38,19 @@
{% endif %}
</td>
{% endif %}
-
+
<!-- FILEICON -->
<td>
- <img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_type_{{ file.filetype|lower }}.gif" />
+ <img src="{{ settings_var.URL_FILEBROWSER_STATIC }}img/filebrowser_type_{{ file.filetype|lower }}.gif" />
</td>
-
+
<!-- THUMBNAIL -->
<td class="fb_thumbnail">
{% if file.filetype == "Image" %}
<a href="{{ file.url_full }}" class="fb_viewlink"><img src="{% version file.path settings_var.ADMIN_THUMBNAIL %}" title="{% trans 'View Image' %}" /></a>
{% endif %}
</td>
-
+
<!-- FILENAME/DIMENSIONS -->
{% if file.filetype == "Folder" %}
<td><a href="{% url fb_browse %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
@@ -74,29 +74,29 @@
</td>
{% endif %}
-
+
<!-- SIZE -->
<td>{{ file.filesize|filesizeformat }}</td>
-
+
<!-- DATE -->
<td>{{ file.datetime|date:"N j, Y" }}</td>
<!-- RENAME -->
- <td class="fb_icon"><a href="{% url fb_rename %}{% query_string %}&amp;filename={{ file.filename }}" class="fb_renamelink" title="{% trans 'Rename' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_rename.gif" /></a></td>
+ <td class="fb_icon"><a href="{% url fb_rename %}{% query_string %}&amp;filename={{ file.filename }}" class="fb_renamelink" title="{% trans 'Rename' %}"><img src="{{ settings_var.URL_FILEBROWSER_STATIC }}img/filebrowser_icon_rename.gif" /></a></td>
<!-- DELETE -->
{% if results_var.delete_total %}
<td class="fb_icon">
{% ifnotequal file.filetype 'Folder' %}
- <a href="{% url fb_delete %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this file?" %}');" title="{% trans 'Delete File' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
+ <a href="{% url fb_delete %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this file?" %}');" title="{% trans 'Delete File' %}"><img src="{{ settings_var.URL_FILEBROWSER_STATIC }}img/filebrowser_icon_delete.gif" /></a>
{% else %}
{% if file.is_empty %}
- <a href="{% url fb_delete %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this Folder?" %}');" title="{% trans 'Delete Folder' %}"><img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
+ <a href="{% url fb_delete %}{% query_string %}&amp;filename={{ file.filename }}&amp;filetype={{ file.filetype }}" class="fb_deletelink" onclick="return confirm('{% trans "Are you sure you want to delete this Folder?" %}');" title="{% trans 'Delete Folder' %}"><img src="{{ settings_var.URL_FILEBROWSER_STATIC }}img/filebrowser_icon_delete.gif" /></a>
{% endif %}
{% endifnotequal %}
</td>
{% endif %}
-
+
<!-- DEBUG -->
{% if settings_var.DEBUG %}
<td>
@@ -125,8 +125,8 @@
{% endif %}
</td>
{% endif %}
-
+
</tr>
{% endfor %}
-
+
View
10 filebrowser/templates/filebrowser/index.html
@@ -7,25 +7,25 @@
{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/changelists.css" />
- <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
+ <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_STATIC }}css/filebrowser.css" />
{% endblock %}
<!-- JAVASCRIPTS -->
{% block extrahead %}
{{ block.super }}
{% ifequal query.pop '1' %} <!-- FileBrowseField -->
- <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_FileBrowseField.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}js/FB_FileBrowseField.js"></script>
{% endifequal %}
{% ifequal query.pop '2' %} <!-- TinyMCE -->
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_TINYMCE }}tiny_mce_popup.js"></script>
- <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_TinyMCE.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}js/FB_TinyMCE.js"></script>
{% if query.mce_rdomain %}<script language="javascript">document.domain = "{{ query.mce_rdomain }}"</script>{% endif %}
{% endifequal %}
{% ifequal query.pop '3' %} <!-- CKeditor (former "FCKeditor") -->
- <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_CKEditor.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}js/FB_CKEditor.js"></script>
{% endifequal %}
{{ media }}
-
+
{% if not actions_on_top and not actions_on_bottom %}
<style>
#changelist table thead th:first-child { width: inherit; }
View
2 filebrowser/templates/filebrowser/makedir.html
@@ -7,7 +7,7 @@
{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/forms.css" />
- <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
+ <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_STATIC }}css/filebrowser.css" />
{% endblock %}
<!-- COLTYPE/BODYCLASS -->
View
2 filebrowser/templates/filebrowser/rename.html
@@ -7,7 +7,7 @@
{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/forms.css" />
- <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
+ <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_STATIC }}css/filebrowser.css" />
{% endblock %}
<!-- COLTYPE/BODYCLASS -->
View
14 filebrowser/templates/filebrowser/upload.html
@@ -7,8 +7,8 @@
{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/forms.css" />
- <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
- <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/uploadify.css" />
+ <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_STATIC }}css/filebrowser.css" />
+ <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_STATIC }}uploadify/uploadify.css" />
{% endblock %}
<!-- JAVASCRIPTS -->
@@ -17,19 +17,19 @@
<script type="text/javascript" src="../../jsi18n/"></script>
<script type="text/javascript" src="{% custom_admin_media_prefix %}js/core.js"></script>
- <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/jquery-1.3.2.min.js"></script>
- <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/jquery.uploadify.v2.1.0.js"></script>
- <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/swfobject.js"></script>
+ <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}uploadify/jquery-1.3.2.min.js"></script>
+ <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}uploadify/jquery.uploadify.v2.1.0.js"></script>
+ <script type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}uploadify/swfobject.js"></script>
<script type="text/javascript" src="{% custom_admin_media_prefix %}js/admin/CollapsedFieldsets.js"></script>
<script type="text/javascript">
(function($){
$(document).ready(function() {
$('#id_file').uploadify({
- 'uploader' : '{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/uploadify.swf',
+ 'uploader' : '{{ settings_var.URL_FILEBROWSER_STATIC }}uploadify/uploadify.swf',
'script' : '{% url fb_do_upload %}',
'scriptData' : {'session_key': '{{session_key}}'},
'checkScript' : '{% url fb_check %}',
- 'cancelImg' : '{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/cancel.png',
+ 'cancelImg' : '{{ settings_var.URL_FILEBROWSER_STATIC }}uploadify/cancel.png',
'auto' : false,
'folder' : '{{ query.dir }}',
'multi' : true,
View
46 filebrowser/templates/filebrowser/versions.html
@@ -7,7 +7,7 @@
{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% custom_admin_media_prefix %}css/changelists.css" />
- <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
+ <link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_STATIC }}css/filebrowser.css" />
{% if query.pop %}
<style type="text/css">
#header { display: none; }
@@ -18,24 +18,24 @@
<!-- JAVASCRIPTS -->
{% block extrahead %}
{{ block.super }}
-
+
{% ifequal query.pop '1' %}
<!-- FileBrowseField -->
- <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_FileBrowseField.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}js/FB_FileBrowseField.js"></script>
{% endifequal %}
-
+
{% ifequal query.pop '2' %}
<!-- TinyMCE -->
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_TINYMCE }}tiny_mce_popup.js"></script>
- <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_TinyMCE.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}js/FB_TinyMCE.js"></script>
{% if query.mce_rdomain %}<script language="javascript">document.domain = "{{ query.mce_rdomain }}"</script>{% endif %}
{% endifequal %}
-
+
{% ifequal query.pop '3' %}
<!-- CKeditor (former "FCKeditor") -->
- <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}js/FB_CKEditor.js"></script>
+ <script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_STATIC }}js/FB_CKEditor.js"></script>
{% endifequal %}
-
+
{{ media }}
{% endblock %}
@@ -53,28 +53,28 @@
<table cellspacing="0">
<thead>
<tr>
-
+
<!-- Select -->
{% ifequal query.pop '1' %}<th></th>{% endifequal %}
{% ifequal query.pop '2' %}<th></th>{% endifequal %}
{% ifequal query.pop '3' %}<th></th>{% endifequal %}
-
+
<!-- Filename/Dimensions -->
<th>{% trans 'Name' %}</th>
-
+
<!-- Version -->
<th>{% trans 'Image Version' %}</th>
-
+
<!-- Debug -->
{% if settings_var.DEBUG %}<th>{% trans "Debug" %}</th>{% endif %}
-
+
</tr>
</thead>
<tbody>
{% for version in settings_var.ADMIN_VERSIONS %}
{% version_object original version as image_version %}
<tr class="{% cycle 'row1' 'row2' %}">
-
+
<!-- Fileselect for FileBrowseField -->
{% ifequal query.pop '1' %}
<td class="fb_icon">
@@ -86,7 +86,7 @@
{% endif %}
</td>
{% endifequal %}
-
+
<!-- Fileselect for RTE/TinyMCE -->
{% ifequal query.pop '2' %}
<td class="fb_icon">
@@ -98,7 +98,7 @@
{% endif %}
</td>
{% endifequal %}
-
+
<!-- Fileselect for CKeditor (former "FCKeditor") -->
{% ifequal query.pop '3' %}
<td class="fb_icon">
@@ -110,18 +110,18 @@
{% endif %}
</td>
{% endifequal %}
-
+
<!-- Filename / Dimensions -->
<td>
{% version_setting version %}
<strong>{{ version_setting.verbose_name }}</strong><br />
{% if version_setting.width %}{% trans "Width" %}: {{ version_setting.width }}px<br />{% endif %}
{% if version_setting.height %}{% trans "Height" %}: {{ version_setting.height }}px{% endif %}
</td>
-
+
<!-- Version -->
<th><img src="{{ image_version.url_full }}" /></th>
-
+
<!-- Debug -->
{% if settings_var.DEBUG %}
<td>
@@ -131,22 +131,22 @@
<strong>Extension</strong> {{ image_version.extension }}<br />
<strong>Date</strong> {{ image_version.date }}<br />
<strong>Datetime Object</strong> {{ image_version.datetime }}<br /><br />
-
+
<strong>Relative Path</strong> {{ image_version.path_relative }}<br />
<strong>Full Path</strong> {{ image_version.path_full }}<br />
<strong>Relative URL</strong> {{ image_version.url_relative }}<br />
<strong>Full URL</strong> {{ image_version.url_full }}<br /><br />
-
+
<strong>URL for FileBrowseField</strong> {{ image_version.url_save }}<br />
<strong>Thumbnail URL</strong> {{ image_version.url_thumbnail }}<br /><br />
-
+
<strong>Dimensions</strong> {{ image_version.dimensions }}<br />
<strong>Width</strong> {{ image_version.width }}<br />
<strong>Height</strong> {{ image_version.height }}<br />
<strong>Orientation</strong> {{ image_version.orientation }}
</td>
{% endif %}
-
+
</tr>
{% endfor %}
</tbody>
View
2 setup.py
@@ -2,7 +2,7 @@
setup(
name='django-filebrowser',
- version='3.5.1',
+ version='3.5.2',
description='Media-Management with the Django Admin-Interface.',
author='Patrick Kranzlmueller, Andrey Voronov',
author_email='patrick@vonautomatisch.at, voronov84@gmail.com',

0 comments on commit 3e57e8e

Please sign in to comment.