Integrated pagelinks into RepositoryPage. Fixed string encoding.

James Moger

2011-04-27 3e087ada55f8b0e83b146578b695552db9dc8d97

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

@@ -41,7 +41,7 @@
      super();

      setupPage("", "");



      boolean showAdmin = false;

      final boolean showAdmin;

      if (GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {

         boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);

         showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();

@@ -50,7 +50,7 @@
      }



      Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);

      adminLinks.add(new BookmarkablePageLink<Void>("newRepository", RepositoriesPage.class));

      adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

      adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));

      add(adminLinks.setVisible(showAdmin));



@@ -60,7 +60,7 @@
      if (messageSource.equalsIgnoreCase("gitblit")) {

         // Read default welcome message

         try {

            ContextRelativeResource res = new ContextRelativeResource("/com/gitblit/wicket/resources/welcome.mkd");

            ContextRelativeResource res = WicketUtils.getResource("welcome.mkd");

            InputStream is = res.getResourceStream().getInputStream();

            InputStreamReader reader = new InputStreamReader(is);

            StringWriter writer = new StringWriter();

@@ -101,7 +101,7 @@
      }

      add(repositoriesMessage);



      List<RepositoryModel> rows = GitBlit.self().getRepositories(getRequest());

      List<RepositoryModel> rows = GitBlit.self().getRepositories();

      DataProvider dp = new DataProvider(rows);

      DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repository", dp) {

         private static final long serialVersionUID = 1L;

@@ -112,6 +112,25 @@
            PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);

            item.add(new LinkPanel("repositoryName", "list", entry.name, SummaryPage.class, pp));

            item.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));



            if (entry.useTickets) {

               item.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png", getString("gb.tickets")));

            } else {

               item.add(WicketUtils.newClearPixel("ticketsIcon"));

            }

				
            if (entry.useDocs) {

               item.add(WicketUtils.newImage("docsIcon", "book_16x16.png", getString("gb.docs")));

            } else {

               item.add(WicketUtils.newClearPixel("docsIcon"));

            }

				
            if (entry.useRestrictedAccess) {

               item.add(WicketUtils.newImage("restrictedAccessIcon", "lock_16x16.png", getString("gb.restrictedAccess")));

            } else {

               item.add(WicketUtils.newClearPixel("restrictedAccessIcon"));

            }

				
            item.add(new Label("repositoryOwner", entry.owner));



            String lastChange = TimeUtils.timeAgo(entry.lastChange);

@@ -119,6 +138,15 @@
            item.add(lastChangeLabel);

            WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));



            if (showAdmin) {

               Fragment repositoryLinks = new Fragment("repositoryLinks", "repositoryAdminLinks", this);

               repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)));

               repositoryLinks.add(new BookmarkablePageLink<Void>("renameRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));

               repositoryLinks.add(new BookmarkablePageLink<Void>("deleteRepository", EditRepositoryPage.class, WicketUtils.newRepositoryParameter(entry.name)).setEnabled(false));

               item.add(repositoryLinks);

            } else {

               item.add(new Label("repositoryLinks"));

            }

            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

         }