Show account type column in teams panel.

Add a new column to the team panel, showing the account type.

diff --git a/src/main/java/com/gitblit/wicket/panels/TeamsPanel.html b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.html
index ff6892926fcc5452be00c9be63f827f79e1cca7e..2cce7b18c3d006969fd9235735407ec99db5413e 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/TeamsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.html
@@ -15,16 +15,18 @@
                                <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="users_16x16.png"/>\r
                                <wicket:message key="gb.teams">[teams]</wicket:message>\r
                        </th>\r
+                       <th class="hidden-phone" style="width:140px;"><wicket:message key="gb.type">[type]</wicket:message></th>\r
                        <th class="hidden-phone" style="width:140px;"><wicket:message key="gb.teamMembers">[team members]</wicket:message></th>\r
                        <th class="hidden-phone" style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th>\r
                        <th style="width:80px;" class="right"></th>\r
                </tr>\r
-               <tbody>         \r
+               <tbody>\r
                        <tr wicket:id="teamRow">\r
                                <td class="left" ><div class="list" wicket:id="teamname">[teamname]</div></td>\r
+                               <td class="hidden-phone left" ><span style="font-size: 0.8em;" wicket:id="accountType">[account type]</span></td>\r
                                <td class="hidden-phone left" ><div class="list" wicket:id="members">[members]</div></td>\r
                                <td class="hidden-phone left" ><div class="list" wicket:id="repositories">[repositories]</div></td>\r
-                               <td class="rightAlign"><span wicket:id="teamLinks"></span></td>                         \r
+                               <td class="rightAlign"><span wicket:id="teamLinks"></span></td>\r
                        </tr>\r
        </tbody>\r
        </table>\r

diff --git a/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
index c1e1a43d7342aef3b02836c30ed5f65fb385c34c..7f3fd9a2399b32ab69abb0001d9ed953a95d5efc 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
@@ -60,6 +60,7 @@ public class TeamsPanel extends BasePanel {
                                                EditTeamPage.class, WicketUtils.newTeamnameParameter(entry.name));\r
                                WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.name);\r
                                item.add(editLink);\r
+                               item.add(new Label("accountType", entry.accountType.name()));\r
                                item.add(new Label("members", entry.users.size() > 0 ? ("" + entry.users.size())\r
                                                : ""));\r
                                item.add(new Label("repositories",\r