Skip to content

Commit f26adfe

Browse files
labkey-adamlabkey-adam
committed
Simplify and expand use of LinkBuilder factory methods
1 parent 385dab0 commit f26adfe

25 files changed

+183
-143
lines changed

‎SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -402,14 +402,14 @@ a { text-decoration: none; }
402402
<div style="float:left; width:351px;">
403403
<img id="toolIcon" src="<%= h(tool.getIconUrl()) %>" class="logoWrap" alt="<%= h(tool.getName()) %>">
404404
<% if (toolEditor) { %>
405-
<%=link(editIconImgHtml).clearClasses().addClass("toolProperty").id("editIcon").title("Icon").onClick("editTool($(this), 'Icon')")%>
405+
<%=simpleLink(editIconImgHtml).addClass("toolProperty").id("editIcon").title("Icon").onClick("editTool($(this), 'Icon')")%>
406406
<% } %>
407407
<div class="block">
408408
<h2><%= h(tool.getName()) %></h2>
409409
<p>
410410
Version <%= h(tool.getVersion()) %>
411411
<% if (allVersions.length > 1) { %>
412-
[<%=link("View All").clearClasses().onClick("$('#allVersionsPop').dialog('open')")%>]
412+
[<%=simpleLink("View All").onClick("$('#allVersionsPop').dialog('open')")%>]
413413
</p>
414414
<% } %>
415415
</p>
@@ -429,14 +429,14 @@ a { text-decoration: none; }
429429
<div class="menuMouseArea sprocket">
430430
<img src="<%= h(imgDir) %>gear.png" title="Settings" alt="Sprocket" />
431431
<ul class="dropMenu">
432-
<li><%=link("Upload new version").clearClasses().onClick("$('#uploadPop').dialog('open')")%></li>
433-
<li><%=link("Upload supplementary file").clearClasses().onClick("$('#uploadSuppPop').dialog('open')")%></li>
432+
<li><%=simpleLink("Upload new version").onClick("$('#uploadPop').dialog('open')")%></li>
433+
<li><%=simpleLink("Upload supplementary file").onClick("$('#uploadSuppPop').dialog('open')")%></li>
434434
<% if (multipleVersions) { %>
435-
<li><%=link("Delete latest version").clearClasses().onClick("$('#delToolLatestDlg').dialog('open')")%></li>
435+
<li><%=simpleLink("Delete latest version").onClick("$('#delToolLatestDlg').dialog('open')")%></li>
436436
<% } %>
437437
<% if (admin) { %>
438-
<li><%=link("Delete").clearClasses().onClick("$('#delToolAllDlg').dialog('open')")%></li>
439-
<li><%=link("Manage tool owners").clearClasses().onClick("popToolOwners()")%></li>
438+
<li><%=simpleLink("Delete").onClick("$('#delToolAllDlg').dialog('open')")%></li>
439+
<li><%=simpleLink("Manage tool owners").onClick("popToolOwners()")%></li>
440440
<% } %>
441441
</ul>
442442
</div>
@@ -445,7 +445,7 @@ a { text-decoration: none; }
445445
<p id="toolDescription" class="toolProperty" title="Description">
446446
<span class="toolPropertyValue"><%= h(tool.getDescription(), true) %></span>
447447
<% if (toolEditor) { %>
448-
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
448+
<%=simpleLink(editIconImgHtml).onClick("editTool($(this))")%>
449449
<% } %>
450450
</p>
451451
<div id="downloadArea">
@@ -480,7 +480,7 @@ a { text-decoration: none; }
480480
<span class="boldfont">Organization:</span>
481481
<span class="toolPropertyValue"><%= h(tool.getOrganization()) %></span>
482482
<% if (toolEditor) { %>
483-
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
483+
<%=simpleLink(editIconImgHtml).onClick("editTool($(this))")%>
484484
<% } %>
485485
</div>
486486
<% } %>
@@ -490,7 +490,7 @@ a { text-decoration: none; }
490490
<span class="boldfont">Authors:</span>
491491
<span class="toolPropertyValue"><%= h(tool.getAuthors()) %></span>
492492
<% if (toolEditor) { %>
493-
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this), 'author')")%>
493+
<%=simpleLink(editIconImgHtml).onClick("editTool($(this), 'author')")%>
494494
<% } %>
495495
</div>
496496
<% } %>
@@ -500,7 +500,7 @@ a { text-decoration: none; }
500500
<span class="boldfont">Languages:</span>
501501
<span class="toolPropertyValue"><%= h(tool.getLanguages()) %></span>
502502
<% if (toolEditor) { %>
503-
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
503+
<%=simpleLink(editIconImgHtml).onClick("editTool($(this))")%>
504504
<% } %>
505505
</div>
506506
<% } %>
@@ -510,7 +510,7 @@ a { text-decoration: none; }
510510
<span class="boldfont">More Information:</span>
511511
<a href="<%= h(tool.getProvider()) %>" target="_blank" rel="noopener noreferrer"><span class="toolPropertyValue"><%= h(tool.getProvider()) %></span></a>
512512
<% if (toolEditor) { %>
513-
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this), 'provider')")%>
513+
<%=simpleLink(editIconImgHtml).onClick("editTool($(this), 'provider')")%>
514514
<% } %>
515515
</div>
516516

‎SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,14 @@
273273
<div class="menuMouseArea sprocket" alt="<%= h(tool.getName()) %>">
274274
<img src="<%= h(imgDir) %>gear.png" title="Settings" />
275275
<ul class="dropMenu">
276-
<li><%=link("Upload new version").clearClasses().onClick("$('#uploadPopOwners').hide(); $('#updatetarget').val(" + tool.getRowId() + "); $('#uploadPop').dialog('open')")%></li>
277-
<li><%=link("Upload supplementary file").clearClasses().onClick("$('#supptarget').val(" + tool.getRowId() + "); $('#uploadSuppPop').dialog('open')")%></li>
276+
<li><%=simpleLink("Upload new version").onClick("$('#uploadPopOwners').hide(); $('#updatetarget').val(" + tool.getRowId() + "); $('#uploadPop').dialog('open')")%></li>
277+
<li><%=simpleLink("Upload supplementary file").onClick("$('#supptarget').val(" + tool.getRowId() + "); $('#uploadSuppPop').dialog('open')")%></li>
278278
<% if (multipleVersions) { %>
279-
<li><%=link("Delete latest version").clearClasses().onClick("delToolLatest($(this))")%></li>
279+
<li><%=simpleLink("Delete latest version").onClick("delToolLatest($(this))")%></li>
280280
<% } %>
281281
<% if (admin) { %>
282-
<li><%=link("Delete").clearClasses().onClick("delToolAll($(this))")%></li>
283-
<li><%=link("Manage tool owners").clearClasses().onClick("popToolOwners(" + tool.getRowId() + ")")%></li>
282+
<li><%=simpleLink("Delete").onClick("delToolAll($(this))")%></li>
283+
<li><%=simpleLink("Manage tool owners").onClick("popToolOwners(" + tool.getRowId() + ")")%></li>
284284
<% } %>
285285
</ul>
286286
</div>
@@ -349,7 +349,7 @@
349349
<p>
350350
<a href="<%= h(detailsUrl) %>">See all <%= totalReviews %> reviews</a>
351351
<% if (loggedIn && !leftReview) { %>
352-
<%=link("Leave review").clearClasses().onClick("$('#ratingToolId').val(" + tool.getRowId() + "); $('#reviewPop').dialog('open')")%>
352+
<%=simpleLink("Leave review").onClick("$('#ratingToolId').val(" + tool.getRowId() + "); $('#reviewPop').dialog('open')")%>
353353
<% } %>
354354
</p>
355355
</div>

‎lincs/src/org/labkey/lincs/LincsController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ public ModelAndView getSuccessView(ClueCredentialsForm form)
10391039
return new HtmlView(
10401040
DIV("Clue/PSP details saved!",
10411041
BR(),
1042-
new LinkBuilder("Back to Project").href(projectUrl).build()
1042+
LinkBuilder.labkeyLink("Back to Project", projectUrl).build()
10431043
)
10441044
);
10451045
}
@@ -1124,8 +1124,8 @@ public ModelAndView getSuccessView(CromwellConfigForm cromwellConfigForm)
11241124
ActionURL projectUrl = PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(getContainer());
11251125
return new HtmlView(
11261126
DIV("Cromwell details saved!",
1127-
BR(),
1128-
new LinkBuilder("Back to Project").href(projectUrl).build()
1127+
BR(),
1128+
LinkBuilder.labkeyLink("Back to Project", projectUrl).build()
11291129
)
11301130
);
11311131
}
@@ -1237,7 +1237,7 @@ public ModelAndView getView(LincsPspJobForm form, BindException errors)
12371237
if(pspJob.getPipelineJobId() != null && getUser().hasSiteAdminPermission())
12381238
{
12391239
ActionURL pipelineJobUrl = PageFlowUtil.urlProvider(PipelineStatusUrls.class).urlDetails(getContainer(), pspJob.getPipelineJobId());
1240-
view.addView(new HtmlView(PageFlowUtil.link("View Pipeline Job. Status: " + PipelineService.get().getStatusFile(pspJob.getPipelineJobId()).getStatus()).href(pipelineJobUrl)));
1240+
view.addView(new HtmlView(LinkBuilder.labkeyLink("View Pipeline Job. Status: " + PipelineService.get().getStatusFile(pspJob.getPipelineJobId()).getStatus(), pipelineJobUrl)));
12411241
}
12421242

12431243
view.setTitle("PSP Job Details");

‎lincs/src/org/labkey/lincs/LincsDataTable.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
8787
// <span style="white-space: nowrap;"> is recommended instead of deprecated <nobr></nobr>
8888
SPAN(
8989
at(style, "white-space: nowrap;"),
90-
new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl),
90+
LinkBuilder.labkeyLink("Download", downloadUrl).iconCls("fa fa-download"),
9191
HtmlString.NBSP,
9292
LinkBuilder.simpleLink("Skyline", docDetailsUrl)
9393
).appendTo(out);
@@ -158,7 +158,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
158158
ActionURL url = new ActionURL(LincsController.SubmitPspJobAction.class, getContainer());
159159
url.addParameter("runId", runId);
160160

161-
out.write(new LinkBuilder(" [Submit Job]").href(url).usePost());
161+
out.write(LinkBuilder.labkeyLink(" [Submit Job]", url).usePost());
162162
}
163163
return;
164164
}
@@ -176,7 +176,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
176176
}
177177
ActionURL url = new ActionURL(LincsController.LincsPspJobDetailsAction.class, getContainer());
178178
url.addParameter("runId", pspJob.getRunId());
179-
out.write(PageFlowUtil.link(text).href(url));
179+
out.write(LinkBuilder.labkeyLink(text, url));
180180
}
181181

182182
@Override
@@ -376,9 +376,9 @@ private void renderGridCell(HtmlWriter out, String analyticsScript, String downl
376376
SPAN(
377377
at(style, "white-space: nowrap;"),
378378
HtmlString.NBSP,
379-
new LinkBuilder("Download").iconCls("fa fa-download").href(downloadUrl).onClick(analyticsScript),
379+
LinkBuilder.labkeyLink("Download", downloadUrl).iconCls("fa fa-download").onClick(analyticsScript),
380380
HtmlString.NBSP,
381-
new LinkBuilder(downloadText).href(downloadUrl).onClick(analyticsScript).clearClasses(),
381+
LinkBuilder.simpleLink(downloadText, downloadUrl).onClick(analyticsScript),
382382
HtmlString.NBSP,
383383
morpheusUrl != null ? HtmlString.NBSP : null,
384384
morpheusUrl,

0 commit comments

Comments
 (0)