Merge pull request #118 from Mrbytes/master

James Moger

2013-10-15 e9dac2e9ead1decb8abb1bf9df3cd638a2f5eb04

 src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java

@@ -41,7 +41,6 @@
import com.gitblit.wicket.pages.EditRepositoryPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.SummaryPage;

import com.gitblit.wicket.pages.TicketsPage;

import com.gitblit.wicket.pages.TreePage;



public class ProjectRepositoryPanel extends BasePanel {

@@ -78,7 +77,7 @@
         add(new Label("originRepository").setVisible(false));

      } else {

         Fragment forkFrag = new Fragment("originRepository", "originFragment", this);

         forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(entry.originRepository), 
         forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(entry.originRepository),

               SummaryPage.class, WicketUtils.newRepositoryParameter(entry.originRepository)));

         add(forkFrag);

      }

@@ -89,7 +88,6 @@
         add(WicketUtils.newClearPixel("sparkleshareIcon").setVisible(false));

      }



      add(new BookmarkablePageLink<Void>("tickets", TicketsPage.class, pp).setVisible(entry.useTickets));

      add(new BookmarkablePageLink<Void>("docs", DocsPage.class, pp).setVisible(entry.useDocs));



      if (entry.isFrozen) {

@@ -103,25 +101,6 @@
      } else {

         add(WicketUtils.newClearPixel("federatedIcon").setVisible(false));

      }

      switch (entry.accessRestriction) {

      case NONE:

         add(WicketUtils.newBlankImage("accessRestrictionIcon").setVisible(false));

         break;

      case PUSH:

         add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png",

               accessRestrictions.get(entry.accessRestriction)));

         break;

      case CLONE:

         add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png",

               accessRestrictions.get(entry.accessRestriction)));

         break;

      case VIEW:

         add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png",

               accessRestrictions.get(entry.accessRestriction)));

         break;

      default:

         add(WicketUtils.newBlankImage("accessRestrictionIcon"));

      }



      if (ArrayUtils.isEmpty(entry.owners)) {

         add(new Label("repositoryOwner").setVisible(false));

@@ -129,10 +108,10 @@
         String owner = "";

         for (String username : entry.owners) {

            UserModel ownerModel = GitBlit.self().getUserModel(username);

			


            if (ownerModel != null) {

               owner = ownerModel.getDisplayName();

            }				
            }

         }

         if (entry.owners.size() > 1) {

            owner += ", ...";

@@ -211,7 +190,5 @@
      }



      add(new ExternalLink("syndication", SyndicationServlet.asLink("", entry.name, null, 0)));



      add(new RepositoryUrlPanel("repositoryPrimaryUrl", true, user, entry, localizer, parent));

   }

}