svn commit: r1302893 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/main/resources/org/apache/archiva/i18n/ archiva-webapp-js/src/main/webapp/js/archiva/ archiva-webapp-js/src/main/webapp/js/archiva/templates/

[ol...@apache.org]

Author: olamy
Date: Tue Mar 20 13:48:14 2012
New Revision: 1302893

URL: http://svn.apache.org/viewvc?rev=1302893&view=rev
Log:
[MRM-1615] Artifact detail view
pom snippet.

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1302893&r1=1302892&r2=1302893&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Tue Mar 20 13:48:14 2012
@@ -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

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1302893&r1=1302892&r2=1302893&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Tue Mar 20 13:48:14 2012
@@ -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) {

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1302893&r1=1302892&r2=1302893&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Tue Mar 20 13:48:14 2012
@@ -430,7 +430,7 @@
     <div class="tab-content">
   	  <div id="artifact-details-info-content" class="tab-pane active">
         <blockquote>${projectVersionMetadata.description}</blockquote>
-        <div class="row span4">
+        <div class="row span6">
         <table class="table">
           <tbody>
             <tr>
@@ -456,13 +456,16 @@
                 <a href="#" data-bind="click: displayParent">
                   ${projectVersionMetadata.mavenFacet.parent.groupId}:${projectVersionMetadata.mavenFacet.parent.artifactId}:${projectVersionMetadata.mavenFacet.parent.version}
                 </a>
-
               </td>
             </tr>
             {{/if}}
           </tbody>
         </table>
         </div>
+        <div class="row span5">
+          <h4>${$.i18n.prop('browse.artifact.pom.snippet')}</h4>
+            <pre class="prettyprint">&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId&gt;${groupId}&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId&gt;${artifactId}&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version&gt;${version}&lt;/version&gt;<br/>&lt;/dependency&gt;</pre>
+          </div>
   	  </div>