litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

temporary fix to ensure jquery is called for custom forms while I'm monkeying around to ensure consistency in markup across 3 base templates

Browse source
This commit is contained in:
nac26 2010-12-06 16:37:01 +00:00
parent 814c782c03
commit 4bab472a46
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/edit/formPrefix.jsp
View file

@ -40,6 +40,7 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <!-- formPrefix.jsp -->
<script type="text/javascript" src="<c:url value="/js/jquery.js"/>"></script>
<%
String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";
if (useTinyMCE.equalsIgnoreCase("true")) {

1
productMods/edit/formSuffix.jsp
View file

@ -46,7 +46,6 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
</div><!-- end wrap -->
<script type="text/javascript" src="<c:url value="/js/extensions/String.js"/>"></script></script>
<script type="text/javascript" src="<c:url value="/js/jquery.js"/>"></script>
<script type="text/javascript" src="<c:url value="/js/jquery_plugins/jquery.bgiframe.pack.js"/>"></script>
<script type="text/javascript" src="<c:url value="/js/jquery_plugins/thickbox/thickbox-compressed.js"/>"></script>
<!-- <script type="text/javascript" src="<c:url value="/js/jquery_plugins/ui.datepicker.js"/>"></script> -->

3
themes/wilma/templates/edit/formPrefix.jsp
View file

@ -42,7 +42,8 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<link rel="stylesheet" href="<%=themeDir%>css/screen.css" />
<!-- script for enabling new HTML5 semantic markup in IE browsers-->
<script language="javascript" type="text/javascript" src="../js/html5.js"></script>
<script type="text/javascript" src="../js/html5.js"></script>
<script type="text/javascript" src="../js/jquery.js"></script>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>