From ce33be67c4c8c783713ad51c187e8296ed71f233 Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 5 Apr 2011 08:24:53 -0400 Subject: [PATCH] Fixed-width 980px and centered. Dropped About. --- resources/gitblit.css | 5 +++++ src/com/gitblit/utils/JGitUtils.java | 2 +- src/com/gitblit/wicket/GitBlitWebApp.java | 2 -- src/com/gitblit/wicket/pages/AboutPage.html | 11 ----------- src/com/gitblit/wicket/pages/AboutPage.java | 15 --------------- src/com/gitblit/wicket/pages/ShortLogPage.html | 2 +- src/com/gitblit/wicket/pages/SummaryPage.html | 8 ++++---- src/com/gitblit/wicket/pages/TreePage.html | 2 +- src/com/gitblit/wicket/panels/PageFooter.html | 3 +-- 9 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 src/com/gitblit/wicket/pages/AboutPage.html delete mode 100644 src/com/gitblit/wicket/pages/AboutPage.java diff --git a/resources/gitblit.css b/resources/gitblit.css index 21f6ca7c..032b26ee 100644 --- a/resources/gitblit.css +++ b/resources/gitblit.css @@ -8,9 +8,14 @@ html, body, table, dl, dt, dd, ol, ul, li, form, a, span, tr, th, td, div, em { } body { + width: 980px; margin: 5px; background-color: #ffffff; color: #000000; + margin-right: auto; + margin-left: auto; + margin-top: none; + padding: 0px; } pre.prettyprint, pre.plainprint { diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index 16a0e9bc..0c29eab8 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -283,7 +283,7 @@ public class JGitUtils { size = walk.getObjectReader().getObjectSize(walk.getObjectId(0), Constants.OBJ_BLOB); } } catch (Throwable t) { - LOGGER.error("Failed to retrieve blobl size", t); + LOGGER.error("Failed to retrieve blob size", t); } return new PathModel(name, walk.getPathString(), size, walk.getFileMode(0).getBits(), commit.getName()); } diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java index 86b6ba6e..b5baa653 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/com/gitblit/wicket/GitBlitWebApp.java @@ -28,7 +28,6 @@ import com.gitblit.GitBlitServer; import com.gitblit.StoredSettings; import com.gitblit.utils.JGitUtils; import com.gitblit.wicket.models.RepositoryModel; -import com.gitblit.wicket.pages.AboutPage; import com.gitblit.wicket.pages.BlobPage; import com.gitblit.wicket.pages.CommitPage; import com.gitblit.wicket.pages.HeadsPage; @@ -60,7 +59,6 @@ public class GitBlitWebApp extends WebApplication { getRequestCycleSettings().setGatherExtendedBrowserInfo(true); // setup the url paths - mount(new MixedParamUrlCodingStrategy("/about", AboutPage.class, new String[] { })); mount(new MixedParamUrlCodingStrategy("/summary", SummaryPage.class, new String[] { "p" })); mount(new MixedParamUrlCodingStrategy("/shortlog", ShortLogPage.class, new String[] { "p", "h" })); mount(new MixedParamUrlCodingStrategy("/tags", TagsPage.class, new String[] { "p" })); diff --git a/src/com/gitblit/wicket/pages/AboutPage.html b/src/com/gitblit/wicket/pages/AboutPage.html deleted file mode 100644 index f6c49cf1..00000000 --- a/src/com/gitblit/wicket/pages/AboutPage.html +++ /dev/null @@ -1,11 +0,0 @@ - - - -
- - - - -
- - \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/AboutPage.java b/src/com/gitblit/wicket/pages/AboutPage.java deleted file mode 100644 index fb34f73d..00000000 --- a/src/com/gitblit/wicket/pages/AboutPage.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.gitblit.wicket.pages; - -import com.gitblit.wicket.BasePage; -import com.gitblit.wicket.panels.PageFooter; -import com.gitblit.wicket.panels.PageHeader; - - -public class AboutPage extends BasePage { - - public AboutPage() { - add(new PageHeader("pageHeader")); - - add(new PageFooter("pageFooter")); - } -} diff --git a/src/com/gitblit/wicket/pages/ShortLogPage.html b/src/com/gitblit/wicket/pages/ShortLogPage.html index ffc0a678..f1daa272 100644 --- a/src/com/gitblit/wicket/pages/ShortLogPage.html +++ b/src/com/gitblit/wicket/pages/ShortLogPage.html @@ -9,7 +9,7 @@
- +
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html index 9ed69293..f5697cd6 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/com/gitblit/wicket/pages/SummaryPage.html @@ -9,12 +9,12 @@
-
+
-
+
@@ -40,7 +40,7 @@
-
+
descriptionMessage goes here
ownerMessage goes here
@@ -57,7 +57,7 @@ -
+
diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/com/gitblit/wicket/pages/TreePage.html index 34806bbc..174e4278 100644 --- a/src/com/gitblit/wicket/pages/TreePage.html +++ b/src/com/gitblit/wicket/pages/TreePage.html @@ -19,7 +19,7 @@
-
+
diff --git a/src/com/gitblit/wicket/panels/PageFooter.html b/src/com/gitblit/wicket/panels/PageFooter.html index be1971ce..1d55ca35 100644 --- a/src/com/gitblit/wicket/panels/PageFooter.html +++ b/src/com/gitblit/wicket/panels/PageFooter.html @@ -3,8 +3,7 @@ -- 2.39.5