Merge lp://staging/~dholbach/help-app/1430735 into lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | Daniel Holbach | ||||
| Proposed branch: | lp://staging/~dholbach/help-app/1430735 | ||||
| Merge into: | lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk | ||||
| Diff against target: |
9029 lines (+2726/-2425) 19 files modified
edit-here/content/pages/apps.md (+17/-15) edit-here/content/pages/basic.md (+9/-8) edit-here/content/pages/index.md (+2/-2) edit-here/content/pages/scopes.md (+4/-3) edit-here/content/pages/security.md (+8/-7) edit-here/content/pages/settings.md (+8/-7) edit-here/content/pages/store.md (+4/-3) edit-here/content/pages/ui.md (+10/-9) edit-here/pelicanconf.py (+9/-1) edit-here/po/de.po (+392/-364) edit-here/po/es.po (+394/-366) edit-here/po/fr.po (+392/-364) edit-here/po/help.pot (+171/-168) edit-here/po/it.po (+392/-364) edit-here/po/pt.po (+392/-367) edit-here/po/ro.po (+392/-364) edit-here/q-and-a.py (+77/-0) edit-here/tests/test_translations.py (+6/-4) edit-here/translations.py (+47/-9) |
||||
| To merge this branch: | bzr merge lp://staging/~dholbach/help-app/1430735 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Planella | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
This is a partial fix for bug 1430735.
What's happening here, is that we allow !!T and !!I as markup to indicate that a particular question/answer pair is either textonly (!!T) or include an image (!!I). This will add HTML markup through our our own q-and-a markdown extension.
We can now also use the attr_list markdown extension to show links as button. Merely add {: .button } at the end of a link.
Tests and stuff are updated as well.
What's not working yet:
- !!I is implemented, but we need to figure out how to parse the image
markup, so we can put it in its own <div>
| Nicholas Skaggs (nskaggs) wrote | # |
| Daniel Holbach (dholbach) wrote | # |
| Daniel Holbach (dholbach) wrote | # |
| Nicholas Skaggs (nskaggs) wrote | # |
| Daniel Holbach (dholbach) wrote | # |
| Daniel Holbach (dholbach) wrote | # |
Unmerged revisions
- 110. By Daniel Holbach
-
simplify hide/readd logic somewhat
- 109. By Daniel Holbach
-
remove attr_list (and other statements), if we find them in translated strings
- 108. By Daniel Holbach
-
make pep8 happy
- 107. By Daniel Holbach
-
add [TOC] to all FAQ pages, add T tag to all questions
- 106. By Daniel Holbach
-
add image
- 105. By Daniel Holbach
-
remove bzr diffI tag for now, it's not implemented yet and we won't need it for version1 in ths store
- 104. By Daniel Holbach
-
merge trunk
- 103. By Daniel Holbach
-
updated .pot and .po files accordingly
- 102. By Daniel Holbach
-
use .link-cta-ubuntu instead of .button
- 101. By Daniel Holbach
-
remove button tags, they are not 'Call To Action buttons'
I need to actually test the branch, but in the meantime I've looked at the code and added some comments.