From 9866e6629d17d7fba3db7574c688fc66de8287c0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 5 Oct 2012 13:43:02 +0000 Subject: [PATCH] fix doc navigation and add missing i18n git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1394517 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/i18n/default.properties | 4 ++++ .../src/main/webapp/js/archiva/docs.js | 12 +----------- 2 files changed, 5 insertions(+), 11 deletions(-) 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 9742d40f1..bad4f58f9 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 @@ -498,3 +498,7 @@ proxy-connector-rule.pattern.already.exists=Same ProxyConnector rule already exi proxy-connector-rule.pattern.connectors.empty=You must select proxyConnectors. +menu.docs.users=User Documentation +menu.docs.rest=REST Api +docs.rest.header=REST Apis Documentations +menu.docs=Documentation diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js index 6c05603ed..e0fe2be9d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js @@ -39,17 +39,7 @@ define("archiva.docs",["jquery","i18n","jquery.tmpl","bootstrap"], function() { } displayArchivaRestDocs=function(){ - $.log("displayArchivaRestDocs"); - $("#main-content" ).html(mediumSpinnerImg()); - $.ajax({ - url:"rest-docs/rest-docs-archiva-rest-api/index.html", - type:"get", - dataType: "html", - success: function(data){ - $("#main-content" ).html($("#rest_docs").tmpl()); - $("#main-content" ).find("#rest_docs_content" ).html(data); - } - }); + window.sammyArchivaApplication.setLocation("#rest-docs-archiva-rest-api/index.html"); } loadRestDocs=function(docType, fullPath){ -- 2.39.5