diff --git a/files/feeds.py b/files/feeds.py index 60ca575..05953a7 100644 --- a/files/feeds.py +++ b/files/feeds.py @@ -83,7 +83,7 @@ class IndexRSSFeed(Feed): return item.edit_date def item_link(self, item): - return reverse("get_media") + "?m={0}".format(item.friendly_token) + return reverse("get_media") + "?hello={0}".format(item.friendly_token) def item_extra_kwargs(self, item): item = { @@ -151,7 +151,7 @@ class SearchRSSFeed(Feed): return item.edit_date def item_link(self, item): - return reverse("get_media") + "?m={0}".format(item.friendly_token) + return reverse("get_media") + "?hello={0}".format(item.friendly_token) def item_extra_kwargs(self, item): item = { diff --git a/files/models.py b/files/models.py index d6a4174..d3ddb3a 100644 --- a/files/models.py +++ b/files/models.py @@ -849,11 +849,11 @@ class Media(models.Model): def get_absolute_url(self, api=False, edit=False): if edit: - return reverse("edit_media") + "?m={0}".format(self.friendly_token) + return reverse("edit_media") + "?hello={0}".format(self.friendly_token) if api: return reverse("api_get_media", kwargs={"friendly_token": self.friendly_token}) else: - return reverse("get_media") + "?m={0}".format(self.friendly_token) + return reverse("get_media") + "?hello={0}".format(self.friendly_token) @property def edit_url(self): @@ -861,7 +861,7 @@ class Media(models.Model): @property def add_subtitle_url(self): - return "/add_subtitle?m=%s" % self.friendly_token + return "/add_subtitle?hello=%s" % self.friendly_token @property def ratings_info(self): @@ -1329,7 +1329,7 @@ class Comment(MPTTModel): super(Comment, self).save(*args, **kwargs) def get_absolute_url(self): - return reverse("get_media") + "?m={0}".format(self.media.friendly_token) + return reverse("get_media") + "?hello={0}".format(self.media.friendly_token) @property def media_url(self): diff --git a/frontend/src/static/js/components/list-item/ListItem.jsx b/frontend/src/static/js/components/list-item/ListItem.jsx index 4186402..0fe6868 100644 --- a/frontend/src/static/js/components/list-item/ListItem.jsx +++ b/frontend/src/static/js/components/list-item/ListItem.jsx @@ -77,7 +77,7 @@ export function listItemProps(props, item, index) { const url = { view: itemPageLink(props, item), - edit: props.canEdit ? item.url.replace('view?m=', 'edit?m=') : null, + edit: props.canEdit ? item.url.replace('view?hello=', 'edit?hello=') : null, }; if (window.MediaCMS.site.devEnv && -1 < url.view.indexOf('view?')) { diff --git a/frontend/src/static/js/utils/settings/config.js b/frontend/src/static/js/utils/settings/config.js index f448992..623ec65 100644 --- a/frontend/src/static/js/utils/settings/config.js +++ b/frontend/src/static/js/utils/settings/config.js @@ -27,7 +27,7 @@ export function config(glbl) { home: glbl.url.home, admin: !glbl.user.is.anonymous && glbl.user.is.admin ? glbl.url.admin : '', error404: glbl.url.error404, - embed: glbl.site.url.replace(/\/+$/, '') + '/embed?m=', + embed: glbl.site.url.replace(/\/+$/, '') + '/embed?hello=', latest: glbl.url.latestMedia, featured: glbl.url.featuredMedia, recommended: glbl.url.recommendedMedia, diff --git a/media_files/userlogos/banner.jpg b/media_files/userlogos/banner.jpg index 73b0cbc..42d841e 100644 Binary files a/media_files/userlogos/banner.jpg and b/media_files/userlogos/banner.jpg differ diff --git a/templates/cms/media.html b/templates/cms/media.html index 2999f19..fcf6d90 100644 --- a/templates/cms/media.html +++ b/templates/cms/media.html @@ -38,7 +38,7 @@ ], "uploadDate": "{{media_object.add_date}}", "dateModified": "{{media_object.edit_date}}", - "embedUrl": "{{FRONTEND_HOST}}/embed?m={{media}}", + "embedUrl": "{{FRONTEND_HOST}}/embed?hello={{media}}", "duration": "T{{media_object.duration}}S", "potentialAction": { "@type": "ViewAction",