juju-core

Merge lp:~marcoceppi/juju-core/doc-css-fixes into lp:juju-core/docs

  1. doc-css-fixes
  2. Merge into docs
Proposed by Marco Ceppi
Status: Merged
Merged at revision: 61
Proposed branch: lp:~marcoceppi/juju-core/doc-css-fixes
Merge into: lp:juju-core/docs
Diff against target: 1410 lines (+138/-476)
34 files modified
htmldocs/authors-charm-anatomy.html (+67/-11)
htmldocs/authors-charm-best-practice.html (+2/-7)
htmldocs/authors-charm-icon.html (+2/-7)
htmldocs/authors-charm-policy.html (+2/-7)
htmldocs/authors-charm-quality.html (+2/-7)
htmldocs/authors-charm-store.html (+1/-17)
htmldocs/authors-charm-writing.html (+1/-17)
htmldocs/authors-charms-in-action.html (+1/-6)
htmldocs/authors-hooks.html (+1/-17)
htmldocs/authors-implicit-relations.html (+1/-17)
htmldocs/authors-service-config.html (+1/-17)
htmldocs/authors-subordinate-services.html (+1/-17)
htmldocs/authors-testing.html (+1/-17)
htmldocs/charms-config.html (+1/-17)
htmldocs/charms-constraints.html (+1/-17)
htmldocs/charms-deploying.html (+1/-17)
htmldocs/charms-destroy.html (+1/-17)
htmldocs/charms-exposing.html (+1/-17)
htmldocs/charms-relations.html (+1/-17)
htmldocs/charms-scaling.html (+1/-17)
htmldocs/charms-upgrading.html (+1/-17)
htmldocs/charms.html (+1/-17)
htmldocs/commands.html (+1/-17)
htmldocs/config-aws.html (+1/-15)
htmldocs/config-hpcloud.html (+1/-17)
htmldocs/config-maas.html (+1/-17)
htmldocs/config-openstack.html (+1/-17)
htmldocs/contributing.html (+1/-17)
htmldocs/css/main.css (+7/-7)
htmldocs/getting-started.html (+1/-17)
htmldocs/glossary.html (+1/-17)
htmldocs/js/main.js (+16/-4)
htmldocs/navigation.html (+14/-13)
skel/header.tpl (+1/-1)
To merge this branch: bzr merge lp:~marcoceppi/juju-core/doc-css-fixes
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+181561@code.launchpad.net

Commit message

Fix navigation and css layout

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'htmldocs/authors-charm-anatomy.html'
2--- htmldocs/authors-charm-anatomy.html 2013-08-14 17:38:26 +0000
3+++ htmldocs/authors-charm-anatomy.html 2013-08-22 13:57:11 +0000
4@@ -53,7 +53,7 @@
5 </div>
6 <div class="header-content">
7 <div class="clearfix">
8- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
9+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
10 <div class="header-navigation-secondary"></div>
11 <div class="header-image"></div>
12 <h1>Resources</h1>
13@@ -64,10 +64,9 @@
14
15 <section id="content" class="container-12">
16 <div class="grid-12 doc-container">
17- <div id="navlinks" class="doc-navigation">LINKS</div>
18+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
19 <div class="grid-9 doc-content">
20 <article>
21- <article>
22 <section id="charm-anatomy">
23 <h1>Anatomy of a charm</h1>
24 <p>Charms define how services integrate and how their service units
25@@ -438,11 +437,68 @@
26
27 </section>
28 </article>
29-
30-<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
31-<script>
32- $("#navlinks").load("navigation.html");
33-</script>
34-
35-
36-
37+ </div>
38+ </div>
39+ </section>
40+ <div class="shadow"></div>
41+ <footer class="global clearfix" role="contentinfo">
42+ <div class="row">
43+ <div class="inner-wrapper">
44+ <nav role="navigation" class="clearfix">
45+ <ul class="footer-a">
46+ <li class="grid-3 first-col">
47+ <h4><a href="/get-started">Get started</a></h4>
48+ <ul>
49+ <li class="page_item page-item-20"><a href="https://juju.ubuntu.com/get-started/local/">Local</a></li>
50+ <li class="page_item page-item-22"><a href="https://juju.ubuntu.com/get-started/amazon/">Amazon Web Services</a></li>
51+ <li class="page_item page-item-18"><a href="https://juju.ubuntu.com/get-started/hp-cloud/">HP Cloud</a></li>
52+ <li class="page_item page-item-16"><a href="https://juju.ubuntu.com/get-started/rackspace/">Rackspace</a></li>
53+ <li class="page_item page-item-3596"><a href="https://juju.ubuntu.com/get-started/openstack/">Openstack</a></li>
54+ <li class="page_item page-item-3600"><a href="https://juju.ubuntu.com/get-started/maas/">MAAS</a></li>
55+ </ul>
56+ </li>
57+ <li class="grid-3">
58+ <h4><a href="/resources">Resources</a></h4>
59+ <ul>
60+ <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
61+ <li><a href="/resources/videos/">Videos</a></li>
62+ <li><a href="http://uistage.jujucharms.com:8080/">Juju GUI demo site</a></li>
63+ </ul>
64+ </li>
65+ <li class="grid-3">
66+ <h4><a href="/community">Community</a></h4>
67+ <ul>
68+ <li class="page_item page-item-28"><a href="https://juju.ubuntu.com/community/juju-blog/">Juju Blog</a></li>
69+ <li class="page_item page-item-4262"><a href="https://juju.ubuntu.com/community/weekly-charm-meeting/">Weekly Charm Meeting</a></li>
70+ <li class="page_item page-item-4036"><a href="https://juju.ubuntu.com/community/charmers/">Charmers</a></li>
71+ <li><a href="https://lists.ubuntu.com/mailman/listinfo/juju">Mailing List</a></li>
72+ <li><a href="http://webchat.freenode.net/?channels=juju">Chat</a></li>
73+ <li><a href="http://askubuntu.com/questions/tagged/juju?sort=faq&pagesize=50">FAQ</a></li>
74+ </ul>
75+ </li>
76+ <li class="grid-3 last-col">
77+ <h4><a href="https://launchpad.net/juju">Code</a></h4>
78+ <ul>
79+ <li><a href="https://launchpad.net/juju-core">Juju Core</a></li>
80+ <li><a href="https://launchpad.net/charms">Charms</a></li>
81+ </ul>
82+ </li>
83+ </ul>
84+ </nav>
85+ </div>
86+ </div>
87+ <div class="row no-border">
88+ <div class="legal inner-wrapper">
89+ <p>&copy; 2013 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
90+ <p><a href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
91+ </div>
92+ </div>
93+</footer>
94+
95+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
96+ <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>
97+ <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
98+ <script type="text/javascript" src="js/main.js"></script>
99+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
100+ </body>
101+</html>
102
103=== modified file 'htmldocs/authors-charm-best-practice.html'
104--- htmldocs/authors-charm-best-practice.html 2013-08-14 17:38:26 +0000
105+++ htmldocs/authors-charm-best-practice.html 2013-08-22 13:57:11 +0000
106@@ -53,7 +53,7 @@
107 </div>
108 <div class="header-content">
109 <div class="clearfix">
110- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
111+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
112 <div class="header-navigation-secondary"></div>
113 <div class="header-image"></div>
114 <h1>Resources</h1>
115@@ -64,7 +64,7 @@
116
117 <section id="content" class="container-12">
118 <div class="grid-12 doc-container">
119- <div id="navlinks" class="doc-navigation">LINKS</div>
120+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
121 <div class="grid-9 doc-content">
122 <article>
123 <section id ="best_practice">
124@@ -196,10 +196,5 @@
125 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
126 <script type="text/javascript" src="js/main.js"></script>
127 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
128-
129- <script>
130- $("#navlinks").load("navigation.html");
131- </script>
132-
133 </body>
134 </html>
135
136=== modified file 'htmldocs/authors-charm-icon.html'
137--- htmldocs/authors-charm-icon.html 2013-08-14 17:38:26 +0000
138+++ htmldocs/authors-charm-icon.html 2013-08-22 13:57:11 +0000
139@@ -53,7 +53,7 @@
140 </div>
141 <div class="header-content">
142 <div class="clearfix">
143- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
144+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
145 <div class="header-navigation-secondary"></div>
146 <div class="header-image"></div>
147 <h1>Resources</h1>
148@@ -64,7 +64,7 @@
149
150 <section id="content" class="container-12">
151 <div class="grid-12 doc-container">
152- <div id="navlinks" class="doc-navigation">LINKS</div>
153+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
154 <div class="grid-9 doc-content">
155 <article>
156 <section id='charm-icons'>
157@@ -217,10 +217,5 @@
158 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
159 <script type="text/javascript" src="js/main.js"></script>
160 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
161-
162- <script>
163- $("#navlinks").load("navigation.html");
164- </script>
165-
166 </body>
167 </html>
168
169=== modified file 'htmldocs/authors-charm-policy.html'
170--- htmldocs/authors-charm-policy.html 2013-08-14 17:38:26 +0000
171+++ htmldocs/authors-charm-policy.html 2013-08-22 13:57:11 +0000
172@@ -53,7 +53,7 @@
173 </div>
174 <div class="header-content">
175 <div class="clearfix">
176- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
177+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
178 <div class="header-navigation-secondary"></div>
179 <div class="header-image"></div>
180 <h1>Resources</h1>
181@@ -64,7 +64,7 @@
182
183 <section id="content" class="container-12">
184 <div class="grid-12 doc-container">
185- <div id="navlinks" class="doc-navigation">LINKS</div>
186+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
187 <div class="grid-9 doc-content">
188 <article>
189 <section id ="charm-policy">
190@@ -189,10 +189,5 @@
191 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
192 <script type="text/javascript" src="js/main.js"></script>
193 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
194-
195- <script>
196- $("#navlinks").load("navigation.html");
197- </script>
198-
199 </body>
200 </html>
201
202=== modified file 'htmldocs/authors-charm-quality.html'
203--- htmldocs/authors-charm-quality.html 2013-08-14 17:38:26 +0000
204+++ htmldocs/authors-charm-quality.html 2013-08-22 13:57:11 +0000
205@@ -53,7 +53,7 @@
206 </div>
207 <div class="header-content">
208 <div class="clearfix">
209- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
210+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
211 <div class="header-navigation-secondary"></div>
212 <div class="header-image"></div>
213 <h1>Resources</h1>
214@@ -64,7 +64,7 @@
215
216 <section id="content" class="container-12">
217 <div class="grid-12 doc-container">
218- <div id="navlinks" class="doc-navigation">LINKS</div>
219+ <div id="navlinks" class="grid-3 doc-navigation">LINKS</div>
220 <div class="grid-9 doc-content">
221 <article>
222 <section id ="authors-charm-quality">
223@@ -271,10 +271,5 @@
224 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
225 <script type="text/javascript" src="js/main.js"></script>
226 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
227-
228- <script>
229- $("#navlinks").load("navigation.html");
230- </script>
231-
232 </body>
233 </html>
234
235=== modified file 'htmldocs/authors-charm-store.html'
236--- htmldocs/authors-charm-store.html 2013-08-14 17:38:26 +0000
237+++ htmldocs/authors-charm-store.html 2013-08-22 13:57:11 +0000
238@@ -15,17 +15,6 @@
239 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
240 <![endif]-->
241 </head>
242-
243-
244-
245-
246-
247-
248-<!-- DO NOT EDIT ABOVE THIS LINE -->
249-
250-<!-- DO NOT EDIT ABOVE THIS LINE -->
251-
252-
253 <body class="resources">
254 <header class="global clearfix" role="banner">
255 <div class="header-navigation">
256@@ -53,7 +42,7 @@
257 </div>
258 <div class="header-content">
259 <div class="clearfix">
260- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
261+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
262 <div class="header-navigation-secondary"></div>
263 <div class="header-image"></div>
264 <h1>Resources</h1>
265@@ -273,10 +262,5 @@
266 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
267 <script type="text/javascript" src="js/main.js"></script>
268 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
269-
270- <script>
271- $("#navlinks").load("navigation.html");
272- </script>
273-
274 </body>
275 </html>
276
277=== modified file 'htmldocs/authors-charm-writing.html'
278--- htmldocs/authors-charm-writing.html 2013-08-14 17:38:26 +0000
279+++ htmldocs/authors-charm-writing.html 2013-08-22 13:57:11 +0000
280@@ -15,17 +15,6 @@
281 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
282 <![endif]-->
283 </head>
284-
285-
286-
287-
288-
289-
290-<!-- DO NOT EDIT ABOVE THIS LINE -->
291-
292-<!-- DO NOT EDIT ABOVE THIS LINE -->
293-
294-
295 <body class="resources">
296 <header class="global clearfix" role="banner">
297 <div class="header-navigation">
298@@ -53,7 +42,7 @@
299 </div>
300 <div class="header-content">
301 <div class="clearfix">
302- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
303+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
304 <div class="header-navigation-secondary"></div>
305 <div class="header-image"></div>
306 <h1>Resources</h1>
307@@ -393,10 +382,5 @@
308 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
309 <script type="text/javascript" src="js/main.js"></script>
310 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
311-
312- <script>
313- $("#navlinks").load("navigation.html");
314- </script>
315-
316 </body>
317 </html>
318
319=== modified file 'htmldocs/authors-charms-in-action.html'
320--- htmldocs/authors-charms-in-action.html 2013-08-14 17:38:26 +0000
321+++ htmldocs/authors-charms-in-action.html 2013-08-22 13:57:11 +0000
322@@ -53,7 +53,7 @@
323 </div>
324 <div class="header-content">
325 <div class="clearfix">
326- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
327+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
328 <div class="header-navigation-secondary"></div>
329 <div class="header-image"></div>
330 <h1>Resources</h1>
331@@ -266,10 +266,5 @@
332 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
333 <script type="text/javascript" src="js/main.js"></script>
334 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
335-
336- <script>
337- $("#navlinks").load("navigation.html");
338- </script>
339-
340 </body>
341 </html>
342
343=== modified file 'htmldocs/authors-hooks.html'
344--- htmldocs/authors-hooks.html 2013-08-14 17:38:26 +0000
345+++ htmldocs/authors-hooks.html 2013-08-22 13:57:11 +0000
346@@ -15,17 +15,6 @@
347 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
348 <![endif]-->
349 </head>
350-
351-
352-
353-
354-
355-
356-<!-- DO NOT EDIT ABOVE THIS LINE -->
357-
358-<!-- DO NOT EDIT ABOVE THIS LINE -->
359-
360-
361 <body class="resources">
362 <header class="global clearfix" role="banner">
363 <div class="header-navigation">
364@@ -53,7 +42,7 @@
365 </div>
366 <div class="header-content">
367 <div class="clearfix">
368- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
369+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
370 <div class="header-navigation-secondary"></div>
371 <div class="header-image"></div>
372 <h1>Resources</h1>
373@@ -161,10 +150,5 @@
374 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
375 <script type="text/javascript" src="js/main.js"></script>
376 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
377-
378- <script>
379- $("#navlinks").load("navigation.html");
380- </script>
381-
382 </body>
383 </html>
384
385=== modified file 'htmldocs/authors-implicit-relations.html'
386--- htmldocs/authors-implicit-relations.html 2013-08-14 17:38:26 +0000
387+++ htmldocs/authors-implicit-relations.html 2013-08-22 13:57:11 +0000
388@@ -15,17 +15,6 @@
389 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
390 <![endif]-->
391 </head>
392-
393-
394-
395-
396-
397-
398-<!-- DO NOT EDIT ABOVE THIS LINE -->
399-
400-<!-- DO NOT EDIT ABOVE THIS LINE -->
401-
402-
403 <body class="resources">
404 <header class="global clearfix" role="banner">
405 <div class="header-navigation">
406@@ -53,7 +42,7 @@
407 </div>
408 <div class="header-content">
409 <div class="clearfix">
410- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
411+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
412 <div class="header-navigation-secondary"></div>
413 <div class="header-image"></div>
414 <h1>Resources</h1>
415@@ -162,10 +151,5 @@
416 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
417 <script type="text/javascript" src="js/main.js"></script>
418 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
419-
420- <script>
421- $("#navlinks").load("navigation.html");
422- </script>
423-
424 </body>
425 </html>
426
427=== modified file 'htmldocs/authors-service-config.html'
428--- htmldocs/authors-service-config.html 2013-08-14 17:38:26 +0000
429+++ htmldocs/authors-service-config.html 2013-08-22 13:57:11 +0000
430@@ -15,17 +15,6 @@
431 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
432 <![endif]-->
433 </head>
434-
435-
436-
437-
438-
439-
440-<!-- DO NOT EDIT ABOVE THIS LINE -->
441-
442-<!-- DO NOT EDIT ABOVE THIS LINE -->
443-
444-
445 <body class="resources">
446 <header class="global clearfix" role="banner">
447 <div class="header-navigation">
448@@ -53,7 +42,7 @@
449 </div>
450 <div class="header-content">
451 <div class="clearfix">
452- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
453+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
454 <div class="header-navigation-secondary"></div>
455 <div class="header-image"></div>
456 <h1>Resources</h1>
457@@ -178,10 +167,5 @@
458 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
459 <script type="text/javascript" src="js/main.js"></script>
460 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
461-
462- <script>
463- $("#navlinks").load("navigation.html");
464- </script>
465-
466 </body>
467 </html>
468
469=== modified file 'htmldocs/authors-subordinate-services.html'
470--- htmldocs/authors-subordinate-services.html 2013-08-14 17:38:26 +0000
471+++ htmldocs/authors-subordinate-services.html 2013-08-22 13:57:11 +0000
472@@ -15,17 +15,6 @@
473 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
474 <![endif]-->
475 </head>
476-
477-
478-
479-
480-
481-
482-<!-- DO NOT EDIT ABOVE THIS LINE -->
483-
484-<!-- DO NOT EDIT ABOVE THIS LINE -->
485-
486-
487 <body class="resources">
488 <header class="global clearfix" role="banner">
489 <div class="header-navigation">
490@@ -53,7 +42,7 @@
491 </div>
492 <div class="header-content">
493 <div class="clearfix">
494- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
495+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
496 <div class="header-navigation-secondary"></div>
497 <div class="header-image"></div>
498 <h1>Resources</h1>
499@@ -210,10 +199,5 @@
500 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
501 <script type="text/javascript" src="js/main.js"></script>
502 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
503-
504- <script>
505- $("#navlinks").load("navigation.html");
506- </script>
507-
508 </body>
509 </html>
510
511=== modified file 'htmldocs/authors-testing.html'
512--- htmldocs/authors-testing.html 2013-08-14 17:38:26 +0000
513+++ htmldocs/authors-testing.html 2013-08-22 13:57:11 +0000
514@@ -15,17 +15,6 @@
515 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
516 <![endif]-->
517 </head>
518-
519-
520-
521-
522-
523-
524-<!-- DO NOT EDIT ABOVE THIS LINE -->
525-
526-<!-- DO NOT EDIT ABOVE THIS LINE -->
527-
528-
529 <body class="resources">
530 <header class="global clearfix" role="banner">
531 <div class="header-navigation">
532@@ -53,7 +42,7 @@
533 </div>
534 <div class="header-content">
535 <div class="clearfix">
536- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
537+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
538 <div class="header-navigation-secondary"></div>
539 <div class="header-image"></div>
540 <h1>Resources</h1>
541@@ -333,10 +322,5 @@
542 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
543 <script type="text/javascript" src="js/main.js"></script>
544 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
545-
546- <script>
547- $("#navlinks").load("navigation.html");
548- </script>
549-
550 </body>
551 </html>
552
553=== modified file 'htmldocs/charms-config.html'
554--- htmldocs/charms-config.html 2013-08-14 17:38:26 +0000
555+++ htmldocs/charms-config.html 2013-08-22 13:57:11 +0000
556@@ -15,17 +15,6 @@
557 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
558 <![endif]-->
559 </head>
560-
561-
562-
563-
564-
565-
566-<!-- DO NOT EDIT ABOVE THIS LINE -->
567-
568-<!-- DO NOT EDIT ABOVE THIS LINE -->
569-
570-
571 <body class="resources">
572 <header class="global clearfix" role="banner">
573 <div class="header-navigation">
574@@ -53,7 +42,7 @@
575 </div>
576 <div class="header-content">
577 <div class="clearfix">
578- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
579+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
580 <div class="header-navigation-secondary"></div>
581 <div class="header-image"></div>
582 <h1>Resources</h1>
583@@ -200,10 +189,5 @@
584 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
585 <script type="text/javascript" src="js/main.js"></script>
586 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
587-
588- <script>
589- $("#navlinks").load("navigation.html");
590- </script>
591-
592 </body>
593 </html>
594
595=== modified file 'htmldocs/charms-constraints.html'
596--- htmldocs/charms-constraints.html 2013-08-21 16:25:31 +0000
597+++ htmldocs/charms-constraints.html 2013-08-22 13:57:11 +0000
598@@ -15,17 +15,6 @@
599 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
600 <![endif]-->
601 </head>
602-
603-
604-
605-
606-
607-
608-<!-- DO NOT EDIT ABOVE THIS LINE -->
609-
610-<!-- DO NOT EDIT ABOVE THIS LINE -->
611-
612-
613 <body class="resources">
614 <header class="global clearfix" role="banner">
615 <div class="header-navigation">
616@@ -53,7 +42,7 @@
617 </div>
618 <div class="header-content">
619 <div class="clearfix">
620- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
621+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
622 <div class="header-navigation-secondary"></div>
623 <div class="header-image"></div>
624 <h1>Resources</h1>
625@@ -230,10 +219,5 @@
626 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
627 <script type="text/javascript" src="js/main.js"></script>
628 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
629-
630- <script>
631- $("#navlinks").load("navigation.html");
632- </script>
633-
634 </body>
635 </html>
636
637=== modified file 'htmldocs/charms-deploying.html'
638--- htmldocs/charms-deploying.html 2013-08-14 17:38:26 +0000
639+++ htmldocs/charms-deploying.html 2013-08-22 13:57:11 +0000
640@@ -15,17 +15,6 @@
641 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
642 <![endif]-->
643 </head>
644-
645-
646-
647-
648-
649-
650-<!-- DO NOT EDIT ABOVE THIS LINE -->
651-
652-<!-- DO NOT EDIT ABOVE THIS LINE -->
653-
654-
655 <body class="resources">
656 <header class="global clearfix" role="banner">
657 <div class="header-navigation">
658@@ -53,7 +42,7 @@
659 </div>
660 <div class="header-content">
661 <div class="clearfix">
662- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
663+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
664 <div class="header-navigation-secondary"></div>
665 <div class="header-image"></div>
666 <h1>Resources</h1>
667@@ -172,10 +161,5 @@
668 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
669 <script type="text/javascript" src="js/main.js"></script>
670 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
671-
672- <script>
673- $("#navlinks").load("navigation.html");
674- </script>
675-
676 </body>
677 </html>
678
679=== modified file 'htmldocs/charms-destroy.html'
680--- htmldocs/charms-destroy.html 2013-08-14 17:38:26 +0000
681+++ htmldocs/charms-destroy.html 2013-08-22 13:57:11 +0000
682@@ -15,17 +15,6 @@
683 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
684 <![endif]-->
685 </head>
686-
687-
688-
689-
690-
691-
692-<!-- DO NOT EDIT ABOVE THIS LINE -->
693-
694-<!-- DO NOT EDIT ABOVE THIS LINE -->
695-
696-
697 <body class="resources">
698 <header class="global clearfix" role="banner">
699 <div class="header-navigation">
700@@ -53,7 +42,7 @@
701 </div>
702 <div class="header-content">
703 <div class="clearfix">
704- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
705+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
706 <div class="header-navigation-secondary"></div>
707 <div class="header-image"></div>
708 <h1>Resources</h1>
709@@ -172,10 +161,5 @@
710 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
711 <script type="text/javascript" src="js/main.js"></script>
712 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
713-
714- <script>
715- $("#navlinks").load("navigation.html");
716- </script>
717-
718 </body>
719 </html>
720
721=== modified file 'htmldocs/charms-exposing.html'
722--- htmldocs/charms-exposing.html 2013-08-14 17:38:26 +0000
723+++ htmldocs/charms-exposing.html 2013-08-22 13:57:11 +0000
724@@ -15,17 +15,6 @@
725 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
726 <![endif]-->
727 </head>
728-
729-
730-
731-
732-
733-
734-<!-- DO NOT EDIT ABOVE THIS LINE -->
735-
736-<!-- DO NOT EDIT ABOVE THIS LINE -->
737-
738-
739 <body class="resources">
740 <header class="global clearfix" role="banner">
741 <div class="header-navigation">
742@@ -53,7 +42,7 @@
743 </div>
744 <div class="header-content">
745 <div class="clearfix">
746- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
747+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
748 <div class="header-navigation-secondary"></div>
749 <div class="header-image"></div>
750 <h1>Resources</h1>
751@@ -163,10 +152,5 @@
752 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
753 <script type="text/javascript" src="js/main.js"></script>
754 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
755-
756- <script>
757- $("#navlinks").load("navigation.html");
758- </script>
759-
760 </body>
761 </html>
762
763=== modified file 'htmldocs/charms-relations.html'
764--- htmldocs/charms-relations.html 2013-08-14 17:38:26 +0000
765+++ htmldocs/charms-relations.html 2013-08-22 13:57:11 +0000
766@@ -15,17 +15,6 @@
767 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
768 <![endif]-->
769 </head>
770-
771-
772-
773-
774-
775-
776-<!-- DO NOT EDIT ABOVE THIS LINE -->
777-
778-<!-- DO NOT EDIT ABOVE THIS LINE -->
779-
780-
781 <body class="resources">
782 <header class="global clearfix" role="banner">
783 <div class="header-navigation">
784@@ -53,7 +42,7 @@
785 </div>
786 <div class="header-content">
787 <div class="clearfix">
788- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
789+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
790 <div class="header-navigation-secondary"></div>
791 <div class="header-image"></div>
792 <h1>Resources</h1>
793@@ -205,10 +194,5 @@
794 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
795 <script type="text/javascript" src="js/main.js"></script>
796 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
797-
798- <script>
799- $("#navlinks").load("navigation.html");
800- </script>
801-
802 </body>
803 </html>
804
805=== modified file 'htmldocs/charms-scaling.html'
806--- htmldocs/charms-scaling.html 2013-08-14 17:38:26 +0000
807+++ htmldocs/charms-scaling.html 2013-08-22 13:57:11 +0000
808@@ -15,17 +15,6 @@
809 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
810 <![endif]-->
811 </head>
812-
813-
814-
815-
816-
817-
818-<!-- DO NOT EDIT ABOVE THIS LINE -->
819-
820-<!-- DO NOT EDIT ABOVE THIS LINE -->
821-
822-
823 <body class="resources">
824 <header class="global clearfix" role="banner">
825 <div class="header-navigation">
826@@ -53,7 +42,7 @@
827 </div>
828 <div class="header-content">
829 <div class="clearfix">
830- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
831+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
832 <div class="header-navigation-secondary"></div>
833 <div class="header-image"></div>
834 <h1>Resources</h1>
835@@ -159,10 +148,5 @@
836 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
837 <script type="text/javascript" src="js/main.js"></script>
838 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
839-
840- <script>
841- $("#navlinks").load("navigation.html");
842- </script>
843-
844 </body>
845 </html>
846
847=== modified file 'htmldocs/charms-upgrading.html'
848--- htmldocs/charms-upgrading.html 2013-08-14 17:38:26 +0000
849+++ htmldocs/charms-upgrading.html 2013-08-22 13:57:11 +0000
850@@ -15,17 +15,6 @@
851 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
852 <![endif]-->
853 </head>
854-
855-
856-
857-
858-
859-
860-<!-- DO NOT EDIT ABOVE THIS LINE -->
861-
862-<!-- DO NOT EDIT ABOVE THIS LINE -->
863-
864-
865 <body class="resources">
866 <header class="global clearfix" role="banner">
867 <div class="header-navigation">
868@@ -53,7 +42,7 @@
869 </div>
870 <div class="header-content">
871 <div class="clearfix">
872- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
873+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
874 <div class="header-navigation-secondary"></div>
875 <div class="header-image"></div>
876 <h1>Resources</h1>
877@@ -137,10 +126,5 @@
878 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
879 <script type="text/javascript" src="js/main.js"></script>
880 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
881-
882- <script>
883- $("#navlinks").load("navigation.html");
884- </script>
885-
886 </body>
887 </html>
888
889=== modified file 'htmldocs/charms.html'
890--- htmldocs/charms.html 2013-08-14 17:38:26 +0000
891+++ htmldocs/charms.html 2013-08-22 13:57:11 +0000
892@@ -15,17 +15,6 @@
893 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
894 <![endif]-->
895 </head>
896-
897-
898-
899-
900-
901-
902-<!-- DO NOT EDIT ABOVE THIS LINE -->
903-
904-<!-- DO NOT EDIT ABOVE THIS LINE -->
905-
906-
907 <body class="resources">
908 <header class="global clearfix" role="banner">
909 <div class="header-navigation">
910@@ -53,7 +42,7 @@
911 </div>
912 <div class="header-content">
913 <div class="clearfix">
914- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
915+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
916 <div class="header-navigation-secondary"></div>
917 <div class="header-image"></div>
918 <h1>Resources</h1>
919@@ -156,10 +145,5 @@
920 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
921 <script type="text/javascript" src="js/main.js"></script>
922 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
923-
924- <script>
925- $("#navlinks").load("navigation.html");
926- </script>
927-
928 </body>
929 </html>
930
931=== modified file 'htmldocs/commands.html'
932--- htmldocs/commands.html 2013-08-14 17:38:26 +0000
933+++ htmldocs/commands.html 2013-08-22 13:57:11 +0000
934@@ -15,17 +15,6 @@
935 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
936 <![endif]-->
937 </head>
938-
939-
940-
941-
942-
943-
944-<!-- DO NOT EDIT ABOVE THIS LINE -->
945-
946-<!-- DO NOT EDIT ABOVE THIS LINE -->
947-
948-
949 <body class="resources">
950 <header class="global clearfix" role="banner">
951 <div class="header-navigation">
952@@ -53,7 +42,7 @@
953 </div>
954 <div class="header-content">
955 <div class="clearfix">
956- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
957+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
958 <div class="header-navigation-secondary"></div>
959 <div class="header-image"></div>
960 <h1>Resources</h1>
961@@ -172,10 +161,5 @@
962 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
963 <script type="text/javascript" src="js/main.js"></script>
964 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
965-
966- <script>
967- $("#navlinks").load("navigation.html");
968- </script>
969-
970 </body>
971 </html>
972
973=== modified file 'htmldocs/config-aws.html'
974--- htmldocs/config-aws.html 2013-08-14 17:38:26 +0000
975+++ htmldocs/config-aws.html 2013-08-22 13:57:11 +0000
976@@ -15,13 +15,6 @@
977 <![endif]-->
978 <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
979 </head>
980-
981-
982-<!-- DO NOT EDIT ABOVE THIS LINE -->
983-
984-<!-- DO NOT EDIT ABOVE THIS LINE -->
985-
986-
987 <body class="resources">
988 <header class="global clearfix" role="banner">
989 <div class="header-navigation">
990@@ -49,7 +42,7 @@
991 </div>
992 <div class="header-content">
993 <div class="clearfix">
994- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
995+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
996 <div class="header-navigation-secondary"></div>
997 <div class="header-image"></div>
998 <h1>Resources</h1>
999@@ -161,12 +154,5 @@
1000 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1001 <script type="text/javascript" src="js/main.js"></script>
1002 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1003-
1004- <script>
1005- $("#navlinks").load("navigation.html");
1006- </script>
1007-
1008 </body>
1009 </html>
1010-
1011-
1012
1013=== modified file 'htmldocs/config-hpcloud.html'
1014--- htmldocs/config-hpcloud.html 2013-08-14 17:38:26 +0000
1015+++ htmldocs/config-hpcloud.html 2013-08-22 13:57:11 +0000
1016@@ -15,17 +15,6 @@
1017 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1018 <![endif]-->
1019 </head>
1020-
1021-
1022-
1023-
1024-
1025-
1026-<!-- DO NOT EDIT ABOVE THIS LINE -->
1027-
1028-<!-- DO NOT EDIT ABOVE THIS LINE -->
1029-
1030-
1031 <body class="resources">
1032 <header class="global clearfix" role="banner">
1033 <div class="header-navigation">
1034@@ -53,7 +42,7 @@
1035 </div>
1036 <div class="header-content">
1037 <div class="clearfix">
1038- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1039+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
1040 <div class="header-navigation-secondary"></div>
1041 <div class="header-image"></div>
1042 <h1>Resources</h1>
1043@@ -176,10 +165,5 @@
1044 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1045 <script type="text/javascript" src="js/main.js"></script>
1046 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1047-
1048- <script>
1049- $("#navlinks").load("navigation.html");
1050- </script>
1051-
1052 </body>
1053 </html>
1054
1055=== modified file 'htmldocs/config-maas.html'
1056--- htmldocs/config-maas.html 2013-08-14 17:38:26 +0000
1057+++ htmldocs/config-maas.html 2013-08-22 13:57:11 +0000
1058@@ -15,17 +15,6 @@
1059 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1060 <![endif]-->
1061 </head>
1062-
1063-
1064-
1065-
1066-
1067-
1068-<!-- DO NOT EDIT ABOVE THIS LINE -->
1069-
1070-<!-- DO NOT EDIT ABOVE THIS LINE -->
1071-
1072-
1073 <body class="resources">
1074 <header class="global clearfix" role="banner">
1075 <div class="header-navigation">
1076@@ -53,7 +42,7 @@
1077 </div>
1078 <div class="header-content">
1079 <div class="clearfix">
1080- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1081+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
1082 <div class="header-navigation-secondary"></div>
1083 <div class="header-image"></div>
1084 <h1>Resources</h1>
1085@@ -158,10 +147,5 @@
1086 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1087 <script type="text/javascript" src="js/main.js"></script>
1088 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1089-
1090- <script>
1091- $("#navlinks").load("navigation.html");
1092- </script>
1093-
1094 </body>
1095 </html>
1096
1097=== modified file 'htmldocs/config-openstack.html'
1098--- htmldocs/config-openstack.html 2013-08-14 17:38:26 +0000
1099+++ htmldocs/config-openstack.html 2013-08-22 13:57:11 +0000
1100@@ -15,17 +15,6 @@
1101 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1102 <![endif]-->
1103 </head>
1104-
1105-
1106-
1107-
1108-
1109-
1110-<!-- DO NOT EDIT ABOVE THIS LINE -->
1111-
1112-<!-- DO NOT EDIT ABOVE THIS LINE -->
1113-
1114-
1115 <body class="resources">
1116 <header class="global clearfix" role="banner">
1117 <div class="header-navigation">
1118@@ -53,7 +42,7 @@
1119 </div>
1120 <div class="header-content">
1121 <div class="clearfix">
1122- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1123+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
1124 <div class="header-navigation-secondary"></div>
1125 <div class="header-image"></div>
1126 <h1>Resources</h1>
1127@@ -169,10 +158,5 @@
1128 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1129 <script type="text/javascript" src="js/main.js"></script>
1130 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1131-
1132- <script>
1133- $("#navlinks").load("navigation.html");
1134- </script>
1135-
1136 </body>
1137 </html>
1138
1139=== modified file 'htmldocs/contributing.html'
1140--- htmldocs/contributing.html 2013-08-14 17:38:26 +0000
1141+++ htmldocs/contributing.html 2013-08-22 13:57:11 +0000
1142@@ -15,17 +15,6 @@
1143 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1144 <![endif]-->
1145 </head>
1146-
1147-
1148-
1149-
1150-
1151-
1152-<!-- DO NOT EDIT ABOVE THIS LINE -->
1153-
1154-<!-- DO NOT EDIT ABOVE THIS LINE -->
1155-
1156-
1157 <body class="resources">
1158 <header class="global clearfix" role="banner">
1159 <div class="header-navigation">
1160@@ -53,7 +42,7 @@
1161 </div>
1162 <div class="header-content">
1163 <div class="clearfix">
1164- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1165+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
1166 <div class="header-navigation-secondary"></div>
1167 <div class="header-image"></div>
1168 <h1>Resources</h1>
1169@@ -190,10 +179,5 @@
1170 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1171 <script type="text/javascript" src="js/main.js"></script>
1172 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1173-
1174- <script>
1175- $("#navlinks").load("navigation.html");
1176- </script>
1177-
1178 </body>
1179 </html>
1180
1181=== modified file 'htmldocs/css/main.css'
1182--- htmldocs/css/main.css 2013-07-15 13:01:23 +0000
1183+++ htmldocs/css/main.css 2013-08-22 13:57:11 +0000
1184@@ -100,7 +100,7 @@
1185 width: 190px !important;
1186 }
1187
1188-.doc-navigation > nav h1 {
1189+.doc-navigation h1 {
1190 text-transform: uppercase;
1191 font-size: 20px;
1192 line-height: 1.2;
1193@@ -109,11 +109,11 @@
1194
1195 }
1196
1197-.doc-navigation > nav h1:not(:first-child) {
1198+.doc-navigation > h1:not(:first-child) {
1199 margin-top: 20px;
1200 }
1201
1202-.doc-navigation > nav h1::before {
1203+.doc-navigation > h1::before {
1204 content: "";
1205 position: absolute;
1206 width: 12px;
1207@@ -124,7 +124,7 @@
1208 background-size: 48px 14px;
1209 }
1210
1211-.doc-navigation > nav li a {
1212+.doc-navigation li a {
1213 padding-left: 20px;
1214 display: block;
1215 margin-bottom: 1px;
1216@@ -138,19 +138,19 @@
1217 text-decoration: underline;
1218 }
1219
1220-.doc-navigation > nav li.sub > a {
1221+.doc-navigation li.sub > a {
1222 padding-left: 30px;
1223 font-weight:normal;
1224 }
1225
1226-.doc-navigation > nav li.selected {
1227+.doc-navigation li.selected {
1228 background-color: #dd4814;
1229 color: #fff;
1230 font-weight: 700;
1231 border-radius: 4px;
1232 }
1233
1234-.doc-navigation > nav li.selected a {
1235+.doc-navigation li.selected a {
1236 color: #fff;
1237 }
1238
1239
1240=== modified file 'htmldocs/getting-started.html'
1241--- htmldocs/getting-started.html 2013-08-19 19:29:45 +0000
1242+++ htmldocs/getting-started.html 2013-08-22 13:57:11 +0000
1243@@ -15,17 +15,6 @@
1244 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1245 <![endif]-->
1246 </head>
1247-
1248-
1249-
1250-
1251-
1252-
1253-<!-- DO NOT EDIT ABOVE THIS LINE -->
1254-
1255-<!-- DO NOT EDIT ABOVE THIS LINE -->
1256-
1257-
1258 <body class="resources">
1259 <header class="global clearfix" role="banner">
1260 <div class="header-navigation">
1261@@ -53,7 +42,7 @@
1262 </div>
1263 <div class="header-content">
1264 <div class="clearfix">
1265- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1266+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
1267 <div class="header-navigation-secondary"></div>
1268 <div class="header-image"></div>
1269 <h1>Resources</h1>
1270@@ -287,10 +276,5 @@
1271 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1272 <script type="text/javascript" src="js/main.js"></script>
1273 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1274-
1275- <script>
1276- $("#navlinks").load("navigation.html");
1277- </script>
1278-
1279 </body>
1280 </html>
1281
1282=== modified file 'htmldocs/glossary.html'
1283--- htmldocs/glossary.html 2013-08-14 17:38:26 +0000
1284+++ htmldocs/glossary.html 2013-08-22 13:57:11 +0000
1285@@ -15,17 +15,6 @@
1286 <script type="text/javascript" src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
1287 <![endif]-->
1288 </head>
1289-
1290-
1291-
1292-
1293-
1294-
1295-<!-- DO NOT EDIT ABOVE THIS LINE -->
1296-
1297-<!-- DO NOT EDIT ABOVE THIS LINE -->
1298-
1299-
1300 <body class="resources">
1301 <header class="global clearfix" role="banner">
1302 <div class="header-navigation">
1303@@ -53,7 +42,7 @@
1304 </div>
1305 <div class="header-content">
1306 <div class="clearfix">
1307- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:894px; display: block;" class="arrow-nav">
1308+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left:455px; display: block;" class="arrow-nav">
1309 <div class="header-navigation-secondary"></div>
1310 <div class="header-image"></div>
1311 <h1>Resources</h1>
1312@@ -183,10 +172,5 @@
1313 <script src="//d38yea5fb4e2oh.cloudfront.net/jquery.stacktack.min.js"></script>
1314 <script type="text/javascript" src="js/main.js"></script>
1315 <script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.js"></script>
1316-
1317- <script>
1318- $("#navlinks").load("navigation.html");
1319- </script>
1320-
1321 </body>
1322 </html>
1323
1324=== modified file 'htmldocs/js/main.js'
1325--- htmldocs/js/main.js 2013-07-12 19:13:53 +0000
1326+++ htmldocs/js/main.js 2013-08-22 13:57:11 +0000
1327@@ -2,15 +2,27 @@
1328 'configuring-your-environment-using-ec2',
1329 'configuring-a-local-environment'];
1330
1331-$(document).ready(function() {
1332- $('.stacktack').stacktack({'site': 'askubuntu.com', 'answers': 'accepted',
1333- 'tags': 'true', 'secure': 'true'});
1334-});
1335+//$(document).ready(function() {
1336+// $('.stacktack').stacktack({'site': 'askubuntu.com', 'answers': 'accepted',
1337+// 'tags': 'true', 'secure': 'true'});
1338+//});
1339
1340 $(document).ready(function() {
1341 if($.inArray(window.location.hash, redirect_hashes) > -1) {
1342 window.location.replace(window.location.pathname + '/' + window.location.hash)
1343 }
1344+
1345+ $("#navlinks").load("navigation.html", function() {
1346+ url = window.location.pathname;
1347+ cur_page = url.substring(url.lastIndexOf('/')+1) + window.location.hash;
1348+ console.log('loaded');
1349+ $('#navlinks ul li').each(function() {
1350+ if($(this).children('a').attr('href') == cur_page) {
1351+ console.log($(this), $(this).children('a'))
1352+ $(this).addClass('selected');
1353+ }
1354+ });
1355+ });
1356 });
1357
1358 $(document).ready(function() {
1359
1360=== modified file 'htmldocs/navigation.html'
1361--- htmldocs/navigation.html 2013-08-16 13:29:42 +0000
1362+++ htmldocs/navigation.html 2013-08-22 13:57:11 +0000
1363@@ -19,20 +19,21 @@
1364 <li class=" sub"><a href="charms-destroy.html">Destroying Services</a></li>
1365 </ul>
1366 <h1>Charm Authors</h1>
1367- <ul></ul>
1368- <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1369- <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1370+ <ul>
1371+ <li class=""><a href="authors-charm-anatomy.html">Anatomy of a charm</a></li>
1372+ <li class=""><a href="authors-charm-writing.html">Writing a charm</a></li>
1373
1374- <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1375- <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1376- <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1377- <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1378- <li class=" sub"><a href="authors-charms-in-action.html">Charms in action!</a></li>
1379- <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1380- <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1381- <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1382- <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1383- <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1384+ <li class=" sub"><a href="authors-subordinate-services.html">Subordinate services</a></li>
1385+ <li class=" sub"><a href="authors-implicit-relations.html">Implicit Relations</a></li>
1386+ <li class=" sub"><a href="authors-testing.html">Charm Testing</a></li>
1387+ <li class=" sub"><a href="authors-hooks.html">Hook debugging</a></li>
1388+ <li class=" sub"><a href="authors-charms-in-action.html">Charms in action!</a></li>
1389+ <li class=""><a href="authors-charm-store.html">The Juju Charm Store</a></li>
1390+ <li class=" sub"><a href="authors-charm-policy.html">Charm store policy</a></li>
1391+ <li class=" sub"><a href="authors-charm-best-practice.html">Best practices</a></li>
1392+ <li class=" sub"><a href="authors-charm-quality.html">Charm Quality Rating</a></li>
1393+ <li class=" sub"><a href="authors-charm-icon.html">Charm Icons</a></li>
1394+ </ul>
1395 <h1>Reference</h1>
1396 <ul>
1397 <li class="sub"><a href="commands.html">Juju commands</a></li>
1398
1399=== modified file 'skel/header.tpl'
1400--- skel/header.tpl 2013-07-15 13:01:12 +0000
1401+++ skel/header.tpl 2013-08-22 13:57:11 +0000
1402@@ -24,7 +24,7 @@
1403 </div>
1404 <div class="header-content">
1405 <div class="clearfix">
1406- <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left: 737px; display: block;" class="arrow-nav">
1407+ <img src="https://juju.ubuntu.com/wp-content/themes/juju-website/img/arrow-nav.png" width="9" height="5" style="left: 455px; display: block;" class="arrow-nav">
1408 <div class="header-navigation-secondary"></div>
1409 <div class="header-image"></div>
1410 <h1>Resources</h1>

Subscribers

People subscribed via source and target branches