You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/28 13:17:16 UTC
svn commit: r1306259 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main:
java/org/apache/archiva/webapp/ui/services/model/ webapp/ webapp/img/
webapp/js/ webapp/js/templates/archiva/
Author: olamy
Date: Wed Mar 28 11:17:16 2012
New Revision: 1306259
URL: http://svn.apache.org/viewvc?rev=1306259&view=rev
Log:
[MRM-1586] rewrite upload artifact page
cleanup ui.
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java?rev=1306259&r1=1306258&r2=1306259&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/webapp/ui/services/model/FileMetadata.java Wed Mar 28 11:17:16 2012
@@ -18,8 +18,8 @@ package org.apache.archiva.webapp.ui.ser
* under the License.
*/
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
/**
* @author Olivier Lamy
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlRoot
*/
@XmlRootElement( name = "fileMetadata" )
public class FileMetadata
+ implements Serializable
{
private String name;
@@ -82,7 +83,6 @@ public class FileMetadata
this.url = url;
}
- @XmlElement( name = "delete_url" )
public String getDeleteUrl()
{
return deleteUrl;
@@ -94,7 +94,6 @@ public class FileMetadata
this.deleteUrl = deleteUrl;
}
- @XmlElement( name = "delete_type" )
public String getDeleteType()
{
return deleteType;
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif?rev=1306259&view=auto
==============================================================================
Files archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif (added) and archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif Wed Mar 28 11:17:16 2012 differ
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif?rev=1306259&view=auto
==============================================================================
Files archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif (added) and archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif Wed Mar 28 11:17:16 2012 differ
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1306259&r1=1306258&r2=1306259&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Wed Mar 28 11:17:16 2012
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
+ <link rel="stylesheet" href="jquery.fileupload-ui.css"/>
<link rel="stylesheet" href="css/chosen-0.9.7.css"/>
<link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css"/>
<link rel="stylesheet" href="css/bootstrap.2.0.2.css">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js?rev=1306259&r1=1306258&r2=1306259&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js Wed Mar 28 11:17:16 2012
@@ -134,9 +134,10 @@
template,
preview;
if (data.context) {
- data.context.each(function (index) {
+
+ data.context.each(function (index, e) {
var file = ($.isArray(data.result) &&
- data.result[index]) || {error: 'emptyResult'};
+ data.result[index]) || data.result || {error: 'emptyResult'};
if (file.error) {
that._adjustMaxNumberOfFiles(1);
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html?rev=1306259&r1=1306258&r2=1306259&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html Wed Mar 28 11:17:16 2012
@@ -1,101 +1,101 @@
<script id="file-upload-tmpl" type="text/html">
-<form id="fileupload" action="restServices/archivaUiServices/fileUploadService/upload" method="POST" enctype="multipart/form-data">
- <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+ <form id="fileupload" action="restServices/archivaUiServices/fileUploadService/upload" method="POST" enctype="multipart/form-data">
<div class="row fileupload-buttonbar">
- <div class="span7">
- <!-- The fileinput-button span is used to style the file input field as button -->
- <span class="btn btn-success fileinput-button">
- <i class="icon-plus icon-white"></i>
- <span>Add files...</span>
- <input type="file" name="files[]" multiple>
- </span>
- <button type="submit" class="btn btn-primary start">
- <i class="icon-upload icon-white"></i>
- <span>Start upload</span>
- </button>
- <button type="reset" class="btn btn-warning cancel">
- <i class="icon-ban-circle icon-white"></i>
- <span>Cancel upload</span>
- </button>
- <button type="button" class="btn btn-danger delete">
- <i class="icon-trash icon-white"></i>
- <span>Delete</span>
- </button>
- <input type="checkbox" class="toggle">
- </div>
- <div class="span5">
- <!-- The global progress bar -->
- <div class="progress progress-success progress-striped active">
- <div class="bar" style="width:0%;"></div>
- </div>
+ <div class="span7">
+ <span class="btn btn-success fileinput-button">
+ <i class="icon-plus icon-white"></i>
+ <span>Add files...</span>
+ <input type="file" name="files[]" multiple="">
+ </span>
+ <button type="submit" class="btn btn-primary start">
+ <i class="icon-upload icon-white"></i>
+ <span>Start upload</span>
+ </button>
+ <button type="reset" class="btn btn-warning cancel">
+ <i class="icon-ban-circle icon-white"></i>
+ <span>Cancel upload</span>
+ </button>
+ <button type="button" class="btn btn-danger delete">
+ <i class="icon-trash icon-white"></i>
+ <span>Delete</span>
+ </button>
+ <input type="checkbox" class="toggle">
+ </div>
+ <div class="span5">
+ <div class="progress progress-success progress-striped active">
+ <div class="bar" style="width:0%;"></div>
</div>
+ </div>
</div>
- <!-- The loading indicator is shown during image processing -->
<div class="fileupload-loading"></div>
<br>
- <!-- The table listing the files available for upload/download -->
- <table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
+ <table class="table table-striped">
+ <tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody>
+ </table>
</form>
</script>
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
+<script id="template-upload" type="text/html">
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
<tr class="template-upload">
- <td class="preview"><span class=""></span></td>
- <td class="name"><span>{%=file.name%}</span></td>
- <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
- {% if (file.error) { %}
- <td class="error" colspan="2"><span class="label label-important">{%=$.i18n.prop('fileupload.error')%}</span> {%=$.i18n.prop('fileupload.errors.'+[file.error]) || file.error%}</td>
- {% } else if (o.files.valid && !i) { %}
- <td>
- <div class="progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
- </td>
- <td class="start">{% if (!o.options.autoUpload) { %}
- <button class="btn btn-primary">
- <i class="icon-upload icon-white"></i>
- <span>{%=$.i18n.prop('fileupload.start')%}</span>
- </button>
- {% } %}</td>
- {% } else { %}
- <td colspan="2"></td>
+ <td class="name"><span>{%=file.name%}</span></td>
+ <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+ {% if (file.error) { %}
+ <td class="error" colspan="2">
+ <span class="label label-important">{%=$.i18n.prop('fileupload.error')%}</span>
+ {%=$.i18n.prop('fileupload.errors.'+[file.error]) || file.error%}
+ </td>
+ {% } else if (o.files.valid && !i) { %}
+ <td>
+ <div class="progress progress-success progress-striped active">
+ <div class="bar" style="width:0%;"></div>
+ </div>
+ </td>
+ <td class="start">
+ {% if (!o.options.autoUpload) { %}
+ <button class="btn btn-primary">
+ <i class="icon-upload icon-white"></i>
+ <span>{%=$.i18n.prop('fileupload.start')%}</span>
+ </button>
{% } %}
- <td class="cancel">{% if (!i) { %}
- <button class="btn btn-warning">
- <i class="icon-ban-circle icon-white"></i>
- <span>{%=$.i18n.prop('fileupload.cancel')%}</span>
- </button>
- {% } %}</td>
+ </td>
+ {% } else { %}
+ <td colspan="2"></td>
+ {% } %}
+ <td class="cancel">
+ {% if (!i) { %}
+ <button class="btn btn-warning">
+ <i class="icon-ban-circle icon-white"></i>
+ <span>{%=$.i18n.prop('fileupload.cancel')%}</span>
+ </button>
+ {% } %}
+ </td>
</tr>
-{% } %}
+ {% } %}
</script>
-<!-- The template to display files available for download -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
- <tr class="template-download">
- {% if (file.error) { %}
- <td></td>
- <td class="name"><span>{%=file.name%}</span></td>
- <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
- <td class="error" colspan="2"><span class="label label-important">{%=$.i18n.prop('fileupload.error')%}</span> {%=$.i18n.prop('fileupload.errors.'+[file.error]) || file.error%}</td>
- {% } else { %}
- <td class="preview">{% if (file.thumbnail_url) { %}
- <a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
- {% } %}</td>
- <td class="name">
- <a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
- </td>
- <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
- <td colspan="2"></td>
- {% } %}
- <td class="delete">
- <button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
- <i class="icon-trash icon-white"></i>
- <span>{%=$.i18n.prop('fileupload.destroy')%}</span>
- </button>
- <input type="checkbox" name="delete" value="1">
- </td>
+
+<script id="template-download" type="text/html">
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+ <tr class="template-download">
+ <td class="name"><span>{%=file.name%}</span></td>
+ <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+ {% if (file.error) { %}
+ <td class="error" colspan="2">
+ <span class="label label-important">{%=$.i18n.prop('fileupload.error')%}</span>
+ {%=$.i18n.prop('fileupload.errors.'+[file.error]) || file.error%}
+ </td>
+ {% } else { %}
+ <td colspan="2"></td>
+ {% } %}
+ <td class="delete">
+ <button class="btn btn-danger" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}">
+ <i class="icon-trash icon-white"></i>
+ <span>{%=$.i18n.prop('fileupload.destroy')%}</span>
+ </button>
+ <input type="checkbox" name="delete" value="1">
+ </td>
</tr>
{% } %}
</script>
\ No newline at end of file