Merge lp:~evfool/ubuntu-docs/lp886503 into lp:ubuntu-docs/precise

Proposed by Robert Roth
Status: Merged
Approved by: Jonathan Jesse
Approved revision: 69
Merged at revision: 70
Proposed branch: lp:~evfool/ubuntu-docs/lp886503
Merge into: lp:ubuntu-docs/precise
Diff against target: 12 lines (+2/-0)
1 file modified
html/fix-urls.sh (+2/-0)
To merge this branch: bzr merge lp:~evfool/ubuntu-docs/lp886503
Reviewer Review Type Date Requested Status
Jonathan Jesse (community) Approve
Review via email: mp+86838@code.launchpad.net

Commit message

approving this commit

Description of the change

The urls (/usr/share/...) for the power cog and the user icons have not been included in the fix-urls.sh script to be replaced by img/iconname as the other icons are in the HTML pages, thus the documentation on the server has shown missing icons, causing bug #886503. This branch adds these two icons to fix-urls, and replaces their local absolute path with a relative path.

To post a comment you must log in.
Revision history for this message
Jonathan Jesse (jjesse) :
review: Approve
Revision history for this message
Jonathan Jesse (jjesse) wrote :

fixed and committed revision #70

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'html/fix-urls.sh'
2--- html/fix-urls.sh 2011-08-26 10:41:59 +0000
3+++ html/fix-urls.sh 2011-12-23 22:01:23 +0000
4@@ -41,6 +41,8 @@
5 sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/indicator-messages\.svg#img/indicator-messages\.svg#g"
6 sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/24/user-offline-panel\.svg#img/user-offline-panel\.svg#g"
7 sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/actions/24/system-shutdown-panel\.svg#img/system-shutdown-panel\.svg#g"
8+ sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/stock/22/stock_person-panel\.svg#img/stock_person-panel\.svg#g"
9+ sed -i build/*.html -e "s#/usr/share/icons/ubuntu-mono-light/status/22/system-devices-panel\.svg#img/system-devices-panel\.svg#g"
10
11 ## Search for unfixed ghelp links
12 echo "\nSearching for unfixed ghelp links:"

Subscribers

People subscribed via source and target branches