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.

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

Move over pinax-points templates #2

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

Move over pinax-points templates #2

wants to merge 2 commits into from

Conversation

jaydenwindle
Copy link

Moves the templates from pinax-points to this project to prepare for pinax-points v1.0.0 release.

These templates are a little different than templates from most other pinax apps as they are admin-specific, and seem to be tightly coupled with the one_off_points admin functionality from pinax-points.

Fixes pinax/pinax-points#15.

Copy link
Member

@paltman paltman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think the admin template is at wrong path.

@@ -0,0 +1,18 @@
{% extends "admin/change_list.html" %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is at the wrong path.

Since this is an admin override I think you want it at the path:

pinax/templates/templates/admin/pinax/points/awardedpointvalue/change_list.html

but not entirely sure. It might be:

pinax/templates/templates/admin/pinax_points/awardedpointvalue/change_list.html

Because of the app lable: https://github.com/pinax/pinax-points/blob/master/pinax/points/apps.py#L8

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch - those long paths got me 😆

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This admin file looks out of place to not be in the points directory. Are you sure it should be in its own separate admin folder in pinax-templates? If pinax-points were included in a starter project, perhaps the admin templates would be in the project templates folder. https://github.com/jaydenwindle/pinax-templates/tree/move_pinax_points_templates/pinax/templates/templates/pinax


{% load i18n admin_modify adminmedia %}

{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to ship static as part of the apps either. This should be moved into starter project sass.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nevermind, this is part of the admin system. hm...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, these templates are pretty tightly tied to the admin system. Feels a bit odd to put them side by side with the rest of the pinax templates given the differences. If there's a better way to do this I'd love to hear!


<div class="submit-row">
{% trans "Award" as submit_text %}
<input type="submit" value="{{ submit_text }}" class="default" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer the use of <button> now but not sure this should hold things up.

@KatherineMichel
Copy link
Member

Where are we at with this PR? Are there still changes to be made?

@jaydenwindle
Copy link
Author

Man, it's been ages since I worked on this.

From what I recall, moving these templates over was mentioned in Slack as a blocker for getting pinax-points v1.0 released, so I took a shot at it.

Looks like the v1.0 release is out now, so I'm not sure if this PR and pinax/pinax-points#16 are still relevant. If not, feel free to close :)

@KatherineMichel
Copy link
Member

@jaydenwindle Sorry for the length of time. I'm going through PRs and issues and making sense of ones that have been here for a while. I think it is still relevant, just not sure if anything needs to change with it. I'd love to get it closed bc/it involves 2 issues and a PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants