Author: oching
Date: Thu May 12 09:53:13 2011
New Revision: 1102222
URL: http://svn.apache.org/viewvc?rev=1102222&view=rev
Log:
[MRM-1463] better layout for artifact download box
submitted by Lucien Weller
o enlarged box to 280px (CSS and images)
o display size in KB, MB, GB depending on effective size
o added classifier next to type when available
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.bl.gif
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.ml.gif
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.tl.gif
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java?rev=1102222&r1=1102221&r2=1102222&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
Thu May 12 09:53:13 2011
@@ -59,6 +59,10 @@ public class DownloadArtifact
extends Component
{
private static final String DEFAULT_DOWNLOAD_IMAGE =
"download-type-other.png";
+
+ private static final double KILO_BYTE = 1024.0;
+ private static final double MEGA_BYTE = 1048576.0;
+ private static final double GIGA_BYTE = 1073741824.0;
/**
* @plexus.requirement role-hint="jdo"
@@ -100,7 +104,7 @@ public class DownloadArtifact
public DownloadArtifact( ValueStack stack, PageContext pageContext )
{
super( stack );
- decimalFormat = new DecimalFormat( "#,#00" );
+ decimalFormat = new DecimalFormat( "#,##0.00" );
this.req = (HttpServletRequest) pageContext.getRequest();
this.res = (HttpServletResponse) pageContext.getResponse();
try
@@ -290,13 +294,34 @@ public class DownloadArtifact
{
String type = artifact.getType();
String linkText = StringUtils.capitalize( type );
+
+ if( artifact.getModel().getClassifier() != null &&
!artifact.getModel().getClassifier().trim().equals( "" ) )
+ {
+ linkText = new StringBuilder(linkText).append("
(").append(artifact.getModel().getClassifier()).append(")").toString();
+ }
appendLink( sb, prefix, repo, artifact, linkText );
}
private void appendFilesize( StringBuffer sb, ArchivaArtifact artifact )
{
- sb.append( decimalFormat.format( artifact.getModel().getSize() ) );
+ long size = artifact.getModel().getSize();
+ if( size > GIGA_BYTE )
+ {
+ sb.append( decimalFormat.format( artifact.getModel().getSize() /
GIGA_BYTE ) ).append(" GB");
+ }
+ else if( size > MEGA_BYTE )
+ {
+ sb.append( decimalFormat.format( artifact.getModel().getSize() /
MEGA_BYTE ) ).append(" MB");
+ }
+ else if( size > KILO_BYTE )
+ {
+ sb.append( decimalFormat.format( artifact.getModel().getSize() /
KILO_BYTE ) ).append(" KB");
+ }
+ else
+ {
+ sb.append( decimalFormat.format( artifact.getModel().getSize() )
).append(" B");
+ }
}
public void setArtifactId( String artifactId )
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css?rev=1102222&r1=1102221&r2=1102222&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
Thu May 12 09:53:13 2011
@@ -45,7 +45,7 @@
font-weight: bold;
margin: 15px auto 0px auto;
height: auto;
- width: 150px;
+ width: 280px;
min-width: 120px;
display: block;
}
@@ -113,7 +113,7 @@
.download table {
margin-left: 2px;
- width: 140px;
+ width: 270px;
}
.download .icon {
@@ -122,7 +122,7 @@
.download .type {
font-size: 0.9em;
- text-align: center;
+ text-align: left;
}
.download .size {
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.bl.gif
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.bl.gif?rev=1102222&r1=1102221&r2=1102222&view=diff
==============================================================================
Binary files - no diff available.
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.ml.gif
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.ml.gif?rev=1102222&r1=1102221&r2=1102222&view=diff
==============================================================================
Binary files - no diff available.
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.tl.gif
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/download.tl.gif?rev=1102222&r1=1102221&r2=1102222&view=diff
==============================================================================
Binary files - no diff available.
