Merge branch 'release' into integration/master

zanata · Nov 5, 2014 · 8db5803 · 8db5803
2 parents bca212b + 8a9af5e
commit 8db5803
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java b/functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
@@ -73,7 +73,7 @@ public void createABasicGroup() throws Exception {
                 .as("The version group was created");
         VersionGroupPage groupView = versionGroupsPage.goToGroup(groupName);
         assertThat(groupView.getTitle())
-                .isEqualTo("Groups - ".concat(groupName))
+                .isEqualTo("Zanata: Groups - ".concat(groupName))
                 .as("The group is displayed");
     }
 

diff --git a/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
@@ -155,7 +155,7 @@
         #{msgs['jsf.Login']}
       </h:outputLink>
 
-      <h:form rendered="#{applicationConfigurationAction.singleOpenId}">
+      <h:form rendered="#{applicationConfigurationAction.singleOpenId}" styleClass="bx--inline">
         <h:commandLink id="openid_single_signin_link"
           action="#{loginAction.getLoginPageRedirect()}"
           propagation="none" styleClass="l--push-left-half button--primary">

diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
@@ -18,7 +18,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 
-    <title><ui:insert name="page_title"/></title>
+    <title>#{msgs['jsf.Zanata']}: <ui:insert name="page_title"/></title>
 
     <meta name="description" content=""/>
     <meta name="author" content=""/>
@@ -38,7 +38,6 @@
     <script src="js/vendor/selectivizr-min.js"></script>
     <![endif]-->
 
-    <title>#{msgs['jsf.Zanata']}: <ui:insert name="page_title"/></title>
     <link type="text/css" rel="stylesheet"
       href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic"/>
     <ui:insert name="head"/>