Merge branch 'integration/master' of github.com:zanata/zanata into in…

…tegration/master

zanata-war/etc/gui-preview/template.xhtml

@@ -118,7 +118,9 @@
 
 		<div id="container">
 			<div id="bd">
-			    <ui:include src="search_panel.xhtml" />
+				<div id="submenu"> 
+			    	<ui:include src="search_panel.xhtml" />
+			    </div>
 				<div id="yui-main">
 					<div class="yui-b">
 						<a:outputPanel ajaxRendered="true">
@@ -161,6 +163,14 @@
 			</script><script type="text/javascript">
 			try {
 			var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", #{applicationConfiguration.piwikIdSite});
+			var username =  "#{identity.username}";
+			if(#{identity.loggedIn} == false)
+			{
+				username = "anonymous";
+			} 
+			piwikTracker.setCustomVariable (1, "Visit", username, "visit" ); 
+			piwikTracker.setCustomVariable (2, "View page", username, "page" ); 
+
 			piwikTracker.trackPageView();
 			piwikTracker.enableLinkTracking();
 			} catch( err ) {}

zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java

@@ -0,0 +1,72 @@
+package org.zanata.action;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.log.Log;
+
+@Name("breadcrumbs")
+@AutoCreate
+@Scope(ScopeType.PAGE)
+public class Breadcrumbs implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   @Logger
+   Log log;
+
+   private List<Breadcrumb> locations;
+
+
+   public List<Breadcrumb> getLocations()
+   {
+      if (locations == null)
+      {
+         locations = new ArrayList<Breadcrumb>();
+      }
+      return locations;
+   }
+
+   public void clear()
+   {
+      getLocations().clear();
+   }
+
+   public void addLocation(String location, String display)
+   {
+      getLocations().add(new Breadcrumb(location, display));
+   }
+
+   public void addLocation(String location, String display, int index)
+   {
+      getLocations().add(index, new Breadcrumb(location, display));
+   }
+
+   public class Breadcrumb
+   {
+      private String location;
+      private String display;
+
+      public Breadcrumb(String location, String display)
+      {
+         this.location = location;
+         this.display = display;
+      }
+
+      public String getLocation()
+      {
+         return location;
+      }
+
+      public String getDisplay()
+      {
+         return display;
+      }
+   }
+}

zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java

@@ -69,7 +69,7 @@ public class LanguageTeamAction implements Serializable
    @Logger
    Log log;
 
-   @In
+   @In(create= true)
    private List<HLocale> memberLanguage;
 
    private String language;

zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

@@ -359,7 +359,7 @@ public void onTransUnitUpdated(TransUnitUpdatedEvent event)
                navigationService.updateMap(event.getUpdateInfo().getTransUnit().getId().getId(), event.getUpdateInfo().getTransUnit().getStatus());
 
                boolean editing = targetContentsPresenter.isEditing();
-               Integer rowIndex = navigationService.getRowIndex(event.getUpdateInfo().getTransUnit(), isFiltering(), display.getRowValues());
+               Integer rowIndex = navigationService.getRowNumber(event.getUpdateInfo().getTransUnit(), display.getRowValues());
                boolean updateRow = true;
                boolean reopen = false;
 

zanata-war/src/main/resources/messages.properties

@@ -92,7 +92,7 @@ javax.faces.validator.LongRangeValidator.TYPE=value is not of the correct type
 
 javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1}
 javax.faces.converter.STRING=value could not be converted to a string
-
+jsf.AboutZanata=About Zanata
 jsf.AccountDetails=Account Details
 jsf.AccountEnabled=Account enabled
 jsf.Actions=Actions
@@ -120,12 +120,12 @@ jsf.AreYouSureYouWishToDeleteThisLanguageThisActionCannotBeUndone=Are you sure y
 jsf.AreYouSureYouWishToRemoveThisPersonAsProjectMaintainer=Are you sure you wish to remove this person as project maintainer?
 jsf.AreYouSureYouWishToRemoveThisPersonAsGroupMaintainer=Are you sure you wish to remove this person as group maintainer?
 jsf.AvailableLocales=Disabled Locales
+jsf.Blog=Blog
 jsf.Cancel=Cancel
 jsf.ChangePassword=Change Password
 jsf.ChangeYourGravatar=Change your avatar at gravatar.com
 jsf.Close=Close
-jsf.Copyright=Copyright
-jsf.CopyrightYearInfo=2008-11
+jsf.CopyrightYearInfo=2008-12
 jsf.ConfigFile=Config file
 jsf.Configuration=Configuration
 jsf.ConfigurationForZanataini=Configuration [zanata.ini]
@@ -163,6 +163,7 @@ jsf.Active=Active
 jsf.ActiveVersions=Active versions
 jsf.Delete=Delete
 jsf.Description=Description
+jsf.Documentation=Documentation
 jsf.Disabled=Disable
 jsf.Files=Files
 jsf.DuplicatedRecord=Duplicated record
@@ -243,6 +244,7 @@ jsf.Enabled=Enabled
 jsf.EnabledByDefault=Enabled by default
 jsf.Error=Error
 jsf.ErrorTitle=Current Errors:
+jsf.FAQ=FAQ
 jsf.FedoraUsername=Fedora Username
 jsf.FirstExternalLoginMessage=Please verify the email address below and click Save to validate your email address.
 jsf.ForgotYourPassword=Forgot your password?
@@ -265,7 +267,7 @@ jsf.IAgreeToThe=I agree to the
 jsf.ImportJavaLocales=Import Java Locales
 jsf.InvalidActivationKey=Invalid activation key
 jsf.Version=Version
-
+jsf.IrcHelp=IRC Help
 jsf.iteration.ShowAllLocales.title=Your teams will be <span class='highlighted_datatable_row'>highlighted</span> below.
 jsf.iteration.CopyTrans=Copy Translations
 jsf.iteration.CopyTrans.inProgress=Copy Trans in progress...
@@ -305,7 +307,6 @@ jsf.iteration.files.LocaleId=Locale Id
 jsf.iteration.files.Merge=Merge
 jsf.iteration.files.MergeCheckbox.Title=When checked, updated translations will be written, leaving all others unchaged.
 jsf.iteration.files.NoFiles=No Files Available
-jsf.iteration.files.PanelTitle=Available Files
 jsf.iteration.files.Path=Path
 jsf.iteration.files.ProcessDlgTitle=Processing project files...
 jsf.iteration.files.Statistics=Statistics
@@ -318,6 +319,7 @@ jsf.iteration.stats.Percentage=Percentage
 jsf.JavaLocaleId=Java Locale Id
 jsf.JoinLanguageTeam=Join Language Team
 jsf.JoinedGroups=Joined Groups
+jsf.KnownIssues=Known issues
 jsf.Language=Language
 
 jsf.language.validation.Existing=This language already exists
@@ -333,7 +335,6 @@ jsf.language.manager.EnableByDefaultConfirmation=Are you sure you wish to Enable
 jsf.LanguageTeams=Language Teams
 jsf.Languages=Languages
 jsf.LanguageCode=Language Code
-jsf.LanguageManager=Language Manager
 jsf.LatestProjects=Latest Projects
 jsf.LeaveLanguageTeam=Leave Language Team
 jsf.MaintainedGroups=Maintained Groups
@@ -343,7 +344,6 @@ jsf.ManageLanguage=Manage Languages
 jsf.ManageMaintainers=Manage Maintainers
 
 jsf.ManageSearch=Manage Search
-jsf.manageSearch.Actions=Actions
 jsf.manageSearch.Table=Table
 jsf.ManageSearch.SelectAll=Select All
 jsf.ManageSearch.SelectNone=Clear Selection
@@ -410,19 +410,17 @@ jsf.OverallStatistics=Overall Statistics
 jsf.OnlyShowingFirstPagesizeResults=Only showing first #{projectSearch.pageSize} results.
 jsf.Password=Password
 jsf.PleaseContactAdministrationToGetRegistrationLink=Please contact administration to get registration link.
-jsf.PoweredBy=Powered by
-
 jsf.project.EditHomePage.label=Edit Page Code
 jsf.project.EditHomePage.tooltip=Edit the Project's home page code as persisted. Useful when the home page cannot be edited via the project edit page.
 jsf.project.ViewIteration=View >>
 jsf.Project=Project
 jsf.ProjectName=Project Name
 jsf.ProjectMaintainers=Project Maintainers
 jsf.Projects=Projects
-jsf.ProjectMaintainerManager=Project Maintainer Manager
 jsf.ProjectId=Project ID
 jsf.ProjectIdExample=Example: my-project
 jsf.ProjectVersionId=Version ID
+jsf.ReportAProblem=Report a problem
 jsf.RecordNotFound=Record not found
 jsf.Register=Register
 jsf.RegisterUrl=Register URL
@@ -435,19 +433,17 @@ jsf.RemoveLocale=< Remove
 jsf.RequestToJoinLanguageTeam=Request To Join Team
 jsf.RequestToJoinLanguageTeamTitle=Request To Join '#{sendEmail.locale.localeId.id}' Language Team
 jsf.RequestToJoinVersionGroup=Request To Join Group
-jsf.RequestToJoinVersionGroupTitle=Request To Join Group '#{versionGroupJoinAction.group.name}'
 jsf.ResetPassword=Reset Password
 jsf.ResetYourPassword=Reset Your Password
 jsf.ReadOnly=Read-only
 jsf.ReadOnlyVersions=Read-only versions
 jsf.Role=Role
 jsf.RoleDetails=Role Details
 jsf.RoleManager=Role Manager
-jsf.RunningVersionInfo=Zanata version #{applicationConfiguration.version} (#{applicationConfiguration.buildTimestamp}).
+jsf.RunningVersionInfo=version #{applicationConfiguration.version} (#{applicationConfiguration.buildTimestamp}).
 jsf.Save=Save
 jsf.Search=Search
 jsf.SearchProjects=Search Projects
-jsf.SearchResults=Search Results
 jsf.SelectedLocales=Enabled Locales
 jsf.SelectProjectVersions=Select Project Versions
 jsf.server.EditHomePage.label=Edit Page Content
@@ -460,12 +456,15 @@ jsf.Script=Script
 jsf.SignIn=Sign In
 jsf.SignOut=Sign Out
 jsf.SignUp=Sign Up
+jsf.SiteMap=Site map
 jsf.SizeMembers=#{languageTeamAction.locale.members.size} members
 jsf.Slug=Slug
 jsf.Start=Start
 jsf.Statistics=Statistics
 jsf.Status=Status
 jsf.SubmitRequest=Submit Request
+jsf.Support=Support
+jsf.System=System
 jsf.SupportedLanguageDetails=Supported Language Details
 jsf.TeamMembers=Team Members
 jsf.TermsOfUse=Terms of Use
@@ -483,19 +482,19 @@ jsf.Untranslated=Untranslated
 jsf.Update=Update
 jsf.UrlExample=e.g. http://example.com/zanata or http://zanata.example.com
 jsf.UrlToolTip=The base URL for the server, including the application context path (no final slash)
-jsf.UserManager=User Manager
-
 jsf.UserManager.delete.constraintViolation.error=This user cannot be removed from the system. You can deactivate the user instead.
 
 jsf.Username=Username
 jsf.UsernameToolTip=The username should be all in lower case.
 jsf.Variant=Variant
+jsf.View=View
 jsf.Open=Open
 jsf.OpenGWTDevMode=Open (GWT DevMode)
 
 jsf.project.search.IncludeObsoleteTooltip=Include Obsolete Projects in Search
 
 jsf.Warning=Warning
+jsf.Wiki=Wiki
 jsf.YouDoNotHavePermissionToAccessThisResource=You do not have permission to access this resource.
 jsf.YourSessionHasTimedOutPleaseTryAgain=Your session has timed out. Please try again.
 jsf.YourCurrentApiKeyIs=Your current API key is

zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

@@ -687,6 +687,7 @@ td.ApprovedStateDecoration div div div
 .DocumentListTable td {
 	font-size: 15px;
 	cursor: pointer;
+	padding:8px;
 }
 
 .DocumentListTable td.directoryCol {

zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml

@@ -0,0 +1,20 @@
+<div id="breadcrumbs_panel"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:s="http://jboss.com/products/seam/taglib"
+    xmlns:rich="http://richfaces.org/rich">
+
+     <h:form>
+     	<s:link view="/home.xhtml" propagation="none" rendered="#{not empty breadcrumbs.locations}">
+			<img src="#{requestContextPath}/images/zanata-icon/16x16/house.png" alt="#{messages['jsf.ZanataMainDescription']}" style="width:14px;"/>
+		</s:link>
+
+	     <ui:repeat value="#{breadcrumbs.locations}" var="breadcrumb" styleClass="breadcrumbs">
+	     	<img src="/images/zanata-icon/16x16/chevron-right.png"/>
+		    <s:link value="#{breadcrumb.display}" view="#{breadcrumb.location}" styleClass="breadcrumbs_link" rendered="#{not empty breadcrumb.location}"/>
+		    <s:span styleClass="breadcrumbs_display" rendered="#{empty breadcrumb.location}">#{breadcrumb.display}</s:span>
+		</ui:repeat>
+	</h:form>
+</div>