Browse Source
Improve doc page formatting
Change-Id: Icd060aad6c5d72bd02bac8b4098d4b9fe418494btags/v1.4.0
James Moger
10 years ago
2 changed files with 36 additions and 7 deletions
+ 21
- 2
src/main/java/com/gitblit/wicket/pages/DocPage.html
View File
| @@ -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="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" wicket:id="content">[content]</div> | |||
| </div> | |||
| </wicket:fragment> | |||
| <wicket:fragment wicket:id="plainContent"> | |||
| <div class="docs"> | |||
| <!-- 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 wicket:id="content">[content]</div> | |||
| </div> | |||
| </wicket:fragment> | |||
| </wicket:extend> | |||
| </body> | |||
| </html> | |||
+ 15
- 5
src/main/java/com/gitblit/wicket/pages/DocPage.java
View File
| @@ -20,6 +20,7 @@ import java.util.List; | |||
| 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; | |||
| 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 @@ public class DocPage extends RepositoryPage { | |||
| } | |||
| } | |||
| 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 | |||
Loading…