Skip to content

Commit

Permalink
Merge 24.4 to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@labkey-teamcity
labkey-teamcity committed Apr 10, 2024
2 parents 8f5f26d + 2f0daec commit 7180c8c
Show file tree
Hide file tree
Showing 16 changed files with 236 additions and 242 deletions.
2 changes: 2 additions & 0 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.labkey.api.data.ContainerManager;
import org.labkey.api.module.DefaultModule;
import org.labkey.api.module.ModuleContext;
import org.labkey.api.security.SecurityManager;
import org.labkey.api.view.BaseWebPartFactory;
import org.labkey.api.view.Portal;
import org.labkey.api.view.ViewContext;
Expand Down Expand Up @@ -91,6 +92,7 @@ public void doStartup(ModuleContext moduleContext)
{
// add a container listener so we'll know when our container is deleted:
ContainerManager.addContainerListener(new SkylineToolsStoreContainerListener());
SecurityManager.registerAllowedConnectionSource("jquery-ui", "https://code.jquery.com/ui/1.13.2/jquery-ui.min.js");
}

@Override
Expand Down
16 changes: 11 additions & 5 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineRating.jsp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
<%@ page import="org.springframework.validation.BindingResult" %>
<%@ page import="org.labkey.skylinetoolsstore.SkylineToolsStoreController" %>
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
<%@ page import="org.labkey.api.settings.AppProps" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>

<%!
@Override
public void addClientDependencies(ClientDependencies dependencies)
{
dependencies.add("internal/jQuery");
dependencies.add("skylinetoolsstore/js/functions.js");
}
%>

<%
Object errorAttribute = request.getAttribute(BindingResult.MODEL_KEY_PREFIX + "form");
Object hideForm = request.getAttribute(BindingResult.MODEL_KEY_PREFIX + "hideForm");
Expand All @@ -19,7 +30,6 @@
final String contextPath = AppProps.getInstance().getContextPath();
final String imgDir = contextPath + "/skylinetoolsstore/img/";
final String jsDir = contextPath + "/skylinetoolsstore/js/";
%>
<style>
#slider
Expand Down Expand Up @@ -71,10 +81,6 @@
<br />
<%= PageFlowUtil.generateBackButton() %>

<script type="text/javascript" src="<%= h(jsDir) %>functions.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
<script type="text/javascript" nonce="<%=getScriptNonce()%>">
$(function() {
initRatingSlider($("#slider"), $("#sliderover"), $("#ratingvalue"));
Expand Down
70 changes: 40 additions & 30 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,35 @@
<%@ page import="java.util.Map" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="org.labkey.api.portal.ProjectUrls" %>
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
<%@ page import="org.labkey.api.settings.AppProps" %>
<%@ page import="org.labkey.api.util.DOM" %>
<%@ page import="static org.labkey.api.util.DOM.IMG" %>
<%@ page import="static org.labkey.api.util.DOM.Attribute.src" %>
<%@ page import="static org.labkey.api.util.DOM.Attribute.alt" %>
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>

<%!
@Override
public void addClientDependencies(ClientDependencies dependencies)
{
dependencies.add("internal/jQuery");
dependencies.add("skylinetoolsstore/js/functions.js");
}
public final HtmlString editIconImgHtml = DOM.createHtml(IMG(DOM.at(src, getWebappURL("skylinetoolsstore/img/pencil.png")).at(alt, "Pencil")));
%>
<script src="https://code.jquery.com/ui/1.13.2/jquery-ui.min.js" nonce="<%=getScriptNonce()%>"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">

<%
JspView<?> me = (JspView<?>) HttpView.currentView();
final SkylineTool tool = (SkylineTool)me.getModelBean();
final boolean admin = getUser().hasSiteAdminPermission();
final String contextPath = AppProps.getInstance().getContextPath();
final String cssDir = contextPath + "/skylinetoolsstore/css/";
final String imgDir = contextPath + "/skylinetoolsstore/img/";
final String jsDir = contextPath + "/skylinetoolsstore/js/";
final SafeToRender autocompleteUsers = admin ? SkylineToolsStoreController.getUsersForAutocomplete() : HtmlString.unsafe("\"\"");
Expand Down Expand Up @@ -385,16 +404,14 @@ a { text-decoration: none; }
<div style="float:left; width:351px;">
<img id="toolIcon" src="<%= h(tool.getIconUrl()) %>" class="logoWrap" alt="<%= h(tool.getName()) %>">
<% if (toolEditor) { %>
<a id="editIcon" class="toolProperty" title="Icon" onclick="editTool($(this), 'Icon')">
<img src="<%= h(imgDir) %>pencil.png" />
</a>
<%=link(editIconImgHtml).clearClasses().addClass("toolProperty").id("editIcon").title("Icon").onClick("editTool($(this), 'Icon')")%>
<% } %>
<div class="block">
<h2><%= h(tool.getName()) %></h2>
<p>
Version <%= h(tool.getVersion()) %>
<% if (allVersions.length > 1) { %>
[<a onclick="$('#allVersionsPop').dialog('open')">View All</a>]
[<%=link("View All").clearClasses().onClick("$('#allVersionsPop').dialog('open')")%>]
</p>
<% } %>
</p>
Expand All @@ -407,20 +424,21 @@ a { text-decoration: none; }
<% } %>
</div>

<button class="banner-button-small" onclick="window.open('<%=h(urlProvider(ProjectUrls.class).getBeginURL(getContainer().getChild("Support").getChild(tool.getName())))%>', '_blank')">Support Board</button>
<button id="tool-support-board-btn" class="banner-button-small">Support Board</button>
<% addHandler("tool-support-board-btn", "click", "window.open(" + q(urlProvider(ProjectUrls.class).getBeginURL(getContainer().getChild("Support").getChild(tool.getName()))) + ", '_blank', 'noopener,noreferrer')"); %>
</div>
<% if (toolEditor) { %>
<div class="menuMouseArea sprocket">
<img src="<%= h(imgDir) %>gear.png" title="Settings" alt="Sprocket" />
<ul class="dropMenu">
<li><a onclick="$('#uploadPop').dialog('open')">Upload new version</a></li>
<li><a onclick="$('#uploadSuppPop').dialog('open')">Upload supplementary file</a></li>
<li><%=link("Upload new version").clearClasses().onClick("$('#uploadPop').dialog('open')")%></li>
<li><%=link("Upload supplementary file").clearClasses().onClick("$('#uploadSuppPop').dialog('open')")%></li>
<% if (multipleVersions) { %>
<li><a onclick="$('#delToolLatestDlg').dialog('open')">Delete latest version</a></li>
<li><%=link("Delete latest version").clearClasses().onClick("$('#delToolLatestDlg').dialog('open')")%></li>
<% } %>
<% if (admin) { %>
<li><a onclick="$('#delToolAllDlg').dialog('open')">Delete</a></li>
<li><a onclick="popToolOwners()">Manage tool owners</a></li>
<li><%=link("Delete").clearClasses().onClick("$('#delToolAllDlg').dialog('open')")%></li>
<li><%=link("Manage tool owners").clearClasses().onClick("popToolOwners()")%></li>
<% } %>
</ul>
</div>
Expand All @@ -429,11 +447,12 @@ a { text-decoration: none; }
<p id="toolDescription" class="toolProperty" title="Description">
<span class="toolPropertyValue"><%= h(tool.getDescription(), true) %></span>
<% if (toolEditor) { %>
<a onclick="editTool($(this))"><img src="<%= h(imgDir) %>pencil.png" alt="Pencil" title="Edit" /></a>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
<% } %>
</p>
<div id="downloadArea">
<button class="banner-button" onclick="downloadTool(<%= h(tool.getRowId()) %>);">Download <%=h(tool.getName())%></button>
<button id="download-tool-btn" class="banner-button">Download <%=h(tool.getName())%></button>
<% addHandler("download-tool-btn", "click", "downloadTool(" + tool.getRowId() + ")"); %>
<br>
<strong>Downloaded: <span id="downloadcounter"><%= numDownloads %></span></strong>
</div>
Expand Down Expand Up @@ -463,7 +482,7 @@ a { text-decoration: none; }
<span class="boldfont">Organization:</span>
<span class="toolPropertyValue"><%= h(tool.getOrganization()) %></span>
<% if (toolEditor) { %>
<a onclick="editTool($(this))"><img src="<%= h(imgDir) %>pencil.png" alt="Pencil" title="Edit" /></a>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
<% } %>
</div>
<% } %>
Expand All @@ -473,7 +492,7 @@ a { text-decoration: none; }
<span class="boldfont">Authors:</span>
<span class="toolPropertyValue"><%= h(tool.getAuthors()) %></span>
<% if (toolEditor) { %>
<a onclick="editTool($(this), 'author')"><img src="<%= h(imgDir) %>pencil.png" alt="Pencil" title="Edit" /></a>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this), 'author')")%>
<% } %>
</div>
<% } %>
Expand All @@ -483,17 +502,17 @@ a { text-decoration: none; }
<span class="boldfont">Languages:</span>
<span class="toolPropertyValue"><%= h(tool.getLanguages()) %></span>
<% if (toolEditor) { %>
<a onclick="editTool($(this))"><img src="<%= h(imgDir) %>pencil.png" alt="Pencil" title="Edit" /></a>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this))")%>
<% } %>
</div>
<% } %>
<% if (tool.getProvider() != null || toolEditor) { %>
<div class="barItem toolProperty" title="Provider's Website">
<!--<img src="<%= h(imgDir) %>link.png" alt="Provider" />-->
<span class="boldfont">More Information:</span>
<a href="<%= h(tool.getProvider()) %>" target="_blank"><span class="toolPropertyValue"><%= h(tool.getProvider()) %></span></a>
<a href="<%= h(tool.getProvider()) %>" target="_blank" rel="noopener noreferrer"><span class="toolPropertyValue"><%= h(tool.getProvider()) %></span></a>
<% if (toolEditor) { %>
<a onclick="editTool($(this), 'provider')"><img src="<%= h(imgDir) %>pencil.png" alt="Pencil" title="Edit" /></a>
<%=link(editIconImgHtml).clearClasses().onClick("editTool($(this), 'provider')")%>
<% } %>
</div>

Expand Down Expand Up @@ -582,17 +601,8 @@ a { text-decoration: none; }
<%
}
%>
<%--<% if (!getUser().isGuest() && isLatestVersion && !leftReview) { %>--%>
<%--<p style="text-align: center;">--%>
<%--<a onclick="$('#reviewPop').dialog('open')">Leave a review</a>--%>
<%--</p>--%>
<%--<% } %>--%>
</div>

<link rel="stylesheet" type="text/css" href="<%= h(cssDir) %>jquery-ui.css">
<script type="text/javascript" src="<%= h(jsDir) %>functions.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
</div>

<script type="text/javascript" nonce="<%=getScriptNonce()%>">
$(function() {
Expand Down Expand Up @@ -706,7 +716,7 @@ a { text-decoration: none; }
$("#delRatingDlg").dialog({modal:true, autoOpen:false, create:function(){fixDlg($(this));}, width:'auto', show:DLG_EFFECT_SHOW, hide:DLG_EFFECT_HIDE, dialogClass:"noCloseDlg",
buttons: {
Ok: function() {
window.location = "<%=h(urlFor(SkylineToolsStoreController.DeleteRatingAction.class))%>id=" + $("#delRatingDlg").data("ratingId");
window.location = LABKEY.ActionURL.buildURL("skyts", "deleteRating.view", null, {id: $("#delRatingDlg").data("ratingId")});
},
Cancel: function() {$(this).dialog("close");}
}
Expand Down
20 changes: 13 additions & 7 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreUpload.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@
<%@ page import="org.labkey.api.settings.AppProps" %>
<%@ page import="org.labkey.api.util.SafeToRender" %>
<%@ page import="org.labkey.api.util.HtmlString" %>
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>

<%!
@Override
public void addClientDependencies(ClientDependencies dependencies)
{
dependencies.add("internal/jQuery");
dependencies.add("skylinetoolsstore/js/functions.js");
}
%>
<script src="https://code.jquery.com/ui/1.13.2/jquery-ui.min.js" nonce="<%=getScriptNonce()%>"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">

<%
Object errorAttribute = request.getAttribute(BindingResult.MODEL_KEY_PREFIX + "form");
if (errorAttribute != null)
Expand All @@ -13,9 +26,7 @@
}
final String contextPath = AppProps.getInstance().getContextPath();
final String cssDir = contextPath + "/skylinetoolsstore/css/";
final String imgDir = contextPath + "/skylinetoolsstore/img/";
final String jsDir = contextPath + "/skylinetoolsstore/js/";
final String sender = (String)request.getAttribute(BindingResult.MODEL_KEY_PREFIX + "sender");
final String updateTarget = (String)request.getAttribute(BindingResult.MODEL_KEY_PREFIX + "updatetarget");
Expand Down Expand Up @@ -47,11 +58,6 @@
<br />
<%= PageFlowUtil.generateBackButton() %>

<link rel="stylesheet" type="text/css" href="<%= h(cssDir) %>jquery-ui.css">
<script type="text/javascript" src="<%= h(jsDir) %>functions.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>

<script type="text/javascript" nonce="<%=getScriptNonce()%>">
autocomplete($("#toolOwners"), <%=users%>);
initJqueryUiImages("<%= h(imgDir + "jquery-ui") %>");
Expand Down
39 changes: 23 additions & 16 deletions SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,20 @@
<%@ page import="java.util.Map" %>
<%@ page import="org.labkey.api.util.SafeToRender" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>

<%!
@Override
public void addClientDependencies(ClientDependencies dependencies)
{
dependencies.add("internal/jQuery");
dependencies.add("skylinetoolsstore/js/functions.js");
}
%>
<script src="https://code.jquery.com/ui/1.13.2/jquery-ui.min.js" nonce="<%=getScriptNonce()%>"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">

<%
JspView<?> me = (JspView<?>)HttpView.currentView();
List<SkylineTool> tools = (List<SkylineTool>)me.getModelBean();
Expand All @@ -28,9 +41,7 @@
final boolean loggedIn = !getUser().isGuest();
final String contextPath = AppProps.getInstance().getContextPath();
final String cssDir = contextPath + "/skylinetoolsstore/css/";
final String imgDir = contextPath + "/skylinetoolsstore/img/";
final String jsDir = contextPath + "/skylinetoolsstore/js/";
HashMap<Integer, Integer> toolRatings = new HashMap();
HashMap<Integer, Integer[]> toolRatingSplit = new HashMap();
Expand Down Expand Up @@ -153,7 +164,8 @@

<% if (admin) { %>
<div style="float: left;">
<button type="button" onclick="$('#uploadPopOwners').show(); $('#updatetarget').val(''); $('#uploadPop').dialog('open')" class="styled-button">Add New Tool</button>
<button type="button" id="add-new-tool-btn" class="styled-button">Add New Tool</button>
<% addHandler("add-new-tool-btn", "click", "$('#uploadPopOwners').show(); $('#updatetarget').val(''); $('#uploadPop').dialog('open')"); %>
</div>
<% } %>
<!--Submit Rating Form-->
Expand Down Expand Up @@ -261,14 +273,14 @@
<div class="menuMouseArea sprocket" alt="<%= h(tool.getName()) %>">
<img src="<%= h(imgDir) %>gear.png" title="Settings" />
<ul class="dropMenu">
<li><a onclick="$('#uploadPopOwners').hide(); $('#updatetarget').val(<%= h(tool.getRowId()) %>); $('#uploadPop').dialog('open')">Upload new version</a></li>
<li><a onclick="$('#supptarget').val(<%= h(tool.getRowId()) %>); $('#uploadSuppPop').dialog('open')">Upload supplementary file</a></li>
<li><%=link("Upload new version").clearClasses().onClick("$('#uploadPopOwners').hide(); $('#updatetarget').val(" + tool.getRowId() + "); $('#uploadPop').dialog('open')")%></li>
<li><%=link("Upload supplementary file").clearClasses().onClick("$('#supptarget').val(" + tool.getRowId() + "); $('#uploadSuppPop').dialog('open')")%></li>
<% if (multipleVersions) { %>
<li><a onclick="delToolLatest($(this))">Delete latest version</a></li>
<li><%=link("Delete latest version").clearClasses().onClick("delToolLatest($(this))")%></li>
<% } %>
<% if (admin) { %>
<li><a onclick="delToolAll($(this))">Delete</a></li>
<li><a onclick="popToolOwners(<%= h(tool.getRowId()) %>)">Manage tool owners</a></li>
<li><%=link("Delete").clearClasses().onClick("delToolAll($(this))")%></li>
<li><%=link("Manage tool owners").clearClasses().onClick("popToolOwners(" + tool.getRowId() + ")")%></li>
<% } %>
</ul>
</div>
Expand Down Expand Up @@ -337,7 +349,7 @@
<p>
<a href="<%= h(detailsUrl) %>">See all <%= totalReviews %> reviews</a>
<% if (loggedIn && !leftReview) { %>
/ <a onclick="$('#ratingToolId').val(<%= h(tool.getRowId()) %>); $('#reviewPop').dialog('open')">Leave review</a>
<%=link("Leave review").clearClasses().onClick("$('#ratingToolId').val(" + tool.getRowId() + "); $('#reviewPop').dialog('open')")%>
<% } %>
</p>
</div>
Expand All @@ -348,7 +360,8 @@

<div class="toolButtons">

<button type="button" onclick="window.location.href = '<%=h(urlFor(SkylineToolsStoreController.DownloadToolAction.class).addParameter("id", tool.getRowId()))%>'" class="styled-button">Download</button>
<button type="button" id="download-tool-btn-<%=tool.getRowId()%>" class="styled-button">Download</button>
<% addHandler("download-tool-btn-" + tool.getRowId(), "click", "window.location.href = " + q(urlFor(SkylineToolsStoreController.DownloadToolAction.class).addParameter("id", tool.getRowId()))); %>
<% if ((ratingsCurVer == null || ratingsCurVer.length == 0) && loggedIn) { %>
<%--<button type="button" onclick="$('#ratingToolId').val(<%= h(tool.getRowId()) %>); $('#reviewPop').dialog('open')" class="styled-button">Leave the first Review!</button>--%>
<%
Expand Down Expand Up @@ -378,12 +391,6 @@
<% } %>
</div>

<link rel="stylesheet" type="text/css" href="<%= h(cssDir) %>jquery-ui.css">
<script type="text/javascript" src="<%= h(jsDir) %>functions.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">

<script type="text/javascript" nonce="<%=getScriptNonce()%>">
var READ_MORE_TEXT = "Read more";
var READ_LESS_TEXT = "Close";
Expand Down
2 changes: 1 addition & 1 deletion lincs/resources/views/CustomGCT.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
LABKEY.Utils.onReady(function()
{
document.getElementById("customGctButton").onclick = function() { showCustomGCTForm(); };
document.getElementById("customGctButton")['onclick'] = showCustomGCTForm;
});

</script>
Expand Down
Loading

0 comments on commit 7180c8c

Please sign in to comment.