Merge lp://staging/~dholbach/help-app/1425025-partial into lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk
Proposed by
Daniel Holbach
| Status: | Merged |
|---|---|
| Merged at revision: | 59 |
| Proposed branch: | lp://staging/~dholbach/help-app/1425025-partial |
| Merge into: | lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk |
| Diff against target: |
32 lines (+17/-0) 2 files modified
edit-here/Makefile (+1/-0) edit-here/index.html (+16/-0) |
| To merge this branch: | bzr merge lp://staging/~dholbach/help-app/1425025-partial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Planella | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me as a starting point.
I'm thinking that for the web theme we won't be using this file, as the server should pick up the index.$LANG.html file directly.
However, for the phone theme, we'll need this, and it'll need some JavaScript code to:
- Read the value from the global window.
- Load the appropriate index.$LANG.html page according to the window.