Closed
Conversation
The logic to transclude the contest logo was duplicated. This extracts it into its own Jinja template, transcluded in both country and eventmain templates. It also adds explicitly transclude the WLM logo only for WLM, and adds a default logo for unknown contests.
The mainpage Jinja template had hardcoded the data about contests.
- Add logo to contest_logo Jinja template - Add to parsing regex in database scraping script - Add routes to Flask - Add entry for main page
|
Wow, thich is really awesome! Thanks a lot. J
I will start soon to add config data for WLA to
https://commons.wikimedia.org/wiki/Module:WL_data
Cheers,
Erik
From: Jean-Frédéric [mailto:notifications@github.com]
Sent: Tuesday, January 10, 2017 21:21
To: ptwikis/wikiloves
Cc: Erik Zachte; Mention
Subject: [ptwikis/wikiloves] Add support for Wiki Loves Africa (#4)
Since this was requested by @ezachte <https://github.com/ezachte> (on-wiki), I decided to give this a go :) I may have missed things of course ; it does work locally inside a Docker container.
Hope that helps!
(Before deploying, the WLdata module should be seeded.)
…_____
You can view, comment on, or merge this pull request online at:
#4
Commit Summary
· Extract contest_logo template
· Generalise mainpage template with no hardcoded contests
· Add support for Wiki Loves Africa
File Changes
· M database.py <https://github.com/ptwikis/wikiloves/pull/4/files#diff-0> (2)
· A templates/contest_logo.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-1> (5)
· M templates/country.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-2> (4)
· M templates/eventmain.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-3> (4)
· M templates/mainpage.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-4> (59)
· M wikiloves.py <https://github.com/ptwikis/wikiloves/pull/4/files#diff-5> (6)
Patch Links:
· https://github.com/ptwikis/wikiloves/pull/4.patch
· https://github.com/ptwikis/wikiloves/pull/4.diff
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub <#4> , or mute the thread <https://github.com/notifications/unsubscribe-auth/ACdHt-J5NffL5zde3XhjAFV4gcMSbAh2ks5rQ-hHgaJpZM4Lf2iI> . <https://github.com/notifications/beacon/ACdHt6S0g5ILBTwID7Ty34go8entMSSyks5rQ-hHgaJpZM4Lf2iI.gif>
|
|
Done.
I added all African countries, with UTC diffs, and contest periods for WLA 2014,2015,2016.
2014 and 2105 ran from begin Oct to end Nov
2016 runs from begin Dec to end Jan
Cheers,
Erik
From: Erik Zachte [mailto:erikzachte@infodisiac.com]
Sent: Tuesday, January 10, 2017 21:41
To: 'ptwikis/wikiloves'; 'ptwikis/wikiloves'
Cc: 'Mention'
Subject: RE: [ptwikis/wikiloves] Add support for Wiki Loves Africa (#4)
Wow, thich is really awesome! Thanks a lot. J
I will start soon to add config data for WLA to
https://commons.wikimedia.org/wiki/Module:WL_data
Cheers,
Erik
From: Jean-Frédéric [mailto:notifications@github.com]
Sent: Tuesday, January 10, 2017 21:21
To: ptwikis/wikiloves
Cc: Erik Zachte; Mention
Subject: [ptwikis/wikiloves] Add support for Wiki Loves Africa (#4)
Since this was requested by @ezachte <https://github.com/ezachte> (on-wiki), I decided to give this a go :) I may have missed things of course ; it does work locally inside a Docker container.
Hope that helps!
(Before deploying, the WLdata module should be seeded.)
…_____
You can view, comment on, or merge this pull request online at:
#4
Commit Summary
· Extract contest_logo template
· Generalise mainpage template with no hardcoded contests
· Add support for Wiki Loves Africa
File Changes
· M database.py <https://github.com/ptwikis/wikiloves/pull/4/files#diff-0> (2)
· A templates/contest_logo.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-1> (5)
· M templates/country.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-2> (4)
· M templates/eventmain.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-3> (4)
· M templates/mainpage.html <https://github.com/ptwikis/wikiloves/pull/4/files#diff-4> (59)
· M wikiloves.py <https://github.com/ptwikis/wikiloves/pull/4/files#diff-5> (6)
Patch Links:
· https://github.com/ptwikis/wikiloves/pull/4.patch
· https://github.com/ptwikis/wikiloves/pull/4.diff
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub <#4> , or mute the thread <https://github.com/notifications/unsubscribe-auth/ACdHt-J5NffL5zde3XhjAFV4gcMSbAh2ks5rQ-hHgaJpZM4Lf2iI> . <https://github.com/notifications/beacon/ACdHt6S0g5ILBTwID7Ty34go8entMSSyks5rQ-hHgaJpZM4Lf2iI.gif>
|
Contributor
|
Hi @JeanFred and @ezachte. |
Contributor
Author
|
@danilomac Sure, I’m happy to be accountable on bug fixing if I break things. Note that I reproduced the prod environment inside a Docker container and can thus vouch that this code is working. Shall I keep working in my fork and deploy the fork to Labs then? |
Contributor
|
@JeanFred yes, you are free to deploy it to Labs. |
Contributor
Author
|
@danilomac Thanks! Just for clarification − are you ok with me deploying it to https://tools.wmflabs.org/wikiloves − with the understanding that I will fix any outstanding issue that may arise − or would you prefer me to create another Labs? |
Contributor
|
@JeanFred yes, you can deploy direct to https://tools.wmflabs.org/wikiloves |
Contributor
Author
|
I now maintain this in my fork |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Since this was requested by @ezachte (on-wiki), I decided to give this a go :) I may have missed things of course ; it does work locally inside a Docker container.
Hope that helps!
(Before deploying, the WLdata module should be seeded.)