Merge branch 'master' of https://github.com/Mrbytes/gitblit

James Moger

2012-10-13 c658df9e87d65b08d5482cf04489cb0532ff83dd

 src/com/gitblit/wicket/panels/FederationTokensPanel.java

@@ -20,18 +20,19 @@
import java.util.List;



import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.link.ExternalLink;

import org.apache.wicket.markup.html.link.Link;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;



import com.gitblit.Constants.FederationRequest;

import com.gitblit.Constants.FederationToken;

import com.gitblit.FederationServlet;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.FederationUtils;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.SendProposalPage;



public class FederationTokensPanel extends BasePanel {



@@ -40,12 +41,12 @@
   public FederationTokensPanel(String wicketId, final boolean showFederation) {

      super(wicketId);



      final String baseUrl = getRequest().getRelativePathPrefixToContextRoot();

      add(new ExternalLink("federatedUsers", FederationServlet.asPullLink(baseUrl, GitBlit.self()

      final String baseUrl = WicketUtils.getGitblitURL(getRequest());

      add(new ExternalLink("federatedUsers", FederationUtils.asLink(baseUrl, GitBlit.self()

            .getFederationToken(FederationToken.USERS_AND_REPOSITORIES),

            FederationRequest.PULL_USERS)));



      add(new ExternalLink("federatedSettings", FederationServlet.asPullLink(baseUrl, GitBlit

      add(new ExternalLink("federatedSettings", FederationUtils.asLink(baseUrl, GitBlit

            .self().getFederationToken(FederationToken.ALL), FederationRequest.PULL_SETTINGS)));



      final List<String[]> data = new ArrayList<String[]>();

@@ -82,22 +83,11 @@
            }

            item.add(new Label("value", entry[1]));



            item.add(new ExternalLink("repositoryDefinitions", FederationServlet.asPullLink(

            item.add(new ExternalLink("repositoryDefinitions", FederationUtils.asLink(

                  baseUrl, entry[1], FederationRequest.PULL_REPOSITORIES)));



            // TODO make this work

            Link<Void> sendProposal = new Link<Void>("send") {



               private static final long serialVersionUID = 1L;



               @Override

               public void onClick() {

                  error("Sorry, this does not work yet.  :(");

               }

            };

            sendProposal.add(new JavascriptTextPrompt("onclick",

                  "Please enter URL for remote Gitblit instance:"));

            item.add(sendProposal);

            item.add(new BookmarkablePageLink<Void>("send",

                  SendProposalPage.class, WicketUtils.newTokenParameter(entry[1])));



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;