Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add django 1.5 support #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −27
Open

Add django 1.5 support #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion filebrowser/templates/filebrowser/append.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<table>
<caption>{% trans "FileBrowser" %}</caption>
<tr class="row2">
<th scope="row"><a href="{% url fb_browse %}">{% trans "FileBrowser" %}</a></th>
<th scope="row"><a href="{% url 'fb_browse' %}">{% trans "FileBrowser" %}</a></th>
<td> </td>
<td> </td>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions filebrowser/templates/filebrowser/include/breadcrumbs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<a href="../../">{% trans "Home" %}</a> &rsaquo;
{% endif %}
{% if breadcrumbs or breadcrumbs_title %}
<a href="{% url fb_browse %}{% query_string "" "dir,filename,p" %}">{% trans 'FileBrowser' %}</a> &rsaquo;
<a href="{% url 'fb_browse' %}{% query_string "" "dir,filename,p" %}">{% trans 'FileBrowser' %}</a> &rsaquo;
{% else %}
{% trans 'FileBrowser' %}
{% endif %}
{% for item in breadcrumbs %}
{% if not forloop.last %}
<a href="{% url fb_browse %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
<a href="{% url 'fb_browse' %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
{% else %}
{% if breadcrumbs_title %}
<a href="{% url fb_browse %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
<a href="{% url 'fb_browse' %}{% query_string "" "dir,filename,p" %}&amp;dir={{ item.1 }}">{{ item.0 }}</a> &rsaquo;
{% else %}
{{ item.0 }}
{% endif %}
Expand Down
14 changes: 8 additions & 6 deletions filebrowser/templates/filebrowser/include/filelisting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{% load i18n adminmedia fb_tags fb_versions %}
{% load i18n fb_tags fb_versions %}
{% load admin_static admin_list %}
{% load admin_urls %}

{% for file in page.object_list %}
<tr class="{% cycle 'row1' 'row2' %}{% if file.filetype == "Folder" %} fb_folder{% endif %}">
Expand Down Expand Up @@ -53,7 +55,7 @@

<!-- 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>
<td><a href="{% url 'fb_browse' %}{% query_string "" "q,dir,p" %}&amp;dir={{ file.path_relative_directory|urlencode }}"><strong>{{ file.filename }}</strong></a></td>
{% else %}
<td>
<b><a href="{{ file.url_full }}">{{ file.filename }}</a></b>
Expand All @@ -69,7 +71,7 @@
{% endif %}
{% endcomment %}
{% if results_var.images_total and settings_var.ADMIN_VERSIONS and file.filetype == "Image" %}
<a class="internal fb_showversions" href="{% url fb_versions %}{% query_string "" "p" %}&amp;filename={{ file.filename }}" title="{% trans 'Versions' %}">{% trans 'Versions' %}</a>
<a class="internal fb_showversions" href="{% url 'fb_versions' %}{% query_string "" "p" %}&amp;filename={{ file.filename }}" title="{% trans 'Versions' %}">{% trans 'Versions' %}</a>
{% endif %}
</td>
{% endif %}
Expand All @@ -82,16 +84,16 @@
<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_MEDIA }}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_MEDIA }}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_MEDIA }}img/filebrowser_icon_delete.gif" /></a>
{% endif %}
{% endifnotequal %}
</td>
Expand Down
4 changes: 3 additions & 1 deletion filebrowser/templates/filebrowser/include/toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{% load i18n adminmedia fb_tags %}
{% load i18n fb_tags %}
{% load admin_static admin_list %}
{% load admin_urls %}

<div id="toolbar">
<form id="changelist-search" action="." method="get">
Expand Down
8 changes: 4 additions & 4 deletions filebrowser/templates/filebrowser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "admin/base_site.html" %}

<!-- LOADING -->
{% load i18n adminmedia fb_tags fb_pagination %}
{% load admin_static admin_urls admin_list i18n fb_tags fb_pagination %}

<!-- STYLESHEETS -->
{% 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="{% static 'admin/css/changelists.css' %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
{% endblock %}

Expand Down Expand Up @@ -45,8 +45,8 @@
<div id="content-main">
{% block object-tools %}
<ul class="object-tools">
<li><a href="{% url fb_mkdir %}{% query_string '' 'p' %}">{% trans "New Folder" %}</a></li>
<li><a href="{% url fb_upload %}{% query_string '' 'p' %}" class="focus">{% trans "Upload" %}</a></li>
<li><a href="{% url 'fb_mkdir' %}{% query_string '' 'p' %}">{% trans "New Folder" %}</a></li>
<li><a href="{% url 'fb_upload' %}{% query_string '' 'p' %}" class="focus">{% trans "Upload" %}</a></li>
</ul>
{% endblock %}
<div class="module filtered" id="changelist">
Expand Down
4 changes: 2 additions & 2 deletions filebrowser/templates/filebrowser/makedir.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "admin/base_site.html" %}

<!-- LOADING -->
{% load i18n adminmedia fb_tags fb_csrf %}
{% load i18n admin_static fb_tags fb_csrf %}

<!-- STYLESHEETS -->
{% 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="{% static 'admin/css/forms.css' %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions filebrowser/templates/filebrowser/rename.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "admin/base_site.html" %}

<!-- LOADING -->
{% load i18n adminmedia fb_tags fb_csrf %}
{% load i18n admin_static fb_tags fb_csrf %}

<!-- STYLESHEETS -->
{% 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="{% static 'admin/css/forms.css' %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
{% endblock %}

Expand Down
12 changes: 6 additions & 6 deletions filebrowser/templates/filebrowser/upload.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "admin/base_site.html" %}

<!-- LOADING -->
{% load i18n adminmedia fb_tags %}
{% load i18n admin_static admin_urls admin_list fb_tags %}

<!-- STYLESHEETS -->
{% 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="{% static 'admin/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" />
{% endblock %}
Expand All @@ -15,20 +15,20 @@
{% block extrahead %}
{{ block.super }}
<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="{% static 'admin/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="{% custom_admin_media_prefix %}js/admin/CollapsedFieldsets.js"></script>
<script type="text/javascript" src="{% static 'admin/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',
'script' : '{% url fb_do_upload %}',
'script' : '{% url 'fb_do_upload' %}',
'scriptData' : {'session_key': '{{session_key}}'},
'checkScript' : '{% url fb_check %}',
'checkScript' : '{% url 'fb_check' %}',
'cancelImg' : '{{ settings_var.URL_FILEBROWSER_MEDIA }}uploadify/cancel.png',
'auto' : false,
'folder' : '{{ query.dir }}',
Expand Down
4 changes: 2 additions & 2 deletions filebrowser/templates/filebrowser/versions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "admin/base_site.html" %}

<!-- LOADING -->
{% load i18n adminmedia fb_tags fb_versions %}
{% load i18n admin_static fb_tags fb_versions %}

<!-- STYLESHEETS -->
{% 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="{% static 'admin/css/changelists.css' %}" />
<link rel="stylesheet" type="text/css" href="{{ settings_var.URL_FILEBROWSER_MEDIA }}css/filebrowser.css" />
{% if query.pop %}
<style type="text/css">
Expand Down