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

Jump to bottom

Templates compatible to Django 1.5 #58

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Templates compatible to Django 1.5 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8acc55
update index.html --> no more admin media
MrtnBckr Sep 16, 2013
b4c3ac6
1.5
Sep 16, 2013
7b38585
more 1.5
Sep 16, 2013
c92c858
blabla
Sep 16, 2013
45d024a
templates in 1.5
Sep 16, 2013
10a9e32
template stuff
Sep 17, 2013
d740029
no IDE stuff
Sep 20, 2013
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
4 changes: 2 additions & 2 deletions filebrowser/templates/filebrowser/append.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<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>
</table>
</div>
</div>
2 changes: 1 addition & 1 deletion filebrowser/templates/filebrowser/custom_field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load fb_versions %}
<input id="{{ final_attrs.id }}" type="text" class="vFileBrowseField" name="{{ final_attrs.name }}" value="{{ value }}" /><a href="javascript:FileBrowser.show('{{ final_attrs.id }}', '{% url fb_browse %}?pop=1{% if final_attrs.directory %}&amp;dir={{ final_attrs.directory }}{% endif %}{% if final_attrs.format %}&amp;type={{ final_attrs.format }}{% endif %}');" class="fb_show">
<input id="{{ final_attrs.id }}" type="text" class="vFileBrowseField" name="{{ final_attrs.name }}" value="{{ value }}" /><a href="javascript:FileBrowser.show('{{ final_attrs.id }}', '{% url 'fb_browse' %}?pop=1{% if final_attrs.directory %}&amp;dir={{ final_attrs.directory }}{% endif %}{% if final_attrs.format %}&amp;type={{ final_attrs.format }}{% endif %}');" class="fb_show">
<img src="{{ final_attrs.search_icon }}" alt="" />
</a>
{% ifequal value.filetype "Image" %}
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
24 changes: 12 additions & 12 deletions filebrowser/templates/filebrowser/include/filelisting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% load i18n adminmedia fb_tags fb_versions %}
{% load i18n fb_tags fb_versions static %}

{% 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">
Expand All @@ -14,7 +14,7 @@
{% endif %}
</td>
{% endif %}

<!-- FILESELECT FOR RTE/TINYMCE -->
{% if query.pop == "2" and results_var.select_total %}
<td class="fb_icon">
Expand All @@ -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">
Expand All @@ -38,19 +38,19 @@
{% endif %}
</td>
{% endif %}

<!-- FILEICON -->
<td>
<img src="{{ settings_var.URL_FILEBROWSER_MEDIA }}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>
Expand All @@ -74,10 +74,10 @@
</td>
{% endif %}


<!-- SIZE -->
<td>{{ file.filesize|filesizeformat }}</td>

<!-- DATE -->
<td>{{ file.datetime|date:"N j, Y" }}</td>

Expand All @@ -96,7 +96,7 @@
{% endifnotequal %}
</td>
{% endif %}

<!-- DEBUG -->
{% if settings_var.DEBUG %}
<td>
Expand Down Expand Up @@ -125,8 +125,8 @@
{% endif %}
</td>
{% endif %}

</tr>
{% endfor %}


6 changes: 3 additions & 3 deletions filebrowser/templates/filebrowser/include/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load i18n adminmedia fb_tags %}
{% load i18n static fb_tags %}
<div class="search-results">
<p>{% blocktrans count cl.result_count as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %}</p>
<span class="quiet">{% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}</span>
Expand All @@ -8,7 +8,7 @@ <h2 class="collapse-toggle collapse-open">{% trans 'Search' %}xx</h2>
<div id="toolbar">
<form id="changelist-search" action="." method="get">
<div><!-- DIV needed for valid HTML -->
<label for="searchbar"><img src="{{ STATIC_URL }}filebrowser/img/icon-searchbox.png" alt="Search" /></label>
<label for="searchbar"><img src="{% static "filebrowser/img/icon-searchbox.png" %}" alt="Search" /></label>
<input type="text" size="40" name="q" value="{{ q }}" id="searchbar" />
{% if query.filter_type %}<input type="hidden" name="filter_type" value="{{ query.filter_type }}" />{% endif %}
{% if query.filter_date %}<input type="hidden" name="filter_date" value="{{ query.filter_date }}" />{% endif %}
Expand All @@ -17,7 +17,7 @@ <h2 class="collapse-toggle collapse-open">{% trans 'Search' %}xx</h2>
{% if query.pop %}<input type="hidden" name="pop" value="{{ query.pop }}" />{% endif %}
{% if query.type %}<input type="hidden" name="type" value="{{ query.type }}" />{% endif %}
<input type="submit" value="{% trans "Go" %}" />

<p class="help"><strong>Search for:</strong> Filename</p>
{% if results_var.results_total %}
{% if query.filter_type or query.filter_date or query.q %}
Expand Down
4 changes: 2 additions & 2 deletions filebrowser/templates/filebrowser/include/toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% load i18n adminmedia fb_tags %}
{% load i18n static fb_tags %}

<div id="toolbar">
<form id="changelist-search" action="." method="get">
<div><!-- DIV needed for valid HTML -->
<label for="searchbar"><img alt="Search" src="{{ STATIC_URL }}filebrowser/img/icon-searchbox.png"></label>
<label for="searchbar"><img alt="Search" src="{% static "filebrowser/img/icon-searchbox.png" %}"></label>
<input type="text" name="q" value="{{ query.q }}" id="searchbar" />
{% if query.filter_type %}<input type="hidden" name="filter_type" value="{{ query.filter_type }}" />{% endif %}
{% if query.filter_date %}<input type="hidden" name="filter_date" value="{{ query.filter_date }}" />{% endif %}
Expand Down
10 changes: 5 additions & 5 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 i18n static 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 All @@ -25,7 +25,7 @@
<script language="javascript" type="text/javascript" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}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; }
Expand All @@ -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 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 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 static 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
Loading