[zanata/zanata-server] 6fa93c: Create template for displaying version slugs with ...

[GitHub]

  Branch: refs/heads/display-version-state-on-release
  Home:   https://github.com/zanata/zanata-server
  Commit: 6fa93c10a393854c4cf99d9e78c72473a59c0aa7
      https://github.com/zanata/zanata-server/commit/6fa93c10a393854c4cf99d9e78c72473a59c0aa7
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml

  Log Message:
  -----------
  Create template for displaying version slugs with state-dependent styling and icons.


  Commit: f081d033ee6a76dc943ff5d440b211eeb22f6fc8
      https://github.com/zanata/zanata-server/commit/f081d033ee6a76dc943ff5d440b211eeb22f6fc8
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Use version label template in site.

Use label in all the places I could find:

 - project -> versions tab
 - project: your latest activity
 - version page
 - create version page
 - group -> projects tab
 - group -> languages tab -> projects
 - group -> settings -> projects tab
 - group -> request to join
 - dashboard -> activity tab
 - dashboard -> projects: versions dropdown

Tweak styles and use version label template in a few more places.

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml


  Commit: d51e360a0fee0b22bf99bc3fc1cc949c9a1874c0
      https://github.com/zanata/zanata-server/commit/d51e360a0fee0b22bf99bc3fc1cc949c9a1874c0
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java

  Log Message:
  -----------
  Show appropriate icon for readonly and obsolete in the editor


Compare: https://github.com/zanata/zanata-server/compare/6fa93c10a393^...d51e360a0fee