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/02/17 18:40:10 UTC
svn commit: r1245678 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
search.js templates/search.html
Author: olamy
Date: Fri Feb 17 17:40:09 2012
New Revision: 1245678
URL: http://svn.apache.org/viewvc?rev=1245678&view=rev
Log:
magnify browsing :-)
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/archiva/templates/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=1245678&r1=1245677&r2=1245678&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 Fri Feb 17 17:40:09 2012
@@ -18,17 +18,50 @@
*/
$(function() {
+ //-----------------------------------------
+ // browse part
+ //-----------------------------------------
+
BrowseViewModel=function(browseResultEntries,parentGroupdId){
+ var self=this;
this.browseResultEntries=browseResultEntries;
this.parentGroupdId=parentGroupdId;
displayGroupId=function(groupId){
- displayGroupDetail(groupId,"..");
+ displayGroupDetail(groupId,self.parentGroupdId);
}
}
+ displayGroupDetail=function(groupId,parentGroupdId){
+ var mainContent = $("#main-content");
+ var browseResult=mainContent.find("#browse_result");
+ var browseBreadCrumb=mainContent.find("#browse_breadcrumb");
+ mainContent.find("#main_browse_result_content").hide( "slide", {}, 300,
+ function(){
+ browseResult.html(mediumSpinnerImg());
+ browseBreadCrumb.html(smallSpinnerImg());
+ mainContent.find("#main_browse_result_content" ).show();
+ var url = "restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId);
+ $.ajax(url, {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ var browseResultEntries = mapbrowseResultEntries(data);
+ var browseViewModel = new BrowseViewModel(browseResultEntries,parentGroupdId);
+
+ ko.applyBindings(browseViewModel,mainContent.get(0));
+ }
+ });
+ }
+ );
+
+ }
+
+ /**
+ * call from menu entry to display root level
+ */
displayBrowse=function(){
clearUserMessages();
var mainContent = $("#main-content");
@@ -40,40 +73,12 @@ $(function() {
success: function(data) {
var browseResultEntries = mapbrowseResultEntries(data);
$.log("size:"+browseResultEntries.length);
- var browseViewModel = new BrowseViewModel(browseResultEntries);
-
+ var browseViewModel = new BrowseViewModel(browseResultEntries,"..");
ko.applyBindings(browseViewModel,mainContent.get(0));
}
});
}
- displayGroupDetail=function(groupId,parentGroupdId){
- var mainContent = $("#main-content");
- var browseResult=mainContent.find("#browse_result");
- browseResult.hide( "slide", {}, 500,
- function(){
- browseResult.html(mediumSpinnerImg());
- browseResult.show();
- var url = "restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId);
- $.ajax(url, {
- type: "GET",
- dataType: 'json',
- success: function(data) {
- var browseResultEntries = mapbrowseResultEntries(data);
- var browseViewModel = new BrowseViewModel(browseResultEntries,parentGroupdId);
-
- ko.applyBindings(browseViewModel,mainContent.get(0));
- }
- });
- }
- );
-
- }
-
- displaySearch=function(){
- $("#main-content" ).html("coming soon :-)");
- }
-
mapbrowseResultEntries=function(data){
if (data.browseResult && data.browseResult.browseResultEntries) {
return $.isArray(data.browseResult.browseResultEntries) ?
@@ -88,4 +93,13 @@ $(function() {
this.name=name;
this.project=project;
}
+
+ //-----------------------------------------
+ // search part
+ //-----------------------------------------
+
+ displaySearch=function(){
+ $("#main-content" ).html("coming soon :-)");
+ }
+
});
\ No newline at end of file
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=1245678&r1=1245677&r2=1245678&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 Fri Feb 17 17:40:09 2012
@@ -23,14 +23,11 @@
<h2>${$.i18n.prop('browse.repository')}</h2>
</div>
</div>
- <div id="browse_breadcrumb">
- <ul class="breadcrumb">
- <li><a href="#"><i class="icon-home"/> </a> <span class="divider">/</span></li>
- <li><a href="#">org</a> <span class="divider">/</span></li>
- </ul>
- </div>
- <div id="browse_result" class="well" data-bind='template:{name:"browse-groups-tmpl"}'>
-
+ <div id="main_browse_result">
+ <div id="main_browse_result_content" class="well">
+ <div id="browse_breadcrumb" data-bind='template:{name:"browse-breadcrumb-tmpl"}'></div>
+ <div id="browse_result" class="well" data-bind='template:{name:"browse-groups-tmpl"}'></div>
+ </div>
</div>
</script>
@@ -53,4 +50,11 @@
{{/each}}
</ul>
</div>
+</script>
+
+<script id="browse-breadcrumb-tmpl" type="text/html">
+ <ul class="breadcrumb">
+ <li><a href="#"><i class="icon-home"/> </a> <span class="divider">/</span></li>
+ <li><a href="#">org</a> <span class="divider">/</span></li>
+ </ul>
</script>
\ No newline at end of file