Merge pull request sakaiproject#1896 from nicholaswilson100/SAK-30476

SAK-30476: jquery and jquery-ui have moved so change citations refere…
vaquarkhan · Mar 9, 2016 · 505422f · 505422f
2 parents 5f243a5 + 733dc0a
commit 505422f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/citations/citations-servlet/servlet/src/webapp/vm/compact.vm b/citations/citations-servlet/servlet/src/webapp/vm/compact.vm
@@ -21,7 +21,7 @@
 		<link href="/library/skin/tool_base.css" type="text/css" rel="stylesheet" media="all" />
 		<link href="/library/skin/default/tool.css" type="text/css" rel="stylesheet" media="all" />
 		<link href="/savecite/css/savecite.css" type="text/css" rel="stylesheet" media="all" />
-		<script type="text/javascript" src="/library/js/jquery/1.7.1/jquery-1.7.1.min.js"></script>
+		<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
 	</head>
   	<body>
 		<div class="portletBody">

diff --git a/citations/citations-servlet/servlet/src/webapp/vm/servlet.vm b/citations/citations-servlet/servlet/src/webapp/vm/servlet.vm
@@ -20,7 +20,7 @@
 		<title>$tlang.getString( "window.gscholar" )</title>
 		<link href="/library/skin/tool_base.css" type="text/css" rel="stylesheet" media="all" />
 		<link href="/library/skin/default/tool.css" type="text/css" rel="stylesheet" media="all" />
-		<script type="text/javascript" src="/library/js/jquery/1.7.1/jquery-1.7.1.min.js"></script>
+		<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
 		<script type="text/javascript" src="/savecite/js/savecite.js"></script>
 	</head>
   	<body>

diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm b/citations/citations-tool/tool/src/webapp/vm/citation/new_resource.vm
@@ -21,13 +21,13 @@
  *
  **********************************************************************************
 -->
-<script type="text/javascript" src="#libraryLink('js/jquery/1.7.1/jquery-1.7.1.min.js')">	
+<script type="text/javascript" src="#libraryLink('webjars/jquery/1.11.3/jquery.min.js')">
 </script>
-<script type="text/javascript" src="#libraryLink('js/jquery/ui/1.11.3/jquery-ui.min.js')">	
+<script type="text/javascript" src="#libraryLink('webjars/jquery-ui/1.11.3/jquery-ui.min.js')">
 </script>
 <script type="text/javascript" src="#libraryLink('js/jquery/sortable/jquery.sortable.min.js')">
 </script>
-<link media="all" rel="stylesheet" type="text/css" href="#libraryLink('js/jquery-ui-latest/css/ui-lightness/jquery-ui.css')">
+<link media="all" rel="stylesheet" type="text/css" href="#libraryLink('webjars/jquery-ui/1.11.3/jquery-ui.min.css')">
 <link media="all" rel="stylesheet" type="text/css" href="/sakai-citations-tool/css/citations.css">
 <style type="text/css">
 span.searchTargetLink { margin-right:50px; }

diff --git a/citations/citations-tool/tool/src/webapp/vm/citation/reorder.vm b/citations/citations-tool/tool/src/webapp/vm/citation/reorder.vm
@@ -3,9 +3,9 @@
 	#citations-sortable li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em; }
 	#citations-sortable li span { position: absolute; margin-left: -1.3em; }
 </style>
-<link rel="stylesheet" href="/library/js/jquery-ui-latest/css/ui-lightness/jquery-ui.css" type="text/css" media="all" />
-<script type="text/javascript" src="/library/js/jquery/1.7.1/jquery-1.7.1.min.js"></script>
-<script type="text/javascript" src="/library/js/jquery/ui/1.11.3/jquery-ui.min.js"></script>
+<link rel="stylesheet" href="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.css" type="text/css" media="all" />
+<script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
+<script type="text/javascript" src="/library/webjars/jquery-ui/1.11.3/jquery-ui.min.js"></script>
 <script type="text/javascript" src="/sakai-citations-tool/js/citationscript.js">
 </script>
 <div class="portletBody specialLink">