Ubuntu Help App

Merge lp:~dholbach/help-app/1425025-partial into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

  1. 1425025-partial
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-02-27
Status: Merged
Merged at revision: 59
Proposed branch: lp:~dholbach/help-app/1425025-partial
Merge into: lp:~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:~dholbach/help-app/1425025-partial
Reviewer Review Type Date Requested Status
David Planella 2015-02-27 Approve on 2015-02-27
Review via email: mp+251217@code.launchpad.net
To post a comment you must log in.
lp:~dholbach/help-app/1425025-partial updated on 2015-02-27
57. By Daniel Holbach on 2015-02-27

merge from trunk

58. By Daniel Holbach on 2015-02-27

copy index.html for 'web' use-case too

David Planella (dpm) wrote :

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.navigator.language JS object
- Load the appropriate index.$LANG.html page according to the window.navigator.language value

review: Approve
lp:~dholbach/help-app/1425025-partial updated on 2015-02-27
59. By Daniel Holbach on 2015-02-27

uncommit last revision, for the web, we want to use http://www.w3.org/International/questions/qa-apache-lang-neg

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'edit-here/Makefile'
2--- edit-here/Makefile 2015-02-26 16:21:11 +0000
3+++ edit-here/Makefile 2015-02-27 08:25:50 +0000
4@@ -67,6 +67,7 @@
5 html:
6 ./generate-translations
7 $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
8+ cp index.html $(OUTPUTDIR)
9
10 clean:
11 [ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
12
13=== added file 'edit-here/index.html'
14--- edit-here/index.html 1970-01-01 00:00:00 +0000
15+++ edit-here/index.html 2015-02-27 08:25:50 +0000
16@@ -0,0 +1,16 @@
17+<!doctype html>
18+<html lang="en-us">
19+ <head>
20+ <title>Ubuntu for devices - Help</title>
21+ <meta name="description" content="Ubuntu for devices - Help">
22+ <meta name="viewport" content="width=device-width, initial-scale=1,
23+ maximum-scale=1, user-scalable=0">
24+ <meta charset="utf-8" />
25+ </head>
26+ <body>
27+ <ul>
28+ <li><a href="index.en-us.html">English</a></li>
29+ <li><a href="index.de.html">German</a></li>
30+ </ul>
31+ </body>
32+</html>

Subscribers

People subscribed via source and target branches