Explorar o código

submit media fix

Juan Carlos %!s(int64=5) %!d(string=hai) anos
pai
achega
ba89f9d471
Modificáronse 2 ficheiros con 60 adicións e 62 borrados
  1. 55 57
      marktplatz/forms.py
  2. 5 5
      marktplatz/templates/marktplatz/file_upload.html

+ 55 - 57
marktplatz/forms.py

@@ -282,19 +282,17 @@ class WohnprojektForm(ProductForm):
 
 class MediaForm(FileFormMixin, forms.Form):
     image = UploadedFileField()
-    name_for = CharField()
-    copyright = CharField()
-
+    name_for = forms.CharField()
+    copyright = forms.CharField()
     #prefix = 'upload'
 
 
     def __init__(self, *args, **kwargs):
         super(MediaForm, self).__init__(*args, **kwargs)
-
         self.helper = FormHelper()
         self.helper.form_tag = False
         self.fields['name_for'].label = 'Bildbeschriftung'
-        self.fields['copyright'].label = 'Copyright von'
+        self.fields['copyright'].label = 'Urheberrechte'
         self.fields['image'].label = 'Bild oder Video'
         self.fields['image'].help_text = 'Bitte laden Sie Bilder im PNG- oder JPEG-Format hoch. Laden Sie Videos im MP4-Format hoch.'
         self.layout = Layout(
@@ -311,58 +309,58 @@ class MediaForm(FileFormMixin, forms.Form):
 
 
 
-class MediaForm_test(FileFormMixin, forms.Form):
-    image = UploadedFileField()
-    name_for = CharField()
-    copyright = CharField()
-
-    def __init__(self, *args, **kwargs):
-        super(MediaForm_test, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-
-
-class MediaForm1(FileFormMixin, forms.Form):
-    image = MultipleUploadedFileField()
-    name_for = CharField()
-    copyright = CharField()
-
-    def __init__(self, *args, **kwargs):
-        super(MediaForm1, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-
-
-class MediaForm2(FileFormMixin,forms.Form):
-    image = UploadedFileField()
-    name_for = CharField()
-    copyright = CharField()
-
-    def __init__(self, *args, **kwargs):
-        super(MediaForm2, self).__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-
-
-MediaFormSet = formset_factory(MediaForm_test, extra=3)
-
-
-class MediaFormsetHelper(FormHelper):
-
-    def __init__(self,*args, **kwargs):
-        super(MediaFormsetHelper, self).__init__(*args, **kwargs)
-        self.form_tag = False
-        self.layout = Layout(
-            Fieldset(
-                (''),
-                Div(
-                    Div('name_for', css_class='form-group col-md-6 mb-0'),
-                    Div('copyright', css_class='form-group col-md-4 mb-0')
-                    , css_class='form-row'),
-                Div(
-                    Div('image', css_class='form-group col-md-6 mb-0'),
-                    css_class='form-row'),
-            ))
+# class MediaForm_test(FileFormMixin, forms.Form):
+#     image = UploadedFileField()
+#     name_for = CharField()
+#     copyright = CharField()
+#
+#     def __init__(self, *args, **kwargs):
+#         super(MediaForm_test, self).__init__(*args, **kwargs)
+#         self.helper = FormHelper()
+#         self.helper.form_tag = False
+
+
+# class MediaForm1(FileFormMixin, forms.Form):
+#     image = MultipleUploadedFileField()
+#     name_for = CharField()
+#     copyright = CharField()
+#
+#     def __init__(self, *args, **kwargs):
+#         super(MediaForm1, self).__init__(*args, **kwargs)
+#         self.helper = FormHelper()
+#         self.helper.form_tag = False
+#
+#
+# class MediaForm2(FileFormMixin,forms.Form):
+#     image = UploadedFileField()
+#     name_for = CharField()
+#     copyright = CharField()
+#
+#     def __init__(self, *args, **kwargs):
+#         super(MediaForm2, self).__init__(*args, **kwargs)
+#         self.helper = FormHelper()
+#         self.helper.form_tag = False
+
+
+# MediaFormSet = formset_factory(MediaForm_test, extra=3)
+#
+#
+# class MediaFormsetHelper(FormHelper):
+#
+#     def __init__(self,*args, **kwargs):
+#         super(MediaFormsetHelper, self).__init__(*args, **kwargs)
+#         self.form_tag = False
+#         self.layout = Layout(
+#             Fieldset(
+#                 (''),
+#                 Div(
+#                     Div('name_for', css_class='form-group col-md-6 mb-0'),
+#                     Div('copyright', css_class='form-group col-md-4 mb-0')
+#                     , css_class='form-row'),
+#                 Div(
+#                     Div('image', css_class='form-group col-md-6 mb-0'),
+#                     css_class='form-row'),
+#             ))
 
 
 class VideoForm(forms.ModelForm):

+ 5 - 5
marktplatz/templates/marktplatz/file_upload.html

@@ -47,18 +47,18 @@
 
 <div class="container-fluid">
 
-    <h4 style="margin-top: 10px">Upload new Media </h4>
+    <h4 style="margin-top: 10px">Laden Sie neue Medien hoch</h4>
     {% if warning%}
 <div class="alert alert-danger rounded-0" role="alert">
   {{warning}}
 </div>
 {% endif %}
-    <p style="margin-top: 10px">Please upload no more than 7 pictures and two videos. </p>
+    <p style="margin-top: 10px">Bitte laden Sie nicht mehr als 7 Bilder und zwei Videos hoch.</p>
 
     {% if video_count and media_count%}
-    <p style="margin-top: 10px">You have uploaded too many media items. You can delete Media to upload again.</p>
+    <p style="margin-top: 10px">Sie haben zu viele Medienelemente hochgeladen. Sie können Medien löschen, um sie erneut hochzuladen.</p>
     {% elif video_count%}
-    <p style="margin-top: 10px">You have uploaded too many videos. Make sure you only upload Photos.</p>
+    <p style="margin-top: 10px">Sie haben zu viele Videos hochgeladen. Stellen Sie sicher, dass Sie nur Fotos hochladen.</p>
 
 
  <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
@@ -91,7 +91,7 @@
 </form>
 
        {% elif media_count%}
-    <p style="margin-top: 10px">You have uploaded too many photos. Make sure you only upload Videos.</p>
+    <p style="margin-top: 10px">Sie haben zu viele Fotos hochgeladen. Stellen Sie sicher, dass Sie nur Videos hochladen.</p>
     <link rel="stylesheet" href="{% static "ajaxuploader/css/fileuploader.css" %}">
 
    <script src="{% static "jquery/dist/jquery.js" %}"></script>