Moved paging count to setting. Fixed css layouts. Removed log pager.

James Moger

2011-04-11 50984c55466228ccff0630e49acb4c5e271d446b

Moved paging count to setting.  Fixed css layouts.  Removed log pager.

 gitblit.properties

@@ -77,6 +77,9 @@
# Value must exceed 0 else default of 5 is used

summaryRefsCount = 5



# The number of commits to show on each page of a Log

logPageCommitsCount = 50



# Registered extensions for google-code-prettify

prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb




 src/com/gitblit/wicket/pages/CommitPage.html

@@ -35,7 +35,7 @@
    <div class="commit_message" wicket:id="fullMessage">[commit message]</div>

    

    <!-- changed paths -->

    <table class="pretty">

    <table style="border-top:1px solid #bbb;" class="pretty">

        <tr wicket:id="changedPath">

            <td class="path"><span wicket:id="pathName">[commit path]</span></td>            

            <td>


 src/com/gitblit/wicket/pages/SummaryPage.html

@@ -28,15 +28,15 @@
    </div>



    <!-- commits -->

    <div wicket:id="commitsPanel">[commits panel]</div>	
    <div style="padding-bottom:10px;" wicket:id="commitsPanel">[commits panel]</div>	


    <!-- branches -->

    <div style="width:400px; float:left;">

    <div style="padding-bottom:10px;width:400px; float:left;">

        <div wicket:id="branchesPanel">[branches panel]</div>

    </div>



    <!-- tags -->

    <div style="margin-left:405px;">

    <div style="padding-bottom:10px;margin-left:405px;">

        <div wicket:id="tagsPanel">[tags panel]</div>

    </div>

    


 src/com/gitblit/wicket/panels/BranchesPanel.html

@@ -27,8 +27,6 @@


    <div wicket:id="allBranches">[all branches]</div>    

        

    <!-- spacer -->

    <div style="padding:5px;"></div>

</wicket:panel>

</body>

</html>

 src/com/gitblit/wicket/panels/LogPanel.html

@@ -24,11 +24,8 @@
               </tr>

        </tbody>

    </table>    

    <div class="pager" wicket:id="pageLogs">[pager]</div>

    <div wicket:id="moreLogs">[more...]</div>

    

    <!-- spacer -->

    <div style="padding:5px;"></div>

</wicket:panel>

</body>

</html>

 src/com/gitblit/wicket/panels/LogPanel.java

@@ -4,7 +4,6 @@
import java.util.List;

import java.util.Map;



import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.panel.Panel;

@@ -16,8 +15,8 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.StoredSettings;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.GitBlitWebApp;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.WicketUtils;

@@ -34,13 +33,12 @@
    public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) {

        super(wicketId);

        boolean pageResults = limit <= 0;    

        setOutputMarkupId(pageResults);

		
        int itemsPerPage = StoredSettings.getInteger("logPageCommitsCount", 50);

        final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

        List<RevCommit> commits;

        if (pageResults) {

            // Paging result set

            commits = JGitUtils.getRevLog(r, objectId, pageOffset*GitBlitWebApp.PAGING_ITEM_COUNT, GitBlitWebApp.PAGING_ITEM_COUNT);

            commits = JGitUtils.getRevLog(r, objectId, pageOffset * itemsPerPage, itemsPerPage);

        } else {

            // Fixed size result set

            commits = JGitUtils.getRevLog(r, objectId, 0, limit);

@@ -95,22 +93,12 @@
        if (limit <= 0) {

            // no display limit

            add(new Label("moreLogs", "").setVisible(false));

            add(new Label("pageLogs", "").setVisible(false));

        } else {            

            if (pageResults) {

                // paging

                add(new Label("moreLogs", "").setVisible(false));

                if (commits.size() == limit) {

                    // show pager

                    logView.setItemsPerPage(GitBlitWebApp.PAGING_ITEM_COUNT);

                    add(new AjaxPagingNavigator("pageLogs", logView));

                } else {

                    // nothing to page

                    add(new Label("pageLogs", "").setVisible(false));

                }

            } else {

                // more

                add(new Label("pageLogs", "").setVisible(false));

                if (commits.size() == limit) {

                    // show more

                    add(new LinkPanel("moreLogs", "link", new StringResourceModel("gb.moreLogs", this, null), LogPage.class, WicketUtils.newRepositoryParameter(repositoryName)));


 src/com/gitblit/wicket/panels/TagsPanel.html

@@ -26,8 +26,6 @@
    

    <div wicket:id="allTags">[all tags]</div>    

        

    <!-- spacer -->

    <div style="padding:5px;"></div>

</wicket:panel>

</body>

</html>

 src/com/gitblit/wicket/resources/gitblit.css

@@ -187,7 +187,7 @@
div.commit_message {

    padding: 8px;

    border: solid #bbb;

    border-width: 1px 0px 1px;

    border-width: 1px 0px 0px;

}



div.bug_open, span.bug_open {

@@ -305,10 +305,8 @@
}



table.pretty, table.repositories {

    margin-top:5px;

    margin-bottom:5px;

    border-spacing: 0px;

    border-top: 1px solid #bbb;

    border-left: 1px solid #bbb;

    border-right: 1px solid #bbb;    

}