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

Load custom form css before theme css, so the latter can more easily be used to override the former. Load custom form js at bottom of page rather than top (Javascript best practice).

Browse source
This commit is contained in:
rjy7 2010-04-15 19:40:09 +00:00
parent be65629194
commit 1d5eedae4c
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webapp/web/edit/formPrefix.jsp
View file

@ -60,12 +60,7 @@
</script> </script>
<% } %> <% } %>
<script language="javascript" type="text/javascript" src="../js/extensions/String.js"></script>
<script language="javascript" type="text/javascript" src="../js/jquery.js"></script>
<script language="javascript" type="text/javascript" src="../js/jquery_plugins/jquery.bgiframe.pack.js"></script>
<script language="javascript" type="text/javascript" src="../js/jquery_plugins/thickbox/thickbox-compressed.js"></script>
<!-- <script language="javascript" type="text/javascript" src="../js/jquery_plugins/ui.datepicker.js"></script> -->
<script language="javascript" type="text/javascript" src="../js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.pack.js"></script>
<% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false"; <% String useAutoComplete = (useAutoComplete=request.getParameter("useAutoComplete")) != null && !(useAutoComplete.equals("")) ? useAutoComplete : "false";
if (useAutoComplete.equalsIgnoreCase("true")) { %> if (useAutoComplete.equalsIgnoreCase("true")) { %>
@ -73,18 +68,14 @@
<% } %> <% } %>
<c:forEach var="jsFile" items="${customJs}"> <c:forEach var="cssFile" items="${customCss}">
<script type="text/javascript" src="${jsFile}"></script> <link rel="stylesheet" type="text/css" href="${cssFile}" media="screen"/>
</c:forEach> </c:forEach>
<link rel="stylesheet" type="text/css" href="../js/jquery_plugins/thickbox/thickbox.css"/> <link rel="stylesheet" type="text/css" href="../js/jquery_plugins/thickbox/thickbox.css"/>
<link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/screen.css"/>" media="screen"/> <link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/screen.css"/>" media="screen"/>
<link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/formedit.css" />" media="screen"/> <link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/formedit.css" />" media="screen"/>
<c:forEach var="cssFile" items="${customCss}">
<link rel="stylesheet" type="text/css" href="${cssFile}" media="screen"/>
</c:forEach>
<title>Edit</title> <title>Edit</title>
</head> </head>
<body class="formsEdit"> <body class="formsEdit">

11
webapp/web/edit/formSuffix.jsp
View file

@ -13,5 +13,16 @@
</div><!-- end wrap --> </div><!-- end wrap -->
<script language="javascript" type="text/javascript" src="../js/extensions/String.js"></script>
<script language="javascript" type="text/javascript" src="../js/jquery.js"></script>
<script language="javascript" type="text/javascript" src="../js/jquery_plugins/jquery.bgiframe.pack.js"></script>
<script language="javascript" type="text/javascript" src="../js/jquery_plugins/thickbox/thickbox-compressed.js"></script>
<!-- <script language="javascript" type="text/javascript" src="../js/jquery_plugins/ui.datepicker.js"></script> -->
<script language="javascript" type="text/javascript" src="../js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.pack.js"></script>
<c:forEach var="jsFile" items="${customJs}">
<script type="text/javascript" src="${jsFile}"></script>
</c:forEach>
</body> </body>
</html> </html>