From ce33be67c4c8c783713ad51c187e8296ed71f233 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 05 Apr 2011 08:24:53 -0400
Subject: [PATCH] Fixed-width 980px and centered. Dropped About.
---
src/com/gitblit/wicket/pages/SummaryPage.html | 8 ++++----
/dev/null | 15 ---------------
src/com/gitblit/wicket/pages/ShortLogPage.html | 2 +-
src/com/gitblit/wicket/panels/PageFooter.html | 3 +--
src/com/gitblit/wicket/pages/TreePage.html | 2 +-
src/com/gitblit/wicket/GitBlitWebApp.java | 2 --
resources/gitblit.css | 5 +++++
src/com/gitblit/utils/JGitUtils.java | 2 +-
8 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/resources/gitblit.css b/resources/gitblit.css
index 21f6ca7..032b26e 100644
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -8,9 +8,14 @@
}
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 16a0e9b..0c29eab 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -283,7 +283,7 @@
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 86b6ba6..b5baa65 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -28,7 +28,6 @@
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 @@
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 f6c49cf..0000000
--- a/src/com/gitblit/wicket/pages/AboutPage.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<body>
- <div wicket:id="pageHeader"></div>
-
- <img src="gitblt2.png" />
-
- <!-- footer -->
- <div wicket:id="pageFooter"></div>
-</body>
-</html>
\ 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 fb34f73..0000000
--- 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 ffc0a67..f1daa27 100644
--- a/src/com/gitblit/wicket/pages/ShortLogPage.html
+++ b/src/com/gitblit/wicket/pages/ShortLogPage.html
@@ -9,7 +9,7 @@
<!-- shortlog -->
<div style="margin-top:5px;" class="header" wicket:id="summary"></div>
- <table class="pretty">
+ <table style="width:100%" "class="pretty">
<tbody>
<tr wicket:id="commit">
<td class="date"><span wicket:id="commitDate"></span></td>
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html
index 9ed6929..f5697cd 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.html
+++ b/src/com/gitblit/wicket/pages/SummaryPage.html
@@ -9,12 +9,12 @@
<div>
<!-- Repository Activity Chart -->
- <div style="width:50%;float:right;">
+ <div style="width:400px;float:right;">
<img class="activityGraph" wicket:id="commitsChart" />
</div>
<!-- Repository info -->
- <div style="width:50%;">
+ <div style="margin-right:410px;">
<table class="plain">
<tr><th>description</th><td><span wicket:id="repositoryDescription">Message goes here</span></td></tr>
<tr><th>owner</th><td><span wicket:id="repositoryOwner">Message goes here</span></td></tr>
@@ -40,7 +40,7 @@
<div class="pager" wicket:id="shortlogMore"></div>
<!-- Open Heads Body -->
- <div style="width:34%;float:right;">
+ <div style="width:300px;float:right;">
<!-- heads -->
<div class="header" wicket:id="heads"></div>
<table style="width:100%" class="pretty">
@@ -57,7 +57,7 @@
</div>
<!-- Open Tags body -->
- <div style="width:65%">
+ <div style="margin-right:305px;">
<!-- tags -->
<div class="header" wicket:id="tags"></div>
<table style="width:100%" class="pretty">
diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/com/gitblit/wicket/pages/TreePage.html
index 34806bb..174e427 100644
--- a/src/com/gitblit/wicket/pages/TreePage.html
+++ b/src/com/gitblit/wicket/pages/TreePage.html
@@ -19,7 +19,7 @@
<div wicket:id="breadcrumbs"></div>
<!-- changed paths -->
- <table class="pretty">
+ <table style="width:100%" class="pretty">
<tr wicket:id="changedPath">
<td><span wicket:id="pathName"></span></td>
<td class="size"><span wicket:id="pathSize"></span></td>
diff --git a/src/com/gitblit/wicket/panels/PageFooter.html b/src/com/gitblit/wicket/panels/PageFooter.html
index be1971c..1d55ca3 100644
--- a/src/com/gitblit/wicket/panels/PageFooter.html
+++ b/src/com/gitblit/wicket/panels/PageFooter.html
@@ -3,8 +3,7 @@
<wicket:panel>
<div class="page_footer">
<div style="float:right">
- <span wicket:id="gbVersion"></span> |
- <a title="about git:blit" href="about">About Git:Blit</a>
+ <a href="http://gitblit.com"><span wicket:id="gbVersion"></span></a>
</div>
<div wicket:id="footerText"></div>
</div>
--
Gitblit v1.9.1