Author: olamy
Date: Thu Dec 20 12:29:14 2012
New Revision: 1424433
URL: http://svn.apache.org/viewvc?rev=1424433&view=rev
Log:
[MRM-1684] feeds link behaviour seems not coherent
Modified:
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/templates/archiva/search.html
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=1424433&r1=1424432&r2=1424433&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
Thu Dec 20 12:29:14 2012
@@ -1008,6 +1008,7 @@ define("archiva.search",["jquery","i18n"
mainContent.find("#selected_repository"
).html($("#selected_repository_tmpl" )
.tmpl({repositories:data,selected:repositoryId,feedsUrl:feedsUrl}));
}else{
+ feedsUrl+="/feeds";
mainContent.find("#selected_repository"
).html($("#selected_repository_tmpl" )
.tmpl({repositories:data,selected:"",feedsUrl:null}));
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1424433&r1=1424432&r2=1424433&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Thu Dec 20 12:29:14 2012
@@ -51,32 +51,33 @@
{{/if}}
{{each(i,browseResultEntry) browseResultEntries}}
{{if browseResultEntry.project}}
- {{if deleteKarma}}
- <li class="browse-list-project">
- <img class="cursor-hand" id="delete-${browseResultEntry.name}"
src="images/trash.png"
-
data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
- <a href="#"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
- </li>
- {{else}}
- <li class="browse-list-project">
- <a href="#"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
- <a
href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img
src="images/atom.gif"></img></a>
- </li>
- {{/if}}
- {{else}}
- {{if deleteKarma}}
- <li class="browse-list">
- <img class="cursor-hand" id="delete-${browseResultEntry.name}"
src="images/trash.png"
-
data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
- <a
data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
- title="folder
${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
- </li>
+ {{if deleteKarma}}
+ <li class="browse-list-project">
+ <img class="cursor-hand" id="delete-${browseResultEntry.name}"
src="images/trash.png"
+
data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
+ <a href="#"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ <a
href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img
src="images/atom.gif"/></a>
+ </li>
+ {{else}}
+ <li class="browse-list-project">
+ <a href="#"
data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ <a
href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img
src="images/atom.gif"/></a>
+ </li>
+ {{/if}}
{{else}}
- <li class="browse-list">
- <a href="#" title="folder ${displayEntry(browseResultEntry.name)}"
-
data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
- </li>
- {{/if}}
+ {{if deleteKarma}}
+ <li class="browse-list">
+ <img class="cursor-hand" id="delete-${browseResultEntry.name}"
src="images/trash.png"
+
data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
+ <a
data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
+ title="folder
${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ </li>
+ {{else}}
+ <li class="browse-list">
+ <a href="#" title="folder ${displayEntry(browseResultEntry.name)}"
+
data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+ </li>
+ {{/if}}
{{/if}}
{{/each}}
