From: Olivier Lamy Date: Tue, 20 Mar 2012 13:48:14 +0000 (+0000) Subject: [MRM-1615] Artifact detail view X-Git-Tag: archiva-1.4-M3~996 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=81c26add27958809469f4c4d41b9fa15b49560fe;p=archiva.git [MRM-1615] Artifact detail view pom snippet. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1302893 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index e98961f83..7daa6a628 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -259,6 +259,7 @@ artifact.detail.tab.header.info=Info artifact.detail.tab.header.dependency.tree=Dependency Tree artifact.detail.tab.header.used.by=Used By browse.artifact.version=Version +browse.artifact.pom.snippet=POM Snippet #login login.username.placehoder=Username diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js index 942efe0f3..1ae374d08 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js @@ -273,7 +273,7 @@ $(function() { type: "GET", dataType: 'json', success: function(data) { - mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ).tmpl({repositories:data})); + mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ).tmpl({repositories:data,selected:""})); var url="restServices/archivaServices/browseService/rootGroups" $.ajax(url, { type: "GET", @@ -314,7 +314,7 @@ $(function() { } var selectedRepo=getSelectedBrowsingRepository(); if (selectedRepo){ - url+="?repositoryId="+selectedRepo; + url+="?repositoryId="+encodeURIComponent(selectedRepo); } $( "#main-content #browse-autocomplete" ).autocomplete({ minLength: 2, @@ -362,7 +362,7 @@ $(function() { var browseUrl="restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(query); var selectedRepo=getSelectedBrowsingRepository(); if (selectedRepo){ - browseUrl+="?repositoryId="+selectedRepo; + browseUrl+="?repositoryId="+encodeURIComponent(selectedRepo); } $.get(browseUrl, function(data) { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html index cee3ea280..7a6e9b610 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html @@ -430,7 +430,7 @@
${projectVersionMetadata.description}
-
+ +
+

${$.i18n.prop('browse.artifact.pom.snippet')}

+
<dependency>
  <groupId>${groupId}</groupId>
  <artifactId>${artifactId}</artifactId>
  <version>${version}</version>
</dependency>
+