Merge lp:~dpm/help-app/question-navigation into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

[David Planella]

Added list of questions at the top of each page for easy navigation via the toc python-markdown extension.

Web theme: removed all non-essential CSS and JS files for easier debugging. Reverted to online-only assets for now, will go back to offline assets later.

Known issues:
- I've only added the TOC to one of the content files. If it works well, I'll add it to the rest.
- This puts the [TOC] marker in the .pot file, which is likely to be broken by translators:

#. type: Plain text
#: content/pages/settings.md:6
msgid "[TOC]"
msgstr ""

[Daniel Holbach (dholbach)]

Great work!

Should be easy to maintain and easy to use. Here's the necessary fix in translations.py:

https://code.launchpad.net/~dholbach/help-app/question-navigation.fixes/+merge/252431

[Daniel Holbach (dholbach)]

If you can approve and merge the fix, I'm happy for this to get landed.

review: Approve

=== modified file 'edit-here/content/pages/settings.md'
--- edit-here/content/pages/settings.md	2015-03-09 14:59:58 +0000
+++ edit-here/content/pages/settings.md	2015-03-10 11:02:31 +0000
@@ -2,6 +2,7 @@
 
 *How do I change my phone settings?*
 
+[TOC]
 
 ### How do I update my system?
 Your device will prompt you when an update is ready. A notification will appear informing you of the new update. If you wish, you can manually check and perform an update yourself. Open the *System Settings* application. Select *Update*, and then click the check for updates button.

=== modified file 'edit-here/pelicanconf.py'
--- edit-here/pelicanconf.py	2015-02-26 15:45:19 +0000
+++ edit-here/pelicanconf.py	2015-03-10 11:02:31 +0000
@@ -43,3 +43,5 @@
 TAGS_SAVE_AS = ''
 TAG_SAVE_AS = ''
 THEME = 'themes/phone'
+
+MD_EXTENSIONS = ['toc']

=== added directory 'edit-here/themes/web/static/js/plugins'
=== renamed file 'edit-here/themes/web/static/js/Imager.js' => 'edit-here/themes/web/static/js/plugins/Imager.js'
=== renamed file 'edit-here/themes/web/static/js/modernizr.2.7.1.js' => 'edit-here/themes/web/static/js/plugins/modernizr.2.7.1.js'
=== modified file 'edit-here/themes/web/templates/_head.html'
--- edit-here/themes/web/templates/_head.html	2015-03-09 15:48:23 +0000
+++ edit-here/themes/web/templates/_head.html	2015-03-10 11:02:31 +0000
@@ -6,12 +6,20 @@
   <link rel="shortcut icon" href="{{ THEME_STATIC_DIR }}/img/favicon.ico" type="image/x-icon" />
 
   <!-- stylesheets -->
+  <!--
   <link rel="stylesheet" type="text/css" media="all" href="{{ THEME_STATIC_DIR }}/css/ubuntu-styles.css"/>
   <link rel="stylesheet" type="text/css" media="screen" href="{{ THEME_STATIC_DIR }}/css/styles.css" />
   <link rel="stylesheet" type="text/css" media="screen" href="{{ THEME_STATIC_DIR }}/css/global-responsive.css" />
   <link rel="stylesheet" type="text/css" media="print" href="{{ THEME_STATIC_DIR }}/css/core-print.css" />
+  -->
+  <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
+  <link rel="stylesheet" type="text/css" media="all" href="{{ THEME_STATIC_DIR }}/css/help-app.css" />
   
   <!-- javascript -->
+
   <script src="{{ THEME_STATIC_DIR }}/js/plugins/modernizr.2.7.1.js"></script>
   <script src="{{ THEME_STATIC_DIR }}/js/plugins/Imager.js"></script>
 
+  <script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-min.js"></script>
+  <script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/core.js"></script>
+

=== modified file 'edit-here/themes/web/templates/_header.html'
--- edit-here/themes/web/templates/_header.html	2015-03-09 15:48:23 +0000
+++ edit-here/themes/web/templates/_header.html	2015-03-10 11:02:31 +0000
@@ -1,7 +1,7 @@
 <nav role="navigation" class="nav-primary nav-right">
   <div class="logo">
     <a class="logo-ubuntu" href="/">
-      <img width="106" height="25" src="{{ THEME_STATIC_DIR }}/img/llogo-ubuntu-orange.svg" alt="" />
+      <img width="106" height="25" src="{{ THEME_STATIC_DIR }}/img/logo-ubuntu-orange.svg" alt="" />
       <span>help</span>
     </a>
   </div>

=== modified file 'edit-here/themes/web/templates/base.html'
--- edit-here/themes/web/templates/base.html	2015-03-09 14:59:58 +0000
+++ edit-here/themes/web/templates/base.html	2015-03-10 11:02:31 +0000
@@ -34,6 +34,7 @@
   </footer>
 
 <!-- Use this only until Modernizr fixes Opera Mini background-size detection -->
+<!--
 <script>
 	var isOperaMini = (navigator.userAgent.indexOf('Opera Mini') > -1);
 	if(isOperaMini) {
@@ -73,7 +74,7 @@
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
 </script>
-
+-->
 </body>
 
 </html>