From: <pn...@hy...> - 2008-08-29 18:48:45
|
Author: pnguyen Date: 2008-08-29 11:48:40 -0700 (Fri, 29 Aug 2008) New Revision: 10928 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10928 Modified: trunk/web/resource/common/monitor/visibility/MetricsDisplayControlForm.jsp Log: HHQ-2322: undoing dojo dialog change for advanced settings until a working dojo dialog solution can be implemented Modified: trunk/web/resource/common/monitor/visibility/MetricsDisplayControlForm.jsp =================================================================== --- trunk/web/resource/common/monitor/visibility/MetricsDisplayControlForm.jsp 2008-08-29 17:35:24 UTC (rev 10927) +++ trunk/web/resource/common/monitor/visibility/MetricsDisplayControlForm.jsp 2008-08-29 18:48:40 UTC (rev 10928) @@ -133,7 +133,7 @@ <c:if test="${(rangeEnd - rangeBegin) > 172800000}"> <fmt:message key="resource.common.monitor.visibility.now"/></a> <fmt:message key="common.label.Pipe"/> </c:if> - <html:link href="javascript:showAdvanced()"><fmt:message key="resource.common.monitor.visibility.metricsToolbar.EditRangeBtn"/></html:link> </td> + <html:link href="javascript:moveIt(dojo.byId('advancedDisplay'), '-100px',null);showAdvanced();"><fmt:message key="resource.common.monitor.visibility.metricsToolbar.EditRangeBtn"/></html:link> </td> </tr> </table> </td> @@ -166,7 +166,7 @@ <c:if test="${(rangeEnd - rangeBegin) > 172800000}"> <fmt:message key="resource.common.monitor.visibility.now"/></a> <fmt:message key="common.label.Pipe"/> </c:if> -<html:link href="javascript:showAdvanced()"><fmt:message key="resource.common.monitor.visibility.metricsToolbar.AdvancedSettingsBtn"/></html:link> + <html:link href="javascript:moveIt(dojo.byId('advancedDisplay'), '-100px',null);showAdvanced();"><fmt:message key="resource.common.monitor.visibility.metricsToolbar.AdvancedSettingsBtn"/></html:link> </td> </tr> </table> @@ -182,31 +182,16 @@ </c:choose> </table> <div id="advancedAnchor" style="position: relative; visibility: hidden;"></div> - <div id="advancedDisplay"> - <div class="dialogbody"> + <div id="advancedDisplay" class="dialog" style="width:600px;height:160px; "> <tiles:insert definition=".resource.common.monitor.visibility.embeddedMetricDisplayRange"> <c:if test="${not empty form}"> <tiles:put name="form" beanName="form"/> <tiles:put name="formName" beanName="formName"/> </c:if> </tiles:insert> - </div> </div> <!-- / --> <script type="text/javascript"> -dojo11.require("dijit.Dialog"); -var advanecdDialog; -dojo.addOnLoad(function(){ - advanecdDialog = dojo11.byId('advancedDisplay'); - advanecdDialog.style.width = "600px"; - advanecdDialog.dialog = new dijit11.Dialog({ - id: "create_cbg_dialog", - refocus: true, - autofocus: false, - title: "<fmt:message key='resource.common.monitor.visibility.MetricDisplayRangeTab'/>", - },advanecdDialog); -}); - function hideAdvanced() { var advancedDiv = dojo.byId('advancedDisplay'); advancedDiv.style.display='none'; |