Merge branch 'master' into rpc

James Moger

2011-10-02 f762b160efd5cafd919a6fd7f9587f578eceb454

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

@@ -136,8 +136,7 @@
            String extra = item.getModelObject();

            PageRegistration pageReg = registeredPages.get(extra);

            item.add(new LinkPanel("extraLink", null, getString(pageReg.translationKey),

                  pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName))

                  .setEnabled(!extra.equals(pageWicketId)));

                  pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName)));

         }

      };

      add(extrasView);

@@ -182,8 +181,8 @@
      if (!StringUtils.isEmpty(wicketId)) {

         Component c = get(wicketId);

         if (c != null) {

            //c.setEnabled(false);

            WicketUtils.setCssClass(c, "active");

//            c.setEnabled(false);

//            WicketUtils.setCssClass(c, "selected");

         }

      }

   }

@@ -385,7 +384,7 @@


      void setTranslatedAttributes() {

         WicketUtils.setHtmlTooltip(get("searchType"), getString("gb.searchTypeTooltip"));

         WicketUtils.setHtmlTooltip(get("searchBox"), getString("gb.searchTooltip"));

         WicketUtils.setHtmlTooltip(get("searchBox"), MessageFormat.format(getString("gb.searchTooltip"), repositoryName));

         WicketUtils.setInputPlaceholder(get("searchBox"), getString("gb.search"));

      }



@@ -393,6 +392,10 @@
      public void onSubmit() {

         SearchType searchType = searchTypeModel.getObject();

         String searchString = searchBoxModel.getObject();

         if (searchString == null) {

            // FIXME IE intermittently has no searchString. Wicket bug?

            return;

         }

         for (SearchType type : SearchType.values()) {

            if (searchString.toLowerCase().startsWith(type.name().toLowerCase() + ":")) {

               searchType = type;