From a7a9a757ac15f198d8bacf991bea85e8b01a4112 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 03 Mar 2014 16:52:10 -0500
Subject: [PATCH] Fix layouts on edit pages to properly use Bootstrap rows and spans
---
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html | 16 +++++++++++-----
src/main/java/com/gitblit/wicket/pages/EditUserPage.html | 12 +++++++++---
src/main/java/com/gitblit/wicket/pages/EditTeamPage.html | 7 ++++++-
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index 0ea2863..781cf29 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -7,7 +7,8 @@
<wicket:extend>
<body onload="document.getElementById('name').focus();">
<form style="padding-top:5px;" wicket:id="editForm">
-
+<div class="row">
+<div class="span12">
<div class="tabbable">
<!-- tab titles -->
<ul class="nav nav-tabs">
@@ -100,11 +101,16 @@
</table>
</div>
</div>
-
- <div class="row">
- <div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" /> <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" /></div>
- </div>
</div>
+</div>
+</div>
+
+<div class="row">
+<div class="span12">
+ <div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" /> <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" /></div>
+</div>
+</div>
+
</form>
</body>
</wicket:extend>
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.html b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.html
index 7e44c87..33d532c 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.html
@@ -8,7 +8,8 @@
<body onload="document.getElementById('name').focus();">
<!-- Team Table -->
<form style="padding-top:5px;" wicket:id="editForm">
-
+<div class="row">
+<div class="span12">
<div class="tabbable">
<!-- tab titles -->
<ul class="nav nav-tabs">
@@ -55,10 +56,14 @@
</div>
</div>
</div>
+</div>
+</div>
<div class="row">
+<div class="span12">
<div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="6" /> <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="7" /></div>
</div>
+</div>
</form>
</body>
diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.html b/src/main/java/com/gitblit/wicket/pages/EditUserPage.html
index 067fe56..e78e44e 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.html
@@ -8,7 +8,9 @@
<body onload="document.getElementById('username').focus();">
<!-- User Table -->
<form style="padding-top:5px;" wicket:id="editForm">
-
+
+<div class="row">
+<div class="span12">
<div class="tabbable">
<!-- tab titles -->
<ul class="nav nav-tabs">
@@ -52,7 +54,7 @@
<!-- access permissions tab -->
<div class="tab-pane" id="permissions">
- <table class="plain">
+ <table class=plain>
<tbody class="settings">
<tr><th><wicket:message key="gb.teamMemberships"></wicket:message></th><td style="padding:2px;"><span wicket:id="teams"></span></td></tr>
<tr><td colspan="2"><hr></hr></td></tr>
@@ -66,10 +68,14 @@
</div>
</div>
</div>
-
+</div>
+</div>
+
<div class="row">
+<div class="span12">
<div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="9" /> <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="10" /></div>
</div>
+</div>
</form>
</body>
--
Gitblit v1.9.1