You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/11/19 01:23:56 UTC

svn commit: r718816 - in /archiva/site/src/site: apt/download.apt resources/css/jqModal.css resources/css/site.css resources/js/ resources/js/jqModal.js resources/js/jquery.lightbox.js xdoc/index.xml

Author: brett
Date: Tue Nov 18 16:23:55 2008
New Revision: 718816

URL: http://svn.apache.org/viewvc?rev=718816&view=rev
Log:
split pre-release from stable release, jquery it up

Added:
    archiva/site/src/site/resources/css/jqModal.css   (with props)
    archiva/site/src/site/resources/js/
      - copied from r706097, continuum/site/src/site/resources/js/
    archiva/site/src/site/resources/js/jqModal.js   (with props)
Removed:
    archiva/site/src/site/resources/js/jquery.lightbox.js
Modified:
    archiva/site/src/site/apt/download.apt
    archiva/site/src/site/resources/css/site.css
    archiva/site/src/site/xdoc/index.xml

Modified: archiva/site/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/download.apt?rev=718816&r1=718815&r2=718816&view=diff
==============================================================================
--- archiva/site/src/site/apt/download.apt (original)
+++ archiva/site/src/site/apt/download.apt Tue Nov 18 16:23:55 2008
@@ -6,7 +6,7 @@
 
   Archiva is distributed under the {{{http://archiva.apache.org/license.html} Apache License, version 2.0}}.
 
-* Current Version: Archiva 1.2-M1
+* Current Release: Archiva 1.1.3
 
   This is the currently recommended version of Archiva.
 
@@ -17,6 +17,28 @@
   []
 
 *-------------------------------+---------+----------+-----------+
+| Archiva 1.1.3                 | Mirrors | Checksum | Signature |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.1.3 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.1.3 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.1.3 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva 1.1.3 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.1.3-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+
+* Preview Release: Archiva 1.2-M1
+
+  This is a preview of the next version of Archiva for testing and feedback.
+
+    * {{{docs/1.2-M1/release-notes.html} Release Notes}}
+
+  []
+
+*-------------------------------+---------+----------+-----------+
 | Archiva 1.2-M1                 | Mirrors | Checksum | Signature |
 *-------------------------------+---------+----------+-----------+
 | Archiva 1.2-M1 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-bin.tar.gz.asc} asc}} |
@@ -33,18 +55,6 @@
 * Previous Versions
 
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3                 | Mirrors | Checksum | Signature |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.tar.gz.asc} asc}} |
-*-------------------------------+---------+----------+-----------+
-|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.asc} asc}} |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.asc} asc}} |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-docs.zip.asc} asc}} |
-*-------------------------------+---------+----------+-----------+
-| Archiva 1.1.3 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.1.3-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.1.3-src.zip.asc} asc}} |
-*-------------------------------+---------+----------+-----------+
 | Archiva 1.1.2                   | Mirrors | Checksum | Signature |
 *-------------------------------+---------+----------+-----------+
 | Archiva 1.1.2 Standalone        | {{{http://archive.apache.org/dist/archiva/binaries/apache-archiva-1.1.2-bin.tar.gz} tar.gz}} | {{{http://archive.apache.org/dist/archiva/binaries/apache-archiva-1.1.2-bin.tar.gz.md5} md5}} | {{{http://archive.apache.org/dist/archiva/binaries/apache-archiva-1.1.2-bin.tar.gz.asc} asc}} |

Added: archiva/site/src/site/resources/css/jqModal.css
URL: http://svn.apache.org/viewvc/archiva/site/src/site/resources/css/jqModal.css?rev=718816&view=auto
==============================================================================
--- archiva/site/src/site/resources/css/jqModal.css (added)
+++ archiva/site/src/site/resources/css/jqModal.css Tue Nov 18 16:23:55 2008
@@ -0,0 +1,37 @@
+/* jqModal base Styling courtesy of;
+	Brice Burgess <bh...@iceburg.net> */
+
+/* The Window's CSS z-index value is respected (takes priority). If none is supplied,
+	the Window's z-index value will be set to 3000 by default (via jqModal.js). */
+	
+.jqmWindow {
+    display: none;
+    
+    position: fixed;
+    top: 17%;
+    left: 50%;
+    
+    margin-left: -300px;
+    width: 600px;
+    
+    background-color: #EEE;
+    color: #333;
+    border: 1px solid black;
+    padding: 12px;
+}
+
+.jqmOverlay { background-color: #000; }
+
+/* Background iframe styling for IE6. Prevents ActiveX bleed-through (<select> form elements, etc.) */
+* iframe.jqm {position:absolute;top:0;left:0;z-index:-1;
+	width: expression(this.parentNode.offsetWidth+'px');
+	height: expression(this.parentNode.offsetHeight+'px');
+}
+
+/* Fixed posistioning emulation for IE6
+     Star selector used to hide definition from browsers other than IE6
+     For valid CSS, use a conditional include instead */
+* html .jqmWindow {
+     position: absolute;
+     top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(17 * (document.documentElement.offsetHeight || document.body.clientHeight) / 100) + 'px');
+}
\ No newline at end of file

Propchange: archiva/site/src/site/resources/css/jqModal.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: archiva/site/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/archiva/site/src/site/resources/css/site.css?rev=718816&r1=718815&r2=718816&view=diff
==============================================================================
--- archiva/site/src/site/resources/css/site.css (original)
+++ archiva/site/src/site/resources/css/site.css Tue Nov 18 16:23:55 2008
@@ -19,7 +19,6 @@
   width: 75%;
   background-color: #ccc;
   padding: 0;
-  cursor: pointer;
 }
 
 div.mainBox div {
@@ -42,10 +41,6 @@
   margin-right: 0.2em;
 }
 
-div#downloadBox {
-  display: none;
-}
-
 div.linkBox p {
   text-align: right;
   margin-bottom: 0;
@@ -61,4 +56,6 @@
   margin: 10px;
 }
 
-
+div.jqmWindow h2, div.jqmWindow p {
+  text-align: center;
+}

Added: archiva/site/src/site/resources/js/jqModal.js
URL: http://svn.apache.org/viewvc/archiva/site/src/site/resources/js/jqModal.js?rev=718816&view=auto
==============================================================================
--- archiva/site/src/site/resources/js/jqModal.js (added)
+++ archiva/site/src/site/resources/js/jqModal.js Tue Nov 18 16:23:55 2008
@@ -0,0 +1,69 @@
+/*
+ * jqModal - Minimalist Modaling with jQuery
+ *   (http://dev.iceburg.net/jquery/jqModal/)
+ *
+ * Copyright (c) 2007,2008 Brice Burgess <bh...@iceburg.net>
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ * 
+ * $Version: 07/06/2008 +r13
+ */
+(function($) {
+$.fn.jqm=function(o){
+var p={
+overlay: 50,
+overlayClass: 'jqmOverlay',
+closeClass: 'jqmClose',
+trigger: '.jqModal',
+ajax: F,
+ajaxText: '',
+target: F,
+modal: F,
+toTop: F,
+onShow: F,
+onHide: F,
+onLoad: F
+};
+return this.each(function(){if(this._jqm)return H[this._jqm].c=$.extend({},H[this._jqm].c,o);s++;this._jqm=s;
+H[s]={c:$.extend(p,$.jqm.params,o),a:F,w:$(this).addClass('jqmID'+s),s:s};
+if(p.trigger)$(this).jqmAddTrigger(p.trigger);
+});};
+
+$.fn.jqmAddClose=function(e){return hs(this,e,'jqmHide');};
+$.fn.jqmAddTrigger=function(e){return hs(this,e,'jqmShow');};
+$.fn.jqmShow=function(t){return this.each(function(){$.jqm.open(this._jqm,t);});};
+$.fn.jqmHide=function(t){return this.each(function(){$.jqm.close(this._jqm,t)});};
+
+$.jqm = {
+hash:{},
+open:function(s,t){var h=H[s],c=h.c,cc='.'+c.closeClass,z=(parseInt(h.w.css('z-index'))),z=(z>0)?z:3000,o=$('<div></div>').css({height:'100%',width:'100%',position:'fixed',left:0,top:0,'z-index':z-1,opacity:c.overlay/100});if(h.a)return F;h.t=t;h.a=true;h.w.css('z-index',z);
+ if(c.modal) {if(!A[0])L('bind');A.push(s);}
+ else if(c.overlay > 0)h.w.jqmAddClose(o);
+ else o=F;
+
+ h.o=(o)?o.addClass(c.overlayClass).prependTo('body'):F;
+ if(ie6){$('html,body').css({height:'100%',width:'100%'});if(o){o=o.css({position:'absolute'})[0];for(var y in {Top:1,Left:1})o.style.setExpression(y.toLowerCase(),"(_=(document.documentElement.scroll"+y+" || document.body.scroll"+y+"))+'px'");}}
+
+ if(c.ajax) {var r=c.target||h.w,u=c.ajax,r=(typeof r == 'string')?$(r,h.w):$(r),u=(u.substr(0,1) == '@')?$(t).attr(u.substring(1)):u;
+  r.html(c.ajaxText).load(u,function(){if(c.onLoad)c.onLoad.call(this,h);if(cc)h.w.jqmAddClose($(cc,h.w));e(h);});}
+ else if(cc)h.w.jqmAddClose($(cc,h.w));
+
+ if(c.toTop&&h.o)h.w.before('<span id="jqmP'+h.w[0]._jqm+'"></span>').insertAfter(h.o);	
+ (c.onShow)?c.onShow(h):h.w.show();e(h);return F;
+},
+close:function(s){var h=H[s];if(!h.a)return F;h.a=F;
+ if(A[0]){A.pop();if(!A[0])L('unbind');}
+ if(h.c.toTop&&h.o)$('#jqmP'+h.w[0]._jqm).after(h.w).remove();
+ if(h.c.onHide)h.c.onHide(h);else{h.w.hide();if(h.o)h.o.remove();} return F;
+},
+params:{}};
+var s=0,H=$.jqm.hash,A=[],ie6=$.browser.msie&&($.browser.version == "6.0"),F=false,
+i=$('<iframe src="javascript:false;document.write(\'\');" class="jqm"></iframe>').css({opacity:0}),
+e=function(h){if(ie6)if(h.o)h.o.html('<p style="width:100%;height:100%"/>').prepend(i);else if(!$('iframe.jqm',h.w)[0])h.w.prepend(i); f(h);},
+f=function(h){try{$(':input:visible',h.w)[0].focus();}catch(_){}},
+L=function(t){$()[t]("keypress",m)[t]("keydown",m)[t]("mousedown",m);},
+m=function(e){var h=H[A[A.length-1]],r=(!$(e.target).parents('.jqmID'+h.s)[0]);if(r)f(h);return !r;},
+hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function() {
+ if(!this[c]){this[c]=[];$(this).click(function(){for(var i in {jqmShow:1,jqmHide:1})for(var s in this[i])if(H[this[i][s]])H[this[i][s]].w[i](this);return F;});}this[c].push(s);});});};
+})(jQuery);
\ No newline at end of file

Propchange: archiva/site/src/site/resources/js/jqModal.js
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: archiva/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/index.xml?rev=718816&r1=718815&r2=718816&view=diff
==============================================================================
--- archiva/site/src/site/xdoc/index.xml (original)
+++ archiva/site/src/site/xdoc/index.xml Tue Nov 18 16:23:55 2008
@@ -5,6 +5,20 @@
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
   <body>
+    <link rel="stylesheet" href="css/jqModal.css" type="text/css" media="screen" />
+    <script src="js/jquery-1.2.6.pack.js" type="text/javascript"></script>
+    <script src="js/jqModal.js" type="text/javascript"></script>
+    <script type="text/javascript">
+<![CDATA[
+            $(document).ready(function(){
+ $('#dialogStable').jqm();
+ $('#dialogStable').jqmAddTrigger($('span.expand:eq(0)').find('a'));
+ $('#dialogPrerelease').jqm();
+ $('#dialogPrerelease').jqmAddTrigger($('span.expand:eq(1)').find('a'));
+            });
+]]>
+    </script>
+
     <style type="text/css">
       div.section {
         margin-right: 175px;
@@ -89,7 +103,7 @@
          and usage reporting, extensible scanning functionality... and many more!
       </p>
 
-      <div class="mainBox" onclick="location.href='docs/1.2-M1/tour/index.html'">
+      <div class="mainBox">
         <div>
           <span class="bignumber">1</span>
 
@@ -106,7 +120,7 @@
           <br style="clear: left" />
         </div>
       </div>
-      <div class="mainBox" onmouseover="document.getElementById('downloadBox').style.display='block';" onmouseout="document.getElementById('downloadBox').style.display='none';" onclick="location.href='download.html'">
+      <div class="mainBox">
         <div>
           <span class="bignumber">2</span>
 
@@ -114,11 +128,59 @@
             <a href="download.html">Download Archiva <img src="images/arrow.png" width="16" height="16" alt="" /></a>
           </p>
           <p>
-            <!-- TODO: use velocity and property throughout -->
-            Download the latest release Archiva 1.2-M1 - November 14, 2008<br/><a href="docs/1.2-M1/release-notes.html">Release Notes</a>
+            <span class="expand">
+              <img src="images/collapsed.gif" width="7" height="7" alt="" />
+              <strong>Stable release</strong>: <a href="#">Archiva 1.1.3</a> - October 9, 2008 
+            </span>
+            <br/>
+            <span class="expand">
+              <!-- TODO: use velocity and property throughout -->
+              <img src="images/collapsed.gif" width="7" height="7" alt="" />
+              <strong>Preview release</strong>: <a href="#">Archiva 1.2-M1</a> - November 14, 2008
+            </span>
+            <br/>
+            <span class="expand">
+              <img src="images/collapsed.gif" width="7" height="7" alt="" />
+              <a href="download.html"><strong>All downloads</strong></a>
+            </span>
           </p>
         </div>
-        <div id="downloadBox" class="linkBox">
+      </div>
+      <div id="dialogStable" class="jqmWindow">
+        <h2>Archiva 1.1.3</h2>
+        <p>
+          This is the recommended release of Archiva.
+        </p>
+        <div class="linkBox">
+          <table>
+            <tr>
+              <th> </th>
+              <th>Mirrors</th>
+              <th>Checksum</th>
+              <th>Signature</th>
+            </tr>
+            <tr>
+              <td>Archiva 1.1.3 Standalone</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3-bin.zip">zip</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3-bin.zip.asc">asc</a></td>
+            </tr>
+            <tr>
+              <td>Archiva 1.1.3 WAR</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.1.3.war">war</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.1.3.war.asc">asc</a></td>
+            </tr>
+          </table> 
+        </div>
+        <p><a href="docs/1.1.3/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
+      </div>
+      <div id="dialogPrerelease" class="jqmWindow">
+        <h2>Archiva 1.2-M1</h2>
+        <p>
+          This is a preview release of the next version of Archiva.
+        </p>
+        <div class="linkBox">
           <table>
             <tr>
               <th> </th>
@@ -138,21 +200,9 @@
               <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.md5">md5</a></td>
               <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1.war.asc">asc</a></td>
             </tr>
-            <tr>
-              <td>Archiva 1.2-M1 Documentation</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.2-M1-docs.zip">docs zip</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-docs.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.2-M1-docs.zip.asc">asc</a></td>
-            </tr>
-            <tr>
-              <td>Archiva 1.2-M1 Sources</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.2-M1-src.zip">source zip</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/source/apache-archiva-1.2-M1-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/source/apache-archiva-1.2-M1-src.zip.asc">asc</a></td>
-            </tr>
           </table> 
-          <p><a href="download.html">All downloads</a></p>
         </div>
+        <p><a href="docs/1.2-M1/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
       </div>
       <div class="mainBox" onclick="location.href='docs/1.2-M1/quick-start.html'">
         <div>