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

Fix/nopreview #55

Merged
merged 15 commits into from
Apr 7, 2015
Merged

Fix/nopreview #55

merged 15 commits into from
Apr 7, 2015

Conversation

jkt001
Copy link
Contributor

@jkt001 jkt001 commented Apr 5, 2015

resized no_preview.png, added no_review sized 150x150 px, modify views and base_list.html accordingly

@jkt001 jkt001 added the ready label Apr 5, 2015
@jkt001 jkt001 mentioned this pull request Apr 5, 2015
18 tasks
@jkt001
Copy link
Contributor Author

jkt001 commented Apr 5, 2015

this fixes issue #51 point 3

@@ -4,6 +4,8 @@
)
from crew.models import Crew

no_preview_150 = '/statics/images/no-preview-150.png'
no_preview = '/statics/images/no-preview.png'
Copy link
Contributor

Choose a reason for hiding this comment

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

Can try {% static \"images/no-preview.png\" %} here for me? I think this is the better way, if possible

Copy link
Contributor

Choose a reason for hiding this comment

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

👍 as long as we don't hard code the URL.
For Static reverse outside of templates, we can still make use the templatetags at staticfiles.
django.contrib.staticfiles.templatetags.staticfiles.static

from django.contrib.staticfiles.templatetags.staticfiles import static
no_preview = static('images/no-preview.png')

@jkt001
Copy link
Contributor Author

jkt001 commented Apr 6, 2015

rebased this branch to master and update the image reference to static

@jkt001
Copy link
Contributor Author

jkt001 commented Apr 6, 2015

somehow after I rebased, changes that I did not make appear in the "files changed" tab. Don't know why, but this is ready for merge.

@digawp
Copy link
Contributor

digawp commented Apr 6, 2015

Shouldn't have rebased in this case. I guess @9gix is right, just merge unless you are sure what you are doing. I am not sure what will happen if we merge this, bcuz usually if this happened to me during 2103, I will fix the branch so that changes from the master does not appear in the PR.
@9gix pls advise?

9gix added a commit that referenced this pull request Apr 7, 2015
@9gix 9gix merged commit c3c09e9 into master Apr 7, 2015
@9gix 9gix deleted the fix/nopreview branch April 7, 2015 07:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants