Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1684] feeds link behaviour seems not coherent 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1424433 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-12-20 12:29:14 +00:00
parent 8447215c1f
commit 6d3d28eb21
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
View File

@ -1008,6 +1008,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ) mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" )
.tmpl({repositories:data,selected:repositoryId,feedsUrl:feedsUrl})); .tmpl({repositories:data,selected:repositoryId,feedsUrl:feedsUrl}));
}else{ }else{
feedsUrl+="/feeds";
mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" ) mainContent.find("#selected_repository" ).html($("#selected_repository_tmpl" )
.tmpl({repositories:data,selected:"",feedsUrl:null})); .tmpl({repositories:data,selected:"",feedsUrl:null}));
} }

51
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
View File

@ -51,32 +51,33 @@
{{/if}} {{/if}}
{{each(i,browseResultEntry) browseResultEntries}} {{each(i,browseResultEntry) browseResultEntries}}
{{if browseResultEntry.project}} {{if browseResultEntry.project}}
{{if deleteKarma}} {{if deleteKarma}}
<li class="browse-list-project"> <li class="browse-list-project">
<img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png" <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/> data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
<a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a> <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
</li> <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}} {{else}}
<li class="browse-list-project"> {{if deleteKarma}}
<a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a> <li class="browse-list">
<a href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img src="images/atom.gif"></img></a> <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
</li> data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
{{/if}} <a data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
{{else}} title="folder ${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
{{if deleteKarma}} </li>
<li class="browse-list"> {{else}}
<img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png" <li class="browse-list">
data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/> <a href="#" title="folder ${displayEntry(browseResultEntry.name)}"
<a data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#" data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
title="folder ${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a> </li>
</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}} {{/if}}
{{/each}} {{/each}}