Cleaned up png location

Now all png needed for the manual are copied to html dir

[makedoc]

.travis.pushdoc

@@ -11,10 +11,10 @@ cd tmp/$$
 
 # grab doc
 mkdir user-doc
-cp -R $root/user-doc/{*.png,html,manual.pdf} user-doc/
+cp -R $root/user-doc/{html,manual.pdf} user-doc/
 test -d $root/user-doc/regtests && cp -R $root/user-doc/regtests user-doc/ || true
 mkdir developer-doc
-cp -R $root/developer-doc/{*.png,html} developer-doc/
+cp -R $root/developer-doc/html developer-doc/
 
 # This file should be here, it is needed otherwise
 # files beginning with _ are skipped

developer-doc/Makefile

@@ -4,7 +4,7 @@
 all:
 	./extract
 	./go-doxygen
-	cp Octocat.png html/
+	cp *png html/
 
 clean:
 	rm -fr automatic html latex *~ links-to-user-manual.txt

developer-doc/PlumedDeveloperHeader.html

@@ -23,9 +23,9 @@ $mathjax
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tbody>
 <tr style="height: 30px;">
-<td valign="center"> &nbsp; <img src="../pigeon.png" width="120"/></td>
-<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="../logo.png" width="400" /> </td>
-<td style="padding-left: 0.2em;" align="right"> <a href="../../user-doc/html/index.html"> <img src="../developer-logo.png" width="180" /> </a> </td>
+<td valign="center"> &nbsp; <img src="pigeon.png" width="120"/></td>
+<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="logo.png" width="400" /> </td>
+<td style="padding-left: 0.2em;" align="right"> <a href="../../user-doc/html/index.html"> <img src="developer-logo.png" width="180" /> </a> </td>
 </tr>
 </tbody>
 </table>

developer-doc/PlumedFooter.html

@@ -15,7 +15,7 @@
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tr><td align="left" valign="center"> 
 Hosted by GitHub &nbsp;
-<a href="http://github.com"><img src="Octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
+<a href="http://github.com"><img src="octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
 <!--$generatedby  &#160; --> <a href="http://www.doxygen.org/index.html">
 </td><td width=90% align="right">
 <img class="footer" src="doxygen.png" alt="doxygen" align="right"/>

src/lib/Makefile

@@ -92,7 +92,7 @@ install-do:
 # rebuild libraries and main using new target dir
 	$(MAKE) PLUMED_LIBDIR=$(PLUMED_INSTALL_ROOT)/src/lib/ PLUMED_INSTALL=Install all
 # copy .h, .cpp .o compile_options.sh and documentation:
-	cd ../../ ; tar cf - patches scripts src/*/*.h src/*/*.cpp src/*/*.o src/config/compile_options.sh *-doc/*.png *-doc/html *-doc/regtests *-doc/manual.pdf | tar xf - -C $(PLUMED_INSTALL_ROOT)/
+	cd ../../ ; tar cf - patches scripts src/*/*.h src/*/*.cpp src/*/*.o src/config/compile_options.sh *-doc/html *-doc/regtests *-doc/manual.pdf | tar xf - -C $(PLUMED_INSTALL_ROOT)/
 # also copy .h files into include/ dir
 	cd ../../src ; tar cf - */*.h */*/*.h | tar xf - -C $(PLUMED_INSTALL_PREFIX)/include/plumed$(PLUMED_INSTALL_LIBSUFFIX)/
 # copy inc files changing the path

user-doc/Makefile

@@ -15,7 +15,7 @@ else
 all:
 	./extract
 	./go-doxygen
-	cp Octocat.png html/
+	cp *png html/
 	./report_errors
 
 endif

user-doc/PlumedFooter.html

@@ -15,7 +15,7 @@
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tr><td align="left" valign="center"> 
 Hosted by GitHub &nbsp;
-<a href="http://github.com"><img src="Octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
+<a href="http://github.com"><img src="octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
 <!--$generatedby  &#160; --> <a href="http://www.doxygen.org/index.html">
 </td><td width=90% align="right">
 <img class="footer" src="doxygen.png" alt="doxygen" align="right"/>

user-doc/PlumedUserHeader.html

@@ -23,9 +23,9 @@ $mathjax
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tbody>
 <tr style="height: 30px;">
-<td valign="center"> &nbsp; <img src="../pigeon.png" width="120"/></td>
-<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="../logo.png" width="400" /> </td>
-<td style="padding-left: 0.2em;" align="right"> <a href="../../developer-doc/html/index.html"> <img src="../user-logo.png" width="180" /> </a> </td>
+<td valign="center"> &nbsp; <img src="pigeon.png" width="120"/></td>
+<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="logo.png" width="400" /> </td>
+<td style="padding-left: 0.2em;" align="right"> <a href="../../developer-doc/html/index.html"> <img src="user-logo.png" width="180" /> </a> </td>
 </tr>
 </tbody>
 </table>