12 files changed, 27 insertions, 46 deletions
diff --git a/archiva-docs/src/maven-site.vm b/archiva-docs/src/maven-site.vm
index c613411e4..106014f8e 100644
--- a/archiva-docs/src/maven-site.vm
+++ b/archiva-docs/src/maven-site.vm
@@ -464,11 +464,21 @@
     <link rel="stylesheet" href="$relativePath/css/maven-base.css">
     <link rel="stylesheet" href="$relativePath/css/boostrap-override.css"
     <link rel="stylesheet" href="$relativePath/css/prettify.css" type="text/css" media="all" />
-    <script type="text/javascript" src="$relativePath/js/prettify.js"></script>
+    <script src="$relativePath/js/jquery-1.4.3.min.js" type="text/javascript"></script>
+    <script src="$relativePath/js/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>
+    <script src="$relativePath/js/jquery.easing-1.3.pack.js" type="text/javascript"></script>
+    <script src="$relativePath/js/jquery.mousewheel-3.0.4.pack.js" type="text/javascript"></script>
+    <link rel="stylesheet" href="$relativePath/css/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
     <script type="text/javascript">
-        window.onload=function() {
-            prettyPrint();
-        }
+    $(document).ready(function() {
+      $("a#single_image").fancybox({
+        'transitionIn'	:	'elastic',
+        'transitionOut'	:	'elastic',
+        'speedIn'		:	600,
+        'speedOut'		:	200,
+        'overlayShow'	:	true
+      });
+    });
     </script>
 #foreach( $author in $authors )
       <meta name="author" content="$author" />
diff --git a/archiva-docs/src/site/xdoc/tour/admin.xml b/archiva-docs/src/site/xdoc/tour/admin.xml
index 545ab5877..b478c4d51 100644
--- a/archiva-docs/src/site/xdoc/tour/admin.xml
+++ b/archiva-docs/src/site/xdoc/tour/admin.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Graphical Administration">
       <div style="text-align: center">
-        <img src="../images/tour/admin.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/admin.png"><img src="../images/tour/admin.png" height="401" alt="" /></a>
         <p>
           Archiva has a comprehensive web-based administration interface for configuring repositories,
           remote proxies, scheduled jobs and more. The configuration is kept in sync with the XML
diff --git a/archiva-docs/src/site/xdoc/tour/audit-log.xml b/archiva-docs/src/site/xdoc/tour/audit-log.xml
index 12af89442..9a884b339 100644
--- a/archiva-docs/src/site/xdoc/tour/audit-log.xml
+++ b/archiva-docs/src/site/xdoc/tour/audit-log.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Audit Log Report">
       <div style="text-align: center">
-        <img src="../images/tour/audit-log.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/audit-log.png"><img src="../images/tour/audit-log.png" height="401" alt="" /></a>
         <p>
           Archiva provides a user interface for querying audit logs. The current
           implementation only covers upload/deploy actions but will include other
diff --git a/archiva-docs/src/site/xdoc/tour/maintenance.xml b/archiva-docs/src/site/xdoc/tour/maintenance.xml
index ee0efaa98..445e40d17 100644
--- a/archiva-docs/src/site/xdoc/tour/maintenance.xml
+++ b/archiva-docs/src/site/xdoc/tour/maintenance.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Maintenance">
       <div style="text-align: center">
-        <img src="../images/tour/maintenance.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/maintenance.png"><img src="../images/tour/maintenance.png" height="401" alt="" /></a>
         <p>
           Archiva has utilities called consumers that can be used for maintaining the
           Archiva repositories. These can be configured or activated in the Repository
diff --git a/archiva-docs/src/site/xdoc/tour/project.xml b/archiva-docs/src/site/xdoc/tour/project.xml
index 504b9ca14..bb8eb11ee 100644
--- a/archiva-docs/src/site/xdoc/tour/project.xml
+++ b/archiva-docs/src/site/xdoc/tour/project.xml
@@ -22,25 +22,10 @@
     <title>Project Information</title>
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
-  <head>
-
-  </head>
   <body>
-    <script src="../js/jquery-1.4.3.min.js" type="text/javascript"></script>
-    <script src="../js/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>
-    <script src="../js/jquery.easing-1.3.pack.js" type="text/javascript"></script>
-    <script src="../js/jquery.mousewheel-3.0.4.pack.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="../css/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-    <script type="text/javascript">
-    <![CDATA[
-      $(document).ready(function() {
-        $("a#single_image").fancybox();
-      });
-    //]]>
-    </script>
     <section name="Project Information">
       <div style="text-align: center">
-        <a id="single_image" href="../images/tour/project.png"><img src="../images/tour/project.png" width="640" height="401" alt="" /></a>
+        <a id="single_image" href="../images/tour/project.png"><img src="../images/tour/project.png" height="401" alt="" /></a>
         <p>
           Archiva provides an informative display for projects and artifacts stored in the repository.
           This includes a user-friendly display of the Maven project information, as well as the relationships
diff --git a/archiva-docs/src/site/xdoc/tour/proxy.xml b/archiva-docs/src/site/xdoc/tour/proxy.xml
index f7f79646d..67e96b3ac 100644
--- a/archiva-docs/src/site/xdoc/tour/proxy.xml
+++ b/archiva-docs/src/site/xdoc/tour/proxy.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Remote Proxying Cache">
       <div style="text-align: center">
-        <img src="../images/tour/proxy.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/proxy.png"><img src="../images/tour/proxy.png" height="401" alt="" /></a>
         <p>
           Archiva can operate as a proxy for remote repositories, allowing you to improve build
           performance by caching artifacts in a closer network location, and control artifact
diff --git a/archiva-docs/src/site/xdoc/tour/reports.xml b/archiva-docs/src/site/xdoc/tour/reports.xml
index 6d1e20d4a..d0e70524e 100644
--- a/archiva-docs/src/site/xdoc/tour/reports.xml
+++ b/archiva-docs/src/site/xdoc/tour/reports.xml
@@ -27,14 +27,14 @@
   <body>
     <section name="Integrity Reports">
       <div style="text-align: center">
-        <img src="../images/tour/reports.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/reports.png"><img src="../images/tour/reports.png" height="401" alt="" /></a>
         <p>
           Archiva monitors the state of the managed repositories and keeps track of
           potential problems to allow improvement of metadata and to assist in
           troubleshooting problems.
         </p>
         <p>
-          <a href="../adminguide/security.html">Previous: Role-based Security</a> |
+          <a href="security.html">Previous: Role-based Security</a> |
           <strong>Integrity Reports</strong> |
           <a href="audit-log.html">Next: Audit Log Report</a>
         </p>
diff --git a/archiva-docs/src/site/xdoc/tour/rss.xml b/archiva-docs/src/site/xdoc/tour/rss.xml
index adc005b03..56b05d37d 100644
--- a/archiva-docs/src/site/xdoc/tour/rss.xml
+++ b/archiva-docs/src/site/xdoc/tour/rss.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="RSS Feeds">
       <div style="text-align: center">
-        <img src="../images/tour/rss.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/rss.png"><img src="../images/tour/rss.png" height="401" alt="" /></a>
         <p>
           Archiva provides RSS feeds for new artifacts in the repositories and new versions
           of a specific artifact.
@@ -35,7 +35,7 @@
         <p>
           <a href="virtual-repos.html">Previous: Virtual Repositories</a> |
           <strong>RSS Feeds</strong> |
-          <a href="../adminguide/security.html">Next: Role-based Security</a>
+          <a href="security.html">Next: Role-based Security</a>
         </p>
       </div>
     </section>
diff --git a/archiva-docs/src/site/xdoc/tour/search.xml b/archiva-docs/src/site/xdoc/tour/search.xml
index b34e30a24..5341da886 100644
--- a/archiva-docs/src/site/xdoc/tour/search.xml
+++ b/archiva-docs/src/site/xdoc/tour/search.xml
@@ -22,24 +22,10 @@
     <title>Artifact Search</title>
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
-  <head>
-  </head>
   <body>
-    <script src="../js/jquery-1.4.3.min.js" type="text/javascript"></script>
-    <script src="../js/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>
-    <script src="../js/jquery.easing-1.3.pack.js" type="text/javascript"></script>
-    <script src="../js/jquery.mousewheel-3.0.4.pack.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="../css/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-    <script type="text/javascript">
-    <![CDATA[
-      $(document).ready(function() {
-        $("a#single_image").fancybox();
-      });
-    //]]>
-    </script>
     <section name="Artifact Search">
       <div style="text-align: center">
-        <a id="single_image" href="../images/tour/search.png"><img src="../images/tour/search.png" width="640" height="401" alt="" /></a>
+        <a id="single_image" href="../images/tour/search.png"><img src="../images/tour/search.png" height="401" alt="" /></a>
         <p>
           Archiva has both a user-friendly browsing interface, and powerful search functionalities. The contents of all artifacts are indexed,
           including Maven project information and Java class information to facilitate locating code within any repository.
diff --git a/archiva-docs/src/site/xdoc/tour/security.xml b/archiva-docs/src/site/xdoc/tour/security.xml
index 8ff0556c7..ffd61d6db 100644
--- a/archiva-docs/src/site/xdoc/tour/security.xml
+++ b/archiva-docs/src/site/xdoc/tour/security.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Role-based Security">
       <div style="text-align: center">
-        <img src="../images/tour/security.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/security.png"><img src="../images/tour/security.png" height="401" alt="" /></a>
         <p>
           Archiva uses the Redback security framework to provide flexible role-based security controls for repositories.
           You can use the graphical interface to maintain user accounts, as well as secure repositories for read and/or write
diff --git a/archiva-docs/src/site/xdoc/tour/upload.xml b/archiva-docs/src/site/xdoc/tour/upload.xml
index c53b76095..e3390de3b 100644
--- a/archiva-docs/src/site/xdoc/tour/upload.xml
+++ b/archiva-docs/src/site/xdoc/tour/upload.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Artifact Upload">
       <div style="text-align: center">
-        <img src="../images/tour/upload.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/upload.png"><img src="../images/tour/upload.png" height="401" alt="" /></a>
         <p>
           Archiva now supports artifact uploads via UI. A pom file can also be included
           in the upload or Archiva can generate one during the upload.
diff --git a/archiva-docs/src/site/xdoc/tour/virtual-repos.xml b/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
index c3e5766fc..c9d14aca2 100644
--- a/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
+++ b/archiva-docs/src/site/xdoc/tour/virtual-repos.xml
@@ -27,7 +27,7 @@
   <body>
     <section name="Virtual Repositories">
       <div style="text-align: center">
-        <img src="../images/tour/virtual-repos.png" width="640" height="401" alt="" />
+        <a id="single_image" href="../images/tour/virtual-repos.png"><img src="../images/tour/virtual-repos.png" height="401" alt="" /></a>
         <p>
           Archiva implements the concept of virtual repositories, wherein a set of
           Archiva repositories can be grouped together under one URL and that one URL