Switching site publish to asf-staging branch

4 files changed, 156 insertions, 59 deletions

diff --git a/archiva-docs/src/site/resources/css/site.css b/archiva-docs/src/site/resources/css/site.css
index 11f870b91..2374bd1fa 100755
--- a/archiva-docs/src/site/resources/css/site.css
+++ b/archiva-docs/src/site/resources/css/site.css
@@ -17,75 +17,91 @@
  * under the License.
  */
 
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
-  background: none;
-  padding-right: 0;
+body {
+  padding-top: 1px;
+}
+
+a.externalLink[href^="https"] {
+  background: url('../images/external-link-12x12.png') right center no-repeat;
+  padding-right: 18px;
+}
+
+a.externalLink[href^="http"] {
+  background: url('../images/external-link-12x12.png') right center no-repeat;
+  padding-right: 18px;
 }
 
-body ul {
-  list-style-type: square;
+#bodyColumn {
+  margin-left: 1.5em;
 }
 
-#downloadbox {
+div#rhs {
   float: right;
-  margin-left: 2em;
-  padding-left: 1em;
-  padding-right: 1em;
-  padding-bottom: 1em;
-  border: 1px solid #999;
-  background-color: #eee;
-  width: 17.5em;
-}
-
-#downloadbox h5 {
-  color: #000;
-  margin: 0;
-  border-bottom: 1px solid #aaaaaa;
-  font-size: smaller;
-  padding: 0;
+  text-align: center;
+}
+
+div.mainBox {
+  margin-left: auto;
+  margin-right: auto;
   margin-top: 1em;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 5em;
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
+
+div.mainBox div {
+  padding: 0.4em;
 }
 
-#downloadbox p {
+div.newsBox {
+  margin-left: auto;
+  margin-right: auto;
   margin-top: 1em;
-  margin-bottom: 0;
+  margin-bottom: 1em;
+  width: 75%;
+  background-color: #ccc;
+  position: relative;
+  padding-left: 8em;
+  border-top-right-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
 
-#downloadbox li {
-  text-indent: inherit;
+div.newsBox div {
+  padding: 0.6em;
 }
 
-div.p {
-  margin-top: 5px;
-  margin-bottom: 10px;
+div.mainBox span + p a {
+  background: url(../images/arrow.png) no-repeat;
+  background-size: 16px 16px;
+  background-position: right;
+  padding-right: 20px;
 }
 
-pre.commandline {
-  border: 1px solid #bbb;
-  background-color: white;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  font-size: 10pt;
-  padding: 15px;
-  color: gray;
+div.mainBox span + p a {
+  font-size: 1.5em;
+  /*color: black;*/
 }
 
-img {
-  border-style: solid ;
-  border-width: 1px;
-  border-color: #ddd;
-  padding: 5px;
-  margin-top: 10px;
-  border-radius: 5px;
+div.mainBox span + p a:hover {
+  /*color: blue;*/
 }
 
-pre.commandline .input {
-  color: #55f;
+.bignumber {
+  position: absolute;
+  color: white;
+  left: 0.25em;
+  font-size: 1.9em;
 }
 
-pre.commandline .command {
-  color: black;
-  font-weight: bold;
+div.linkBox p {
+  text-align: right;
+  margin-bottom: 0;
+  margin-top: 0;
+  padding-top: 0;
 }
 
 #banner {
@@ -93,7 +109,78 @@ pre.commandline .command {
 }
 
 #banner img {
-  margin: 2px;
+  margin: 10px;
+}
+
+div.jqmWindow h2, div.jqmWindow p {
+  text-align: center;
 }
 
+span.jqmClose {
+  position: absolute;
+  cursor: pointer;
+  right: 4px;
+  top: 6px;
+}
+
+
+div.section {
+  margin-right: 110px;
+  margin-left: 10px;
+}
+
+.hero-unit p {
+  /* font-weight: inherit;*/
+}
+
+.archivascreenshots {
+  border: 1px solid silver;
+  margin-left: 0.25em;
+  margin-bottom: 0.25em
+}
+
+.rhs span {
+  display: block;
+  font-size: 13px;
+  font-weight: bold;
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+
+.container ul li iframe {
+  margin-top: 4px;
+  margin-right: 4px;
+}
+
+.modal-body table {
+  border: 0px;
+}
+
+
+.features-preview:after {
+  background-color: #F5F5F5;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px 0 4px 0;
+  color: #9DA0A4;
+  content: "New web UI";
+  font-size: 12px;
+  font-weight: bold;
+  left: -1px;
+  padding: 3px 7px;
+  position: absolute;
+  top: -1px;
+
+}
+.features-preview {
+  background-color: #FFFFFF;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px 4px 4px 4px;
+  margin: 15px 0;
+  padding: 39px 19px 14px;
+  position: relative;
+  min-height: 450px;
+}
 
+.carousel .item > img {
+  min-height: 400px;
+}
\ No newline at end of file
diff --git a/archiva-docs/src/site/resources/images/external-link-12x12.png b/archiva-docs/src/site/resources/images/external-link-12x12.png
new file mode 100644
index 000000000..8ea642ef3
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/external-link-12x12.png
diff --git a/archiva-docs/src/site/resources/images/external-link.png b/archiva-docs/src/site/resources/images/external-link.png
new file mode 100644
index 000000000..bd5fbd482
--- /dev/null
+++ b/archiva-docs/src/site/resources/images/external-link.png
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index 18cc67806..3ca1226c4 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -53,7 +53,7 @@
       <gitHub>
         <projectId>apache/archiva</projectId>
         <ribbonOrientation>right</ribbonOrientation>
-        <ribbonColor>black</ribbonColor>
+        <ribbonColor>gray</ribbonColor>
       </gitHub>
     </fluidoSkin>
 
@@ -66,7 +66,7 @@
 
     <breadcrumbs>
       <item name="Apache" href="https://www.apache.org" />
-      <item name="Archiva" href="https://archiva.apache.org" />
+      <item name="Archiva" href="https://archiva.apache.org/index.html" />
       <item name="Archiva Documentation" href="index.html" />
     </breadcrumbs>
 
@@ -74,7 +74,7 @@
       <item name="Quick Start"   href="/quick-start.html" />
       <item name="Feature Tour"  href="/tour/index.html" />
       <item name="Release Notes" href="/release-notes.html" />
-      <item name="Downloads"     href="http://archiva.apache.org/download.html" />
+      <item name="Downloads"     href="https://archiva.apache.org/download.html" />
     </menu>
 
     <menu name="Users Guide">
@@ -143,23 +143,33 @@
     </menu>
 
     <menu name="More Information">
-      <item name="Archiva Wiki"              href="http://cwiki.apache.org/confluence/display/ARCHIVA/Index" />
+      <item name="Archiva Wiki"              href="https://cwiki.apache.org/confluence/display/ARCHIVA/Index" />
     </menu>
 
     <menu name="ASF">
-      <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
-      <item name="Foundation" href="http://www.apache.org/foundation/"/>
-      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
-      <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works.html"/>
+      <item name="Foundation" href="https://www.apache.org/foundation/"/>
+      <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Thanks" href="https://www.apache.org/foundation/thanks.html"/>
     </menu>
     <footer>
       <![CDATA[
-      <div class="row span12">Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation.</div>
-      <div class="row span12">
+      <div class="row">
+      <div class="span6 offset1">Apache Archiva, Archiva, Apache, the Apache feather logo, and the Apache Archiva project logos are trademarks of The Apache Software Foundation.</div>
+      </div>
+      <div class="row">
+        &nbsp;
+      </div>
+      <div class="row">
+      <div class="span6 offset2">
+      <p>
         <a href="${project.url}privacy-policy.html">Privacy Policy</a>
+        </p>
+      </div>
       </div>
       ]]>
     </footer>
 
+
   </body>
 </project>