Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
rhbz826309 - Add js to submit a search instead of closing the search …
Browse files Browse the repository at this point in the history
…dialog on language page.

Same as previous commit, now on the language team page when searching for users.
  • Loading branch information
Carlos Munoz committed Jun 4, 2012
1 parent 19bd7d0 commit 3cdfa30
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 12 deletions.
28 changes: 18 additions & 10 deletions zanata-war/src/main/webapp/language/language.xhtml
Expand Up @@ -10,6 +10,20 @@
template="../WEB-INF/layout/template.xhtml">

<ui:define name="page_title">#{languageTeamAction.locale.retrieveDisplayName()} Team</ui:define>

<ui:define name="head">
<script type="text/javascript">
function submitSearchOnEnter(e)
{
if(e.keyCode == 13 )
{
#{rich:element('searchBtn')}.click();
return false;
}
}
</script>
</ui:define>

<ui:define name="center_content">
<rich:jQuery selector="#tab_tribes" query="addClass('ui-tabs-selected')" />
<a4j:form>
Expand Down Expand Up @@ -77,14 +91,6 @@
<s:conversationId name="id" value="#{languageTeamAction.language}"/>
</a4j:commandLink>
<s:link styleClass="action_link" value="#{messages['jsf.RequestToJoinLanguageTeam']}" view="/language/join/#{languageTeamAction.language}" rendered="#{identity.loggedIn and not languageTeamAction.isUserInTeam()}" />
<!--
<s:link styleClass="action_link" value="#{messages['jsf.contactLanguageTeamCoordinator']}" view="/language/contact_coordinator.xhtml" propagation="none" rendered="#{identity.loggedIn}">
using this param is not as clean as I'd like, but seems to be the only way to get a literal
value into a bean. Ideally this should be inserted in pages.xml somehow
<f:param name="emailType" value="contact_coordinator" />
<f:param name="id" value="#{languageTeamAction.language}" />
</s:link>
-->
<s:link styleClass="action_link" value="#{messages['jsf.contactLanguageTeamCoordinator']}" view="/language/contact/#{languageTeamAction.language}" propagation="none" rendered="#{identity.loggedIn}" />
<h:outputText rendered="#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}">
<a href="#" class="action_link" onclick="#{rich:component('userAddPanel')}.show()">#{messages['jsf.AddTeamMember']}</a>
Expand All @@ -97,8 +103,10 @@
<a4j:form>
<h1>Find Users To Add</h1>
<p>
<h:inputText value="#{languageTeamAction.searchTerm}" />
<a4j:commandButton value="#{messages['jsf.Search']}"
<h:inputText value="#{languageTeamAction.searchTerm}"
onkeydown="return submitSearchOnEnter(event);"/>
<a4j:commandButton id="searchBtn"
value="#{messages['jsf.Search']}"
action="#{languageTeamAction.searchForTeamMembers}"
reRender="searchResults"
status="searchStatus" />
Expand Down
20 changes: 18 additions & 2 deletions zanata-war/src/main/webapp/version-group/version_group.xhtml
Expand Up @@ -10,6 +10,20 @@
template="../WEB-INF/layout/template.xhtml">

<ui:define name="page_title">#{messages['jsf.Groups']}:#{versionGroupHome.instance.name}</ui:define>

<ui:define name="head">
<script type="text/javascript">
function submitSearchOnEnter(e)
{
if(e.keyCode == 13 )
{
#{rich:element('searchBtn')}.click();
return false;
}
}
</script>
</ui:define>

<ui:define name="center_content">
<a4j:form>
<rich:jQuery selector="#tab_version_groups" query="addClass('ui-tabs-selected')" />
Expand Down Expand Up @@ -72,8 +86,10 @@
<a4j:form>
<h1>Find Project Version</h1>
<p>
<h:inputText value="#{versionGroupAction.searchTerm}" />
<a4j:commandButton value="#{messages['jsf.Search']}"
<h:inputText value="#{versionGroupAction.searchTerm}"
onkeydown="return submitSearchOnEnter(event)"/>
<a4j:commandButton id="searchBtn"
value="#{messages['jsf.Search']}"
action="#{versionGroupAction.searchProjectAndVersion}"
reRender="searchResults"
status="searchStatus" />
Expand Down

1 comment on commit 3cdfa30

@carlosmunoz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should have been two commits but I inadvertently merged them into a single one. One for the language page and another for the project group page.

Please sign in to comment.