From 5bcb9448de01e33c23d6cebfdc03164469d5bc3d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 27 Jun 2014 23:11:57 -0400 Subject: [PATCH] Merge branch 'ticket/117' into develop --- src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html | 69 +++------------------------------- 1 files changed, 6 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html index e9f1202..115b8c1 100644 --- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html +++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.html @@ -10,79 +10,22 @@ <div class="row"> <div class="span12"> - <table class="plain"> - <tbody class="settings"> - <tr> - <th><wicket:message key="gb.project"></wicket:message></th> - <td></td> - <th><wicket:message key="gb.name"></wicket:message></th> - </tr> - <tr> - <td><select class="span2" wicket:id="projectPath" /></td> - <td style="font-size:24px;color:#ccc;">/</td> - <td class="edit"><input class="span3" type="text" wicket:id="name" id="name" /> <span class="help-inline"><wicket:message key="gb.nameDescription"></wicket:message></span></td> - </tr> - </tbody> - </table> - - <div> - <b><wicket:message key="gb.description"></wicket:message></b><br/> - <input class="span6" type="text" wicket:id="description" /> - </div> + <div wicket:id="namePanel"></div> <hr/> - <span wicket:id="permissionsGroup"> - <div wicket:id="permissions"> - <div style="display: inline-block;vertical-align: top;"> - <input type="radio" wicket:id="radio" /> - <img wicket:id="image"></img> - </div> - <div style="display: inline-block;vertical-align: top;"> - <b><span wicket:id="name"></span></b><br/> - <span wicket:id="description"></span> - </div> - </div> - </span> + <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