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

Commit

Permalink
Merge branch 'release' into integration/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Feb 17, 2015
2 parents a828049 + 542f564 commit c32305a
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 71 deletions.
82 changes: 42 additions & 40 deletions zanata-war/src/main/webapp/iteration/view.xhtml
View file
Expand Up @@ -25,8 +25,8 @@
zanata.tabs.activate(jQuery('#languages_tab'));
var clickEle = jQuery('a.' + lang);
if (lang && clickEle.length != 0) {
updateActiveRow(jQuery('a.' + lang))
toggleColumn('languages')
updateActiveRow(jQuery('a.' + lang));
toggleColumn('languages');
reloadLocale(lang)
}
});
Expand Down Expand Up @@ -54,13 +54,13 @@

crossroads.addRoute(':pre*:/iteration/view/{projectSlug}/{versionSlug}/:section:',
function (pre, projectSlug, versionSlug, section) {
section = section || 'languages'
section = section || 'languages';
section = validateTab('#' + section + "_tab", section, "languages");
zanata.tabs.activate(jQuery('#' + section + "_tab"))
});

renderStatistics();
})
});
//]]>

function openUploadSourcePanel(docId) {
Expand Down Expand Up @@ -103,42 +103,44 @@
}
</script>

<a4j:jsFunction name="reloadLocale" status="languageTab-documentsLoader"
onbegin="clearHTML('#{rich:clientId('languages-document_list')}');clearHTML('#{rich:clientId('language-label')}');zanata.loader.activate('#languagesTab-language-label-loader')"
oncomplete="zanata.loader.deactivate('#languagesTab-language-label-loader')"
render="languages-document_list, language-label, languages-export_options, languageTabDocumentSearch-pager, languageTabDocumentSearch-page-info, languageTabDocumentSearchBottom-pager, languageTabDocumentSearchBottom-page-info">
<a4j:param name="val1" assignTo="#{versionHomeAction.selectedLocaleId}"/>
</a4j:jsFunction>

<a4j:jsFunction name="reloadDocument" status="documentsTab-languagesLoader"
onbegin="clearHTML('#{rich:clientId('documents-language_list')}');clearHTML('#{rich:clientId('document-label')}');zanata.loader.activate('#documentsTab-document-label-loader')"
oncomplete="zanata.loader.deactivate('#documentsTab-document-label-loader')"
render="documents-language_list, document-label, documents-language-size, documentsTabLanguageSearch-pager, documentsTabLanguageSearch-page-info, documentsTabLanguageSearchBottom-pager, documentsTabLanguageSearchBottom-page-info"
action="#{versionHomeAction.setSelectedDocumentId(projSlug, verSlug, docId)}">
<a4j:param name="val1" assignTo="#{projSlug}"/>
<a4j:param name="val2" assignTo="#{verSlug}"/>
<a4j:param name="val3" assignTo="#{docId}"/>
</a4j:jsFunction>

<a4j:jsFunction name="refreshStatistics" status="statistic-loader"
oncomplete="refreshTooltip('version-page')" limitRender="true"
render="overall_statistic, languages-language_form, languages-document_list, documents-document_form, documents-language_list, settings-document_form, languages-size, documents-size, language-label, document-label"
action="#{versionHomeAction.resetPageData}"/>

<a4j:jsFunction name="renderStatistics" status="statistic-loader"
oncomplete="refreshTooltip('version-page');updateStateFromUrl()"
render="overall_statistic, languages-language_form, documents-document_form, settings-document_form"
action="#{versionHomeAction.setPageRendered(true)}"/>

<a4j:jsFunction name="runCopyTrans" action="#{copyTransAction.startCopyTrans}"
render="copy-trans, copy-trans-buttons"/>

<a4j:jsFunction name="cancelCopyTrans" action="#{copyTransAction.cancel}"
render="copy-trans, copy-trans-buttons"/>

<a4j:jsFunction name="cancelCopyVersion" limitRender="true"
action="#{versionHomeAction.cancelCopyVersion()}"
render="version-info, version-more-actions, version-settings, copy-version, messages"/>
<h:form styleClass="l--push-bottom-0">
<a4j:jsFunction name="reloadLocale" status="languageTab-documentsLoader"
onbegin="clearHTML('#{rich:clientId('languages-document_list')}');clearHTML('#{rich:clientId('language-label')}');zanata.loader.activate('#languagesTab-language-label-loader')"
oncomplete="zanata.loader.deactivate('#languagesTab-language-label-loader')"
render="languages-document_list, language-label, languages-export_options, languageTabDocumentSearch-pager, languageTabDocumentSearch-page-info, languageTabDocumentSearchBottom-pager, languageTabDocumentSearchBottom-page-info">
<a4j:param name="val1" assignTo="#{versionHomeAction.selectedLocaleId}"/>
</a4j:jsFunction>

<a4j:jsFunction name="reloadDocument" status="documentsTab-languagesLoader"
onbegin="clearHTML('#{rich:clientId('documents-language_list')}');clearHTML('#{rich:clientId('document-label')}');zanata.loader.activate('#documentsTab-document-label-loader')"
oncomplete="zanata.loader.deactivate('#documentsTab-document-label-loader')"
render="documents-language_list, document-label, documents-language-size, documentsTabLanguageSearch-pager, documentsTabLanguageSearch-page-info, documentsTabLanguageSearchBottom-pager, documentsTabLanguageSearchBottom-page-info"
action="#{versionHomeAction.setSelectedDocumentId(projSlug, verSlug, docId)}">
<a4j:param name="val1" assignTo="#{projSlug}"/>
<a4j:param name="val2" assignTo="#{verSlug}"/>
<a4j:param name="val3" assignTo="#{docId}"/>
</a4j:jsFunction>

<a4j:jsFunction name="refreshStatistics" status="statistic-loader"
oncomplete="refreshTooltip('version-page')" limitRender="true"
render="overall_statistic, languages-language_form, languages-document_list, documents-document_form, documents-language_list, settings-document_form, languages-size, documents-size, language-label, document-label"
action="#{versionHomeAction.resetPageData}"/>

<a4j:jsFunction name="renderStatistics" status="statistic-loader"
oncomplete="refreshTooltip('version-page');updateStateFromUrl()"
render="overall_statistic, languages-language_form, documents-document_form, settings-document_form"
action="#{versionHomeAction.setPageRendered(true)}"/>

<a4j:jsFunction name="runCopyTrans" action="#{copyTransAction.startCopyTrans}"
render="copy-trans, copy-trans-buttons"/>

<a4j:jsFunction name="cancelCopyTrans" action="#{copyTransAction.cancel}"
render="copy-trans, copy-trans-buttons"/>

<a4j:jsFunction name="cancelCopyVersion" limitRender="true"
action="#{versionHomeAction.cancelCopyVersion()}"
render="version-info, version-more-actions, version-settings, copy-version, messages"/>
</h:form>


<div class="g" id="version-page">
Expand Down
64 changes: 33 additions & 31 deletions zanata-war/src/main/webapp/version-group/version_group.xhtml
View file
Expand Up @@ -24,16 +24,16 @@
zanata.tabs.activate(jQuery('#languages_tab'));
var clickEle = jQuery('a.' + lang);
if (lang && clickEle.length != 0) {
updateActiveRow(clickEle)
toggleColumn('languages')
updateActiveRow(clickEle);
toggleColumn('languages');
reloadLocale(lang)
}
});

crossroads.addRoute(':pre*:/version-group/view/{slug}/projects/{proj}/{ver}',
function (pre, slug, proj, ver) {
zanata.tabs.activate(jQuery('#projects_tab'));
var clickEle = jQuery('#' + jqSelector(proj + "[" + ver + "]") + " a")
var clickEle = jQuery('#' + jqSelector(proj + "[" + ver + "]") + " a");
if (clickEle.length != 0) {
updateActiveRow(clickEle);
toggleColumn('projects');
Expand All @@ -53,46 +53,48 @@

crossroads.addRoute(':pre*:/version-group/view/{slug}/:section:',
function (pre, slug, section) {
section = section || 'languages'
section = section || 'languages';
section = validateTab('#' + section + "_tab", section, "languages");
zanata.tabs.activate(jQuery('#' + section + "_tab"))
});

renderStatistics();
})
});
//]]>
</script>

<a4j:jsFunction name="reloadLocale" status="languageTab-projectsLoader"
onbegin="clearHTML('#{rich:clientId('languages-project_list')}');clearHTML('#{rich:clientId('language-label')}');zanata.loader.activate('#languagesTab-language-label-loader')"
oncomplete="zanata.loader.deactivate('#languagesTab-language-label-loader')"
render="languages-project_list, language-label, languageTabVersionFilter-pager, languageTabVersionFilter-page-info, languageTabVersionFilterBottom-pager, languageTabVersionFilterBottom-page-info">
<a4j:param name="val1" assignTo="#{versionGroupHomeAction.selectedLocaleId}"/>
</a4j:jsFunction>
<h:outputScript>
function refreshStatistics() {
setTimeout(refreshStatisticsData, 0);
}
</h:outputScript>

<a4j:jsFunction name="reloadVersion" status="projectsTab-languagesLoader"
onbegin="clearHTML('#{rich:clientId('projects-language_list')}');clearHTML('#{rich:clientId('project-label')}');zanata.loader.activate('#projectsTab-project-label-loader')"
oncomplete="zanata.loader.deactivate('#projectsTab-project-label-loader')"
render="projects-language_list, project-label, projectTabLanguageFilter-pager, projectTabLanguageFilter-page-info, projectTabLanguageFilterBottom-pager, projectTabLanguageFilterBottom-page-info"
action="#{versionGroupHomeAction.setSelectedVersionSlug(projSlug, verSlug)}">
<a4j:param name="val1" assignTo="#{projSlug}"/>
<a4j:param name="val2" assignTo="#{verSlug}"/>
</a4j:jsFunction>
<h:form styleClass="l--push-bottom-0">
<a4j:jsFunction name="reloadLocale" status="languageTab-projectsLoader"
onbegin="clearHTML('#{rich:clientId('languages-project_list')}');clearHTML('#{rich:clientId('language-label')}');zanata.loader.activate('#languagesTab-language-label-loader')"
oncomplete="zanata.loader.deactivate('#languagesTab-language-label-loader')"
render="languages-project_list, language-label, languageTabVersionFilter-pager, languageTabVersionFilter-page-info, languageTabVersionFilterBottom-pager, languageTabVersionFilterBottom-page-info">
<a4j:param name="val1" assignTo="#{versionGroupHomeAction.selectedLocaleId}"/>
</a4j:jsFunction>

<h:outputScript>
function refreshStatistics() {
setTimeout(refreshStatisticsData, 0);
}
</h:outputScript>
<a4j:jsFunction name="reloadVersion" status="projectsTab-languagesLoader"
onbegin="clearHTML('#{rich:clientId('projects-language_list')}');clearHTML('#{rich:clientId('project-label')}');zanata.loader.activate('#projectsTab-project-label-loader')"
oncomplete="zanata.loader.deactivate('#projectsTab-project-label-loader')"
render="projects-language_list, project-label, projectTabLanguageFilter-pager, projectTabLanguageFilter-page-info, projectTabLanguageFilterBottom-pager, projectTabLanguageFilterBottom-page-info"
action="#{versionGroupHomeAction.setSelectedVersionSlug(projSlug, verSlug)}">
<a4j:param name="val1" assignTo="#{projSlug}"/>
<a4j:param name="val2" assignTo="#{verSlug}"/>
</a4j:jsFunction>

<a4j:jsFunction name="refreshStatisticsData" status="statistic-loader"
action="#{versionGroupHomeAction.resetPageData}"
render="overall_statistic,languages-language_form,languages-project_list,language-label,projects-project_form,projects-language_list,project-label,languages-size,projects-size"/>
<a4j:jsFunction name="refreshStatisticsData" status="statistic-loader"
action="#{versionGroupHomeAction.resetPageData}"
render="overall_statistic,languages-language_form,languages-project_list,language-label,projects-project_form,projects-language_list,project-label,languages-size,projects-size"/>

<a4j:jsFunction name="renderStatistics" status="statistic-loader"
render="overall_statistic, languages-language_form, projects-project_form"
action="#{versionGroupHomeAction.setPageRendered(true)}"
oncomplete="updateStateFromUrl()"/>
<a4j:jsFunction name="renderStatistics" status="statistic-loader"
render="overall_statistic, languages-language_form, projects-project_form"
action="#{versionGroupHomeAction.setPageRendered(true)}"
oncomplete="updateStateFromUrl()"/>
</h:form>

<div class="g">
<div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">
Expand Down

0 comments on commit c32305a

Please sign in to comment.