Fixed activity page row layout regression (issue 79)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 322aed46ead027c8efd10f8f0d61f99c19ed7ad2..057661a0c27f6df78cda5a0ea65e22ee2590d587 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -7,6 +7,8 @@
 #### fixes\r
 \r
 - Fixed absolute path/canonical path discrepancy between Gitblit and JGit regarding use of symlinks (issue 78)\r
+- Fixed row layout on activity page (issue 79)\r
+- Fixed Centos service script (Github/mohamedmansour)\r
 \r
 **0.9.1** *released 2012-03-27*\r
 \r

diff --git a/resources/gitblit.css b/resources/gitblit.css
index f53d3e739dd7bd63031db88f0c74160cdefdcf37..7aa208e823532ef3614b259d4f8a108028eeeb2a 100644 (file)
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -776,6 +776,11 @@ table.activity {
        margin-top: 10px;\r
 }\r
 \r
+table.activity td {\r
+       padding-top:7px;\r
+       padding-bottom:7px;\r
+}\r
+\r
 tr th a { background-position: right; padding-right: 15px; background-repeat:no-repeat; }\r
 tr th.wicket_orderDown a {background-image: url(arrow_down.png); }\r
 tr th.wicket_orderUp a { background-image: url(arrow_up.png); }\r

diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/com/gitblit/wicket/panels/ActivityPanel.html
index 1b3dd0598146851b08b22463d71ddecb9e674414..41541df2ffd026b80d72ddf6c12a862a47365022 100644 (file)
--- a/src/com/gitblit/wicket/panels/ActivityPanel.html
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.html
@@ -9,32 +9,29 @@
 \r
        <div wicket:id="activity" style="padding-bottom:10px;">\r
                <div class="header"><i class="icon-refresh" style="vertical-align: middle;"></i> <span style="font-weight:bold;" wicket:id="title">[title]</span></div>\r
-               <table class="activity" wicket:id="commits">\r
-                       <tr wicket:id="commit"></tr>            \r
+               <table class="activity">\r
+                       <tr wicket:id="commit">\r
+                               <td class="date" style="width:60px; vertical-align: middle;text-align: right;padding-right:10px;" ><span wicket:id="time">[time of day]</span></td>\r
+                               <td style="width:10em;text-align:left;vertical-align: middle;">\r
+                                       <span wicket:id="repository" class="repositorySwatch">[repository link]</span>\r
+                               </td>\r
+                               <td style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td>\r
+                               <td style="vertical-align: middle;">\r
+                                       <img wicket:id="commitIcon" style="vertical-align: middle;"></img>\r
+                                       <span wicket:id="message">[shortlog commit link]</span><br/>\r
+                                       <span wicket:id="author" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span>\r
+                               </td>\r
+                               <td style="text-align:right;vertical-align: middle;">\r
+                                       <div wicket:id="commitRefs">[commit refs]</div>\r
+                               </td>\r
+                               <td class="rightAlign" style="width:7em;vertical-align: middle;">\r
+                               <span class="link">\r
+                                               <a wicket:id="view" target="_blank"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff" target="_blank"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree" target="_blank"><wicket:message key="gb.tree"></wicket:message></a>\r
+                                       </span>\r
+                               </td>           \r
+                       </tr>           \r
                </table>        \r
        </div>\r
-       \r
-       <wicket:fragment wicket:id="commitFragment">\r
-               <td class="date" style="width:60px; vertical-align: middle;text-align: right;padding-right:10px;" ><span wicket:id="time">[time of day]</span></td>\r
-               <td style="width:10em;text-align:left;vertical-align: middle;">\r
-                       <span wicket:id="repository" class="repositorySwatch">[repository link]</span>\r
-               </td>\r
-               <td style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td>\r
-               <td style="vertical-align: middle;">\r
-                       <img wicket:id="commitIcon" style="vertical-align: middle;"></img>\r
-                       <span wicket:id="message">[shortlog commit link]</span><br/>\r
-                       <span wicket:id="author" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span>\r
-               </td>\r
-               <td style="text-align:right;vertical-align: middle;">\r
-                       <div wicket:id="commitRefs">[commit refs]</div>\r
-               </td>\r
-               <td class="rightAlign" style="width:7em;vertical-align: middle;">\r
-               <span class="link">\r
-                               <a wicket:id="view" target="_blank"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff" target="_blank"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="tree" target="_blank"><wicket:message key="gb.tree"></wicket:message></a>\r
-                       </span>\r
-               </td>           \r
-       </wicket:fragment>\r
-       \r
 </wicket:panel>\r
 </body>\r
 </html>
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index 250b58dfd8e34ef6b4d43a8e09993cec498e68da..f75cf7d517acc729e1136fbc2f27c2e6159308b8 100644 (file)
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -19,7 +19,6 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;\r
-import org.apache.wicket.markup.html.panel.Fragment;\r
 import org.apache.wicket.markup.repeater.Item;\r
 import org.apache.wicket.markup.repeater.data.DataView;\r
 import org.apache.wicket.markup.repeater.data.ListDataProvider;\r
@@ -31,8 +30,8 @@ import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.pages.CommitDiffPage;\r
 import com.gitblit.wicket.pages.CommitPage;\r
-import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.GitSearchPage;\r
+import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.SummaryPage;\r
 import com.gitblit.wicket.pages.TreePage;\r
 \r
@@ -55,32 +54,31 @@ public class ActivityPanel extends BasePanel {
                                new ListDataProvider<Activity>(recentActivity)) {\r
                        private static final long serialVersionUID = 1L;\r
 \r
-                       public void populateItem(final Item<Activity> item) {\r
-                               final Activity entry = item.getModelObject();\r
-                               item.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));\r
+                       public void populateItem(final Item<Activity> activityItem) {\r
+                               final Activity entry = activityItem.getModelObject();\r
+                               activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));\r
 \r
                                // display the commits in chronological order\r
-                               DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commits",\r
+                               DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commit",\r
                                                new ListDataProvider<RepositoryCommit>(entry.getCommits())) {\r
                                        private static final long serialVersionUID = 1L;\r
 \r
-                                       public void populateItem(final Item<RepositoryCommit> item) {\r
-                                               final RepositoryCommit commit = item.getModelObject();\r
-                                               Fragment fragment = new Fragment("commit", "commitFragment", this);\r
+                                       public void populateItem(final Item<RepositoryCommit> commitItem) {\r
+                                               final RepositoryCommit commit = commitItem.getModelObject();\r
 \r
                                                // commit time of day\r
-                                               fragment.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()\r
+                                               commitItem.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()\r
                                                                .getWhen(), getTimeZone()));\r
 \r
                                                // avatar\r
-                                               fragment.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));\r
+                                               commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));\r
 \r
                                                // merge icon\r
                                                if (commit.getParentCount() > 1) {\r
-                                                       fragment.add(WicketUtils.newImage("commitIcon",\r
+                                                       commitItem.add(WicketUtils.newImage("commitIcon",\r
                                                                        "commit_merge_16x16.png"));\r
                                                } else {\r
-                                                       fragment.add(WicketUtils.newBlankImage("commitIcon"));\r
+                                                       commitItem.add(WicketUtils.newBlankImage("commitIcon"));\r
                                                }\r
 \r
                                                // author search link\r
@@ -89,7 +87,7 @@ public class ActivityPanel extends BasePanel {
                                                                GitSearchPage.class, WicketUtils.newSearchParameter(commit.repository,\r
                                                                                commit.getName(), author, Constants.SearchType.AUTHOR), true);\r
                                                setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);\r
-                                               fragment.add(authorLink);\r
+                                               commitItem.add(authorLink);\r
 \r
                                                // repository\r
                                                String repoName = StringUtils.stripDotGit(commit.repository);\r
@@ -97,19 +95,19 @@ public class ActivityPanel extends BasePanel {
                                                                repoName, SummaryPage.class,\r
                                                                WicketUtils.newRepositoryParameter(commit.repository), true);\r
                                                WicketUtils.setCssBackground(repositoryLink, repoName);\r
-                                               fragment.add(repositoryLink);\r
+                                               commitItem.add(repositoryLink);\r
 \r
                                                // repository branch\r
                                                LinkPanel branchLink = new LinkPanel("branch", "list", commit.branch,\r
                                                                LogPage.class, WicketUtils.newObjectParameter(commit.repository,\r
                                                                                commit.branch), true);\r
                                                WicketUtils.setCssStyle(branchLink, "color: #008000;");\r
-                                               fragment.add(branchLink);\r
+                                               commitItem.add(branchLink);\r
 \r
                                                LinkPanel commitid = new LinkPanel("commitid", "list subject",\r
                                                                commit.getShortName(), CommitPage.class,\r
                                                                WicketUtils.newObjectParameter(commit.repository, commit.getName()), true);\r
-                                               fragment.add(commitid);\r
+                                               commitItem.add(commitid);\r
 \r
                                                // message/commit link\r
                                                String shortMessage = commit.getShortMessage();\r
@@ -125,25 +123,23 @@ public class ActivityPanel extends BasePanel {
                                                if (!shortMessage.equals(trimmedMessage)) {\r
                                                        WicketUtils.setHtmlTooltip(shortlog, shortMessage);\r
                                                }\r
-                                               fragment.add(shortlog);\r
+                                               commitItem.add(shortlog);\r
 \r
                                                // refs\r
-                                               fragment.add(new RefsPanel("commitRefs", commit.repository, commit\r
+                                               commitItem.add(new RefsPanel("commitRefs", commit.repository, commit\r
                                                                .getRefs()));\r
 \r
                                                // view, diff, tree links\r
-                                               fragment.add(new BookmarkablePageLink<Void>("view", CommitPage.class,\r
+                                               commitItem.add(new BookmarkablePageLink<Void>("view", CommitPage.class,\r
                                                                WicketUtils.newObjectParameter(commit.repository, commit.getName())));\r
-                                               fragment.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,\r
+                                               commitItem.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,\r
                                                                WicketUtils.newObjectParameter(commit.repository, commit.getName()))\r
                                                                .setEnabled(commit.getParentCount() > 0));\r
-                                               fragment.add(new BookmarkablePageLink<Void>("tree", TreePage.class,\r
-                                                               WicketUtils.newObjectParameter(commit.repository, commit.getName())));\r
-\r
-                                               item.add(fragment);\r
+                                               commitItem.add(new BookmarkablePageLink<Void>("tree", TreePage.class,\r
+                                                               WicketUtils.newObjectParameter(commit.repository, commit.getName())));                                          \r
                                        }\r
                                };\r
-                               item.add(commits);\r
+                               activityItem.add(commits);\r
                        }\r
                };\r
                add(activityView);\r