Skip to content

Bug 898824 #3983

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

Closed
leesan70 wants to merge 3 commits into from
Closed

Bug 898824 #3983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31d8e80
Rename upload button in Media Gallery
leesan70 Nov 7, 2019
3367503
Add patch file for bug 898824
leesan70 Nov 7, 2019
b465465
Add a3.md for University of Toronto CSC302 A3
leesan70 Nov 7, 2019
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
39 changes: 39 additions & 0 deletions docs/898824.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/kitsune/gallery/jinja2/gallery/gallery.html b/kitsune/gallery/jinja2/gallery/gallery.html
index 8b0c3cfd1..cd72505bf 100644
--- a/kitsune/gallery/jinja2/gallery/gallery.html
+++ b/kitsune/gallery/jinja2/gallery/gallery.html
@@ -9,7 +9,7 @@

{% block above_main %}
{% if user.is_authenticated() %}
- <a id="btn-upload" class="btn btn-submit" href="#">{{ _('Upload a New Media File') }}</a>
+ <a id="btn-upload" class="btn btn-submit" href="#">{{ _('Upload a New Image') }}</a>
{% endif %}
<h1>{{ _('Media Gallery') }}</h1>
{% endblock %}
diff --git a/kitsune/gallery/jinja2/gallery/includes/upload_media_form.html b/kitsune/gallery/jinja2/gallery/includes/upload_media_form.html
index f1ad06a30..4408d95a4 100644
--- a/kitsune/gallery/jinja2/gallery/includes/upload_media_form.html
+++ b/kitsune/gallery/jinja2/gallery/includes/upload_media_form.html
@@ -74,7 +74,7 @@ What JS needs to do:
TODO: better error messages ("invalid file" means too big, or extension, etc)

#}
-<div id="gallery-upload-modal" title="{% if has_draft %}{{ _('Continue Uploading Media') }}{% else %}{{ _('Upload a New Media File') }}{% endif %}" data-modal="true" data-target="#btn-upload" data-id="upload-kbox" data-position="none"
+<div id="gallery-upload-modal" title="{% if has_draft %}{{ _('Continue Uploading Media') }}{% else %}{{ _('Upload a New Image') }}{% endif %}" data-modal="true" data-target="#btn-upload" data-id="upload-kbox" data-position="none"
data-max-image-size="{{ settings.IMAGE_MAX_FILESIZE }}">
<form id="gallery-upload-image" class="upload-form{{ ' draft' if image_form.instance.pk else '' }}"
data-post-url="{{ url('gallery.upload_async', media_type='image') }}"
diff --git a/kitsune/gallery/jinja2/gallery/media.html b/kitsune/gallery/jinja2/gallery/media.html
index c32f135fb..962c0b657 100644
--- a/kitsune/gallery/jinja2/gallery/media.html
+++ b/kitsune/gallery/jinja2/gallery/media.html
@@ -15,7 +15,7 @@

{% block above_main %}
{% if user.is_authenticated() %}
- <a id="btn-upload" class="btn btn-submit" href="{{ url('gallery.gallery', media_type)|urlparams(hash='upload') }}">{{ _('Upload a New Media File') }}</a>
+ <a id="btn-upload" class="btn btn-submit" href="{{ url('gallery.gallery', media_type)|urlparams(hash='upload') }}">{{ _('Upload a New Image') }}</a>
{% endif %}
<h1>{{ media.title|truncate(length=55, killwords=True) }}</h1>
{% endblock %}
Empty file added docs/a3.md
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion kitsune/gallery/jinja2/gallery/gallery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

{% block above_main %}
{% if user.is_authenticated() %}
<a id="btn-upload" class="btn btn-submit" href="#">{{ _('Upload a New Media File') }}</a>
<a id="btn-upload" class="btn btn-submit" href="#">{{ _('Upload a New Image') }}</a>
{% endif %}
<h1>{{ _('Media Gallery') }}</h1>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion kitsune/gallery/jinja2/gallery/includes/upload_media_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
TODO: better error messages ("invalid file" means too big, or extension, etc)

#}
<div id="gallery-upload-modal" title="{% if has_draft %}{{ _('Continue Uploading Media') }}{% else %}{{ _('Upload a New Media File') }}{% endif %}" data-modal="true" data-target="#btn-upload" data-id="upload-kbox" data-position="none"
<div id="gallery-upload-modal" title="{% if has_draft %}{{ _('Continue Uploading Media') }}{% else %}{{ _('Upload a New Image') }}{% endif %}" data-modal="true" data-target="#btn-upload" data-id="upload-kbox" data-position="none"
data-max-image-size="{{ settings.IMAGE_MAX_FILESIZE }}">
<form id="gallery-upload-image" class="upload-form{{ ' draft' if image_form.instance.pk else '' }}"
data-post-url="{{ url('gallery.upload_async', media_type='image') }}"
Expand Down
2 changes: 1 addition & 1 deletion kitsune/gallery/jinja2/gallery/media.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

{% block above_main %}
{% if user.is_authenticated() %}
<a id="btn-upload" class="btn btn-submit" href="{{ url('gallery.gallery', media_type)|urlparams(hash='upload') }}">{{ _('Upload a New Media File') }}</a>
<a id="btn-upload" class="btn btn-submit" href="{{ url('gallery.gallery', media_type)|urlparams(hash='upload') }}">{{ _('Upload a New Image') }}</a>
{% endif %}
<h1>{{ media.title|truncate(length=55, killwords=True) }}</h1>
{% endblock %}
Expand Down