Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion djangocms_file/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-06 14:01+0100\n"
"POT-Creation-Date: 2014-04-22 10:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -29,6 +29,26 @@ msgstr ""
msgid "title"
msgstr ""

#: models.py:35
msgid "target"
msgstr ""

#: models.py:36
msgid "same window"
msgstr ""

#: models.py:37
msgid "new window"
msgstr ""

#: models.py:38
msgid "parent window"
msgstr ""

#: models.py:39
msgid "topmost frame"
msgstr ""

#: templates/cms/plugins/file.html:6
msgid "file missing!"
msgstr ""
53 changes: 53 additions & 0 deletions djangocms_file/migrations/0002_auto__add_field_file_target.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models


class Migration(SchemaMigration):

def forwards(self, orm):
# Adding field 'File.target'
db.add_column(u'djangocms_file_file', 'target',
self.gf('django.db.models.fields.CharField')(default='', max_length=100, blank=True),
keep_default=False)


def backwards(self, orm):
# Deleting field 'File.target'
db.delete_column(u'djangocms_file_file', 'target')


models = {
'cms.cmsplugin': {
'Meta': {'object_name': 'CMSPlugin'},
'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
},
'cms.placeholder': {
'Meta': {'object_name': 'Placeholder'},
'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
},
u'djangocms_file.file': {
'Meta': {'object_name': 'File', '_ormbases': ['cms.CMSPlugin']},
u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
'target': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
}
}

complete_apps = ['djangocms_file']
6 changes: 6 additions & 0 deletions djangocms_file/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ class File(CMSPlugin):
"""
file = models.FileField(_("file"), upload_to=CMSPlugin.get_media_path)
title = models.CharField(_("title"), max_length=255, null=True, blank=True)
target = models.CharField(_("target"), blank=True, max_length=100, choices=((
("", _("same window")),
("_blank", _("new window")),
("_parent", _("parent window")),
("_top", _("topmost frame")),
)))
# CMS_ICON_EXTENSIONS and CMS_ICON_PATH are assumed to be plugin-specific,
# and not included in cms.settings -- they are therefore imported
# from django.conf.settings
Expand Down
2 changes: 1 addition & 1 deletion djangocms_file/templates/cms/plugins/file.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load i18n %}
{% if object.file.url %}
<p class="plugin_file">
<a href="{{ object.file.url }}">
<a href="{{ object.file.url }}"{% if object.target %} target="{{ object.target }}"{% endif %}>
{% if object.get_icon_url %}<img src="{{ object.get_icon_url }}" alt="" />{% endif %}
{% if object.title %}<span class="filetitle">{{ object.title }}{% else %}{{ object.get_file_name }}{% endif %} {% if object.file_exists %}<span class="filesize">({{ object.file.size|filesizeformat }})</span>{% else %}({% trans "file missing!" %}){% endif %}{% if object.title %}</span>{% endif %}
</a>
Expand Down