Merge lp://staging/~developer-ubuntu-com-dev/developer-ubuntu-com/hero-tour-changes into lp://staging/developer-ubuntu-com

Proposed by Daniel Holbach
Status: Merged
Approved by: David Callé
Approved revision: 227
Merged at revision: 197
Proposed branch: lp://staging/~developer-ubuntu-com-dev/developer-ubuntu-com/hero-tour-changes
Merge into: lp://staging/developer-ubuntu-com
Prerequisite: lp://staging/~dholbach/developer-ubuntu-com/importer-post-deployment-fixes
Diff against target: 1977 lines (+1602/-25)
29 files modified
developer_portal/settings.py (+1/-0)
md_importer/importer/__init__.py (+6/-0)
md_importer/importer/article.py (+7/-3)
md_importer/importer/process.py (+3/-1)
md_importer/importer/publish.py (+14/-7)
md_importer/importer/repo.py (+22/-10)
md_importer/migrations/0002_hero_tour_changes.py (+24/-0)
md_importer/models.py (+21/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-macos.md (+77/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-ubuntu.md (+49/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-windows.md (+53/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-macos.md (+74/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-ubuntu.md (+46/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-windows.md (+50/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-macos.md (+73/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-ubuntu.md (+73/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-windows.md (+73/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-macos.md (+74/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-ubuntu.md (+46/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-windows.md (+50/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step3-get-familiar.md (+212/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step4-first-snap.md (+8/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step5-further-readings.md (+3/-0)
md_importer/tests/data/website-test/out/get-started/as-dev/index.html (+63/-0)
md_importer/tests/test_branch_import.py (+66/-0)
md_importer/tests/test_link_rewrite.py (+4/-2)
md_importer/tests/test_website_import.py (+72/-0)
md_importer/tests/utils.py (+4/-2)
templates/snappy_hero_tour.html (+334/-0)
To merge this branch: bzr merge lp://staging/~developer-ubuntu-com-dev/developer-ubuntu-com/hero-tour-changes
Reviewer Review Type Date Requested Status
David Callé Needs Fixing
Review via email: mp+288401@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-03-08.

Description of the change

### Template ###

Template details for testing purposes:

The template currently assumes the following snappy page tree, where all the pages starting from "ubuntu-core-developers-tour" are using the "Snappy Hero Tour" template.

snappy
    get-started
        ubuntu-core-developers-tour
            16-04 (redirect to ubuntu-core-developers-tour)
                step2-<host>-<target> (eg. step2-ubuntu-raspi2)
                step3-*
                step4-*
                step5-*
            15-10 (redirect to ubuntu-core-developers-tour)
                step2-*
                step3-*
                step4-*
                step5-*

The template provides a shell for content, this content is CMS editable and/or imported via the md importer.

Examples:
- http://i.imgur.com/WlMcMeH.png
- http://i.imgur.com/awWXsrp.png

The ubuntu-core-developers-tour page needs to contain specific data for tour navigation to work as intended:
- The snappy version selector needs name="version"
- Each radio input needs name="host" (for host choices) or name="target" (for board choices)

V0 of the tour landing page: http://paste.ubuntu.com/15328791/

To post a comment you must log in.
219. By David Callé

Add first iteration of the snappy hero tour

220. By Daniel Holbach

fix unicode craziness

221. By Daniel Holbach

extend db_add_empty_page do you can define your own slug

222. By Daniel Holbach

add tests for hero tour IA

223. By Daniel Holbach

merge trunk

224. By Daniel Holbach

merge trunk

Revision history for this message
David Callé (davidc3) wrote :

Everything looks and tests are very nice!

Except this failing one:

======================================================================
FAIL: runTest (md_importer.tests.test_link_rewrite.TestLinkRewrite)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/david/dev/duc/mtotrunk_mar16/developer-ubuntu-com/md_importer/tests/test_link_rewrite.py", line 37, in runTest
    self.assertEqual(link.attrs['href'], '/file2')
AssertionError: u'/en/file2/' != '/file2'

review: Needs Fixing
Revision history for this message
David Callé (davidc3) wrote :

looks good*

Revision history for this message
Daniel Holbach (dholbach) wrote :

Ran 32 tests in 153.276s

OK

225. By Daniel Holbach

adapt url expectation to a crash David was seeing

226. By Daniel Holbach

make pep8/pyflakes happy

227. By Daniel Holbach

apply fix from David - thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches