modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 138 +++++----- 1 file changed, 80 insertions(+), 58 deletions(-)
New commits: commit 2dccbf98d5dfb7931d1263f415e57927436397b4 Merge: 165c6dd... 28951fe... Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue May 25 16:00:34 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 165c6dd10417bbc3a2988491a07d01570d50ef5c Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue May 25 15:59:19 2010 -0400
[BZ 586500] Fixed Regression for Refresh Core menu item.
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml index 285807a..50efde2 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml @@ -491,50 +491,71 @@ v <rich:menuItem submitMode="none" </f:facet> </a4j:status>
- - - - - <rich:dropDownMenu rendered="#{request.method == 'GET'}"> - <f:facet name="label"> - <h:panelGroup> - <h:graphicImage value="/images/refreshRunning.gif" rendered="#{UserPreferencesUIBean.pageRefresh != 0}"/> - <h:graphicImage value="/images/refreshStopped.gif" rendered="#{UserPreferencesUIBean.pageRefresh == 0}"/> - <span id="refreshTimeLeft" style="width: 0px;"><h:outputText value="#{UserPreferencesUIBean.pageRefresh}" rendered="#{UserPreferencesUIBean.pageRefresh != 0}"/></span> - - </h:panelGroup> - </f:facet> - - ui:remove***** Logged in as > EDIT DETAILS *****</ui:remove> - - - - <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}', 0)"> - <h:outputText value="Stop"/> - <f:facet name="icon"> - <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 0 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/> - </f:facet> - </rich:menuItem> - <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',60)"> - <h:outputText value="Refresh every 1 minute"/> - <f:facet name="icon"> - <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 60 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/> - </f:facet> - </rich:menuItem> - <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',300)"> - <h:outputText value="Refresh every 5 minutes"/> - <f:facet name="icon"> - <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 300 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/> - </f:facet> - </rich:menuItem> - <rich:menuItem submitMode="none" onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',600)"> - <h:outputText value="Refresh every 10 minutes"/> - <f:facet name="icon"> - <h:graphicImage value="/images/#{UserPreferencesUIBean.pageRefresh == 600 ? 'check.png' : 'spacer.gif'}" width="16" height="16"/> - </f:facet> - </rich:menuItem> - - </rich:dropDownMenu> + ui:remove***** Refresh Graphic *****</ui:remove> + <rich:dropDownMenu rendered="#{request.method == 'GET'}"> + <f:facet name="label"> + <h:panelGroup> + <h:graphicImage + value="/images/refreshRunning.gif" + rendered="#{UserPreferencesUIBean.pageRefresh != 0}" /> + <h:graphicImage + value="/images/refreshStopped.gif" + rendered="#{UserPreferencesUIBean.pageRefresh == 0}" /> + <span + id="refreshTimeLeft" + style="width: 0px;"><h:outputText + value="#{UserPreferencesUIBean.pageRefresh}" + rendered="#{UserPreferencesUIBean.pageRefresh != 0}" /></span> + + </h:panelGroup> + </f:facet> + + ui:remove***** Refresh Intervals *****</ui:remove> + <rich:menuItem + submitMode="none" + onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}', 0)"> + <h:outputText value="Stop" /> + <f:facet name="icon"> + <h:graphicImage + value="/images/#{UserPreferencesUIBean.pageRefresh == 0 ? 'check.png' : 'spacer.gif'}" + width="16" + height="16" /> + </f:facet> + </rich:menuItem> + <rich:menuItem + submitMode="none" + onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',60)"> + <h:outputText value="Refresh every 1 minute" /> + <f:facet name="icon"> + <h:graphicImage + value="/images/#{UserPreferencesUIBean.pageRefresh == 60 ? 'check.png' : 'spacer.gif'}" + width="16" + height="16" /> + </f:facet> + </rich:menuItem> + <rich:menuItem + submitMode="none" + onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',300)"> + <h:outputText value="Refresh every 5 minutes" /> + <f:facet name="icon"> + <h:graphicImage + value="/images/#{UserPreferencesUIBean.pageRefresh == 300 ? 'check.png' : 'spacer.gif'}" + width="16" + height="16" /> + </f:facet> + </rich:menuItem> + <rich:menuItem + submitMode="none" + onclick="updatePageRefresh('#{request.getAttribute('javax.servlet.forward.request_uri')}',600)"> + <h:outputText value="Refresh every 10 minutes" /> + <f:facet name="icon"> + <h:graphicImage + value="/images/#{UserPreferencesUIBean.pageRefresh == 600 ? 'check.png' : 'spacer.gif'}" + width="16" + height="16" /> + </f:facet> + </rich:menuItem> + </rich:dropDownMenu>
ui:remove===== LOGGED IN AS =====</ui:remove>
@@ -628,23 +649,24 @@ v <rich:menuItem submitMode="none"
function refresh() {
- timeLeft = timeLeft - 1; - document.getElementById("refreshTimeLeft").innerHTML = timeLeft; - - if (timeLeft < 1) { - window.location.href = window.location.href; - } - setTimeout("refresh()", 1000); - } - - var refreshTime = <h:outputText value="#{UserPreferencesUIBean.pageRefresh}"/>; - var timeLeft = refreshTime; + if (timeLeft > 0) { + timeLeft = timeLeft - 1; + document.getElementById("refreshTimeLeft").innerHTML = timeLeft; + setTimeout("refresh()", 1000); // call again in 1 second (1000ms) + }
- if (refreshTime > 0) { - setTimeout("refresh()", 1000); - } + if (timeLeft == 0) { + document.getElementById("refreshTimeLeft").innerHTML = timeLeft; + window.location.reload(true); + } + }
+ var refreshTime = <h:outputText value="#{UserPreferencesUIBean.pageRefresh}"/>; + var timeLeft = refreshTime;
+ if (refreshTime > 0) { + setTimeout("refresh()", 1000); + }
</script>
rhq-commits@lists.fedorahosted.org