Gitblit devel
parent: 3d87db0d | patch | commit | show whitespace
James Moger
2013-11-25 8a71a13f23e6352e8a50e500401959ca90eaf8dc 
Improve doc page formatting

Change-Id: Icd060aad6c5d72bd02bac8b4098d4b9fe418494b
2 files modified
43 ■■■■■ changed files
src/main/java/com/gitblit/wicket/pages/DocPage.html 23 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/DocPage.java 20 ●●●●● patch | view | raw | blame | history 
 src/main/java/com/gitblit/wicket/pages/DocPage.html


@@ -6,13 +6,32 @@






<body>



<wicket:extend>



<div wicket:id="doc"></div>







<wicket:fragment wicket:id="markupContent">



<div class="docs" style="margin-top: -10px;">



        <!-- doc nav links -->    



        <div style="float: right;" class="page_nav2">



        <div style="float: right;" class="docnav">



            <a wicket:id="blameLink"><wicket:message key="gb.blame"></wicket:message></a>  | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="rawLink"><wicket:message key="gb.raw"></wicket:message></a>



        </div>    



    



        <!--  document content -->



        <div class="markdown" style="padding-bottom:5px;" wicket:id="content">[content]</div>



        <div class="markdown" wicket:id="content">[content]</div>



</div>



</wicket:fragment>







<wicket:fragment wicket:id="plainContent">



<div class="docs">



        <!-- doc nav links -->	


        <div style="float: right;" class="docnav">



            <a wicket:id="blameLink"><wicket:message key="gb.blame"></wicket:message></a>  | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="rawLink"><wicket:message key="gb.raw"></wicket:message></a>



        </div>	


	


        <!--  document content -->



        <div wicket:id="content">[content]</div>



</div>



</wicket:fragment>







</wicket:extend>



</body>



</html>




 src/main/java/com/gitblit/wicket/pages/DocPage.java


@@ -20,6 +20,7 @@


import org.apache.wicket.PageParameters;



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



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



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



import org.eclipse.jgit.lib.Repository;



import org.eclipse.jgit.revwalk.RevCommit;







@@ -30,6 +31,7 @@


import com.gitblit.wicket.CacheControl.LastModified;



import com.gitblit.wicket.MarkupProcessor;



import com.gitblit.wicket.MarkupProcessor.MarkupDocument;



import com.gitblit.wicket.MarkupProcessor.MarkupSyntax;



import com.gitblit.wicket.WicketUtils;







@CacheControl(LastModified.BOOT)



@@ -65,16 +67,24 @@


            }



        }







        Fragment fragment;



        MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);



        if (MarkupSyntax.PLAIN.equals(markupDoc.syntax)) {



            fragment = new Fragment("doc", "plainContent", this);



        } else {



            fragment = new Fragment("doc", "markupContent", this);



        }







        // document page links



        add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,



        fragment.add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,



                WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));



        add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,



        fragment.add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,



                WicketUtils.newPathParameter(repositoryName, objectId, documentPath)));



        add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(



        fragment.add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(



                repositoryName, objectId, documentPath)));







        MarkupDocument markupDoc = processor.parse(repositoryName, getBestCommitId(commit), documentPath, markupText);



        add(new Label("content", markupDoc.html).setEscapeModelStrings(false));



        fragment.add(new Label("content", markupDoc.html).setEscapeModelStrings(false));



        add(fragment);



    }







    @Override