From 884fd0d19330ecd8fa292d0bbfae3808bc34b97e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 05 Sep 2014 12:12:39 -0400 Subject: [PATCH] Merge branch 'ticket/163' into develop --- src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html | 43 +++++-------------------------------------- 1 files changed, 5 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html index 05f5601..115b8c1 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html @@ -12,53 +12,20 @@ <div wicket:id="namePanel"></div> - <div> - <b><wicket:message key="gb.description"></wicket:message></b><br/> - <input class="span6" type="text" wicket:id="description" /> - </div> - <hr/> - <div wicket:id="permissionPanel"></div> + <div wicket:id="accessPolicyPanel"></div> <hr/> <h4><wicket:message key="gb.initialCommit"></wicket:message></h4> - <div> - <p><wicket:message key="gb.initialCommitDescription"></wicket:message></p> - </div> + <p><wicket:message key="gb.initialCommitDescription"></wicket:message></p> - <div style="clear:both;padding-top:10px;"> - <div style="display: inline-block;vertical-align: top;"> - <input type="checkbox" wicket:id="addReadme" /> - </div> - <div style="display: inline-block;"> - <b><wicket:message key="gb.initWithReadme"></wicket:message></b><br/> - <p><wicket:message key="gb.initWithReadmeDescription"></wicket:message></p> - </div> - </div> + <div wicket:id="addReadme"></div> - <div style="clear:both;padding-top:10px;display:none;"> - <!-- future GitFlow --> - <div style="display: inline-block;vertical-align: top;"> - <input type="checkbox" wicket:id="addGitflow" /> - </div> - <div style="display: inline-block;"> - <b><wicket:message key="gb.initWithGitflow"></wicket:message></b> - <p><wicket:message key="gb.initWithGitflowDescription"></wicket:message></p> - </div> - </div> + <div wicket:id="addGitIgnore"></div> - <div style="clear:both;padding-top:10px;"> - <div style="display: inline-block;vertical-align: top;"> - <input type="checkbox" wicket:id="addGitignore" /> - </div> - <div style="display:inline-block;"> - <b><wicket:message key="gb.initWithGitignore"></wicket:message></b><br/> - <p><wicket:message key="gb.initWithGitignoreDescription"></wicket:message></p> - <p style="padding-top:5px;"><select class="span2" wicket:id="gitignore" /></p> - </div> - </div> + <div wicket:id="addGitFlow"></div> </div> </div> -- Gitblit v1.9.1