Cancel buttons on edit pages. Column fix for flat repositories view.

James Moger

2011-07-20 331fbc638684c605d90d49269202dde071db10c4

 build.xml

@@ -2,7 +2,8 @@
<project name="gitblit" default="compile" basedir=".">



   <!-- Google Code upload task -->

   <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" classpath="${basedir}/tools/ant-googlecode-0.0.3.jar" name="gcupload"/>

   <taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" 
      classpath="${basedir}/tools/ant-googlecode-0.0.3.jar" name="gcupload"/>



   <!-- Project Properties -->

   <property name="project.jar" value="gitblit.jar" />

@@ -382,14 +383,6 @@
         </fileset>

      </copy>



      <!-- Copy google-code-prettify -->

      <mkdir dir="${basedir}/src/com/gitblit/wicket/pages/prettify" />

      <copy todir="${project.site.dir}/prettify">

         <fileset dir="${basedir}/src/com/gitblit/wicket/pages/prettify">

            <exclude name="thumbs.db" />

         </fileset>

      </copy>



      <!-- Generate thumbnails of screenshots -->

      <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildThumbnails">

         <classpath refid="master-classpath" />

@@ -423,9 +416,15 @@


         <arg value="--pageHeader" />

         <arg value="${basedir}/docs/site_header.html" />



			
         <arg value="--pageFooter" />

         <arg value="${basedir}/docs/site_footer.html" />



         <arg value="--analyticsSnippet" />

         <arg value="${basedir}/docs/site_analytics.html" />

				
         <arg value="--adSnippet" />

         <arg value="${basedir}/docs/site_ads.html" />



         <arg value="--alias" />

         <arg value="index=overview" />

@@ -448,10 +447,10 @@
         <arg value="--substitute" />

         <arg value="%JGIT%=${jgit.version}" />



         <arg value="--load" />

         <arg value="--properties" />

         <arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />



      </java>

      </java>	
   </target>

      



@@ -484,7 +483,7 @@
          projectname="gitblit" 

          filename="${distribution.zipfile}" 

          targetfilename="gitblit-${gb.version}.zip"

          summary="Standalone, integrated Gitblit server v${gb.version}"

          summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"

          labels="Featured, Type-Package, OpSys-All" />

         

      <!-- Upload WAR file -->

@@ -494,7 +493,7 @@
           projectname="gitblit" 

           filename="${distribution.warfile}" 

           targetfilename="gitblit-${gb.version}.war"

           summary="Gitblit WAR v${gb.version} for your servlet container"

           summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)"

           labels="Featured, Type-Package, OpSys-All" />

   </target>