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

Some work on WebUI #17

Closed
wants to merge 11 commits into
base: master
from

Conversation

Projects
None yet
2 participants
@jmondragon
Contributor

jmondragon commented Aug 31, 2012

Added thumbnail images and descriptions for podcasts and episodes. Changed ajax calls to jquery. Added support for video files. Stubbed out some methods to track played and position.

jmondragon added some commits Aug 31, 2012

Web UI: Added support for video
Web UI: Added podcast cover image and description
Web UI: Added episode image and description
Web UI: Changed episode detail to dialog
Web UI: Use jquery for ajax calls
Web UI: Added default theme for easy changing
Web UI: Moved back button to jquery mobile default
@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Sep 5, 2012

Member

From where are the images for video, audio, new, etc..? What license do they have? Can we maybe re-use images from e.g. the QML UI, so we don't need to ship duplicate images?

Member

thp commented Sep 5, 2012

From where are the images for video, audio, new, etc..? What license do they have? Can we maybe re-use images from e.g. the QML UI, so we don't need to ship duplicate images?

@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Sep 5, 2012

Member

Also, some commit diffs show the whole file as diff when only parts were changed - did you accidentally change the line ending format or something? It'd be great if the patches just contained the changes.

Member

thp commented Sep 5, 2012

Also, some commit diffs show the whole file as diff when only parts were changed - did you accidentally change the line ending format or something? It'd be great if the patches just contained the changes.

@jmondragon

This comment has been minimized.

Show comment
Hide comment
@jmondragon

jmondragon Sep 5, 2012

Contributor

The images are from a free image library (Primo Icons) which states that they are free for personal or commercial, but I think using the ones from QML is a better idea, since they are already included. Plus, it'd give the Web UI a more consistent interface with the desktop. Should I copy them to the web folder? or have the Python web server expose the 'artwork' directory in the QML folder?

I did notice the diffs showing the whole file, but I wasn't sure how to fix it. The different line ending format makes sense, I'll see if I can redo it so there are minimal patch changes.

Contributor

jmondragon commented Sep 5, 2012

The images are from a free image library (Primo Icons) which states that they are free for personal or commercial, but I think using the ones from QML is a better idea, since they are already included. Plus, it'd give the Web UI a more consistent interface with the desktop. Should I copy them to the web folder? or have the Python web server expose the 'artwork' directory in the QML folder?

I did notice the diffs showing the whole file, but I wasn't sure how to fix it. The different line ending format makes sense, I'll see if I can redo it so there are minimal patch changes.

@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Sep 7, 2012

Member

You can copy the files from QML into the "share/gpodder/ui/web" directory and remove the external files (don't expose the artwork folder, because the users can choose to leave out e.g. the QML UI when installing, so the QML artwork folder might not always be avaiable - that's why a little file duplication is okay in this case). I you need additional icons, please tell me and I can provide them :)

You should be abble to fix the line endings errors using an utility like "dos2unix" or similar, converting DOS-style line endings to Windows-style ones.

Member

thp commented Sep 7, 2012

You can copy the files from QML into the "share/gpodder/ui/web" directory and remove the external files (don't expose the artwork folder, because the users can choose to leave out e.g. the QML UI when installing, so the QML artwork folder might not always be avaiable - that's why a little file duplication is okay in this case). I you need additional icons, please tell me and I can provide them :)

You should be abble to fix the line endings errors using an utility like "dos2unix" or similar, converting DOS-style line endings to Windows-style ones.

@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Sep 15, 2012

Member

Can you squash the changes into a single commit?

Member

thp commented Sep 15, 2012

Can you squash the changes into a single commit?

jmondragon added some commits Aug 31, 2012

Web UI: Added support for video
Web UI: Added podcast cover image and description
Web UI: Added episode image and description
Web UI: Changed episode detail to dialog
Web UI: Use jquery for ajax calls

Web UI: Added episode images

Web UI: Added default theme for easy changing

Web UI: Moved back button to jquery mobile default

Use icons from QML

Use icons from QML

Fixed line endings

Removed po directory

Fixed line endings
@jmondragon

This comment has been minimized.

Show comment
Hide comment
@jmondragon

jmondragon Sep 15, 2012

I'm not sure I did that right, but I did a git rebase to try to get it all into one. I really don't have the hang of git yet, sorry.

jmondragon commented on 1f89cb1 Sep 15, 2012

I'm not sure I did that right, but I did a git rebase to try to get it all into one. I really don't have the hang of git yet, sorry.

@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Sep 21, 2012

Member

Why did you remove the po directory?

Member

thp commented Sep 21, 2012

Why did you remove the po directory?

@jmondragon

This comment has been minimized.

Show comment
Hide comment
@jmondragon

jmondragon Sep 21, 2012

Contributor

My apologies. When I first started working with gpodder, I tried to
compile it to run. Then I realized that it didn't need to be compiled, and
could run from the python code. That first compile put a bunch of *.po
files in the po directory, which I then accidentally pushed to my GitHub.
I suppose what I should have done was just remove the *.po files that I
built locally and add them to my exclude list.

On Sep 21, 2012 1:58 AM, "Thomas Perl" notifications@github.com wrote:

Why did you remove the po directory?


Reply to this email directly or view it on GitHubhttps://github.com/gpodder/gpodder/pull/17#issuecomment-8757644.

Contributor

jmondragon commented Sep 21, 2012

My apologies. When I first started working with gpodder, I tried to
compile it to run. Then I realized that it didn't need to be compiled, and
could run from the python code. That first compile put a bunch of *.po
files in the po directory, which I then accidentally pushed to my GitHub.
I suppose what I should have done was just remove the *.po files that I
built locally and add them to my exclude list.

On Sep 21, 2012 1:58 AM, "Thomas Perl" notifications@github.com wrote:

Why did you remove the po directory?


Reply to this email directly or view it on GitHubhttps://github.com/gpodder/gpodder/pull/17#issuecomment-8757644.

@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Sep 23, 2012

Member

There's a makefile that has a "clean" target to remove any files that have been created. So you should be able to just use "make clean" to remove any of the generated files.

Member

thp commented Sep 23, 2012

There's a makefile that has a "clean" target to remove any files that have been created. So you should be able to just use "make clean" to remove any of the generated files.

@thp

This comment has been minimized.

Show comment
Hide comment
@thp

thp Oct 1, 2012

Member

I've cleaned up, squashed and merged your changes now, thanks: http://gpodder.org/commit/d65232cb

Please check if I didn't mess up anything while doing so. Thanks for your contribution! :)

Member

thp commented Oct 1, 2012

I've cleaned up, squashed and merged your changes now, thanks: http://gpodder.org/commit/d65232cb

Please check if I didn't mess up anything while doing so. Thanks for your contribution! :)

@thp thp closed this Oct 1, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment