-
<%=i18n.localize("All APIs")%>
+
+
+
<%=i18n.localize("All APIs")%>
@@ -22,9 +22,9 @@
if (outputs.error) { %>
<% }else{
- %>
-
<%}else{
- currentPage = currentPage - 1;
- %>
- <%
- } } }
+ } } }
var from = (currentPage - 1)*itemsPerPage;
var to = currentPage*itemsPerPage;
if(currentPage == numberOfPages){
@@ -163,9 +163,21 @@
} %>
<% if(apis){
- for(var apiInfo in apis) {
+ for(var apiInfo in apis) {
api = apis[apiInfo];
path = jagg.getMappedUrl("/site/pages/item-info.jag") + "?name=" + api.name + "&version=" + api.version + "&provider=" + api.provider+urlPostfix;
+ tooltip = "Browse API";
+ if (api.resultType != null && api.resultType == "Document") {
+ if (api.docSourceType == "FILE") {
+ var tenant = jagg.getTenantDomain();
+ docPath = jagg.url("/site/themes/wso2/templates/documentation/download.jag?tenant=" + tenant + "&resourceUrl=" + api.docFilePath)
+ tooltip = "Download Document";
+ } else {
+ docPath = jagg.getMappedUrl("/site/pages/doc-viewer.jag") + "?docName=" + api.docName + "&name=" + api.name + "&version=" + api.version + "&provider=" + api.provider+urlPostfix;
+ tooltip = "View Document";
+ }
+ }
+
var nameSubstring = api.name;
if (api.name.length > 15) {
@@ -173,14 +185,8 @@
}
var apiUrlId = "name="+encode.forHtml(api.name)+"&version="+encode.forHtml(api.version)+"&provider="+encode.forHtml(api.provider) + urlPostfix;
- var isEditable = false;
- var userobj = jagg.getUser();
- var isSuperAdmin = jagg.getManageTierPermitted().permitted;
-
- if (api.provider == userobj.username || userobj.username == "admin" || isSuperAdmin == true)
- { isEditable = true; }
- %>
- <%if(query != null && (query.indexOf("Doc:") == 0 || query.indexOf("doc:") == 0)) {%>
+ %>
+ <%if(query != null && (query.indexOf("Doc:") == 0 || query.indexOf("doc:") == 0)) {%>
<%} else {%>
+
-
-
-
+});
+
+
- <% }); %>
+<% }); %>
diff --git a/components/jaggery-apps/publisher/src/main/publisher/site/themes/wso2/templates/menu/actions/template.jag b/components/jaggery-apps/publisher/src/main/publisher/site/themes/wso2/templates/menu/actions/template.jag
index cc482cc3a..d83627bed 100644
--- a/components/jaggery-apps/publisher/src/main/publisher/site/themes/wso2/templates/menu/actions/template.jag
+++ b/components/jaggery-apps/publisher/src/main/publisher/site/themes/wso2/templates/menu/actions/template.jag
@@ -1,4 +1,4 @@
-<% jagg.template("menu/actions", function(inputs, outputs, jagg) { %>
+<% jagg.template("menu/actions", function (inputs, outputs, jagg) { %>
<%
var encode = require('encode');
encode = new encode.Encode();
@@ -7,7 +7,7 @@
var ssoEnabled = site.ssoConfiguration.enabled;
var urlPrefix = '', urlPostfix = '', isCreatePermitted, isPublishPermitted, api;
- if(tenantDomain!='null'){
+ if (tenantDomain != 'null') {
urlPrefix = "?tenant=" + tenantDomain;
urlPostfix = "&tenant=" + tenantDomain;
}
@@ -16,12 +16,13 @@
var reqUrl = jagg.getAbsoluteReqUrl(request.getRequestURI()) + urlPrefix;
-
var listUrl = jagg.getAbsoluteUrl("/site/pages/index.jag") + urlPrefix;
var listMappedUrl = jagg.getMappedUrl("/site/pages/index.jag") + urlPrefix;
- var infoUrl = jagg.getAbsoluteUrl("/site/pages/item-info.jag") + urlPrefix;;
- var infoMappedUrl = jagg.getMappedUrl("/site/pages/item-info.jag") + urlPrefix;;
+ var infoUrl = jagg.getAbsoluteUrl("/site/pages/item-info.jag") + urlPrefix;
+ ;
+ var infoMappedUrl = jagg.getMappedUrl("/site/pages/item-info.jag") + urlPrefix;
+ ;
var subsUrl = jagg.getAbsoluteUrl("/site/pages/subscriptions.jag") + urlPrefix;
var subsMappedUrl = jagg.getMappedUrl("/site/pages/subscriptions.jag") + urlPrefix;
@@ -32,8 +33,8 @@
var versionUrl = jagg.getAbsoluteUrl("/site/pages/version.jag") + urlPrefix;
var versionMappedUrl = jagg.getMappedUrl("/site/pages/version.jag") + urlPrefix;
- var addUrl=jagg.getAbsoluteUrl("/site/pages/add.jag") + urlPrefix;
- var addMappedUrl=jagg.getMappedUrl("/site/pages/add.jag") + urlPrefix;
+ var addUrl = jagg.getAbsoluteUrl("/site/pages/add.jag") + urlPrefix;
+ var addMappedUrl = jagg.getMappedUrl("/site/pages/add.jag") + urlPrefix;
var addDesignUrl = jagg.getMappedUrl("/site/pages/design.jag") + urlPrefix;
var addImplementUrl = jagg.getMappedUrl("/site/pages/implement.jag") + urlPrefix;
@@ -50,14 +51,6 @@
isCreatePermitted = jagg.getCreatePermitted().permitted;
isPublishPermitted = jagg.getPublishPermitted().permitted;
- var isEditable = false;
- provider = request.getParameter("provider");
- var userobj = jagg.getUser();
- var isSuperAdmin = jagg.getManageTierPermitted().permitted;
-
- if (provider == userobj.username || userobj.username == "admin" || isSuperAdmin == true)
- { isEditable = true; }
-
if(api) {
var provider = api.provider;
var APIUtil = Packages.org.wso2.carbon.apimgt.impl.utils.APIUtil;
@@ -93,16 +86,16 @@
aria-controls="navbar2" title="navigator bar">
-
-
-
+
+
+
-
-
+
+
@@ -194,7 +200,7 @@
<% } else { %>
<% var docUrl = "docName=" + encode.forUriComponent(api.docName) + "&name=" + encode.forUriComponent(api.name) + "&version=" + encode.forUriComponent(api.version)
- + "&provider=" + encode.forUriComponent(api.provider) + urlPostfix; %>
+ + "&provider=" + encode.forUriComponent(api.provider) + urlPostfix; %>
<% } %>
@@ -258,12 +264,21 @@
<% if(api.thumb == null) { %>
@@ -322,11 +353,11 @@
<%
- if (apis!=null&& apis.length == 0) {
- if(mode=="search"){
- %>
-
+ <%if(api.resultType != null && api.resultType == "Document"){%>
+
+ <%}%>
-
: <%=api.name%>"><%=api.name%>
-<%=api.version%>
-<%=api.provider%>
- -<%=api.status%>
- <%if(outputs.isCreatePermitted && isEditable){ %> - ?<%= apiUrlId %>" title="<%=i18n.localize("Edit")%>"> - - "> - "> - - - "> - - " > - "> - - - <%} %> + <%if(api.resultType == null || api.resultType == "API"){%> +: <%=api.name%>"><%=api.name%>
+<%=api.version%>
+<%=api.provider%>
+ +<%=api.status%>
+ <%if(outputs.isCreatePermitted){ %> + ?<%= apiUrlId %>" title="<%=i18n.localize("Edit")%>"> + + "> + "> + + + "> + + " > + "> + + + <%} %> + <%}else if(api.resultType != null && api.resultType == "Document"){%> +<%=api.docName%>
+<%=api.docSourceType.toLowerCase()%> <%=i18n.localize("Document")%>
++
: <%=api.name%>"><%=api.name%>
+<%=api.version%>
+<%=api.provider%>
+ <%}%>
- <%= i18n.localize("Info!")%>
+ if (apis!=null&& apis.length == 0) {
+ if(mode=="search"){
+ %>
+
<%}%>
<%
- }}}
- %>
-
+ }}}
+ %>
+
-
+ <%= i18n.localize("Info!")%>
<%=i18n.localize("No matching APIs found.")%>
<%}else{%>
@@ -344,30 +375,30 @@