Cancel buttons on edit pages. Column fix for flat repositories view.

James Moger

2011-07-20 331fbc638684c605d90d49269202dde071db10c4

Cancel buttons on edit pages. Column fix for flat repositories view.

 src/com/gitblit/wicket/pages/EditRepositoryPage.html

@@ -25,7 +25,7 @@
                <tr><th><wicket:message key="gb.accessRestriction"></wicket:message></th><td class="edit"><select wicket:id="accessRestriction" tabindex="8" /></td></tr>                

                <tr><th><wicket:message key="gb.isFrozen"></wicket:message></th><td class="edit"><input type="checkbox" wicket:id="isFrozen" tabindex="9" /> &nbsp;<i><wicket:message key="gb.isFrozenDescription"></wicket:message></i></td></tr>

                <tr><th style="vertical-align: top;"><wicket:message key="gb.permittedUsers"></wicket:message></th><td style="padding:2px;"><span wicket:id="users"></span></td></tr>                

                <tr><th></th><td class="editButton"><input type="submit" value="Save" wicket:message="value:gb.save" tabindex="10" /></td></tr>

                <tr><th></th><td class="editButton"><input type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="10" /> <input type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="11" /></td></tr>

            </tbody>

        </table>

    </form>    


 src/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -25,6 +25,7 @@


import org.apache.wicket.PageParameters;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.DropDownChoice;

@@ -182,6 +183,18 @@
        form.add(new CheckBox("showReadme"));

        form.add(usersPalette);



        form.add(new Button("save"));

        Button cancel = new Button("cancel"){          
            private static final long serialVersionUID = 1L;



            @Override

            public void onSubmit() {

                setResponsePage(RepositoriesPage.class);

            }

        };

        cancel.setDefaultFormProcessing(false);

        form.add(cancel);

        
        add(form);

    }




 src/com/gitblit/wicket/pages/EditUserPage.html

@@ -20,7 +20,7 @@
                <tr><th><wicket:message key="gb.confirmPassword"></wicket:message></th><td class="edit"><input type="password" wicket:id="confirmPassword" size="30" tabindex="3" /></td></tr>

                <tr><th><wicket:message key="gb.canAdmin"></wicket:message></th><td class="edit"><input type="checkbox" wicket:id="canAdmin" tabindex="6" /> &nbsp;<i><wicket:message key="gb.canAdminDescription"></wicket:message></i></td></tr>                

                <tr><th style="vertical-align: top;"><wicket:message key="gb.restrictedRepositories"></wicket:message></th><td style="padding:2px;"><span wicket:id="repositories"></span></td></tr>

                <tr><th></th><td class="editButton"><input type="submit" value="Save" wicket:message="value:gb.save" tabindex="7" /></td></tr>

                <tr><th></th><td class="editButton"><input type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="7" /> <input type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="8" /></td></tr>

            </tbody>

        </table>

    </form>    


 src/com/gitblit/wicket/pages/EditUserPage.java

@@ -22,6 +22,7 @@


import org.apache.wicket.PageParameters;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.Form;

@@ -172,6 +173,19 @@
        form.add(confirmPasswordField);

        form.add(new CheckBox("canAdmin"));

        form.add(repositories);

		
        form.add(new Button("save"));

        Button cancel = new Button("cancel"){          
            private static final long serialVersionUID = 1L;



            @Override

            public void onSubmit() {

                setResponsePage(RepositoriesPage.class);

            }

        };

        cancel.setDefaultFormProcessing(false);

        form.add(cancel);

        
        add(form);

    }

}


 src/com/gitblit/wicket/panels/RepositoriesPanel.html

@@ -46,6 +46,7 @@
            <th wicket:id="orderByOwner"><wicket:message key="gb.owner">Owner</wicket:message></th>

            <th></th>

            <th wicket:id="orderByDate"><wicket:message key="gb.lastChange">Last Change</wicket:message></th>

            <th></th>

            <th class="right"></th>

        </tr>

    </wicket:fragment>

@@ -57,10 +58,10 @@
                <wicket:message key="gb.repository">Repository</wicket:message>

            </th>

            <th><wicket:message key="gb.description">Description</wicket:message></th>

            <th></th>

            <th><wicket:message key="gb.owner">Owner</wicket:message></th>

            <th></th>

            <th><wicket:message key="gb.lastChange">Last Change</wicket:message></th>

            <th></th>

            <th class="right"></th>

        </tr>

    </wicket:fragment>

@@ -72,10 +73,10 @@
    <wicket:fragment wicket:id="repositoryRow">

        <td class="left"><div class="list" wicket:id="repositoryName">[repository name]</div></td>

        <td><div class="list" wicket:id="repositoryDescription">[repository description]</div></td>

        <td style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>

        <td class="author"><span wicket:id="repositoryOwner">[repository owner]</span></td>

        <td style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>

        <td><span wicket:id="repositoryLastChange">[last change]</span></td>

        <td style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>

        <td class="rightAlign">

            <span wicket:id="repositoryLinks"></span>

            <a style="text-decoration: none;" wicket:id="syndication">