Merge branch 'ticket/245' into develop

James Moger

2015-03-07 d40a44c8c8df8f6bd81c93e72314224f85656f18

 src/main/java/com/gitblit/wicket/WicketUtils.java

@@ -29,12 +29,14 @@
import org.apache.wicket.Component;

import org.apache.wicket.PageParameters;

import org.apache.wicket.Request;

import org.apache.wicket.behavior.AttributeAppender;

import org.apache.wicket.behavior.HeaderContributor;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.markup.html.IHeaderContributor;

import org.apache.wicket.markup.html.IHeaderResponse;

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

import org.apache.wicket.markup.html.image.ContextImage;

import org.apache.wicket.model.Model;

import org.apache.wicket.protocol.http.WebRequest;

import org.apache.wicket.resource.ContextRelativeResource;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

@@ -42,6 +44,7 @@
import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.FederationPullStatus;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.models.FederationModel;

import com.gitblit.models.Metric;

@@ -55,6 +58,10 @@
      container.add(new SimpleAttributeModifier("class", value));

   }



   public static void addCssClass(Component container, String value) {

      container.add(new AttributeAppender("class", new Model<String>(value), " "));

   }

	
   public static void setCssStyle(Component container, String value) {

      container.add(new SimpleAttributeModifier("style", value));

   }

@@ -186,9 +193,9 @@
         return newImage(wicketId, "file_settings_16x16.png");

      }



      MarkupProcessor processor = new MarkupProcessor(GitBlitWebApp.get().settings());

      String ext = StringUtils.getFileExtension(filename).toLowerCase();

      if (processor.getMarkupExtensions().contains(ext)) {

      IStoredSettings settings = GitBlitWebApp.get().settings();

      if (MarkupProcessor.getMarkupExtensions(settings).contains(ext)) {

         return newImage(wicketId, "file_world_16x16.png");

      }

      return newImage(wicketId, "file_16x16.png");