Merge lp:~dholbach/help-app/help.phone-navigation-fixes into lp:~dpm/help-app/phone-navigation

[Daniel Holbach]

[lp:~dholbach/help-app/help.phone-navigation-fixes]

114. By Daniel Holbach on 2015-03-18

add another dependency

[David Planella (dpm)]

This is a really neat feature! It works well, so I'll go ahead and merge it.

However, I've noticed one minor issue:
- Running make launch and then closing the app does not return to the terminal prompt. You have to press Ctrl+C to return. If I just run the equivalent of the make rule on the terminal, when I close the app, then I'm returned to the prompt as expected:

ubuntu-html5-app-launcher --www=app/www --inspector

Not sure what it could be, but I thought I'd mention it.

review: Approve

=== modified file 'HACKING'
--- HACKING	2015-03-18 08:21:54 +0000
+++ HACKING	2015-03-18 10:41:10 +0000
@@ -84,7 +84,7 @@
 
   sudo apt install python-pelican po4a make bzr \
 	ubuntu-html5-ui-toolkit python3-polib python3-magic \
-	python3-markdown
+	python3-markdown ubuntu-html5-container
 
 This will install the necessary files, so you can build the app or web build
 locally and check if your changes actually make sense and look and work well.
@@ -108,10 +108,14 @@
 
 This will also generate translated pages.
 
-You can find the updated HTML in ./app/www/. For instance, you can browse 
-the site in firefox with
-
-firefox app/www/index.html
+You can find the updated HTML in ./app/www/.
+
+To launch the app, you can use ubuntu-html5-app-launcher in the www dir, or
+just call
+
+	make launch
+
+(This will also run the 'make html' command for you.)
 
 
 Creating a click

=== modified file 'Makefile'
--- Makefile	2015-03-06 14:32:59 +0000
+++ Makefile	2015-03-18 10:41:10 +0000
@@ -7,7 +7,7 @@
 	$(foreach fn, $(ignored), $(shell rm -r $(fn);))
 endif
 
-check:
+check: clean
 	make -C edit-here check
 
 click: html
@@ -16,10 +16,13 @@
 html: clean
 	make -C edit-here html
 
-web:
+web: clean
 	make -C edit-here web
 
 update-pot:
 	cd edit-here && ./generate-pot
 
+launch:
+	make -C edit-here launch
+
 .PHONY: click html web update-pot clean check

=== modified file 'edit-here/Makefile'
--- edit-here/Makefile	2015-03-09 13:02:11 +0000
+++ edit-here/Makefile	2015-03-18 10:41:10 +0000
@@ -66,7 +66,6 @@
 web:
 	./generate-translations
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR_WEB) -s $(CONFFILE) $(PELICANOPTS) -t $(THEMEDIR_WEB)
-	cp index.html $(OUTPUTDIR_WEB)
 
 html:
 	./generate-translations
@@ -76,51 +75,55 @@
 clean:
 	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
 
-regenerate:
-	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
-
-serve:
-ifdef PORT
-	cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
-else
-	cd $(OUTPUTDIR) && $(PY) -m pelican.server
-endif
-
-devserver:
-ifdef PORT
-	$(BASEDIR)/develop_server.sh restart $(PORT)
-else
-	$(BASEDIR)/develop_server.sh restart
-endif
-
-stopserver:
-	kill -9 `cat pelican.pid`
-	kill -9 `cat srv.pid`
-	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
-
-publish:
-	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
-
-ssh_upload: publish
-	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
-
-rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
-
-dropbox_upload: publish
-	cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
-
-ftp_upload: publish
-	lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
-
-s3_upload: publish
-	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
-
-cf_upload: publish
-	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
-
-github: publish
-	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
-	git push origin $(GITHUB_PAGES_BRANCH)
-
-.PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+launch: html
+	cd ../app/; `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` &
+
+#regenerate:
+#	$(PELICAN) -r $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS)
+#
+#serve:
+#ifdef PORT
+#	cd $(OUTPUTDIR) && $(PY) -m pelican.server $(PORT)
+#else
+#	cd $(OUTPUTDIR) && $(PY) -m pelican.server
+#endif
+#
+#devserver:
+#ifdef PORT
+#	$(BASEDIR)/develop_server.sh restart $(PORT)
+#else
+#	$(BASEDIR)/develop_server.sh restart
+#endif
+#
+#stopserver:
+#	kill -9 `cat pelican.pid`
+#	kill -9 `cat srv.pid`
+#	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
+#
+#publish:
+#	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
+#
+#ssh_upload: publish
+#	scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
+#
+#rsync_upload: publish
+#	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+#
+#dropbox_upload: publish
+#	cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
+#
+#ftp_upload: publish
+#	lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
+#
+#s3_upload: publish
+#	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
+#
+#cf_upload: publish
+#	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
+#
+#github: publish
+#	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
+#	git push origin $(GITHUB_PAGES_BRANCH)
+#
+.PHONY: html help clean web check
+	#regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github