Menu
▾
▴
[Hyperic-hq-discuss] hq r14411 - in trunk/web: WEB-INF/jsp common portal resource/common/monitor/visibility
|
From: <dcr...@hy...> - 2010-03-23 03:51:06
|
Author: dcrutchf Date: 2010-03-22 20:50:59 -0700 (Mon, 22 Mar 2010) New Revision: 14411 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14411 Modified: trunk/web/WEB-INF/jsp/login.jsp trunk/web/common/Head.jsp trunk/web/portal/PortletLayout.jsp trunk/web/resource/common/monitor/visibility/DashCharts.jsp Log: patched dojo (part 5 - final) Modified: trunk/web/WEB-INF/jsp/login.jsp =================================================================== --- trunk/web/WEB-INF/jsp/login.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/WEB-INF/jsp/login.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -68,7 +68,7 @@ </form> </div> </div> - <script src="<html:rewrite page="/js/dojo/1.1/dojo/dojo.js" />" type="text/javascript"></script> + <script src="<html:rewrite page="/js/dojo/1.1.2/dojo/dojo.js" />" type="text/javascript"></script> <script> dojo.addOnLoad(function() { var username = dojo.byId("usernameInput"); Modified: trunk/web/common/Head.jsp =================================================================== --- trunk/web/common/Head.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/common/Head.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -28,8 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dojo/resources/dojo.css"/>" type="text/css"/> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dijit/themes/tundra/tundra.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dojo/resources/dojo.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css"/>" type="text/css"/> <link rel="shortcut icon" href="<html:rewrite page="/images/4.0/icons/favicon.ico"/>"/> <link rel="stylesheet" href="<html:rewrite page="/css/win.css"/>" type="text/css"/> <link rel="stylesheet" href="<html:rewrite page="/css/HQ_40.css"/>" type="text/css"/> @@ -49,17 +49,17 @@ <script type="text/javascript"> djConfig = { isDebug: false, locale: 'en-us' } </script> -<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.3/dojo.js'/>"></script> +<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.4/dojo.js'/>"></script> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="<html:rewrite page='/js/dojo/1.1/dojo/dojo.js'/>" type="text/javascript"></script> +<script src="<html:rewrite page='/js/dojo/1.1.2/dojo/dojo.js'/>" type="text/javascript"></script> <script type="text/javascript"> var imagePath = "<html:rewrite page="/images/"/>"; dojo11.require('dojo.date'); Modified: trunk/web/portal/PortletLayout.jsp =================================================================== --- trunk/web/portal/PortletLayout.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/portal/PortletLayout.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -29,8 +29,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dojo/resources/dojo.css"/>" type="text/css"/> -<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1/dijit/themes/tundra/tundra.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dojo/resources/dojo.css"/>" type="text/css"/> +<link rel="stylesheet" href="<html:rewrite page="/js/dojo/1.1.2/dijit/themes/tundra/tundra.css"/>" type="text/css"/> <link rel="shortcut icon" href="<html:rewrite page="/images/4.0/icons/favicon.ico"/>"/> <link rel="stylesheet" href="<html:rewrite page="/css/win.css"/>" type="text/css"/> <link rel="stylesheet" href="<html:rewrite page="/css/HQ_40.css"/>" type="text/css"/> @@ -50,17 +50,17 @@ <script type="text/javascript"> djConfig = { isDebug: false, locale: 'en-us' } </script> -<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.3/dojo.js'/>"></script> +<script type="text/javascript" src="<html:rewrite page='/js/dojo/0.4.4/dojo.js'/>"></script> <script type="text/javascript"> djConfig.parseOnLoad = true; -djConfig.baseUrl = '/js/dojo/1.1/dojo/'; +djConfig.baseUrl = '/js/dojo/1.1.2/dojo/'; djConfig.scopeMap = [ ["dojo", "dojo11"], ["dijit", "dijit11"], ["dojox", "dojox11"] ]; </script> -<script src="<html:rewrite page='/js/dojo/1.1/dojo/dojo.js'/>" type="text/javascript"></script> +<script src="<html:rewrite page='/js/dojo/1.1.2/dojo/dojo.js'/>" type="text/javascript"></script> <script type="text/javascript"> var imagePath = "<html:rewrite page="/images/"/>"; dojo11.require('dojo.date'); Modified: trunk/web/resource/common/monitor/visibility/DashCharts.jsp =================================================================== --- trunk/web/resource/common/monitor/visibility/DashCharts.jsp 2010-03-23 03:48:52 UTC (rev 14410) +++ trunk/web/resource/common/monitor/visibility/DashCharts.jsp 2010-03-23 03:50:59 UTC (rev 14411) @@ -50,7 +50,7 @@ <META Http-Equiv="Pragma" Content="no-cache"> <META Http-Equiv="Expires" Content="0"> -<script src="<html:rewrite page='/js/dojo/1.1/dojo/dojo.js'/>" type="text/javascript"></script> +<script src="<html:rewrite page='/js/dojo/1.1.2/dojo/dojo.js'/>" type="text/javascript"></script> <script src="<html:rewrite page="/js/functions.js"/>" type="text/javascript"></script> <script src="<html:rewrite page="/js/prototype.js"/>" type="text/javascript"></script> <script src="<html:rewrite page="/js/effects.js"/>" type="text/javascript"></script> |
